domma-cms 0.75.0 → 0.76.0

package/server/routes/api/users.js

@@ -1,6 +1,7 @@
 /**
  * Users API
  * GET    /api/users      - list all users (admin, manager)
+ * GET    /api/users/_count - the sidebar badge (ids are uuids - nothing can shadow it)
  * GET    /api/users/:id  - single user (admin, manager, or self)
  * POST   /api/users      - create user (admin, manager - manager cannot create admin)
  * PUT    /api/users/:id  - update user (admin, manager - manager cannot edit admin)
@@ -10,6 +11,45 @@ import {authenticate, canManageUser, requirePermission} from '../../middleware/a
 import {getPermissionsFor} from '../../services/roles.js';
 import {createUser, deleteUser, getUserById, listUsers, updateUser} from '../../services/users.js';
 import {getProfile, listProfiles, updateProfile} from '../../services/userProfiles.js';
+import {ago, clip, plural} from '../../services/sidebarBadges.js';
+
+/**
+ * The sidebar badge on Users (its countUrl, GET /api/users/_count). The number
+ * stays what the sidebar has always shown there - the users this reader can
+ * see - and the popover says who is inactive, who has never signed in, and
+ * who signed in last. Plain text throughout (the popover uses textContent);
+ * never anything from the password or tokens.
+ *
+ * @param {object[]} users - as the list route returns them (password stripped)
+ * @param {number} [now]
+ */
+export function usersBadge(users = [], now = Date.now()) {
+    const list = users || [];
+    const inactive = list.filter(u => u.isActive === false);
+    const never = list.filter(u => !u.lastLogin);
+    const week = list.filter(u => u.lastLogin && now - new Date(u.lastLogin).getTime() < 7 * 86_400_000);
+    const recent = list.filter(u => u.lastLogin)
+        .sort((a, b) => String(b.lastLogin).localeCompare(String(a.lastLogin)));
+    return {
+        count: list.length,
+        label: `${plural(list.length, 'user')}${inactive.length ? `, ${inactive.length} inactive` : ''}`,
+        tone: 'info',
+        details: {
+            title: 'Users',
+            rows: [
+                {label: 'Active', value: String(list.length - inactive.length)},
+                {label: 'Inactive', value: String(inactive.length)},
+                {label: 'Signed in this week', value: String(week.length)},
+                {label: 'Never signed in', value: String(never.length)}
+            ],
+            items: recent.slice(0, 6).map(u => ({
+                text: clip(u.name || u.email || 'User'),
+                meta: [u.role, `signed in ${ago(u.lastLogin, now)}`].filter(Boolean).join(' · ')
+            })),
+            empty: 'Nobody has signed in yet.'
+        }
+    };
+}
 
 export async function usersRoutes(fastify) {
     const canRead = [authenticate, requirePermission('users', 'read')];
@@ -27,6 +67,12 @@ export async function usersRoutes(fastify) {
             .map(u => ({...u, profile: profiles.get(u.id) || {}}));
     });
 
+    // The sidebar badge - the same users the list shows this reader. Before /users/:id.
+    fastify.get('/users/_count', {preHandler: canRead}, async (request) => {
+        const {canSeeArtefact} = await import('../../services/projects.js');
+        return usersBadge((await listUsers()).filter(u => canSeeArtefact(request.user, u)));
+    });
+
     // Get single user (admin, manager, or the user themselves)
     fastify.get('/users/:id', { preHandler: [authenticate] }, async (request, reply) => {
         const { id } = request.params;
@@ -119,7 +165,13 @@ export async function usersRoutes(fastify) {
 
         // Strip profile from core updates and handle separately
         const {profile, ...coreUpdates} = updates;
-        const user = await updateUser(id, coreUpdates);
+        let user;
+        try {
+            user = await updateUser(id, coreUpdates);
+        } catch (err) {
+            if (err.code === 'EMAIL_TAKEN') return reply.status(409).send({error: err.message});
+            throw err;
+        }
 
         if (profile && typeof profile === 'object') {
             await updateProfile(id, profile);

package/server/server.js

@@ -440,6 +440,7 @@ const {menusRoutes}         = await import('./routes/api/menus.js');
 const {contextMenusRoutes}  = await import('./routes/api/context-menus.js');
 const {menuLocationsRoutes} = await import('./routes/api/menu-locations.js');
 const {projectsRoutes}      = await import('./routes/api/projects.js');
+const {rolesRoutes}         = await import('./routes/api/roles.js');
 const {apiTokensRoutes}     = await import('./routes/api/api-tokens.js');
 const {apiEndpointsRoutes}  = await import('./routes/api/api-endpoints.js');
 const {endpointsPublicRoutes} = await import('./routes/api/endpoints-public.js');
@@ -475,6 +476,7 @@ await app.register(contextMenusRoutes,  {prefix: '/api'});
 await app.register(themeRoutes,         {prefix: '/api'});
 await app.register(menuLocationsRoutes, {prefix: '/api'});
 await app.register(projectsRoutes,      {prefix: '/api'});
+await app.register(rolesRoutes,         {prefix: '/api'});
 await app.register(apiTokensRoutes,     {prefix: '/api'});
 await app.register(apiEndpointsRoutes,  {prefix: '/api'});
 await app.register(endpointsPublicRoutes, {prefix: '/api'});
@@ -544,6 +546,16 @@ registerSidebarItem({folder: 'data', item: {source: 'Built in', text: 'Actions',
 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}});
+// System. Notifications, Site Settings, Layouts and API Tokens are signals (unread, something quietly
+// wrong, pages on a missing layout, tokens expiring), so not `inventory`.
+registerSidebarItem({folder: 'system', item: {source: 'Built in', text: 'Notifications', url: '#/system/notifications', icon: 'bell', permission: 'notifications', countUrl: '/api/system/notifications/_count'}});
+registerSidebarItem({folder: 'system', item: {source: 'Built in', text: 'Roles', url: '#/roles', icon: 'shield', permission: 'plugins', countUrl: '/api/roles/_count', inventory: true}});
+registerSidebarItem({folder: 'system', item: {source: 'Built in', text: 'Users', url: '#/users', icon: 'users', permission: 'users', countUrl: '/api/users/_count', inventory: true}});
+registerSidebarItem({folder: 'system', item: {source: 'Built in', text: 'Site Settings', url: '#/settings', icon: 'settings', permission: 'settings', countUrl: '/api/settings/_count'}});
+registerSidebarItem({folder: 'system', item: {source: 'Built in', text: 'Layouts', url: '#/layouts', icon: 'layout', permission: 'layouts', countUrl: '/api/layouts/_count'}});
+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}});
 
 await registerPlugins(app);
 

package/server/services/plugins.js

@@ -266,6 +266,13 @@ async function loadConfigDefaults(name) {
   if (_configDefaultsCache.has(name)) return _configDefaultsCache.get(name);
   const configJsPath = path.join(PLUGINS_DIR, name, 'config.js');
   let defaults = {};
+  // No config.js is "no defaults", not a failure: the Marketplace asks for every
+  // installed plugin's settings (enabled or not), and recording a load failure for
+  // one without the file would put it on the health report for being looked at.
+  try { await fs.access(configJsPath); } catch {
+    _configDefaultsCache.set(name, defaults);
+    return defaults;
+  }
   try {
     const {default: exported} = await import(configJsPath);
     defaults = exported || {};

package/server/services/roles.js

@@ -26,6 +26,9 @@ const USERS_DIR = path.resolve(path.dirname(COLLECTIONS_DIR), 'users');
 /** Base role slugs that should always exist */
 const BASE_ROLE_NAMES = ['super-admin', 'admin', 'user'];
 
+/** The seeded roles every site relies on - never deletable, whatever route is asked. */
+export const isBaseRole = (name) => BASE_ROLE_NAMES.includes(name);
+
 /** Role slugs that were seeded by the old 4-role system - used to detect legacy data */
 const DEFUNCT_ROLE_NAMES = ['manager', 'editor', 'subscriber'];
 

package/server/services/search.js

@@ -411,3 +411,61 @@ export function searchPages(pages, query, {maxResults = 10, onError = () => {}}
     results.sort((a, b) => b.score - a.score);
     return results.slice(0, maxResults);
 }
+
+// ---------------------------------------------------------------------------
+// The admin screen: coverage, and the sidebar badge
+// ---------------------------------------------------------------------------
+
+/**
+ * Which pages search can return, and which it leaves out - the same rule
+ * searchPages() applies (drafts and private pages are never results).
+ *
+ * @param {object[]} pages
+ * @returns {{searchable: number, drafts: number, private: number, total: number}}
+ */
+export function searchCoverage(pages = []) {
+    let drafts = 0;
+    let priv = 0;
+    for (const p of pages) {
+        if (p?.status === 'draft') drafts++;
+        else if (p?.visibility === 'private') priv++;
+    }
+    return {searchable: pages.length - drafts - priv, drafts, private: priv, total: pages.length};
+}
+
+/**
+ * The sidebar badge on System > Search (its countUrl, GET /api/search/_count):
+ * how many pages a visitor's search can find, with whether search is on at all
+ * and how it is reached in the popover. An inventory, not a signal - plain text
+ * throughout, the popover sets it with textContent.
+ *
+ * @param {object} settings - normalised search settings
+ * @param {object[]} pages
+ */
+export function searchBadge(settings = SEARCH_DEFAULTS, pages = []) {
+    const s = normaliseSearchSettings(settings);
+    const c = searchCoverage(pages);
+    const pl = (n, one, many = `${one}s`) => `${n} ${n === 1 ? one : many}`;
+    const trigger = s.displayMode === 'floating'
+        ? `Floating button, ${s.position.replace('-', ' ')}`
+        : 'Icon in the navigation bar';
+    return {
+        count: c.searchable,
+        label: s.enabled
+            ? `Search is on - ${pl(c.searchable, 'page')} searchable`
+            : `Search is off - ${pl(c.searchable, 'page')} would be searchable`,
+        tone: 'info',
+        details: {
+            title: 'Site search',
+            rows: [
+                {label: 'Status', value: s.enabled ? 'On' : 'Off'},
+                {label: 'Trigger', value: s.enabled ? trigger : '-'},
+                {label: 'Keyboard shortcut', value: s.enabled && s.keyboardShortcut ? 'Ctrl+K / ⌘K' : 'Off'},
+                {label: 'Searchable pages', value: String(c.searchable)},
+                {label: 'Left out (drafts, private)', value: String(c.drafts + c.private)}
+            ],
+            items: [],
+            empty: s.enabled ? 'Visitors can search every published, public page.' : 'Search is switched off - nothing is added to public pages.'
+        }
+    };
+}

package/server/services/users.js

@@ -168,6 +168,20 @@ export async function updateUser(id, updates) {
     const user = await readUserFile(id);
     if (!user) throw new Error('User not found');
 
+    // An email is how an account signs in: two accounts must never share one.
+    // createUser always refused a taken address; an update did not check at all.
+    if (typeof updates.email === 'string' && updates.email.trim()) {
+        updates.email = updates.email.toLowerCase().trim();
+        if (updates.email !== String(user.email || '').toLowerCase()) {
+            const other = await getUserByEmail(updates.email);
+            if (other && other.id !== user.id) {
+                const err = new Error('A user with that email already exists');
+                err.code = 'EMAIL_TAKEN';
+                throw err;
+            }
+        }
+    }
+
     if (updates.password) {
         updates.password = await bcrypt.hash(updates.password, config.auth.bcryptRounds);
     }

package/admin/js/templates/plugin-marketplace.html

@@ -1,29 +0,0 @@
-<div class="view-header">
-  <h2><span data-icon="store"></span> Browse</h2>
-  <p class="text-muted">Plugins available to this site.</p>
-</div>
-
-<!--
-  Shown when this site is not managed. Telling an unmanaged customer to set
-  MANAGER_URL is telling them to configure something they will never have: a
-  standalone purchase arrives as a file, and Install from File is the whole
-  procedure. The managed path is mentioned second because it is not theirs to
-  set up.
--->
-<div id="marketplace-unavailable" style="display:none">
-  <div class="card">
-    <div class="card-body">
-      <p><strong>This site installs plugins from a file.</strong></p>
-      <p class="text-muted">Buy a plugin and you are sent a single <code>.dcmsplugin</code> file. Use
-        <strong>Install from File</strong> above to install it - no connection to anything is needed, and the
-        same button takes an update later.</p>
-      <p class="text-muted" style="margin-bottom:0">Sites managed for you browse and install here instead, over their
-        manager connection.</p>
-    </div>
-  </div>
-</div>
-
-<div id="marketplace-available" style="display:none">
-  <p id="marketplace-site" class="text-muted" style="display:none;font-size:.85rem;margin:0 0 .75rem"></p>
-  <div id="marketplace-grid" class="card-grid"></div>
-</div>

package/admin/js/views/plugin-marketplace.js

@@ -1 +0,0 @@
-import{api as u}from"../api.js";import{pluginAccent as P,pluginWatermark as S}from"../lib/plugin-accent.js";export const pluginMarketplaceView={templateUrl:"/admin/js/templates/plugin-marketplace.html",async onMount(e){const a=E.loader(e.get(0),{type:"dots"});let t;try{t=await u.marketplace.catalogue()}catch(s){E.toast(`Failed to load marketplace: ${s.message}`,{type:"error"}),a.destroy();return}if(a.destroy(),!t.available){e.find("#marketplace-unavailable").show();return}e.find("#marketplace-available").show(),t.site&&e.find("#marketplace-site").text(`Licensed to ${t.site}.`).show(),U(e,t.catalogue),Domma.icons.scan()}};function U(e,a){const t=e.find("#marketplace-grid").get(0);if(t){for(;t.firstChild;)t.removeChild(t.firstChild);if(!a||a.length===0){const s=document.createElement("p");s.className="text-muted",s.textContent="No plugins available in the marketplace.",t.appendChild(s);return}a.forEach(s=>{const i=R(s,e);t.appendChild(i)})}}function F(e){if(e.tier!=="paid")return"Free";const a=e.terms?.managed?.monthly;return a==null||!Number.isFinite(Number(a))?"Paid":`${e.terms?.currency==="GBP"?"\xA3":(e.terms?.currency||"")+" "}${(Number(a)/100).toFixed(2)}/mo`}function R(e,a){const{slug:t,version:s,displayName:i,description:y,entitled:o,installed:l,installedVersion:p,updatable:b}=e,r=document.createElement("div");r.className="card plugin-card",r.dataset.slug=t,r.style.setProperty("--plugin-accent",P(t)),r.appendChild(S(e.icon));const h=document.createElement("div");h.className="card-body";const m=document.createElement("div");m.className="plugin-header";const N=document.createElement("div");N.className="plugin-icon";const I=document.createElement("span");I.dataset.icon=e.icon||"package",N.appendChild(I);const g=document.createElement("div");g.className="plugin-meta";const x=document.createElement("div");x.className="plugin-name",x.textContent=i||t;const k=document.createElement("div");k.className="plugin-version",k.textContent=l&&p&&p!==s?`v${p} \u2192 v${s}`:`v${s}`,g.appendChild(x),g.appendChild(k);const f=document.createElement("div");f.style.cssText="display:flex;gap:.35rem;align-items:center;";const w=document.createElement("span");if(w.className="badge badge-outline",w.textContent=F(e),f.appendChild(w),o&&e.tier==="paid"){const c=document.createElement("span");c.className="badge badge-success",c.textContent=e.licenceStatus==="grace"?"Renew":"Licensed",c.title=e.licenceStatus==="grace"?"The rental term has ended - still running during the grace period":"This site holds a live licence",f.appendChild(c)}m.appendChild(N),m.appendChild(g),m.appendChild(f);const $=document.createElement("p");$.className="plugin-desc",$.textContent=y||"",h.appendChild(m),h.appendChild($);const C=document.createElement("div");C.className="plugin-footer";const v=document.createElement("span");v.className="text-muted",v.style.fontSize=".8rem",v.textContent="Restart server after changes",C.appendChild(v);const d=document.createElement("div");d.className="plugin-footer-actions";const n=document.createElement("button");if(n.className="btn btn-sm",l&&b&&o){n.className+=" btn-primary",n.textContent="Update",n.onclick=()=>T(e,a,{update:!0}),d.appendChild(n);const c=document.createElement("button");c.className="btn btn-sm btn-ghost",c.textContent="Uninstall",c.onclick=()=>D(t,a),d.appendChild(c)}else l?(n.className+=" btn-ghost",n.textContent="Uninstall",n.onclick=()=>D(t,a),d.appendChild(n)):o?(n.className+=" btn-primary",n.textContent="Install",n.onclick=()=>T(e,a),d.appendChild(n)):(n.className+=" btn-ghost",n.textContent=e.licenceStatus==="expired"?"Licence expired":"Not licensed",n.disabled=!0,n.title="Contact us to add this to your site.",d.appendChild(n));return C.appendChild(d),r.appendChild(h),r.appendChild(C),r}async function T(e,a,{update:t=!1}={}){const{slug:s,version:i,installedVersion:y}=e,o=t?`<p>Update ${s} from ${y} to ${i}?</p><p class="text-muted">The plugin keeps its data, and the current version is put back if the update fails.</p>`:`<p>Install ${e.displayName||s} v${i}?</p><p class="text-muted">It arrives licensed to this site and takes effect after a restart.</p>`;if(await E.confirm(o,{title:t?"Update plugin":"Install plugin",confirmText:t?"Update":"Install",cancelText:"Cancel",html:!0}))try{const l=await u.marketplace.install(s,i,{update:t}),p=l?.action==="upgrade"?`${s} updated${l.from?` from ${l.from}`:""} to ${l.version}.`:`${s} ${l?.version??i} installed.`;E.toast(`${p} Restart the server to activate it.`,{type:"success"});const b=await u.marketplace.catalogue();U(a,b.catalogue),Domma.icons.scan()}catch(l){E.toast(l.message||"Install failed.",{type:"error"})}}async function D(e,a){if(await E.confirm(`Uninstall ${e}? This will remove its files.`))try{await u.marketplace.uninstall(e),E.toast(`${e} uninstalled. Restart to apply.`,{type:"success"});const t=await u.marketplace.catalogue();U(a,t.catalogue),Domma.icons.scan()}catch(t){E.toast(`Uninstall failed: ${t.message}`,{type:"error"})}}