domma-cms 1.10.1 → 1.10.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.10.2] - 2026-10-24
+
+- Blocks, Components, Views and Content API now default to the Content menu. Existing menus move these entries from their former default folders once, preserving labels, permissions, settings and later admin rearrangements.
+
 ## [1.10.1] - 2026-10-24
 
 - **Format on save no longer puts a block's CSS into its HTML.** With Format on save on, saving a block formatted its hidden CSS through the browser's insertText, which types into whatever has focus - the HTML editor - so the formatted CSS was saved inside the HTML. Edits now go through insertText only when their own editor has focus (`applyEdit` in `code-format.js`, `replaceRange` in `markdown-toolbar.js`).

package/config/menus/admin-sidebar.json

@@ -66,6 +66,30 @@
           "url": "#/theme",
           "icon": "droplet",
           "permission": "theme"
+        },
+        {
+          "text": "Views",
+          "url": "#/views",
+          "icon": "eye",
+          "permission": "views"
+        },
+        {
+          "text": "Blocks",
+          "url": "#/blocks",
+          "icon": "box",
+          "permission": "pages"
+        },
+        {
+          "text": "Components",
+          "url": "#/components",
+          "icon": "component",
+          "permission": "components"
+        },
+        {
+          "text": "Content API",
+          "url": "#/content-api",
+          "icon": "file-text",
+          "permission": "settings"
         }
       ],
       "key": "content"
@@ -87,30 +111,12 @@
           "icon": "layout",
           "permission": "collections"
         },
-        {
-          "text": "Views",
-          "url": "#/views",
-          "icon": "eye",
-          "permission": "views"
-        },
         {
           "text": "Actions",
           "url": "#/actions",
           "icon": "zap",
           "permission": "actions"
         },
-        {
-          "text": "Blocks",
-          "url": "#/blocks",
-          "icon": "box",
-          "permission": "pages"
-        },
-        {
-          "text": "Components",
-          "url": "#/components",
-          "icon": "component",
-          "permission": "components"
-        },
         {
           "text": "API Builder",
           "url": "#/api-endpoints",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "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/server.js

@@ -682,11 +682,11 @@ registerSidebarItem({folder: 'content', item: {source: 'Built in', text: 'Contex
 registerSidebarItem({folder: 'content', item: {source: 'Built in', text: 'Theme', url: '#/theme', icon: 'droplet', permission: 'theme', countUrl: '/api/theme/count', inventory: true}});
 registerSidebarItem({folder: 'data', item: {source: 'Built in', text: 'Collections', url: '#/collections', icon: 'database', permission: 'collections', countUrl: '/api/collections/_count', inventory: true}});
 registerSidebarItem({folder: 'data', item: {source: 'Built in', text: 'Forms', url: '#/forms', icon: 'layout', permission: 'collections', countUrl: '/api/forms/_count', inventory: true}});
-registerSidebarItem({folder: 'data', item: {source: 'Built in', text: 'Views', url: '#/views', icon: 'eye', permission: 'views', countUrl: '/api/views/_count', inventory: true}});
+registerSidebarItem({folder: 'content', item: {source: 'Built in', text: 'Views', url: '#/views', icon: 'eye', permission: 'views', countUrl: '/api/views/_count', inventory: true}});
 registerSidebarItem({folder: 'data', item: {source: 'Built in', text: 'Actions', url: '#/actions', icon: 'zap', permission: 'actions', countUrl: '/api/actions/_count', inventory: true}});
 registerSidebarItem({folder: 'data', item: {source: 'Built in', text: 'API Builder', url: '#/api-endpoints', icon: 'code', permission: 'api-endpoints', countUrl: '/api/api-endpoints/_count', inventory: true}});
-registerSidebarItem({folder: 'data', item: {source: 'Built in', text: 'Blocks', url: '#/blocks', icon: 'box', permission: 'pages', countUrl: '/api/blocks/_count', inventory: true}});
-registerSidebarItem({folder: 'data', item: {source: 'Built in', text: 'Components', url: '#/components', icon: 'component', permission: 'components', countUrl: '/api/components/_count', inventory: true}});
+registerSidebarItem({folder: 'content', item: {source: 'Built in', text: 'Blocks', url: '#/blocks', icon: 'box', permission: 'pages', countUrl: '/api/blocks/_count', inventory: true}});
+registerSidebarItem({folder: 'content', item: {source: 'Built in', text: 'Components', url: '#/components', icon: 'component', permission: 'components', countUrl: '/api/components/_count', inventory: true}});
 // System. Notifications, Site Settings and My Profile are signals (unread, something quietly wrong,
 // details not filled in); Layouts and API Tokens are a count while all is well and a signal when not
 // (pages on a missing layout, tokens expiring - the answer says `inventory` in the calm case); Effects
@@ -701,7 +701,7 @@ registerSidebarItem({folder: 'system', item: {source: 'Built in', text: 'Layouts
 registerSidebarItem({folder: 'system', item: {source: 'Built in', text: 'Plugins', url: '#/plugins', icon: 'package', permission: 'plugins', countUrl: '/api/plugins/_count', inventory: true}});
 registerSidebarItem({folder: 'system', item: {source: 'Built in', text: 'API Tokens', url: '#/api-tokens', icon: 'key', permission: 'api-tokens', countUrl: '/api/api-tokens/_count'}});
 registerSidebarItem({folder: 'system', item: {source: 'Built in', text: 'Search', url: '#/search', icon: 'search', permission: 'settings', countUrl: '/api/search/_count', inventory: true}});
-registerSidebarItem({folder: 'system', item: {source: 'Built in', text: 'Content API', url: '#/content-api', icon: 'file-text', permission: 'settings', countUrl: '/api/content-api/_count', inventory: true}});
+registerSidebarItem({folder: 'content', item: {source: 'Built in', text: 'Content API', url: '#/content-api', icon: 'file-text', permission: 'settings', countUrl: '/api/content-api/_count', inventory: true}});
 // Documentation pages added after the sidebar menu was seeded (0.93.1). The menu is
 // seeded once, so new pages reach existing sites only by registering here. The two
 // sub-folders have no key in older menus; findFolder() falls back to their name.

package/server/services/sidebar-migration.js

@@ -37,7 +37,11 @@ const SEED_ITEMS = [
         items: [
             {text: 'Pages', url: '#/pages', icon: 'file-text', permission: 'pages'},
             {text: 'Media', url: '#/media', icon: 'image',     permission: 'media'},
-            {text: 'Site menus', url: '#/menus', icon: 'menu', permission: 'menus'}
+            {text: 'Site menus', url: '#/menus', icon: 'menu', permission: 'menus'},
+            {text: 'Blocks',      url: '#/blocks',      icon: 'box',       permission: 'pages'},
+            {text: 'Components',  url: '#/components',  icon: 'component', permission: 'components'},
+            {text: 'Views',       url: '#/views',       icon: 'eye',       permission: 'views'},
+            {text: 'Content API', url: '#/content-api', icon: 'file-text', permission: 'settings'}
         ]
     },
     {
@@ -45,11 +49,8 @@ const SEED_ITEMS = [
         items: [
             {text: 'Collections', url: '#/collections', icon: 'database',  permission: 'collections'},
             {text: 'Forms',       url: '#/forms',       icon: 'layout',    permission: 'collections'},
-            {text: 'Views',       url: '#/views',       icon: 'eye',       permission: 'views'},
             {text: 'Actions',     url: '#/actions',     icon: 'zap',       permission: 'actions'},
-            {text: 'API Builder', url: '#/api-endpoints', icon: 'code',    permission: 'api-endpoints'},
-            {text: 'Blocks',      url: '#/blocks',      icon: 'box',       permission: 'pages'},
-            {text: 'Components',  url: '#/components',  icon: 'component', permission: 'components'}
+            {text: 'API Builder', url: '#/api-endpoints', icon: 'code',    permission: 'api-endpoints'}
         ]
     },
     // Enabled Tools are placed here at render time (placeTools in
@@ -413,6 +414,33 @@ export async function ensureFolderKeys(opts = {}) {
         changed = true;
     }
 
+    // Move content-building entries from their old default folders once. Keep
+    // their full saved settings, and respect later admin rearrangements.
+    if (!menu.meta?.contentMenuItems && items.length) {
+        const oldFolders = {'#/blocks': 'data', '#/components': 'data', '#/views': 'data', '#/content-api': 'system'};
+        const moving = [];
+        for (const folder of items.filter(n => isFolder(n) && ['data', 'system'].includes(n.key))) {
+            const matches = n => oldFolders[n?.url] === folder.key;
+            moving.push(...(folder.items || []).filter(matches));
+            if (Array.isArray(folder.items)) folder.items = folder.items.filter(n => !matches(n));
+        }
+        const hasUrl = (nodes, url) => nodes.some(n => n?.url === url
+            || (Array.isArray(n?.items) && hasUrl(n.items, url)));
+        let content = items.find(n => isFolder(n) && n.key === 'content');
+        for (const item of moving) {
+            if (hasUrl(items, item.url)) continue;
+            if (!content) {
+                content = {text: 'Content', key: 'content', icon: 'edit', items: []};
+                const idx = items.findIndex(n => isFolder(n) && ['data', 'system'].includes(n.key));
+                items.splice(idx === -1 ? items.length : idx, 0, content);
+            }
+            if (!Array.isArray(content.items)) content.items = [];
+            content.items.push(item);
+        }
+        menu.meta = {...(menu.meta || {}), contentMenuItems: true};
+        changed = true;
+    }
+
     // An empty menu is left empty: the renderer's minimal fallback (Dashboard,
     // Menus) is what an admin needs to repair it, and a lone Tools folder would
     // stop that fallback from applying.