domma-cms 1.4.0 → 1.5.0

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})}};