@signalk/app-dock 1.3.2 → 1.3.3

package/README.md

@@ -102,6 +102,8 @@ Open **Plugin Config > App Dock** in the admin UI. The embedded configurator pro
 | `showFullscreenButton` | `false`      | Show fullscreen toggle in dock; hidden automatically where the Fullscreen API is unavailable     |
 | `showExitButton`       | `false`      | Show X button that returns to the Signal K admin UI                                              |
 
+In either `iframeMode`, the server's admin UI (an app whose URL is under `/admin/`, such as the Settings tile) opens fresh every time, at the URL its tile points to. A webapp or page opened from inside the admin UI does not come back the next time Settings is tapped.
+
 ## Access
 
 With security enabled, what the dock offers depends on the visitor:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/app-dock",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "macOS-style configurable app dock for switching between SignalK webapps on touch screens",
   "repository": {
     "url": "https://github.com/SignalK/app-dock"

package/public/dock.js

@@ -614,6 +614,18 @@
   }
 
   // ─── Switch to app ────────────────────────────────────────────────────────────
+  // The server's admin UI leads anywhere: into a webapp, a plugin's page or
+  // another of its own screens. Its tile opens it fresh every time, at the
+  // URL the tile points to, so it never resumes wherever it was left.
+  function opensFresh(app) {
+    try {
+      const url = new URL(app.url, window.location.href)
+      return url.origin === window.location.origin && /^\/admin(\/|$)/.test(url.pathname)
+    } catch {
+      return false
+    }
+  }
+
   function switchToApp(index) {
     const app = cfg.apps[index]
     if (!app) return
@@ -626,7 +638,8 @@
       el.classList.toggle('active', el.dataset.index === String(index))
     })
 
-    const alreadyLoaded = !!iframes[app.url]
+    const fresh = opensFresh(app)
+    const alreadyLoaded = !fresh && !!iframes[app.url]
 
     if (cfg.iframeMode === 'destroy') {
       $iframeContainer.innerHTML = ''
@@ -635,6 +648,11 @@
       Object.values(iframes).forEach((f) => f.classList.remove('active'))
     }
 
+    if (fresh && iframes[app.url]) {
+      iframes[app.url].remove()
+      delete iframes[app.url]
+    }
+
     if (!iframes[app.url]) {
       if (!alreadyLoaded) showLoading(app.label)