unraid · elibosley · Jul 8, 2025 · Jul 3, 2025 · Jul 3, 2025 · Jul 3, 2025
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
@@ -1,3 +1,9 @@
 {
+  "permissions": {
+    "allow": [
+      "Bash(rg:*)",
+      "Bash(find:*)"
+    ]
+  },
   "enableAllProjectMcpServers": false
 }
diff --git a/...ile-modifier/modifications/__test__/__fixtures__/downloaded/.login.php.last-download-time b/...ile-modifier/modifications/__test__/__fixtures__/downloaded/.login.php.last-download-time
@@ -1 +1 @@
-1750864232307
+1751630630443
diff --git a/...r/modifications/__test__/__fixtures__/downloaded/DefaultPageLayout.php.last-download-time b/...r/modifications/__test__/__fixtures__/downloaded/DefaultPageLayout.php.last-download-time
@@ -1 +1 @@
-1750864231987
+1751630630198
diff --git a/...fier/modifications/__test__/__fixtures__/downloaded/Notifications.page.last-download-time b/...fier/modifications/__test__/__fixtures__/downloaded/Notifications.page.last-download-time
@@ -1 +1 @@
-1750864232160
+1751630630343
diff --git a/...difier/modifications/__test__/__fixtures__/downloaded/auth-request.php.last-download-time b/...difier/modifications/__test__/__fixtures__/downloaded/auth-request.php.last-download-time
@@ -1 +1 @@
-1750864232467
+1751630630571
diff --git a/...-file-modifier/modifications/__test__/__fixtures__/downloaded/rc.nginx.last-download-time b/...-file-modifier/modifications/__test__/__fixtures__/downloaded/rc.nginx.last-download-time
@@ -1 +1 @@
-1750864333264
+1751630630810
diff --git a/...ile-modifier/modifications/__test__/snapshots/DefaultPageLayout.php.modified.snapshot.php b/...ile-modifier/modifications/__test__/snapshots/DefaultPageLayout.php.modified.snapshot.php
@@ -706,6 +706,7 @@ function flashReport() {
 <?include "$docroot/plugins/dynamix.my.servers/include/myservers1.php"?>
 </head>
 <body>
+<unraid-modals></unraid-modals>
  <div id="displaybox">
   <div class="upgrade_notice" style="display:none"></div>
   <div id="header" class="<?=$display['banner']?>">

diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/default-page-layout.modification.ts b/api/src/unraid-api/unraid-file-modifier/modifications/default-page-layout.modification.ts
@@ -72,13 +72,17 @@ if (is_localhost() && !is_good_session()) {
         );
     }
 
+    private addModalsWebComponent(source: string): string {
+        return source.replace('<body>', '<body>\n<unraid-modals></unraid-modals>');
+    }
     private applyToSource(fileContent: string): string {
         const transformers = [
             this.removeNotificationBell.bind(this),
             this.replaceToasts.bind(this),
             this.addToaster.bind(this),
             this.patchGuiBootAuth.bind(this),
             this.hideHeaderLogo.bind(this),
+            this.addModalsWebComponent.bind(this),
         ];
 
         return transformers.reduce((content, transformer) => transformer(content), fileContent);

diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/log-viewer.modification.ts b/api/src/unraid-api/unraid-file-modifier/modifications/log-viewer.modification.ts
diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-page-layout.patch b/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-page-layout.patch
@@ -53,8 +53,13 @@ Index: /usr/local/emhttp/plugins/dynamix/include/DefaultPageLayout.php
  }
 
  function closeNotifier() {
-@@ -699,11 +708,11 @@
+@@ -695,15 +704,16 @@
+ });
+ </script>
+ <?include "$docroot/plugins/dynamix.my.servers/include/myservers1.php"?>
+ </head>
  <body>
++<unraid-modals></unraid-modals>
   <div id="displaybox">
    <div class="upgrade_notice" style="display:none"></div>
    <div id="header" class="<?=$display['banner']?>">
@@ -66,7 +71,7 @@ Index: /usr/local/emhttp/plugins/dynamix/include/DefaultPageLayout.php
      <?include "$docroot/plugins/dynamix.my.servers/include/myservers2.php"?>
    </div>
    <a href="#" class="move_to_end" title="<?=_('Move To End')?>"><i class="fa fa-arrow-circle-down"></i></a>
-@@ -748,12 +757,12 @@
+@@ -748,12 +758,12 @@
    }
    // create list of nchan scripts to be started
    if (isset($button['Nchan'])) nchan_merge($button['root'], $button['Nchan']);
@@ -80,7 +85,7 @@ Index: /usr/local/emhttp/plugins/dynamix/include/DefaultPageLayout.php
  foreach ($buttons as $button) {
    annotate($button['file']);
    // include page specific stylesheets (if existing)
-@@ -960,26 +969,18 @@
+@@ -960,26 +970,18 @@
          case 'warning': bell2++; break;
          case 'normal' : bell3++; break;
        }
@@ -112,7 +117,7 @@ Index: /usr/local/emhttp/plugins/dynamix/include/DefaultPageLayout.php
  });
 
  <?if ($wlan0):?>
-@@ -1363,7 +1364,8 @@
+@@ -1363,7 +1365,8 @@
      }
    }
  }

diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/ApiKeys.page b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/ApiKeys.page
@@ -3,6 +3,4 @@ Title="API Keys"
 Icon="icon-u-key"
 Tag="key"
 ---
-<unraid-i18n-host>
-    <unraid-api-key-manager />
-</unraid-i18n-host>
+<unraid-api-key-manager />
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Connect.page b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Connect.page
@@ -577,5 +577,5 @@ _(GraphQL API Developer Sandbox)_:
 </div>
 
 <!-- start unraid-api section -->
-<unraid-i18n-host><unraid-connect-settings></unraid-connect-settings></unraid-i18n-host>
+<unraid-connect-settings></unraid-connect-settings>
 <!-- end unraid-api section -->
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/LogViewer.page b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/LogViewer.page
@@ -0,0 +1,6 @@
+Menu="UNRAID-OS"
+Title="Log Viewer (new)"
+Icon="icon-log"
+Tag="list"
+---
+<unraid-log-viewer></unraid-log-viewer>
diff --git a/...n/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Registration.page b/...n/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Registration.page
@@ -18,6 +18,4 @@ require_once "$docroot/plugins/dynamix/include/ReplaceKey.php";
 $replaceKey = new ReplaceKey();
 $replaceKey->check(true);
 ?>
-<unraid-i18n-host>
-  <unraid-registration></unraid-registration>
-</unraid-i18n-host>
+<unraid-registration></unraid-registration>
diff --git a/...rce/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/myservers2.php b/...rce/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/myservers2.php
@@ -17,20 +17,5 @@
 ?>
 <script>
 window.LOCALE_DATA = '<?= $wCTranslations->getTranslationsJson(true) ?>';
-/**
- * So we're not needing to modify DefaultLayout with an additional include, we'll add the Modals web component to the bottom of the body.
- */
-const i18nHostWebComponent = 'unraid-i18n-host';
-const modalsWebComponent = 'unraid-modals';
-if (!document.getElementsByTagName(modalsWebComponent).length) {
-    const $body = document.getElementsByTagName('body')[0];
-    const $i18nHost = document.createElement(i18nHostWebComponent);
-    const $modals = document.createElement(modalsWebComponent);
-    $body.appendChild($i18nHost);
-    $i18nHost.appendChild($modals);
-}
 </script>
-
-<unraid-i18n-host>
-    <unraid-user-profile server="<?= $serverState->getServerStateJsonForHtmlAttr() ?>"></unraid-user-profile>
-</unraid-i18n-host>
+<unraid-user-profile server="<?= $serverState->getServerStateJsonForHtmlAttr() ?>"></unraid-user-profile>
diff --git a/...urce/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/sso-login.php b/...urce/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/sso-login.php
@@ -17,6 +17,4 @@
 echo $wcExtractor->getScriptTagHtml();
 ?>
 
-<unraid-i18n-host>
-    <unraid-sso-button ssoenabled="<?= $serverState->ssoEnabled ? "true" : "false" ?>"></unraid-sso-button>
-</unraid-i18n-host>
+<unraid-sso-button ssoenabled="<?= $serverState->ssoEnabled ? "true" : "false" ?>"></unraid-sso-button>
diff --git a/...raid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php b/...raid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php
@@ -5,6 +5,7 @@ class WebComponentsExtractor
 {
     private const PREFIXED_PATH = '/plugins/dynamix.my.servers/unraid-components/';
     private const RICH_COMPONENTS_ENTRY = 'unraid-components.client.mjs';
+    private const RICH_COMPONENTS_ENTRY_JS = 'unraid-components.client.js';
     private const UI_ENTRY = 'src/register.ts';
     private const UI_STYLES_ENTRY = 'style.css';
 
@@ -47,7 +48,16 @@ private function getRichComponentsFile(): string
             $subfolder = $this->getRelativePath($manifestPath);
 
             foreach ($manifest as $key => $value) {
-                if (strpos($key, self::RICH_COMPONENTS_ENTRY) !== false && isset($value["file"])) {
+                // Skip timestamp entries
+                if ($key === 'ts' || !is_array($value)) {
+                    continue;
+                }
+
+                // Check for both old format (direct key match) and new format (path-based key)
+                $matchesMjs = strpos($key, self::RICH_COMPONENTS_ENTRY) !== false;
+                $matchesJs = strpos($key, self::RICH_COMPONENTS_ENTRY_JS) !== false;
+
+                if (($matchesMjs || $matchesJs) && isset($value["file"])) {
                     return ($subfolder ? $subfolder . '/' : '') . $value["file"];
                 }
             }
@@ -59,7 +69,7 @@ private function getRichComponentsScript(): string
     {
         $jsFile = $this->getRichComponentsFile();
         if (empty($jsFile)) {
-            return '<script>console.error("%cNo matching key containing \'' . self::RICH_COMPONENTS_ENTRY . '\' found.", "font-weight: bold; color: white; background-color: red");</script>';
+            return '<script>console.error("%cNo matching key containing \'' . self::RICH_COMPONENTS_ENTRY . '\' or \'' . self::RICH_COMPONENTS_ENTRY_JS . '\' found.", "font-weight: bold; color: white; background-color: red");</script>';
         }
         return '<script src="' . $this->getAssetPath($jsFile) . '"></script>';
     }

diff --git a/.../dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/welcome-modal.php b/.../dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/welcome-modal.php
@@ -14,7 +14,5 @@
 echo $wcExtractor->getScriptTagHtml();
 ?>
 
-<unraid-i18n-host>
-    <unraid-welcome-modal></unraid-welcome-modal>
-</unraid-i18n-host>
+<unraid-welcome-modal></unraid-welcome-modal>
 
diff --git a/.../source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.plugin.manager/Downgrade.page b/.../source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.plugin.manager/Downgrade.page
@@ -146,9 +146,7 @@ function confirmDowngrade() {
 }
 </script>
 
-<unraid-i18n-host>
-  <unraid-downgrade-os
+<unraid-downgrade-os
     reboot-version="<?= $rebootDetails->rebootVersion ?>"
     restore-version="<?= $rebootDetails->previousVersion ?>"
     restore-release-date="<?= $rebootDetails->previousReleaseDate ?>"></unraid-downgrade-os>
-</unraid-i18n-host>
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.plugin.manager/Update.page b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.plugin.manager/Update.page
@@ -49,6 +49,4 @@ function flashBackup() {
 }
 </script>
 
-<unraid-i18n-host>
-  <unraid-update-os reboot-version="<?= $rebootDetails->rebootVersion ?>"></unraid-update-os>
-</unraid-i18n-host>
+<unraid-update-os reboot-version="<?= $rebootDetails->rebootVersion ?>"></unraid-update-os>