domma-cms 1.4.0 → 1.6.0

package/plugins/_lib/admin/mail/compose-window.js

@@ -69,7 +69,8 @@ function formatSize(bytes) {
 }
 
 import {applyIdentity, findIdentity, identityFrom, swapSignature} from './identity.js';
-import {describeWhen, quickTimes} from './scheduling.js';
+import {describeWhen, quickTimes, sendQuestion} from './scheduling.js';
+import {isSendShortcut} from './keyboard.js';
 import {fmtDateTime} from '../ui/dates.js';
 import {applyTemplate, expandTemplate} from './templates.js';
 import {makeResizable} from './resizable.js';
@@ -300,7 +301,7 @@ const FORM = `
         <button type="button" class="btn btn-sm btn-ghost" data-on-click="later" title="Send this at a time you choose">Later…</button>
         <button type="button" class="btn btn-sm btn-primary" data-on-click="send"
                 data-bind-disabled="cannotSend.value" data-bind-text="sendLabel.value" data-bind-title="sendTitle.value"></button>
-        <span data-help-title="Sending" data-help="Later… sends at a time you choose, and the button then says when. With an undo delay set in Mail Settings, Send holds the message for those seconds so you can take it back; it has not gone until they pass."></span>
+        <span data-help-title="Sending" data-help="Ctrl+Enter (Cmd+Enter on a Mac) sends too, after asking first. Later… sends at a time you choose, and the button then says when. With an undo delay set in Mail Settings, Send holds the message for those seconds so you can take it back; it has not gone until they pass."></span>
     </div>
 </div>`;
 
@@ -848,6 +849,25 @@ export function openCompose({
     attachList.addEventListener('click', onAttachClick);
     attachList.addEventListener('keydown', onAttachKey);
 
+    // Ctrl+Enter (Cmd+Enter): send, from anywhere in the window - the editor included - but only
+    // after "Are you sure?", because the combination is easy to hit while typing.
+    let askingSend = false;
+    const onSendKey = async (e) => {
+        if (!isSendShortcut(e)) return;
+        e.preventDefault();
+        e.stopPropagation();
+        if (askingSend || closed || cannotSend.peek()) return;
+        askingSend = true;
+        try {
+            const q = sendQuestion({...collect(), sendAt: scheduledAt.peek(), undoSeconds});
+            const ok = await E.confirm(q.text, {title: q.title, confirmText: q.confirmText, cancelText: 'Keep writing'});
+            if (ok && !closed && !cannotSend.peek()) await send();
+        } finally {
+            askingSend = false;
+        }
+    };
+    slideover.element.addEventListener('keydown', onSendKey, true);
+
     slideover.element.appendChild(form);
     const stopResizing = makeResizable(slideover, {
         storageKey: 'domma-mail.compose-width',
@@ -911,6 +931,7 @@ export function openCompose({
         attachMenu?.destroy?.();
         attachList.removeEventListener('click', onAttachClick);
         attachList.removeEventListener('keydown', onAttachKey);
+        slideover.element?.removeEventListener('keydown', onSendKey, true);
         try { stopHelp?.(); } catch { /* gone */ }
         closedListeners.splice(0).forEach(fn => { try { fn(); } catch { /* ignore */ } });
         // Domma hides a closed slideover rather than removing it: every message

package/plugins/_lib/admin/mail/keyboard.js

@@ -126,11 +126,26 @@ export const SHORTCUTS = [
     ['r / Shift-R', 'Reply / reply all'],
     ['f', 'Forward'],
     ['c', 'New message'],
+    ['Ctrl-Enter', 'Send the message you are writing (asks first; Cmd-Enter on a Mac)'],
     ['/', 'Search'],
     ['x', 'Select or deselect'],
     ['Shift-A', 'Select all on this page'],
     ['!', 'Mark as spam, or not spam'],
     ['# or Delete', 'Delete'],
     ['Esc', 'Clear search or selection'],
-    ['?', 'This list']
+    ['?', 'This list'],
+    ['G then a letter', 'Go to another Tool (G then D for Dashboards); Ctrl-K finds any Tool by name, and ? outside Email lists every hotkey']
 ];
+
+/**
+ * Ctrl+Enter (Cmd+Enter on a Mac) - "send" in the compose window, as in most
+ * mail clients. The one combination this file claims, and only in compose,
+ * where it asks before anything goes (compose-window.js).
+ *
+ * @param   {KeyboardEvent} event
+ * @returns {boolean}
+ */
+export function isSendShortcut(event) {
+    if (!event || event.key !== 'Enter' || event.altKey || event.shiftKey || event.isComposing) return false;
+    return Boolean(event.ctrlKey || event.metaKey) && !(event.ctrlKey && event.metaKey);
+}

package/plugins/_lib/admin/mail/scheduling.js

@@ -203,3 +203,25 @@ export function dueNow(items, now = Date.now()) {
         return Number.isFinite(when) && when <= at;
     });
 }
+
+/**
+ * The "Are you sure?" for Ctrl+Enter: who it goes to, what, and when - a
+ * keypress is easy to make by accident, so the question says what would happen.
+ *
+ * @param   {{to?: Array<{name?: string, address?: string}|string>, subject?: string, sendAt?: string|null, undoSeconds?: number}} msg
+ * @param   {Date} [now]
+ * @returns {{title: string, text: string, confirmText: string}}
+ */
+export function sendQuestion({to = [], subject = '', sendAt = null, undoSeconds = 0} = {}, now = new Date()) {
+    const names = (Array.isArray(to) ? to : []).map(r => (typeof r === 'string' ? r : (r?.name || r?.address || ''))).filter(Boolean);
+    const who = !names.length ? 'nobody yet'
+        : names.length <= 3 ? names.join(', ')
+            : `${names.slice(0, 2).join(', ')} and ${names.length - 2} more`;
+    const what = String(subject || '').trim() ? `"${String(subject).trim().slice(0, 80)}"` : 'this message (no subject)';
+    if (sendAt) {
+        return {title: 'Schedule this message?', confirmText: 'Schedule',
+            text: `Send ${what} to ${who} ${describeWhen(sendAt, now)}?`};
+    }
+    return {title: 'Send this message?', confirmText: 'Send',
+        text: `Send ${what} to ${who} now?${undoSeconds > 0 ? ` You will have ${undoSeconds} seconds to take it back.` : ''}`};
+}

package/plugins/blog/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "blog",
   "displayName": "Blog",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "tier": "free",
   "description": "Public-facing blog with posts, categories and comments - layouts and listings built from editable blocks.",
   "author": "Domma CMS",
@@ -17,6 +17,7 @@
         "text": "Blog",
         "icon": "file-text",
         "url": "#/plugins/blog",
+        "hotkey": "b",
         "section": "#/plugins/blog",
         "countUrl": "/api/plugins/blog/comments/pending-count",
         "children": [

package/plugins/booking/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "booking",
   "displayName": "Booking",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "tier": "free",
   "description": "Let people book appointments with you or your team, and rooms or equipment, from a booking page on your site. Opening hours, days off and buffers; confirmation and reminder emails with a link to change or cancel; a diary in the admin. Book straight from a contact or an email.",
   "author": "Domma CMS",
@@ -48,6 +48,7 @@
         "text": "Booking",
         "icon": "clipboard-check",
         "url": "#/plugins/booking",
+        "hotkey": "k",
         "section": "#/plugins/booking",
         "permission": "booking",
         "countUrl": "/api/plugins/booking/count"

package/plugins/free-tier.lock.json

@@ -1,9 +1,9 @@
 {
   "note": "Written by `make sync-free-tier` in dcms-marketplace. Do not edit these plugins here - edit them there and sync.",
-  "source": "dcms-marketplace@c9103e9",
+  "source": "dcms-marketplace@8b9c2f1",
   "plugins": {
     "blog": {
-      "version": "1.9.4",
+      "version": "1.9.5",
       "files": {
         "CLAUDE.md": "926730d510cc38f6764ffcb9afbed1c3ae3a547117c6c0243b14f899271350fb",
         "admin/css/index.css": "6142a6b756e1218157842528830b1e84f592f0b84b7d5ce6449db421b6f4b039",
@@ -50,7 +50,7 @@
         "lib/render.js": "0e97c6a950bc962c8d8ea4b2f21d06cb73fbcdc738d8942d6935d01309a29b1d",
         "lib/samples.js": "e8cdb77ce22e43937707f6854d3a5cb722437dc584e22ac7b24480bef686cf85",
         "plugin.js": "0aa46a01b5298065497f39729b88e34a9f56ac684b0a14f8d94ab6007f0221d0",
-        "plugin.json": "7bfba248651527bb98fa388a66234a53e9808c6a28e878504a1fa9fae216b658",
+        "plugin.json": "b4d7637ecb053df7ab182aaed7962c52e47fbee0eedcd041964585fbc85ea7da",
         "plugin.public.js": "67e109da613237d9ec52e7cc2f3442bb61ca5a51cb184448b9f0d993e50f7ae3",
         "public/blog.css": "fd733e6b624190da1e70dc1b6613e2376efd7f7570a28fab311d81006d03d960",
         "public/blog.js": "d01c72a9834dcc7c5241923371f2b164ac30d20ac9f1a5c5dc5b71fa3cb09f08",
@@ -73,7 +73,7 @@
       }
     },
     "booking": {
-      "version": "1.6.1",
+      "version": "1.6.2",
       "files": {
         "CLAUDE.md": "9a862d4f9ee4676c67af9699820015d7e0ab98b14b62deee6d51cefe0cc28471",
         "admin/css/index.css": "4f7731921c0c5038cb1566a6ab2d43ffc35bf9b161e58f87a0cff423e81b47fa",
@@ -100,7 +100,7 @@
         "lib/mail.js": "cad8f409df62d6e42f0f4024ec364bbe018a62b842fa3f7c38786fd4e7f92408",
         "lib/store.js": "7aa7967e4694e5a3b85378f60302e5a47394b1d90c7dd86e09578156f1c13e03",
         "plugin.js": "948cf76ee8495d9a6bce85c4f5549107385c8a947bc7690ff08d6d2b870f458d",
-        "plugin.json": "ce7b3e0154550b8c25e447571dc0deb329f4adff13408d569573ea592d91073c",
+        "plugin.json": "6032a3e333e3ae492a2484fbb0ab93cfffe20c9d01e85f67ef7369c55e5c6f10",
         "plugin.public.js": "4d5b4e8ad6943182ee3b6c6e6f6762a2d3f676d8d7ee363fcb07bd47d3d6532e",
         "public/booking.css": "8b88989fdd04e50efc1688a2f32fe2e422299d7d13b81bb8fce0cc162fa99df6",
         "public/booking.js": "7dfc3d205696967013886567f67a867443c2e370bac29019d69911d695fdbade",
@@ -138,14 +138,14 @@
       }
     },
     "mail-reader": {
-      "version": "1.2.4",
+      "version": "1.2.6",
       "files": {
-        "CLAUDE.md": "29a46b6113dafb37c5e4c728a0d1f7286e805301e7d3d2bbae0c72eb43d5f456",
+        "CLAUDE.md": "40b25e33b9f14636bf766b68d1af5be24dcf69ccf6d770b9d080c1ed81664abb",
         "admin/views/mail.js": "c5c6483f9618c75cac8f4be32d3aea99511db76d4b9d38b8ef43bdc1d35db3c5",
         "config.js": "6e65803ad822a9acda40c203631b8eb32a87cf9d9e5f1c7cb59d01aa406075c6",
-        "docs/guide.md": "14f8c45663c1325f681cce418d59d4093cc858d605a98630cce0030fff5e479d",
+        "docs/guide.md": "a8febdc46bf60af35c6d980ac37629baa93da94e0970473f6fbe2d3f242ceb63",
         "plugin.js": "7f602a60c4eca7d3637659d03d5de9e242584666846b16c9e5a1b758e4856c9f",
-        "plugin.json": "0d928f4a6dc5bcca9e23e35280d026eb133a8bb1120daea54cbe754c2b4e7773"
+        "plugin.json": "af84350ede3edcb8b07ca752f8799245519a475c2242e89919a7e3e9b74cc8ff"
       }
     },
     "security": {
@@ -175,7 +175,7 @@
       }
     },
     "shopping-cart": {
-      "version": "1.1.0",
+      "version": "1.1.1",
       "files": {
         "CLAUDE.md": "70765cf061e97d0a57890d7731e0624b224e36267df42741e763e3efcd076d05",
         "admin/css/index.css": "a6bab1d0072e364ee1d94c2d7d7b99c3660ba91c5eba537e269a579f5b17f924",
@@ -199,7 +199,7 @@
         "lib/shop.js": "4399931dd46ab4dc9bd28e8613c992420ab822bd694b1495ef2b4ad6483b5153",
         "lib/summary.js": "5697ffa45c9cc5338bbcb6eada08671c3e8376c49c629d2ae99b022397523f71",
         "plugin.js": "1f8477188b4054d172b37d953a439b4d5d4a532c6d26daaf9808346f332ddfcf",
-        "plugin.json": "eccf7d9bf2f7fdde26d78c82b944897031387b42ab26daa04c59d7a5cac3ea5f",
+        "plugin.json": "e379f3d5a713684d3f1d32dfa2ae1ec26f8a79a346e2591b1b2ea9b1263d6f54",
         "plugin.public.js": "98fa32b6c69db4a967577f3536fc521c926053319dd20d2bae8bc7e94830e3e8",
         "public/cart.js": "fcc706773a36e4bfd02ea235bcdad629137e996218e0a0e23892e33c689f2a6e",
         "public/lib/money.js": "d22b2b6f80dde6f7887b69e24188c05ea93c02217aba639b5331aa3bd616f4fc",
@@ -224,7 +224,7 @@
       }
     },
     "support": {
-      "version": "1.1.0",
+      "version": "1.1.1",
       "files": {
         "CLAUDE.md": "ff42515f210dfdbeb1b14992012177ad8513323a340a0d4fe69a6ec13773db5a",
         "admin/css/index.css": "bad02a487ebb131b64ee55e2a4533c8b79d6ada80fffd34b0952bf3b68204a36",
@@ -240,7 +240,7 @@
         "lib/sender.js": "b20aaee34ade89814a897f68467f9902693843fa6b5c8eb0090c4059193c8227",
         "lib/shape.js": "04d840b589d20700ccb2cfa4c72072f8d9f8e03f0573e2ea1177a7a83a383bea",
         "plugin.js": "e3c50a05fa99cb24375782bbb3ca8c58cf5ddc3036937e6115f4d963715c120e",
-        "plugin.json": "e6efaf06f7f2c99b196909e56f0a0b6d65b438ffd6d616aa4207769861f9bd66",
+        "plugin.json": "85ea5009e63d12ddbcf2be9d0df330827e3bf3babd35deddd47fce1da807049e",
         "tests/api.test.js": "1fa87f6ae12c48fc34a5fb2b5bbeed6cfaa36329610674d4fae05d64734dbb15",
         "tests/shape.test.js": "364c6b7680699f59fcd449cd448184486488838300f155135daea4c05387cf74"
       }

package/plugins/mail-reader/CLAUDE.md

@@ -102,3 +102,9 @@ With the Tool switched off its API 404s and the action is simply absent.
 
 Right-click on the open message is engine code (`_lib/admin/mail/body-menu.js`, the `MENU_BRIDGE` in
 `_lib/mail/render.js`); this version only documents it in docs/guide.md. Ship after the core release.
+
+## Messages per page (guide only, 1.2.5; core domma-cms PR #98, 0.116.8)
+
+The page-size picker under the list is engine code (`listPageSize()`/`pageAfterResize()` in
+`_lib/admin/mail/settings-section.js`, sent as `limit` by `reader-view.js`, capped by `maxListLimit`);
+this version only documents it in docs/guide.md. 0.116.8 is already released, so it can ship now.

package/plugins/mail-reader/docs/guide.md

@@ -41,7 +41,7 @@ You need your mailbox's IMAP details from your email provider: the server name,
 
 ### Message list
 
-- Newest first, 50 messages a page. Use **Newer** and **Older** to page.
+- Newest first, 50 messages a page. Use **Newer** and **Older** to page. The picker between them shows 25, 50, 100 or 200 a page instead; this browser remembers your choice, and changing it keeps you at the same messages.
 - Icons on a row show high priority, messages you have replied to, and attachments.
 - **Refresh** (the circular arrow) fetches the list again.
 - Right-click a message for **Open**, **Copy sender's address**, **Copy subject** and **Add sender to contacts**. The last one is shown only when the Contacts Tool is switched on, and is greyed out when the sender is already in your contacts.
@@ -96,7 +96,7 @@ Whoever runs the site can change these in the plugin's configuration file (`conf
 
 | Option | Default | Meaning |
 |---|---|---|
-| `listLimit` | 50 | Messages per page |
+| `listLimit` | 50 | Messages per page until you pick another size under the list |
 | `allowRemoteImages` | false | Load remote images without asking |
 | `allowInsecureTLS` | false | Accept mail server certificates that do not verify (see Tips) |
 | `connectionTimeoutMs` | 20000 | How long to wait for a mail server, in milliseconds |

package/plugins/mail-reader/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "mail-reader",
   "displayName": "Mail Reader",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "tier": "free",
   "description": "Read-only IMAP mailbox reader. Connects to a standard IMAP server and reads mail without ever writing to it.",
   "author": "Darryl Waterhouse",
@@ -17,6 +17,7 @@
         "text": "Mail Reader",
         "icon": "mail",
         "url": "#/plugins/mail-reader",
+        "hotkey": "r",
         "section": "#/plugins/mail-reader",
         "countUrl": "/api/plugins/mail-reader/unread",
         "permission": "email"

package/plugins/shopping-cart/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "shopping-cart",
   "displayName": "Shopping Cart",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "tier": "free",
   "description": "Sell from your site: products with options, stock and pictures, a storefront and a cart that follows shoppers from page to page, and checkout with Stripe, PayPal or payment offline. Orders to fulfil in the sidebar, refunds from the order.",
   "author": "Domma CMS",
@@ -32,6 +32,7 @@
         "text": "Shop",
         "icon": "shopping-bag",
         "url": "#/plugins/shopping-cart",
+        "hotkey": "h",
         "section": "#/plugins/shopping-cart",
         "permission": "shop",
         "countUrl": "/api/plugins/shopping-cart/count"

package/plugins/support/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "support",
   "displayName": "Support",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "tier": "free",
   "description": "Get help from Domma straight from your admin: our email, phone and hours always to hand, and a conversation with the Domma team for anything you need - urgent requests first. Right-click a request to archive, resolve or remove it.",
   "author": "Domma CMS",
@@ -41,6 +41,7 @@
         "text": "Support",
         "icon": "headphones",
         "url": "#/plugins/support",
+        "hotkey": "s",
         "section": "#/plugins/support",
         "permission": "support",
         "countUrl": "/api/plugins/support/count"

package/server/routes/api/auth.js

@@ -250,8 +250,8 @@ export async function authRoutes(fastify) {
             menuItems: async () => (await getMenu('admin-sidebar').catch(() => null))?.items || [],
             canSee: (visibility) => checkVisibility(request.user, visibility)
         });
-        // Dashboard Pro's "Open the admin on my board" - for a user the admin does not confine.
-        if (!adminScope && isDashboardPro() && (await readPrefs(request.user)).home) adminHome = '/my-dashboard';
+        // Dashboard Pro's "Open on my boards" - for a user the admin does not confine.
+        if (!adminScope && isDashboardPro() && (await readPrefs(request.user)).home) adminHome = '/dashboards';
         return {permissions, adminScope, adminHome};
     });
 

package/server/routes/api/sidebar.js

@@ -26,6 +26,17 @@ export async function sidebarRoutes(fastify, opts = {}) {
     const authenticate = opts.authenticate || defaultAuthenticate;
     const signedIn     = {preHandler: [authenticate]};
 
+    /** Dashboard Pro: the Dashboard entry (`#/`) is Dashboards, wearing the name this person (or the site) gave it. */
+    const dashboardsLabel = async (request) => (isDashboardPro()
+        ? boardName(await readPrefs(request.user), await readSite())
+        : null);
+    /** Relabel the entry for `#/` - only while it still says "Dashboard", so a name an admin gave it stays. */
+    const relabel = (items, label) => (items || []).map((it) => {
+        if (!it || typeof it !== 'object') return it;
+        const next = it.url === '#/' && String(it.text || '').trim() === 'Dashboard' ? {...it, text: label} : it;
+        return Array.isArray(next.items) ? {...next, items: relabel(next.items, label)} : next;
+    });
+
     fastify.get('/sidebar/menu', signedIn, async (request) => {
         const menu = await getMenu(ADMIN_SIDEBAR_SLUG);
         if (!menu) return {items: []};
@@ -33,16 +44,16 @@ export async function sidebarRoutes(fastify, opts = {}) {
         // renderer needs them to place Tools before it drops them. An item
         // this user may not see (`visibility`) arrives as a label-less hidden
         // stub for the same reason - see restrictedStub() in menus.js.
-        return {...menu, items: filterItemsForUser(menu.items || [], request.user, {keepHidden: true})};
+        const items = filterItemsForUser(menu.items || [], request.user, {keepHidden: true});
+        const label = await dashboardsLabel(request);
+        return {...menu, items: label ? relabel(items, label) : items};
     });
 
     fastify.get('/sidebar/registered-items', signedIn, async (request) => {
-        // Dashboard Pro: My Dashboard wears the name this person (or the site) gave it.
-        const boardLabel = isDashboardPro()
-            ? boardName(await readPrefs(request.user), await readSite())
-            : null;
+        // A Tool that owns `#/` (the fleet manager's Dashboard) registers the entry itself.
+        const boardLabel = await dashboardsLabel(request);
         return getRegisteredSidebarItems()
-            .map(entry => (boardLabel && entry?.item?.url === '#/my-dashboard'
+            .map(entry => (boardLabel && entry?.item?.url === '#/' && String(entry.item.text || '').trim() === 'Dashboard'
                 ? {...entry, item: {...entry.item, text: boardLabel}}
                 : entry))
             .filter(entry => !entry?.item?.hidden && checkVisibility(request.user, entry?.item?.visibility))

package/server/services/dashboardSettings.js

@@ -24,7 +24,9 @@ export const UPDATES = ['live', 'slower', 'paused'];
 export const NAME_MAX = 40;
 
 export const DEFAULT_PREFS = {name: '', greeting: true, columns: 4, density: 'normal', updates: 'live', home: false};
-export const DEFAULT_SITE = {name: 'My Dashboard', locked: false};
+export const DEFAULT_SITE = {name: 'Dashboards', locked: false};
+/** The default before 1.5, when it named the board's own sidebar entry: read as no name at all. */
+const OLD_DEFAULT = 'My Dashboard';
 
 const cleanName = (v) => String(v ?? '').replace(/[\u0000-\u001f<>]/g, '').replace(/\s+/g, ' ').trim().slice(0, NAME_MAX);
 
@@ -41,10 +43,11 @@ export function normalisePrefs(input) {
     };
 }
 
-/** The site's settings, cleaned. A blank name falls back to "My Dashboard". */
+/** The site's settings, cleaned. A blank name (or the old default) falls back to "Dashboards". */
 export function normaliseSite(input) {
     const s = input && typeof input === 'object' ? input : {};
-    return {name: cleanName(s.name) || DEFAULT_SITE.name, locked: s.locked === true};
+    const name = cleanName(s.name);
+    return {name: name && name !== OLD_DEFAULT ? name : DEFAULT_SITE.name, locked: s.locked === true};
 }
 
 /** What is wrong with submitted settings, as messages ([] when they are fine). */
@@ -66,7 +69,8 @@ export function siteProblems(input) {
 
 /** What the board is called for this person: their own name, else the site's. */
 export function boardName(prefs, site) {
-    return cleanName(prefs?.name) || normaliseSite(site).name;
+    const mine = cleanName(prefs?.name);
+    return mine && mine !== OLD_DEFAULT ? mine : normaliseSite(site).name;
 }
 
 // ---- Files -------------------------------------------------------------------

package/server/services/widgets.js

@@ -32,7 +32,7 @@
  * @module services/widgets
  */
 
-import {getRegisteredSidebarItems, registerSidebarItem} from './hooks.js';
+import {getRegisteredSidebarItems} from './hooks.js';
 
 /** Widths on the board's four-column grid. */
 export const WIDGET_SIZES = ['s', 'm', 'l', 'xl'];
@@ -226,7 +226,6 @@ export function layoutProblems(input) {
 // ---------------------------------------------------------------------------
 
 const owners = new Set();
-let sidebarRegistered = false;
 
 /**
  * A Pro Tool switches the board on (plugins.js hands it to each plugin as
@@ -239,14 +238,8 @@ let sidebarRegistered = false;
 export function enableDashboardPro({owner, tier, closedSource} = {}) {
     if (typeof owner !== 'string' || !owner.trim()) return false;
     if (tier !== 'paid' || closedSource !== true) return false;
-    // The board's own address in the sidebar (Overview), once: `#/` can belong to
-    // another Tool (the fleet manager's Dashboard), and My Dashboard still reaches it.
-    if (!sidebarRegistered) {
-        sidebarRegistered = true;
-        try {
-            registerSidebarItem({folder: 'overview', item: {source: 'Dashboard Pro', text: 'My Dashboard', url: '#/my-dashboard', icon: 'layout'}});
-        } catch { /* a sidebar without folders still has the route */ }
-    }
+    // No sidebar entry of its own: the Dashboard entry becomes Dashboards (routes/api/sidebar.js),
+    // whose first tab is the primary Dashboard and the rest the boards (admin lib/dashboards-arrange.js).
     owners.add(owner.trim());
     return true;
 }
@@ -274,7 +267,8 @@ export function _resetWidgetsForTests() {
 
 export const MAX_BOARDS = 12;
 export const BOARD_NAME_MAX = 40;
-const BOARD_ID_RE = /^[a-z0-9][a-z0-9-]{0,39}$/;
+// `overview` is the primary Dashboard's tab (admin lib/dashboards-arrange.js), never a board.
+const BOARD_ID_RE = /^(?!overview$)[a-z0-9][a-z0-9-]{0,39}$/;
 
 const boardName = (v, fallback) => String(v ?? '').replace(/[\u0000-\u001f<>]/g, '').replace(/\s+/g, ' ').trim().slice(0, BOARD_NAME_MAX) || fallback;
 

package/admin/js/templates/my-dashboard.html

@@ -1,3 +0,0 @@
-<!-- My Dashboard - the Dashboard Pro board at its own address (admin/js/views/my-dashboard.js), for a site
-     whose `#/` belongs to another Tool (the fleet manager's Dashboard, a chosen admin home). -->
-<div class="dbx"></div>

package/admin/js/views/my-dashboard.js

@@ -1 +0,0 @@
-import{apiRequest as r}from"../api.js";import{viewLifetime as m}from"../lib/tool-kit.js";const o=/^#\/my-dashboard\/?(\?.*)?$/,a=m(o);export const myDashboardView={templateUrl:"/admin/js/templates/my-dashboard.html",async onMount(t){a.reset();const e=await r("/dashboard/pro",{method:"GET"}).catch(()=>null);if(!o.test(location.hash))return;const i=t.get(0).querySelector(".dbx")||t.get(0);if(!e?.enabled){i.innerHTML='<p class="dbp-empty">My Dashboard comes with Dashboard Pro, which is not switched on for this site. Find it in the Marketplace.</p>';return}const{mountBoard:s}=await import("./dashboard-board.js");await s(t,a,{isAdmin:e.isAdmin===!0})}};