domma-cms 0.74.0 → 0.76.0

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/server/services/views.js

@@ -475,3 +475,41 @@ export async function executeView(slug, {page = 1, limit = 25, user = null} = {}
         ? executeMongoView(view, { page, limit, user })
         : executeFileView(view, { page, limit, user });
 }
+
+/**
+ * The sidebar badge on Views (its countUrl, GET /api/views/_count): how many
+ * views, red when one reads from a collection that no longer exists - such a
+ * view errors on every page that shows it. Plain text: the popover sets it
+ * with textContent.
+ *
+ * @param {object[]} views
+ * @param {Set<string>} collectionSlugs - the collections that exist
+ * @returns {{count: number, label: string, tone: string, details: object}}
+ */
+export function viewsBadge(views = [], collectionSlugs = new Set()) {
+    const broken = views.filter(v => v.pipeline?.source && !collectionSlugs.has(v.pipeline.source));
+    const pub = views.filter(v => v.access?.public).length;
+    const n = views.length;
+    const ordered = [...broken, ...views.filter(v => !broken.includes(v))];
+    return {
+        count: n,
+        label: `${n} view${n === 1 ? '' : 's'}${broken.length ? `, ${broken.length} reading a missing collection` : ''}`,
+        tone: broken.length ? 'danger' : 'info',
+        details: {
+            title: 'Views',
+            rows: [
+                {label: 'Views', value: String(n)},
+                {label: 'Public', value: String(pub)},
+                {label: 'Missing source', value: String(broken.length), ...(broken.length && {tone: 'danger'})}
+            ],
+            items: ordered.slice(0, 8).map(v => ({
+                text: String(v.title || v.slug),
+                meta: broken.includes(v)
+                    ? `source "${v.pipeline.source}" is gone`
+                    : [v.pipeline?.source, v.display?.mode || 'table', v.access?.public ? 'public' : ''].filter(Boolean).join(' · '),
+                ...(broken.includes(v) && {tone: 'danger'})
+            })),
+            empty: 'No views yet.'
+        }
+    };
+}

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