domma-cms 1.10.32 → 1.10.33

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.10.33] - 2026-10-26
+
+- Group newer Tools into purpose-based submenus, including business, marketing, publishing, maintenance and games. Upgrade saved loose entries once while preserving labels, visibility, permissions and custom submenus.
+
 ## [1.10.32] - 2026-10-26
 
 - Add clickable (?) explanations throughout the Forms editor, including submission actions, triggers, conditions, field options and chooser controls. Newly added controls receive help immediately; help buttons preserve checkbox and panel state.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "1.10.32",
+  "version": "1.10.33",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/server/services/hooks.js

@@ -98,14 +98,21 @@ const _registeredSidebarItems = [];
  * Unknown plugins remain directly in Tools until they declare their own group.
  */
 const TOOL_GROUPS = new Map(Object.entries({
-    Productivity: ['#/notes', '#/todo', '#/calculator', '#/plugins/calendar', '#/plugins/waypoint-pro'],
+    Productivity: ['#/notes', '#/todo', '#/calculator', '#/plugins/calendar', '#/plugins/waypoint-pro', '#/plugins/sheets'],
     Communication: ['#/contacts', '#/plugins/contacts-pro', '#/plugins/mail-reader', '#/plugins/email-pro', '#/plugins/messages'],
-    Marketing: ['#/analytics', '#/seo', '#/plugins/analytics-pro/dashboard', '#/plugins/social', '#/plugins/feedback', '#/plugins/surveys'],
-    Publishing: ['#/plugins/blog', '#/plugins/blog-pro', '#/plugins/docs', '#/plugins/theme-roller'],
-    Business: ['#/plugins/shopping-cart', '#/plugins/booking', '#/plugins/invoice', '#/job-board', '#/plugins/garage'],
-    Maintenance: ['#/plugins/security', '#/plugins/security-pro', '#/plugins/security-pro/my-2fa', '#/plugins/backup-pro', '#/plugins/data-transfer', '#/wordpress-import']
+    Marketing: ['#/analytics', '#/seo', '#/plugins/analytics-pro/dashboard', '#/plugins/social', '#/plugins/feedback', '#/plugins/surveys', '#/plugins/campaigns-pro', '#/plugins/ecards'],
+    Publishing: ['#/plugins/blog', '#/plugins/blog-pro', '#/plugins/docs', '#/plugins/theme-roller', '#/plugins/wiki', '#/plugins/wiki-pro', '#/plugins/scraper', '#/plugins/scraper-pro'],
+    Business: ['#/plugins/shopping-cart', '#/plugins/booking', '#/plugins/booking-pro', '#/plugins/invoice', '#/job-board', '#/plugins/garage', '#/plugins/takeaway', '#/plugins/support', '#/plugins/onboard-pro'],
+    Maintenance: ['#/plugins/security', '#/plugins/security-pro', '#/plugins/security-pro/my-2fa', '#/plugins/backup-pro', '#/plugins/data-transfer', '#/wordpress-import', '#/plugins/site-manager/backups'],
+    Manage: ['#/plugins/site-manager/dashboard', '#/plugins/site-manager/server', '#/plugins/site-manager/injector-library'],
+    Games: ['#/plugins/crossword', '#/plugins/daily-word', '#/plugins/quiz', '#/plugins/word-search']
 }).flatMap(([group, urls]) => urls.map(url => [url, group])));
 
+/** Default category for a known Tool URL, also used when upgrading saved menus. */
+export function defaultToolGroup(url) {
+    return TOOL_GROUPS.get(url);
+}
+
 /**
  * Register a Tool's sidebar entry. Entries are placed into the rendered admin
  * sidebar at render time - they are NOT persisted into menu JSON - so plugins
@@ -130,7 +137,7 @@ export function registerSidebarItem(opts) {
     }
     const {folder: itemFolder, group: itemGroup, ...item} = opts.item;
     const folder = opts.folder || itemFolder || DEFAULT_TOOL_FOLDER;
-    const defaultGroup = folder === DEFAULT_TOOL_FOLDER && !opts.parent ? TOOL_GROUPS.get(item.url) : undefined;
+    const defaultGroup = folder === DEFAULT_TOOL_FOLDER && !opts.parent ? defaultToolGroup(item.url) : undefined;
     const group = [opts.group, itemGroup, defaultGroup].find(g => typeof g === 'string' && g.trim());
     _registeredSidebarItems.push({
         parent: opts.parent || null,

package/server/services/sidebar-migration.js

@@ -15,6 +15,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import {fileURLToPath} from 'url';
 import {invalidateMenuIndex} from './menus.js';
+import {defaultToolGroup} from './hooks.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const DEFAULT_CONFIG_DIR = path.resolve(path.dirname(__filename), '..', '..', 'config');
@@ -482,6 +483,38 @@ export async function ensureFolderKeys(opts = {}) {
         changed = true;
     }
 
+    // Categorise only loose, known Tools once. Custom submenus and entries
+    // outside Tools keep their placement; later admin rearrangements win.
+    if (!menu.meta?.purposeToolGroups && items.length) {
+        const find = (nodes, test) => {
+            for (const node of nodes || []) {
+                if (test(node)) return node;
+                const nested = find(node?.items, test);
+                if (nested) return nested;
+            }
+            return null;
+        };
+        const tools = find(items, n => isFolder(n) && n.key === 'tools');
+        if (tools && Array.isArray(tools.items)) {
+            const loose = tools.items.filter(n => n?.url && defaultToolGroup(n.url));
+            for (const node of loose) {
+                const name = defaultToolGroup(node.url);
+                const key = `tools.${name.toLowerCase()}`;
+                let group = find(items, n => isFolder(n) && n.key === key)
+                    || tools.items.find(n => isFolder(n) && !n.key && String(n.text).toLowerCase() === name.toLowerCase());
+                if (!group) {
+                    group = {text: name, key, icon: 'folder', items: []};
+                    tools.items.push(group);
+                }
+                tools.items = tools.items.filter(n => n !== node);
+                if (!Array.isArray(group.items)) group.items = [];
+                group.items.push(node);
+            }
+        }
+        menu.meta = {...(menu.meta || {}), purposeToolGroups: true};
+        changed = true;
+    }
+
     if (!changed) return {updated: false, reason: 'already up to date'};
 
     menu.meta = {...(menu.meta || {}), updatedAt: new Date().toISOString()};