domma-cms 1.6.48 → 1.6.50

package/admin/js/templates/docs/usage-site-settings.html

@@ -28,6 +28,13 @@
                               is none (a <code>favicon</code> in <code>config/site.json</code> takes first
                               place).</td>
                       </tr>
+                      <tr>
+                          <td>Branding</td>
+                          <td>The public site's brand (name, logo or icon, link) and the admin's own. The
+                              <strong>Admin name</strong> is shown in the admin's top bar, its sidebar and the
+                              browser tab, for everyone who signs in; empty, it uses the site title. The admin logo
+                              takes priority over the admin icon.</td>
+                      </tr>
                       <tr>
                           <td>SEO</td>
                           <td>Default page title, title separator and default description. The full SEO Tool is

package/admin/js/templates/pages.html

@@ -6,6 +6,10 @@
         <span data-bind-text="projectNote.value"></span> <a href="#/pages">Show all pages</a>
     </p>
 
+    <p class="pgx-notice" data-bind-hidden="!tagNote.value">
+        <span data-bind-text="tagNote.value"></span> <button type="button" class="pgx-link" data-on-click="showAllTags">Show all pages</button>
+    </p>
+
     <div class="pgx-card">
         <div class="pgx-bar">
             <div class="pgx-seg" role="group" aria-label="Status">
@@ -25,7 +29,7 @@
                 <button type="button" data-on-click="showList" data-bind-class="mode.value === 'list' && 'is-on'" title="List">List</button>
                 <button type="button" data-on-click="showTree" data-bind-class="mode.value === 'tree' && 'is-on'" title="Tree - pages under the page whose URL they sit beneath">Tree</button>
             </div>
-            <span data-help-title="Pages" data-help="Click a page to edit it. Right-click it (or ⋮, or Shift+F10) to view it on the site, copy its address, transition between Draft, Published and Review, trim its revision history or delete it. Drafts are not public: visitors get a 404, while anyone who can edit pages sees them with a Draft banner. Tree shows each page under the page whose address it sits beneath. Your filter, sort and view are remembered."></span>
+            <span data-help-title="Pages" data-help="Click a page to edit it. Right-click it (or ⋮, or Shift+F10) to view it on the site, copy its address, transition between Draft, Published and Review, trim its revision history or delete it. Drafts are not public: visitors get a 404, while anyone who can edit pages sees them with a Draft banner. Tree shows each page under the page whose address it sits beneath. Tags link pages together - add or remove one from the right-click menu, and pick which tag to show (or manage the tags) with the cog above. Your filter, sort, view and tag are remembered."></span>
         </div>
         <div class="pgx-note dm-loading-slot" data-bind-hidden="!loading.value">Loading…</div>
         <p class="pgx-note is-bad" data-bind-hidden="!loadError.value" data-bind-text="loadError.value"></p>
@@ -67,6 +71,8 @@
     background: color-mix(in srgb, var(--dm-text) 10%, transparent); color: var(--dm-text-muted); }
 .pgx-chip.is-ok { background: color-mix(in srgb, var(--dm-success) 16%, transparent); color: var(--dm-success); }
 .pgx-chip.is-warn { background: color-mix(in srgb, var(--dm-warning) 18%, transparent); color: var(--dm-warning); }
+.pgx-chip.is-tag { background: color-mix(in srgb, var(--dm-primary) 12%, transparent); color: var(--dm-primary); max-width: 14rem; overflow: hidden; text-overflow: ellipsis; }
+.pgx-link { border: 0; background: none; padding: 0; font: inherit; color: var(--dm-primary); text-decoration: underline; cursor: pointer; }
 .pgx-chip.is-info { background: color-mix(in srgb, var(--dm-info, var(--dm-primary)) 14%, transparent); color: var(--dm-info, var(--dm-primary)); }
 .pgx-kebab { border: 0; background: none; cursor: pointer; font-size: var(--dm-text-lg); color: var(--dm-text-muted); border-radius: var(--dm-radius-sm); padding: 0 .3rem; }
 .pgx-kebab:hover { color: var(--dm-primary); }

package/admin/js/templates/settings.html

@@ -105,7 +105,8 @@
                 </div>
 
             </div><p class="text-muted">The logo takes priority over the icon. Set the browser icon in the Favicon tab.</p></div>
-            <div class="stx-card"><div class="stx-card-title">Admin sidebar</div><div class="stx-grid">
+            <div class="stx-card"><div class="stx-card-title">Admin
+                <span data-help-title="Admin name and mark" data-help="The name and logo or icon at the top of the admin - in the top bar, the sidebar and the browser tab - for everyone who signs in. Leave the name empty to use the site title."></span></div><div class="stx-grid">
                 <div><label class="form-label" for="stx-adminBrandTitle">Admin name</label>
                     <input id="stx-adminBrandTitle" type="text" class="form-input" placeholder="Uses the site title when empty" data-model="adminBrandTitle.value">
                 </div>

package/admin/js/views/blocks.js

@@ -1,22 +1,23 @@
-import{api as v,apiRequest as Ce}from"../api.js";import{addBannerAction as A}from"../lib/plugin-chrome.js";import{helpPopovers as te}from"../lib/help-popover.js";import{onceClosed as ne,openMenuAt as ae,sidebarCount as Se,viewLifetime as Me}from"../lib/tool-kit.js";import{filterByProject as Le,getProjectFromHash as Ie,renderProjectFilterNotice as Te}from"../lib/project-context.js";import{FILTERS as je,arrangeBlocks as $e,blockRow as Ne,checkNewName as Be,copyName as oe,shortcodeFor as se,usageText as le}from"../lib/blocks-arrange.js";import{fmtDate as De}from"../lib/dates.js";const ce=/^#\/(blocks|projects\/[^/?#]+\/blocks)\/?(\?.*)?$/,Fe="#/blocks",N="blocks.draft",U="blocks.filter",Re=`
+import{api as h,apiRequest as Fe}from"../api.js";import{addBannerAction as A}from"../lib/plugin-chrome.js";import{helpPopovers as ie}from"../lib/help-popover.js";import{onceClosed as re,openMenuAt as de,sidebarCount as Re,viewLifetime as qe}from"../lib/tool-kit.js";import{filterByProject as Ue,getProjectFromHash as He,renderProjectFilterNotice as Oe}from"../lib/project-context.js";import{FILTERS as Pe,arrangeBlocks as Ke,blockRow as We,checkNewName as _e,copyName as ue,shortcodeFor as pe,usageText as me}from"../lib/blocks-arrange.js";import{fmtDate as ze}from"../lib/dates.js";import{UNTAGGED as Ge,activeNote as Ye,askTagName as Je,normaliseActive as Ve,openTagSettings as Qe,same as be,tagCounts as Xe,tagMenuItems as Ze,tagsOf as D}from"../lib/list-tags.js";const he=/^#\/(blocks|projects\/[^/?#]+\/blocks)\/?(\?.*)?$/,et="#/blocks",F="blocks.draft",_="blocks.filter",fe="blocks.tag",tt=`
 <div class="blx-row" data-name="{{name}}" tabindex="0" data-bind-class="unused && 'is-unused'">
     <span class="blx-icon" aria-hidden="true"><span data-icon="box" data-icon-size="16"></span></span>
     <span class="blx-main"><strong>{{name}}</strong><span data-bind-hidden="!description">{{description}}</span><small>{{meta}}</small></span>
     <span class="blx-chips">
         <span class="blx-chip is-info" data-bind-hidden="!hasCss" title="Has its own CSS">CSS</span>
+        <span class="blx-chip is-tag" data-bind-hidden="!listTags" title="Tags">{{listTags}}</span>
         <span class="blx-chip" data-bind-hidden="!project" title="Project">{{project}}</span>
         <span class="blx-chip" data-bind-hidden="!bundled" title="Ships with the CMS">Built in</span>
         <span class="blx-chip is-warn" data-bind-hidden="!unused" title="No page or view places it">Unused</span>
     </span>
     <span class="blx-uses" title="Pages and views that use it">{{uses}}</span>
     <button type="button" class="blx-kebab" aria-label="Actions for {{name}}" title="Actions">\u22EE</button>
-</div>`,g=s=>String(s??"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;");function ie(s){const a=document.createElement("template");return a.innerHTML=s.trim(),a.content.firstElementChild}const i=Me(ce);async function qe(s){try{return await navigator.clipboard.writeText(s),!0}catch{const a=document.createElement("textarea");a.value=s,a.style.cssText="position:fixed;opacity:0;",document.body.appendChild(a),a.select();let h=!1;try{h=document.execCommand("copy")}catch{}return a.remove(),h}}export const blocksView={templateUrl:"/admin/js/templates/blocks.html",async onMount(s){i.reset();const a=s.get(0).querySelector(".blx")||s.get(0),h=()=>ce.test(location.hash)&&a.isConnected,w=Ie(),p=M.observable([]),H=M.observable(!0),B=M.observable("");let O="all";try{O=je.includes(S.get(U))?S.get(U):"all"}catch{}const y=M.observable(O),P=M.observable("");i.add(M.effect(()=>{const e=y.value;try{S.set(U,e)}catch{}}));const re=De,D=M.observable([]);i.add(M.effect(()=>{D.value=$e(p.value,{filter:y.value,query:P.value}).map(e=>Ne(e,re))}));const de=M.computed(()=>{const e=p.value,t=e.filter(n=>(n.usage?.pages?.length||0)+(n.usage?.views?.length||0)>0).length;return{all:e.length,used:t,unused:e.length-t}}),ue=M.computed(()=>p.value.length?"No blocks match.":"No blocks yet - New block in the banner makes one, or Import brings one in."),F=e=>p.peek().find(t=>t.name===e),pe=w?`#/blocks/new?project=${encodeURIComponent(w)}`:"#/blocks/new",K=e=>`#/blocks/edit/${encodeURIComponent(e)}`;async function W(){try{let e=await Ce("/blocks?usage=1",{method:"GET"});if(!h())return;if(e=Array.isArray(e)?e:[],w){const t=e.length;e=Le(e,w),Te(a,{total:t,shown:e.length,slug:w,allHref:"#/blocks",noun:"blocks"})}p.value=e,B.value=""}catch(e){B.value=`Could not load the blocks: ${e.message||e}`}finally{H.value=!1}}const T=async()=>{Se(Fe),h()&&await W()};async function me(e){const n=(e.usage?.pages?.length||0)+(e.usage?.views?.length||0)?` It is ${g(le(e).toLowerCase())} - they will show nothing where it was.`:"";if(await E.confirm(`Delete the block "${g(e.name)}"?${n} This cannot be undone.`))try{await v.blocks.delete(e.name),E.toast(`Deleted "${e.name}".`,{type:"success"}),await T()}catch(r){E.toast(r.message||"Failed to delete block.",{type:"error"})}}async function be(e){try{await v.blocks.exportBundle(e.name)}catch(t){E.toast(t.message||"Export failed.",{type:"error"})}}async function he(e){const t=se(e),n=await qe(t);E.toast(n?`Copied ${t}`:`Could not copy - your browser refused. The shortcode is ${t}`,{type:n?"success":"error"})}const k=a.querySelector(".blx-import-file");async function z(){const e=k.files?.[0];if(!e)return;k.value="";let t;try{t=JSON.parse(await e.text())}catch{E.toast("Not a valid .dmblock.json file (could not parse JSON).",{type:"error"});return}if(!t||typeof t!="object"||!t.name||typeof t.html!="string"){E.toast("Bundle is missing a name or html field.",{type:"error"});return}try{const n=await v.blocks.importBundle(t);E.toast(`Imported "${n.name}".`,{type:"success"}),await T()}catch(n){if(n.code==="CONFLICT"){if(!await E.confirm(`A block named "${g(n.name)}" already exists. Overwrite it with the imported version?`)){E.toast("Import cancelled.",{type:"info"});return}try{const r=await v.blocks.importBundle(t,{overwrite:!0});E.toast(`Overwrote "${r.name}".`,{type:"success"}),await T()}catch(r){E.toast(r.message||"Import failed.",{type:"error"})}return}E.toast(n.message||"Import failed.",{type:"error"})}}k.addEventListener("change",z),i.add(()=>k.removeEventListener("change",z));const x=new Set;let f=null,_=!1;function fe(e){const t=E.slideover({title:`Where ${g(e.name)} is used`,size:"sm",position:"right"}),n=ie(`
+</div>`,k=l=>String(l??"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;");function ge(l){const n=document.createElement("template");return n.innerHTML=l.trim(),n.content.firstElementChild}const i=qe(he);async function at(l){try{return await navigator.clipboard.writeText(l),!0}catch{const n=document.createElement("textarea");n.value=l,n.style.cssText="position:fixed;opacity:0;",document.body.appendChild(n),n.select();let f=!1;try{f=document.execCommand("copy")}catch{}return n.remove(),f}}export const blocksView={templateUrl:"/admin/js/templates/blocks.html",async onMount(l){i.reset();const n=l.get(0).querySelector(".blx")||l.get(0),f=()=>he.test(location.hash)&&n.isConnected,w=He(),u=M.observable([]),z=M.observable(!0),R=M.observable("");let G="all";try{G=Pe.includes(S.get(_))?S.get(_):"all"}catch{}const y=M.observable(G),Y=M.observable("");i.add(M.effect(()=>{const e=y.value;try{S.set(_,e)}catch{}}));let J="";try{J=Ve(S.get(fe))}catch{}const g=M.observable(J),x=M.observable([]);i.add(M.effect(()=>{const e=g.value;try{S.set(fe,e)}catch{}}));const ve=ze,q=M.observable([]);i.add(M.effect(()=>{q.value=Ke(u.value,{filter:y.value,query:Y.value,tag:g.value})}));const U=M.observable([]);i.add(M.effect(()=>{U.value=q.value.map(e=>We(e,ve))}));const H=M.computed(()=>Xe(x.value,u.value)),ye=M.computed(()=>Ye(g.value,q.value.length,"blocks")),ke=M.computed(()=>{const e=u.value,t=e.filter(a=>(a.usage?.pages?.length||0)+(a.usage?.views?.length||0)>0).length;return{all:e.length,used:t,unused:e.length-t}}),we=M.computed(()=>u.value.length?"No blocks match.":"No blocks yet - New block in the banner makes one, or Import brings one in."),O=e=>u.peek().find(t=>t.name===e),xe=w?`#/blocks/new?project=${encodeURIComponent(w)}`:"#/blocks/new",V=e=>`#/blocks/edit/${encodeURIComponent(e)}`;async function P(){try{let e=await Fe("/blocks?usage=1",{method:"GET"});if(!f())return;if(e=Array.isArray(e)?e:[],w){const t=e.length;e=Ue(e,w),Oe(n,{total:t,shown:e.length,slug:w,allHref:"#/blocks",noun:"blocks"})}u.value=e,R.value="",await Ee()}catch(e){R.value=`Could not load the blocks: ${e.message||e}`}finally{z.value=!1}}async function Ee(){try{x.value=(await h.listTags.list("blocks")).map(t=>t.name)}catch{}const e=g.peek();e&&e!==Ge&&!H.peek().some(t=>be(t.name,e))&&(g.value="")}async function Q(e,t){try{const a=await h.listTags.changeItem("blocks",e.name,t);u.value=u.peek().map(s=>s.name===e.name?{...s,meta:{...s.meta||{},adminTags:a}}:s),a.some(s=>!x.peek().some(p=>be(p,s)))&&(x.value=[...x.peek(),...a])}catch(a){E.toast(`Tags not saved: ${a.message||a}`,{type:"error"})}}const Se=()=>Qe({kind:"blocks",noun:"blocks",title:"Blocks settings - tags",tags:H,active:g,reload:P}),j=async()=>{Re(et),f()&&await P()};async function Ce(e){const a=(e.usage?.pages?.length||0)+(e.usage?.views?.length||0)?` It is ${k(me(e).toLowerCase())} - they will show nothing where it was.`:"";if(await E.confirm(`Delete the block "${k(e.name)}"?${a} This cannot be undone.`))try{await h.blocks.delete(e.name),E.toast(`Deleted "${e.name}".`,{type:"success"}),await j()}catch(s){E.toast(s.message||"Failed to delete block.",{type:"error"})}}async function Te(e){try{await h.blocks.exportBundle(e.name)}catch(t){E.toast(t.message||"Export failed.",{type:"error"})}}async function Me(e){const t=pe(e),a=await at(t);E.toast(a?`Copied ${t}`:`Could not copy - your browser refused. The shortcode is ${t}`,{type:a?"success":"error"})}const C=n.querySelector(".blx-import-file");async function X(){const e=C.files?.[0];if(!e)return;C.value="";let t;try{t=JSON.parse(await e.text())}catch{E.toast("Not a valid .dmblock.json file (could not parse JSON).",{type:"error"});return}if(!t||typeof t!="object"||!t.name||typeof t.html!="string"){E.toast("Bundle is missing a name or html field.",{type:"error"});return}try{const a=await h.blocks.importBundle(t);E.toast(`Imported "${a.name}".`,{type:"success"}),await j()}catch(a){if(a.code==="CONFLICT"){if(!await E.confirm(`A block named "${k(a.name)}" already exists. Overwrite it with the imported version?`)){E.toast("Import cancelled.",{type:"info"});return}try{const s=await h.blocks.importBundle(t,{overwrite:!0});E.toast(`Overwrote "${s.name}".`,{type:"success"}),await j()}catch(s){E.toast(s.message||"Import failed.",{type:"error"})}return}E.toast(a.message||"Import failed.",{type:"error"})}}C.addEventListener("change",X),i.add(()=>C.removeEventListener("change",X));const T=new Set;let v=null,Z=!1;function Ne(e){const t=E.slideover({title:`Where ${k(e.name)} is used`,size:"sm",position:"right"}),a=ge(`
                 <div class="blx-form">
                     <p class="blx-note blx-where-sum"></p>
                     <ul class="blx-where"></ul>
                     <div><div class="form-label">Shortcode</div><div class="blx-code"></div>
                         <small class="blx-hint">Right-click the block in the list and Copy shortcode to paste it into a page.</small></div>
-                </div>`);n.querySelector(".blx-where-sum").textContent=le(e)+".",n.querySelector(".blx-code").textContent=se(e);const r=n.querySelector(".blx-where"),b=(l,j,$)=>{const L=document.createElement("li"),o=document.createElement("a");o.href=l,o.textContent=j,o.addEventListener("click",()=>t.close());const d=document.createElement("small");d.textContent=$,L.append(o,d),r.appendChild(L)};for(const l of e.usage?.pages||[])b(`#/pages/edit${l}`,l,"page");for(const l of e.usage?.views||[])b(`#/views/edit/${encodeURIComponent(l)}`,l,"view");t.element.appendChild(n),x.add(t),ne(t,()=>x.delete(t)),t.open()}function Y(e,t=null){const n=()=>p.peek().map(c=>c.name),r=t?.name??oe(e.name,n()),b=M.observable(r),l=M.observable(!1),j=M.computed(()=>Be(b.value,p.value.map(c=>c.name))),$={name:b,saving:l,err:j,cannot:M.computed(()=>l.value||!!j.value)},L=()=>b.peek()!==oe(e.name,n())||!!t,o=E.slideover({title:`Duplicate ${g(e.name)}`,size:"sm",position:"right"}),d=ie(`
+                </div>`);a.querySelector(".blx-where-sum").textContent=me(e)+".",a.querySelector(".blx-code").textContent=pe(e);const s=a.querySelector(".blx-where"),p=(r,B,$)=>{const L=document.createElement("li"),o=document.createElement("a");o.href=r,o.textContent=B,o.addEventListener("click",()=>t.close());const m=document.createElement("small");m.textContent=$,L.append(o,m),s.appendChild(L)};for(const r of e.usage?.pages||[])p(`#/pages/edit${r}`,r,"page");for(const r of e.usage?.views||[])p(`#/views/edit/${encodeURIComponent(r)}`,r,"view");t.element.appendChild(a),T.add(t),re(t,()=>T.delete(t)),t.open()}function ee(e,t=null){const a=()=>u.peek().map(d=>d.name),s=t?.name??ue(e.name,a()),p=M.observable(s),r=M.observable(!1),B=M.computed(()=>_e(p.value,u.value.map(d=>d.name))),$={name:p,saving:r,err:B,cannot:M.computed(()=>r.value||!!B.value)},L=()=>p.peek()!==ue(e.name,a())||!!t,o=E.slideover({title:`Duplicate ${k(e.name)}`,size:"sm",position:"right"}),m=ge(`
                 <div class="blx-form">
                     <div>
                         <label class="form-label" for="blx-dup-name">Name of the copy
@@ -31,4 +32,4 @@ import{api as v,apiRequest as Ce}from"../api.js";import{addBannerAction as A}fro
                         <button type="button" class="btn btn-sm btn-primary" data-on-click="save" data-bind-disabled="cannot.value">
                             <span data-icon="copy" data-icon-size="13"></span> Duplicate</button>
                     </div>
-                </div>`);let R=!1;async function X(){if($.cannot.peek())return;l.value=!0;const c=b.peek().trim();try{const u=await v.blocks.get(e.name);await v.blocks.put(c,{content:u.content,css:u.css||"",...u.meta?.project&&{meta:{project:u.meta.project}}}),E.toast(`Made "${c}".`,{type:"success"}),R=!0,o.close(),await T()}catch(u){E.toast(`Not duplicated: ${u.message||u}`,{type:"error"})}finally{l.value=!1}}o.element.appendChild(d);const we=te(d),ke=M.applyBindings($,d,{methods:{save:X,cancel:()=>o.close()}}),xe=c=>{c.key==="Enter"&&c.target.matches("input")&&(c.preventDefault(),X())};d.addEventListener("keydown",xe);const Z={dirty:L,values:()=>({name:b.peek()}),source:e.name};f=Z,x.add(o),ne(o,()=>{ke.dispose(),we(),x.delete(o),f===Z&&(f=null)});const Ee=o.close.bind(o);let q=!1;o.close=async c=>{if(!R&&!_&&c!==!0&&L()){if(q)return;q=!0;const u=await E.confirm("Discard the name you typed?");if(q=!1,!u)return}return R=!0,Ee()},I.scan(d),o.open();const ee=d.querySelector("#blx-dup-name");ee?.focus(),ee?.select()}function ye(e){const t=F(e);if(!t)return[];const n=(t.usage?.pages?.length||0)+(t.usage?.views?.length||0);return[{header:t.name},{label:"Edit",icon:"edit",action:()=>{location.hash=K(t.name)}},{label:"Copy shortcode",icon:"copy",action:()=>he(t)},{label:n?`Where it is used (${n})\u2026`:"Where it is used\u2026",icon:"link",action:()=>fe(t)},{type:"divider"},{label:"Duplicate\u2026",icon:"layers",action:()=>Y(t)},{label:"Export (.dmblock.json)",icon:"download",action:()=>be(t)},{type:"divider"},{label:"Delete\u2026",icon:"trash",danger:!0,action:()=>me(t)}]}const m=a.querySelector(".blx-list");m.innerHTML=Re;const ve=M.applyBindings({blocks:p,loading:H,loadError:B,filter:y,query:P,rows:D,counts:de,emptyText:ue},a,{methods:{showAll:()=>{y.value="all"},showUsed:()=>{y.value="used"},showUnused:()=>{y.value="unused"}}});i.add(()=>ve.dispose()),i.add(te(a,{position:"bottom"})),i.add(M.effect(()=>{D.value,requestAnimationFrame(()=>{m.isConnected&&I.scan(m)})}));const ge=E.contextMenu(m,{cursor:"glyph",match:".blx-row",inherit:!1,density:"compact",items:e=>ye(e.dataset.name)});i.add(()=>ge?.destroy?.());const J=e=>{F(e)&&(location.hash=K(e))},V=e=>{const t=e.target.closest(".blx-row");if(!t)return;const n=e.target.closest(".blx-kebab");if(n){ae(n);return}J(t.dataset.name)},G=e=>{const t=e.target.closest(".blx-row");t&&(e.key==="F10"&&e.shiftKey?(e.preventDefault(),ae(t)):e.key==="Enter"&&e.target===t&&J(t.dataset.name))};m.addEventListener("click",V),m.addEventListener("keydown",G),i.add(()=>{m.removeEventListener("click",V),m.removeEventListener("keydown",G)}),A(s,{id:"blocks-guide",icon:"book",title:"Blocks guide",onClick:()=>{location.hash="#/docs/usage/blocks"}}),A(s,{id:"blocks-import",icon:"upload",title:"Import a .dmblock.json bundle",onClick:()=>k.click()}),A(s,{id:"blocks-new",icon:"plus",title:"New block",onClick:()=>{location.hash=pe}});const Q=e=>{f?.dirty()&&(e.preventDefault(),e.returnValue="")};if(window.addEventListener("beforeunload",Q),i.add(()=>window.removeEventListener("beforeunload",Q)),i.add(()=>{if(f?.dirty())try{S.set(N,{source:f.source,values:f.values(),at:new Date().toISOString()})}catch{}_=!0,[...x].forEach(e=>{try{e.close(!0)}catch{}})}),I.scan(a),await W(),!h())return;let C=null;try{C=S.get(N)}catch{}if(C?.values&&C.source){try{S.remove?S.remove(N):S.set(N,null)}catch{}const e=F(C.source);e&&await E.confirm(`You were duplicating "${g(e.name)}" and left it unfinished. Pick up where you left off?`)&&h()&&Y(e,C.values)}}};
+                </div>`);let K=!1;async function oe(){if($.cannot.peek())return;r.value=!0;const d=p.peek().trim();try{const c=await h.blocks.get(e.name);await h.blocks.put(d,{content:c.content,css:c.css||"",...(c.meta?.project||D(c).length)&&{meta:{...c.meta?.project&&{project:c.meta.project},...D(c).length&&{adminTags:D(c)}}}}),E.toast(`Made "${d}".`,{type:"success"}),K=!0,o.close(),await j()}catch(c){E.toast(`Not duplicated: ${c.message||c}`,{type:"error"})}finally{r.value=!1}}o.element.appendChild(m);const Be=ie(m),$e=M.applyBindings($,m,{methods:{save:oe,cancel:()=>o.close()}}),Ae=d=>{d.key==="Enter"&&d.target.matches("input")&&(d.preventDefault(),oe())};m.addEventListener("keydown",Ae);const le={dirty:L,values:()=>({name:p.peek()}),source:e.name};v=le,T.add(o),re(o,()=>{$e.dispose(),Be(),T.delete(o),v===le&&(v=null)});const De=o.close.bind(o);let W=!1;o.close=async d=>{if(!K&&!Z&&d!==!0&&L()){if(W)return;W=!0;const c=await E.confirm("Discard the name you typed?");if(W=!1,!c)return}return K=!0,De()},I.scan(m),o.open();const ce=m.querySelector("#blx-dup-name");ce?.focus(),ce?.select()}function Ie(e){const t=O(e);if(!t)return[];const a=(t.usage?.pages?.length||0)+(t.usage?.views?.length||0);return[{header:t.name},{label:"Edit",icon:"edit",action:()=>{location.hash=V(t.name)}},{label:"Copy shortcode",icon:"copy",action:()=>Me(t)},{label:a?`Where it is used (${a})\u2026`:"Where it is used\u2026",icon:"link",action:()=>Ne(t)},{type:"divider"},...Ze({all:H.peek().map(s=>s.name),current:D(t),change:s=>Q(t,s),newTag:async()=>{const s=await Je();s&&await Q(t,{add:[s]})}}),{type:"divider"},{label:"Duplicate\u2026",icon:"layers",action:()=>ee(t)},{label:"Export (.dmblock.json)",icon:"download",action:()=>Te(t)},{type:"divider"},{label:"Delete\u2026",icon:"trash",danger:!0,action:()=>Ce(t)}]}const b=n.querySelector(".blx-list");b.innerHTML=tt;const Le=M.applyBindings({blocks:u,loading:z,loadError:R,filter:y,query:Y,rows:U,counts:ke,emptyText:we,tagNote:ye},n,{methods:{showAllTags:()=>{g.value=""},showAll:()=>{y.value="all"},showUsed:()=>{y.value="used"},showUnused:()=>{y.value="unused"}}});i.add(()=>Le.dispose()),i.add(ie(n,{position:"bottom"})),i.add(M.effect(()=>{U.value,requestAnimationFrame(()=>{b.isConnected&&I.scan(b)})}));const je=E.contextMenu(b,{cursor:"glyph",match:".blx-row",inherit:!1,density:"compact",items:e=>Ie(e.dataset.name)});i.add(()=>je?.destroy?.());const te=e=>{O(e)&&(location.hash=V(e))},ae=e=>{const t=e.target.closest(".blx-row");if(!t)return;const a=e.target.closest(".blx-kebab");if(a){de(a);return}te(t.dataset.name)},se=e=>{const t=e.target.closest(".blx-row");t&&(e.key==="F10"&&e.shiftKey?(e.preventDefault(),de(t)):e.key==="Enter"&&e.target===t&&te(t.dataset.name))};b.addEventListener("click",ae),b.addEventListener("keydown",se),i.add(()=>{b.removeEventListener("click",ae),b.removeEventListener("keydown",se)}),A(l,{id:"blocks-settings",icon:"settings",title:"Blocks settings - tags",onClick:Se}),A(l,{id:"blocks-guide",icon:"book",title:"Blocks guide",onClick:()=>{location.hash="#/docs/usage/blocks"}}),A(l,{id:"blocks-import",icon:"upload",title:"Import a .dmblock.json bundle",onClick:()=>C.click()}),A(l,{id:"blocks-new",icon:"plus",title:"New block",onClick:()=>{location.hash=xe}});const ne=e=>{v?.dirty()&&(e.preventDefault(),e.returnValue="")};if(window.addEventListener("beforeunload",ne),i.add(()=>window.removeEventListener("beforeunload",ne)),i.add(()=>{if(v?.dirty())try{S.set(F,{source:v.source,values:v.values(),at:new Date().toISOString()})}catch{}Z=!0,[...T].forEach(e=>{try{e.close(!0)}catch{}})}),I.scan(n),await P(),!f())return;let N=null;try{N=S.get(F)}catch{}if(N?.values&&N.source){try{S.remove?S.remove(F):S.set(F,null)}catch{}const e=O(N.source);e&&await E.confirm(`You were duplicating "${k(e.name)}" and left it unfinished. Pick up where you left off?`)&&f()&&ee(e,N.values)}}};

package/admin/js/views/pages.js

@@ -1,15 +1,16 @@
-import{api as y}from"../api.js";import{SHAPES as ke,whileLoading as Pe}from"../lib/loading.js";import{addBannerAction as Me}from"../lib/plugin-chrome.js";import{helpPopovers as Z}from"../lib/help-popover.js";import{onceClosed as Ee,openMenuAt as ee,settingsStore as xe,sidebarCount as te,viewLifetime as Se}from"../lib/tool-kit.js";import{filterByProject as Ce,getProjectFromHash as $e}from"../lib/project-context.js";import{arrangePages as Te,checkPrune as Le,normaliseSettings as ae,pageRow as De,statusCounts as Ae,treeRows as Re}from"../lib/pages-arrange.js";const se=/^#\/(pages|projects\/[^/?#]+\/pages)\/?(\?.*)?$/,ne="#/pages",C="pages.prune.draft",je=`
+import{api as p}from"../api.js";import{SHAPES as Le,whileLoading as Ne}from"../lib/loading.js";import{addBannerAction as ne}from"../lib/plugin-chrome.js";import{helpPopovers as oe}from"../lib/help-popover.js";import{onceClosed as Re,openMenuAt as ie,settingsStore as je,sidebarCount as re,viewLifetime as Be}from"../lib/tool-kit.js";import{filterByProject as le,getProjectFromHash as Ke}from"../lib/project-context.js";import{arrangePages as qe,checkPrune as He,normaliseSettings as ce,pageRow as Ie,statusCounts as Ue,treeRows as _e}from"../lib/pages-arrange.js";import{UNTAGGED as Fe,activeNote as Oe,askTagName as Ve,openTagSettings as ze,same as de,tagCounts as Ge,tagMenuItems as We,tagsOf as Ye}from"../lib/list-tags.js";const pe=/^#\/(pages|projects\/[^/?#]+\/pages)\/?(\?.*)?$/,ue="#/pages",D="pages.prune.draft",Je=`
 <div class="pgx-row" data-path="{{urlPath}}" tabindex="0" data-bind-class="rowCls">
     <span class="pgx-main"><strong>{{title}}</strong><small>{{meta}} <span class="pgx-tags">{{tagsText}}</span></small></span>
     <span class="pgx-chips">
         <span class="pgx-chip" data-bind-hidden="!visibility" title="Who can see it">{{visibility}}</span>
+        <span class="pgx-chip is-tag" data-bind-hidden="!listTags" title="Tags">{{listTags}}</span>
         <span class="pgx-chip is-info" data-bind-hidden="!project" title="Project">{{project}}</span>
         <span class="pgx-chip" data-bind-hidden="!bundled" title="Shipped with the CMS">Bundled</span>
         <span class="pgx-chip is-warn" data-bind-hidden="!plugin" title="Managed by this plugin">{{plugin}}</span>
         <span class="pgx-chip" data-bind-class="statusCls">{{statusText}}</span>
     </span>
     <button type="button" class="pgx-kebab" aria-label="Actions for {{title}}" title="Actions">\u22EE</button>
-</div>`,w=l=>String(l??"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;");function Be(l){const r=document.createElement("template");return r.innerHTML=l.trim(),r.content.firstElementChild}const oe=xe("pages.settings",ae),o=Se(se),Ke=l=>`#/pages/edit${l}`;export const pagesView={templateUrl:"/admin/js/templates/pages.html",async onMount(l){o.reset();const r=l.get(0).querySelector(".pgx")||l.get(0),$=()=>se.test(location.hash)&&r.isConnected,u=$e(),T=oe.read(),n=M.observable([]),H=M.observable(0),N=M.observable(!0),L=M.observable(""),p=M.observable(T.status),D=M.observable(T.sort),m=M.observable(T.mode),U=M.observable("");o.add(M.effect(()=>oe.write(ae({status:p.value,sort:D.value,mode:m.value}))));const A=M.observable([]);o.add(M.effect(()=>{A.value=Te(n.value,{status:p.value,query:U.value,sort:D.value})}));const _=M.observable([]);o.add(M.effect(()=>{_.value=A.value.map(e=>De(e))}));const re=M.computed(()=>Ae(n.value)),ie=M.computed(()=>n.value.length?"No pages match.":"No pages yet - New page in the banner makes one."),le=M.computed(()=>{const e=H.value;return!u||!e?"":`Showing only pages in ${u}. ${e} other page${e===1?" is":"s are"} filed elsewhere.`}),F=e=>n.peek().find(t=>t.urlPath===e);async function ce(){try{const e=await Pe(r.querySelector(".dm-loading-slot"),y.pages.list(),ke.rows);if(!$())return;const t=Array.isArray(e)?e:[],a=u?Ce(t,u):t;H.value=t.length-a.length,n.value=a,L.value=""}catch(e){L.value=`Could not load the pages: ${e.message||e}`}finally{N.value=!1}}const k=e=>{location.hash=Ke(e)},de=()=>{location.hash=u?`#/pages/new?project=${encodeURIComponent(u)}`:"#/pages/new"};async function ue(e){const t=e.plugin?`"${w(e.title||e.urlPath)}" is managed by the <strong>${w(e.plugin)}</strong> plugin - deleting it may stop that plugin working. Delete it anyway?`:`Delete the page at <strong>${w(e.urlPath)}</strong>? This cannot be undone.`;if(await E.confirm(t))try{await y.pages.delete(e.urlPath),E.toast("Page deleted.",{type:"success"}),n.value=n.peek().filter(a=>a.urlPath!==e.urlPath),te(ne)}catch(a){E.toast(`Not deleted: ${a.message||a}`,{type:"error"})}}async function pe(e){const t=new URL(e.urlPath,location.origin).href;try{await navigator.clipboard.writeText(t),E.toast("Address copied.",{type:"success",duration:2e3})}catch{E.toast(t,{type:"info",duration:8e3})}}async function R(e,t){if(e.status!==t)try{const a=await y.pages.get(e.urlPath);await y.pages.update(e.urlPath,{frontmatter:{status:t},body:a.content||""}),n.value=n.peek().map(c=>c.urlPath===e.urlPath?{...c,status:t}:c),E.toast(t==="published"?"Page published.":t==="review"?"Page moved to review.":"Page moved to drafts.",{type:"success"}),te(ne)}catch(a){E.toast(`Could not change page status: ${a.message||a}`,{type:"error"})}}let d=null;const j=new Set;let V=!1;function O(e,t=null){const a=e.versionCount||0,c=M.observable(String(t?.keep??Math.min(5,a))),x=M.observable(!1),f=M.computed(()=>Le(c.value,a)),G={keep:c,saving:x,err:M.computed(()=>f.value.error),summary:M.computed(()=>{const s=f.value;return s.error?"":s.deletes?`Deletes the ${s.deletes} oldest, keeps the newest ${Math.min(s.keep,a)}.`:"Nothing to delete - that keeps them all."}),cannot:M.computed(()=>x.value||!!f.value.error||f.value.deletes===0),intro:`${e.title||e.urlPath} has ${a} saved revision${a===1?"":"s"} - earlier versions you can compare with and restore from the editor's History.`},ve=String(c.peek()),J=()=>String(c.peek())!==ve||!!t,i=E.slideover({title:`Trim revisions - ${w(e.title||e.urlPath)}`,size:"sm",position:"right"}),g=Be(`
+</div>`,T=r=>String(r??"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;");function Qe(r){const l=document.createElement("template");return l.innerHTML=r.trim(),l.content.firstElementChild}const ge=je("pages.settings",ce),i=Be(pe),Xe=r=>`#/pages/edit${r}`;export const pagesView={templateUrl:"/admin/js/templates/pages.html",async onMount(r){i.reset();const l=r.get(0).querySelector(".pgx")||r.get(0),L=()=>pe.test(location.hash)&&l.isConnected,d=Ke(),x=ge.read(),o=M.observable([]),_=M.observable(0),F=M.observable(!0),N=M.observable(""),h=M.observable(x.status),R=M.observable(x.sort),b=M.observable(x.mode),O=M.observable(""),u=M.observable(x.tag),y=M.observable([]);i.add(M.effect(()=>ge.write(ce({status:h.value,sort:R.value,mode:b.value,tag:u.value}))));const C=M.observable([]);i.add(M.effect(()=>{C.value=qe(o.value,{status:h.value,query:O.value,sort:R.value,tag:u.value})}));const V=M.observable([]);i.add(M.effect(()=>{V.value=C.value.map(e=>Ie(e))}));const he=M.computed(()=>Ue(o.value)),me=M.computed(()=>o.value.length?"No pages match.":"No pages yet - New page in the banner makes one."),ve=M.computed(()=>{const e=_.value;return!d||!e?"":`Showing only pages in ${d}. ${e} other page${e===1?" is":"s are"} filed elsewhere.`}),j=M.computed(()=>Ge(y.value,o.value)),fe=M.computed(()=>Oe(u.value,C.value.length,"pages")),z=e=>o.peek().find(t=>t.urlPath===e);async function be(){try{const e=await Ne(l.querySelector(".dm-loading-slot"),p.pages.list(),Le.rows);if(!L())return;const t=Array.isArray(e)?e:[],a=d?le(t,d):t;_.value=t.length-a.length,o.value=a,N.value="",await G()}catch(e){N.value=`Could not load the pages: ${e.message||e}`}finally{F.value=!1}}async function G(){try{y.value=(await p.listTags.list("pages")).map(t=>t.name)}catch{}const e=u.peek();e&&e!==Fe&&!j.peek().some(t=>de(t.name,e))&&(u.value="")}async function W(e,t){try{const a=await p.listTags.changeItem("pages",e.urlPath,t);o.value=o.peek().map(s=>s.urlPath===e.urlPath?{...s,adminTags:a}:s),a.some(s=>!y.peek().some(v=>de(v,s)))&&(y.value=[...y.peek(),...a])}catch(a){E.toast(`Tags not saved: ${a.message||a}`,{type:"error"})}}async function ye(){const e=await p.pages.list(),t=Array.isArray(e)?e:[];o.value=d?le(t,d):t,await G()}const we=()=>ze({kind:"pages",noun:"pages",title:"Pages settings - tags",tags:j,active:u,reload:ye}),$=e=>{location.hash=Xe(e)},ke=()=>{location.hash=d?`#/pages/new?project=${encodeURIComponent(d)}`:"#/pages/new"};async function Pe(e){const t=e.plugin?`"${T(e.title||e.urlPath)}" is managed by the <strong>${T(e.plugin)}</strong> plugin - deleting it may stop that plugin working. Delete it anyway?`:`Delete the page at <strong>${T(e.urlPath)}</strong>? This cannot be undone.`;if(await E.confirm(t))try{await p.pages.delete(e.urlPath),E.toast("Page deleted.",{type:"success"}),o.value=o.peek().filter(a=>a.urlPath!==e.urlPath),re(ue)}catch(a){E.toast(`Not deleted: ${a.message||a}`,{type:"error"})}}async function Me(e){const t=new URL(e.urlPath,location.origin).href;try{await navigator.clipboard.writeText(t),E.toast("Address copied.",{type:"success",duration:2e3})}catch{E.toast(t,{type:"info",duration:8e3})}}async function B(e,t){if(e.status!==t)try{const a=await p.pages.get(e.urlPath);await p.pages.update(e.urlPath,{frontmatter:{status:t},body:a.content||""}),o.value=o.peek().map(s=>s.urlPath===e.urlPath?{...s,status:t}:s),E.toast(t==="published"?"Page published.":t==="review"?"Page moved to review.":"Page moved to drafts.",{type:"success"}),re(ue)}catch(a){E.toast(`Could not change page status: ${a.message||a}`,{type:"error"})}}let g=null;const K=new Set;let Y=!1;function J(e,t=null){const a=e.versionCount||0,s=M.observable(String(t?.keep??Math.min(5,a))),v=M.observable(!1),k=M.computed(()=>He(s.value,a)),ee={keep:s,saving:v,err:M.computed(()=>k.value.error),summary:M.computed(()=>{const n=k.value;return n.error?"":n.deletes?`Deletes the ${n.deletes} oldest, keeps the newest ${Math.min(n.keep,a)}.`:"Nothing to delete - that keeps them all."}),cannot:M.computed(()=>v.value||!!k.value.error||k.value.deletes===0),intro:`${e.title||e.urlPath} has ${a} saved revision${a===1?"":"s"} - earlier versions you can compare with and restore from the editor's History.`},Se=String(s.peek()),te=()=>String(s.peek())!==Se||!!t,c=E.slideover({title:`Trim revisions - ${T(e.title||e.urlPath)}`,size:"sm",position:"right"}),f=Qe(`
                 <div class="pgx-form">
                     <p class="pgx-note" data-bind-text="intro"></p>
                     <div>
@@ -25,4 +26,4 @@ import{api as y}from"../api.js";import{SHAPES as ke,whileLoading as Pe}from"../l
                         <button type="button" class="btn btn-sm btn-danger" data-on-click="trim" data-bind-disabled="cannot.value">
                             <span data-icon="archive" data-icon-size="13"></span> Trim</button>
                     </div>
-                </div>`);async function Q(){if(!G.cannot.peek()){x.value=!0;try{const s=await y.versions.prune(e.urlPath,f.peek().keep);E.toast(`Removed ${s.deleted} revision${s.deleted===1?"":"s"}; kept ${s.kept}.`,{type:"success"}),n.value=n.peek().map(b=>b.urlPath===e.urlPath?{...b,versionCount:s.kept}:b),K=!0,i.close()}catch(s){E.toast(s.message||"Could not trim the revisions.",{type:"error"})}finally{x.value=!1}}}i.element.appendChild(g);const fe=Z(g),be=M.applyBindings(G,g,{methods:{trim:Q,cancel:()=>i.close()}}),ye=s=>{s.key==="Enter"&&s.target.id==="pgx-f-keep"&&(s.preventDefault(),Q())};g.addEventListener("keydown",ye);const X={path:e.urlPath,dirty:J,values:()=>({keep:c.peek()})};d=X,j.add(i),Ee(i,()=>{be.dispose(),fe(),j.delete(i),d===X&&(d=null)});const we=i.close.bind(i);let K=!1,q=!1;i.close=async s=>{if(!K&&s!==!0&&!V&&J()){if(q)return;q=!0;const b=await E.confirm("Discard the change you have not applied?");if(q=!1,!b)return}return K=!0,we()},I.scan(g),i.open(),g.querySelector("#pgx-f-keep")?.select()}function he(e){const t=F(e);if(!t)return[];const a=t.versionCount||0;return[{header:t.title||t.urlPath},{label:"Edit",icon:"edit",action:()=>k(t.urlPath)},{label:t.status==="published"?"View on the site":"Preview (draft)",icon:"external-link",action:()=>window.open(t.urlPath,"_blank","noopener")},{label:"Copy address",icon:"copy",action:()=>pe(t)},{label:"Transition",icon:"circle",submenu:[{label:"Published",disabled:t.status==="published",action:()=>R(t,"published")},{label:"Draft",disabled:t.status==="draft",action:()=>R(t,"draft")},{label:"Review",disabled:t.status==="review",action:()=>R(t,"review")}]},{type:"divider"},{label:a?`Trim revisions (${a})\u2026`:"No revisions to trim",icon:"archive",disabled:!a,action:()=>O(t)},{type:"divider"},{label:"Delete\u2026",icon:"trash",danger:!0,action:()=>ue(t)}]}const h=r.querySelector(".pgx-list");h.innerHTML=je;const ge=M.applyBindings({pages:n,loading:N,loadError:L,status:p,sort:D,mode:m,query:U,rows:_,counts:re,emptyText:ie,projectNote:le},r,{methods:{showAll:()=>{p.value="all"},showPublished:()=>{p.value="published"},showDrafts:()=>{p.value="draft"},showList:()=>{m.value="list"},showTree:()=>{m.value="tree"}}});o.add(()=>ge.dispose()),o.add(Z(r,{position:"bottom"}));const B=r.querySelector(".pgx-tree");let P=null;o.add(M.effect(()=>{const e=m.value==="tree",t=e?Re(A.value):null;try{P?.destroy?.()}catch{}P=null,B.replaceChildren(),!(!e||!t.length)&&(P=E.treeView(B,{data:t,idKey:"id",parentKey:"parent_id",labelKey:"name",iconKey:"icon",expandedByDefault:!0,onSelect:a=>k(a)}),I.scan(B))})),o.add(()=>{try{P?.destroy?.()}catch{}});const me=E.contextMenu(h,{cursor:"glyph",match:".pgx-row",inherit:!1,density:"compact",items:e=>he(e.dataset.path)});o.add(()=>me?.destroy?.());const z=e=>{const t=e.target.closest(".pgx-row");if(!t)return;const a=e.target.closest(".pgx-kebab");if(a){ee(a);return}k(t.dataset.path)},W=e=>{const t=e.target.closest(".pgx-row");t&&(e.key==="F10"&&e.shiftKey?(e.preventDefault(),ee(t)):e.key==="Enter"&&e.target===t&&k(t.dataset.path))};h.addEventListener("click",z),h.addEventListener("keydown",W),o.add(()=>{h.removeEventListener("click",z),h.removeEventListener("keydown",W)}),Me(l,{id:"pages-new",icon:"plus",title:"New page",onClick:de});const Y=e=>{d?.dirty()&&(e.preventDefault(),e.returnValue="")};if(window.addEventListener("beforeunload",Y),o.add(()=>window.removeEventListener("beforeunload",Y)),o.add(()=>{if(d?.dirty())try{S.set(C,{path:d.path,values:d.values(),at:new Date().toISOString()})}catch{}V=!0,[...j].forEach(e=>{try{e.close(!0)}catch{}})}),I.scan(r),await ce(),!$())return;let v=null;try{v=S.get(C)}catch{}if(v?.path&&v.values){try{S.remove?S.remove(C):S.set(C,null)}catch{}const e=F(v.path);e&&(e.versionCount||0)>0&&await E.confirm(`You left trimming the revisions of "${w(e.title||e.urlPath)}" unfinished. Pick up where you left off?`)&&$()&&O(e,v.values)}}};
+                </div>`);async function ae(){if(!ee.cannot.peek()){v.value=!0;try{const n=await p.versions.prune(e.urlPath,k.peek().keep);E.toast(`Removed ${n.deleted} revision${n.deleted===1?"":"s"}; kept ${n.kept}.`,{type:"success"}),o.value=o.peek().map(P=>P.urlPath===e.urlPath?{...P,versionCount:n.kept}:P),H=!0,c.close()}catch(n){E.toast(n.message||"Could not trim the revisions.",{type:"error"})}finally{v.value=!1}}}c.element.appendChild(f);const Ce=oe(f),$e=M.applyBindings(ee,f,{methods:{trim:ae,cancel:()=>c.close()}}),Ae=n=>{n.key==="Enter"&&n.target.id==="pgx-f-keep"&&(n.preventDefault(),ae())};f.addEventListener("keydown",Ae);const se={path:e.urlPath,dirty:te,values:()=>({keep:s.peek()})};g=se,K.add(c),Re(c,()=>{$e.dispose(),Ce(),K.delete(c),g===se&&(g=null)});const De=c.close.bind(c);let H=!1,U=!1;c.close=async n=>{if(!H&&n!==!0&&!Y&&te()){if(U)return;U=!0;const P=await E.confirm("Discard the change you have not applied?");if(U=!1,!P)return}return H=!0,De()},I.scan(f),c.open(),f.querySelector("#pgx-f-keep")?.select()}function Ee(e){const t=z(e);if(!t)return[];const a=t.versionCount||0;return[{header:t.title||t.urlPath},{label:"Edit",icon:"edit",action:()=>$(t.urlPath)},{label:t.status==="published"?"View on the site":"Preview (draft)",icon:"external-link",action:()=>window.open(t.urlPath,"_blank","noopener")},{label:"Copy address",icon:"copy",action:()=>Me(t)},{label:"Transition",icon:"circle",submenu:[{label:"Published",disabled:t.status==="published",action:()=>B(t,"published")},{label:"Draft",disabled:t.status==="draft",action:()=>B(t,"draft")},{label:"Review",disabled:t.status==="review",action:()=>B(t,"review")}]},{type:"divider"},...We({all:j.peek().map(s=>s.name),current:Ye(t),change:s=>W(t,s),newTag:async()=>{const s=await Ve();s&&await W(t,{add:[s]})}}),{type:"divider"},{label:a?`Trim revisions (${a})\u2026`:"No revisions to trim",icon:"archive",disabled:!a,action:()=>J(t)},{type:"divider"},{label:"Delete\u2026",icon:"trash",danger:!0,action:()=>Pe(t)}]}const m=l.querySelector(".pgx-list");m.innerHTML=Je;const Te=M.applyBindings({pages:o,loading:F,loadError:N,status:h,sort:R,mode:b,query:O,rows:V,counts:he,emptyText:me,projectNote:ve,tagNote:fe},l,{methods:{showAllTags:()=>{u.value=""},showAll:()=>{h.value="all"},showPublished:()=>{h.value="published"},showDrafts:()=>{h.value="draft"},showList:()=>{b.value="list"},showTree:()=>{b.value="tree"}}});i.add(()=>Te.dispose()),i.add(oe(l,{position:"bottom"}));const q=l.querySelector(".pgx-tree");let A=null;i.add(M.effect(()=>{const e=b.value==="tree",t=e?_e(C.value):null;try{A?.destroy?.()}catch{}A=null,q.replaceChildren(),!(!e||!t.length)&&(A=E.treeView(q,{data:t,idKey:"id",parentKey:"parent_id",labelKey:"name",iconKey:"icon",expandedByDefault:!0,onSelect:a=>$(a)}),I.scan(q))})),i.add(()=>{try{A?.destroy?.()}catch{}});const xe=E.contextMenu(m,{cursor:"glyph",match:".pgx-row",inherit:!1,density:"compact",items:e=>Ee(e.dataset.path)});i.add(()=>xe?.destroy?.());const Q=e=>{const t=e.target.closest(".pgx-row");if(!t)return;const a=e.target.closest(".pgx-kebab");if(a){ie(a);return}$(t.dataset.path)},X=e=>{const t=e.target.closest(".pgx-row");t&&(e.key==="F10"&&e.shiftKey?(e.preventDefault(),ie(t)):e.key==="Enter"&&e.target===t&&$(t.dataset.path))};m.addEventListener("click",Q),m.addEventListener("keydown",X),i.add(()=>{m.removeEventListener("click",Q),m.removeEventListener("keydown",X)}),ne(r,{id:"pages-settings",icon:"settings",title:"Pages settings - tags",onClick:we}),ne(r,{id:"pages-new",icon:"plus",title:"New page",onClick:ke});const Z=e=>{g?.dirty()&&(e.preventDefault(),e.returnValue="")};if(window.addEventListener("beforeunload",Z),i.add(()=>window.removeEventListener("beforeunload",Z)),i.add(()=>{if(g?.dirty())try{S.set(D,{path:g.path,values:g.values(),at:new Date().toISOString()})}catch{}Y=!0,[...K].forEach(e=>{try{e.close(!0)}catch{}})}),I.scan(l),await be(),!L())return;let w=null;try{w=S.get(D)}catch{}if(w?.path&&w.values){try{S.remove?S.remove(D):S.set(D,null)}catch{}const e=z(w.path);e&&(e.versionCount||0)>0&&await E.confirm(`You left trimming the revisions of "${T(e.title||e.urlPath)}" unfinished. Pick up where you left off?`)&&L()&&J(e,w.values)}}};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "1.6.48",
+  "version": "1.6.50",
   "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/routes/api/auth.js

@@ -24,6 +24,7 @@ import {config, getConfig} from '../../config.js';
 import {getRegisteredSidebarItems, hooks} from '../../services/hooks.js';
 import {getMenu} from '../../services/menus.js';
 import {resolveAdminHome} from '../../services/adminHome.js';
+import {adminBrandFor} from '../../services/adminBrand.js';
 import {authenticate, checkVisibility} from '../../middleware/auth.js';
 import {getAdminScope, getPermissionsForRoles, getRoleLevel} from '../../services/roles.js';
 import {getEffectiveRegistry, GROUP_ORDER} from '../../services/permissionRegistry.js';
@@ -252,7 +253,8 @@ export async function authRoutes(fastify) {
         });
         // Dashboard Pro's "Open on my boards" - for a user the admin does not confine.
         if (!adminScope && isDashboardPro() && (await readPrefs(request.user)).home) adminHome = '/dashboards';
-        return {permissions, adminScope, adminHome};
+        // adminBrand: the admin's name and mark for the top bar, sidebar header and tab title.
+        return {permissions, adminScope, adminHome, adminBrand: adminBrandFor(getConfig('site'))};
     });
 
     // GET /api/auth/permissions-registry - returns the full permissions registry,

package/server/routes/api/list-tags.js

@@ -0,0 +1,85 @@
+/**
+ * List tags - admin-only labels on pages and blocks (services/listTags.js).
+ *
+ * GET  /api/list-tags/:kind              - {tags: [{name, count}]}
+ * POST /api/list-tags/:kind              - {name}: create a tag
+ * PUT  /api/list-tags/:kind/item         - {id, tags} replaces one item's tags; {id, add, remove} patches them
+ * POST /api/list-tags/:kind/rename       - {from, to}
+ * POST /api/list-tags/:kind/delete       - {name}: take it off every item
+ *
+ * :kind is `pages` or `blocks`; both sit under the pages permission, as the
+ * blocks routes do. Names travel in bodies, not paths, so any spelling works.
+ * Every change is limited to the items the caller's projects let them see.
+ */
+import {authenticate, requirePermission} from '../../middleware/auth.js';
+import {addTag, changeItemTags, deleteTag, listTags, renameTag} from '../../services/listTags.js';
+import {canSeeArtefact, canSeePage} from '../../services/projects.js';
+import {getBlock} from '../../services/blocks.js';
+import {getPage} from '../../services/content.js';
+
+/** Visibility of one item from what the listers return. */
+function visibleTo(user, kind) {
+    return kind === 'pages'
+        ? (p) => canSeeArtefact(user, {meta: {project: p.resolvedProject}})
+        : (b) => canSeeArtefact(user, b);
+}
+
+function fail(reply, err) {
+    if (err.code === 'BAD_KIND') return reply.status(404).send({error: err.message});
+    if (err.code === 'BAD_TAG' || err.code === 'INVALID_NAME') return reply.status(400).send({error: err.message});
+    if (err.code === 'ENOENT') return reply.status(404).send({error: 'Not found'});
+    throw err;
+}
+
+export async function listTagsRoutes(fastify) {
+    const canRead = {preHandler: [authenticate, requirePermission('pages', 'read')]};
+    const canUpdate = {preHandler: [authenticate, requirePermission('pages', 'update')]};
+
+    fastify.get('/list-tags/:kind', canRead, async (request, reply) => {
+        try {
+            return {tags: await listTags(request.params.kind, visibleTo(request.user, request.params.kind))};
+        } catch (err) { return fail(reply, err); }
+    });
+
+    fastify.post('/list-tags/:kind', canUpdate, async (request, reply) => {
+        try {
+            return {name: await addTag(request.params.kind, request.body?.name)};
+        } catch (err) { return fail(reply, err); }
+    });
+
+    fastify.put('/list-tags/:kind/item', canUpdate, async (request, reply) => {
+        const {kind} = request.params;
+        const {id, tags, add, remove} = request.body || {};
+        if (typeof id !== 'string' || !id) return reply.status(400).send({error: 'id is required'});
+        const lists = [tags, add, remove].filter(v => v !== undefined);
+        if (!lists.length || !lists.every(Array.isArray)) return reply.status(400).send({error: 'send tags, or add/remove, as arrays'});
+        try {
+            if (kind === 'pages') {
+                const page = await getPage(id);
+                if (!page) return reply.status(404).send({error: 'Page not found'});
+                if (!(await canSeePage(request.user, id, page.project))) return reply.status(403).send({error: 'Access denied for this project'});
+            } else if (kind === 'blocks') {
+                const block = await getBlock(id).catch(() => null);
+                if (!block) return reply.status(404).send({error: 'Block not found'});
+                if (!canSeeArtefact(request.user, block)) return reply.status(403).send({error: 'Access denied for this project'});
+            }
+            return {tags: await changeItemTags(kind, id, Array.isArray(tags) ? {tags} : {add, remove})};
+        } catch (err) { return fail(reply, err); }
+    });
+
+    fastify.post('/list-tags/:kind/rename', canUpdate, async (request, reply) => {
+        const {from, to} = request.body || {};
+        if (typeof from !== 'string' || !from) return reply.status(400).send({error: 'from is required'});
+        try {
+            return await renameTag(request.params.kind, from, to, visibleTo(request.user, request.params.kind));
+        } catch (err) { return fail(reply, err); }
+    });
+
+    fastify.post('/list-tags/:kind/delete', canUpdate, async (request, reply) => {
+        const {name} = request.body || {};
+        if (typeof name !== 'string' || !name) return reply.status(400).send({error: 'name is required'});
+        try {
+            return await deleteTag(request.params.kind, name, visibleTo(request.user, request.params.kind));
+        } catch (err) { return fail(reply, err); }
+    });
+}

package/server/routes/api/pages.js

@@ -181,6 +181,8 @@ export async function pagesRoutes(fastify) {
             category: p.category || null,
             visibility: p.visibility || 'public',
             tags: p.tags || [],
+            // Admin-only list tags (services/listTags.js) - not the public `tags`.
+            adminTags: Array.isArray(p.adminTags) ? p.adminTags : [],
             project: p.project ?? null,
             resolvedProject: p.resolvedProject ?? null,
             // The list's "managed by a plugin" chip and delete warning read these;

package/server/server.js

@@ -532,6 +532,7 @@ const { formsRoutes }       = await import('./routes/api/forms.js');
 const { viewsRoutes }       = await import('./routes/api/views.js');
 const { actionsRoutes }     = await import('./routes/api/actions.js');
 const {blocksRoutes} = await import('./routes/api/blocks.js');
+const {listTagsRoutes} = await import('./routes/api/list-tags.js');
 const {componentsRoutes} = await import('./routes/api/components.js');
 const {versionsRoutes} = await import('./routes/api/versions.js');
 const {effectsRoutes} = await import('./routes/api/effects.js');
@@ -568,6 +569,7 @@ await app.register(formsRoutes,       { prefix: '/api' });
 await app.register(viewsRoutes,       { prefix: '/api' });
 await app.register(actionsRoutes,     { prefix: '/api' });
 await app.register(blocksRoutes, {prefix: '/api'});
+await app.register(listTagsRoutes, {prefix: '/api'});
 await app.register(componentsRoutes, {prefix: '/api'});
 await app.register(versionsRoutes, {prefix: '/api'});
 await app.register(effectsRoutes, {prefix: '/api'});

package/server/services/adminBrand.js

@@ -0,0 +1,32 @@
+/**
+ * The admin's own name and mark - what the top bar, the sidebar header and the
+ * browser tab show. Site Settings › Branding › Admin name / logo / icon, with
+ * the site title standing in for an empty name, so a site called ACME Ltd says
+ * ACME Ltd in its admin without anyone setting anything.
+ *
+ * It travels with GET /api/auth/permissions, so every signed-in user sees it -
+ * reading Site Settings needs the settings permission, which a confined role
+ * (a job-board candidate) does not have.
+ *
+ * @module server/services/adminBrand
+ */
+
+/** The fallback when a site has neither an admin name nor a title. */
+export const DEFAULT_ADMIN_TITLE = 'Domma CMS';
+
+/**
+ * @param {object} [site] - config/site.json
+ * @returns {{title: string, logo: string, icon: string}}
+ */
+export function adminBrandFor(site = {}) {
+    const own = site?.adminBrand && typeof site.adminBrand === 'object' ? site.adminBrand : {};
+    // Whitespace collapsed: a title reads back that way from the browser tab.
+    const str = (v) => (typeof v === 'string' ? v.replace(/[ \t\n\f\r]+/g, ' ').trim() : '');
+    const logo = str(own.logo);
+    return {
+        title: (str(own.title) || str(site?.title) || DEFAULT_ADMIN_TITLE).slice(0, 120),
+        // Same rule as the sidebar header: a site path or an http(s) address, nothing else.
+        logo: /^(?:\/(?!\/)|https?:\/\/)/i.test(logo) ? logo : '',
+        icon: /^[a-z0-9-]{1,40}$/.test(str(own.icon)) ? str(own.icon) : ''
+    };
+}

package/server/services/blocks.js

@@ -334,9 +334,17 @@ export async function saveBlock(name, content, {bundled, css, meta} = {}) {
     await fs.mkdir(BLOCKS_DIR, {recursive: true});
     await fs.writeFile(blockFilePath(name), content, 'utf8');
     const metaPath = blockMetaPath(name);
+    // List tags (services/listTags.js) are set from the Blocks list, not by a
+    // content save: a caller that does not send `adminTags` keeps the stored
+    // ones, or an editor opened before a tagging would save over it.
+    let keptTags;
+    if (!(meta && typeof meta === 'object' && 'adminTags' in meta)) {
+        try { keptTags = JSON.parse(await fs.readFile(metaPath, 'utf8'))?.adminTags; } catch { /* no sidecar */ }
+    }
     // Merge sidecar meta - bundled flag plus any caller-supplied fields (eg meta.project).
     const sidecar = {
         ...(meta && typeof meta === 'object' ? meta : {}),
+        ...(Array.isArray(keptTags) && keptTags.length ? {adminTags: keptTags} : {}),
         ...(bundled ? {bundled: true} : {})
     };
     if (Object.keys(sidecar).length > 0) {
@@ -358,6 +366,31 @@ export async function saveBlock(name, content, {bundled, css, meta} = {}) {
     return {success: true, name};
 }
 
+/**
+ * Merge keys into a block's sidecar meta without touching its HTML or CSS.
+ * A key set to undefined is removed; an emptied sidecar is deleted, as
+ * saveBlock does. No cache invalidation: the sidecar is admin metadata
+ * (project, list tags) that rendering never reads.
+ *
+ * @param {string} name
+ * @param {object} patch
+ * @returns {Promise<object>} the sidecar as written
+ * @throws {Error} With code INVALID_NAME, or ENOENT when the block is not found
+ */
+export async function setBlockMeta(name, patch) {
+    assertValidName(name);
+    await fs.access(blockFilePath(name));
+    let meta = {};
+    try { meta = JSON.parse(await fs.readFile(blockMetaPath(name), 'utf8')) || {}; } catch { /* no sidecar yet */ }
+    for (const [k, v] of Object.entries(patch || {})) {
+        if (v === undefined) delete meta[k];
+        else meta[k] = v;
+    }
+    if (Object.keys(meta).length) await fs.writeFile(blockMetaPath(name), JSON.stringify(meta, null, 2) + '\n', 'utf8');
+    else await fs.unlink(blockMetaPath(name)).catch(() => {});
+    return meta;
+}
+
 /**
  * Delete a block and its companion files (.css, .meta.json).
  * Missing companions are ignored; only the primary .html file triggers ENOENT.

package/server/services/content.js

@@ -5,6 +5,7 @@
  */
 import fs from 'fs/promises';
 import path from 'path';
+import matter from 'gray-matter';
 import {parseMarkdown, serialiseMarkdown} from './markdown.js';
 import {config} from '../config.js';
 import {hooks} from './hooks.js';
@@ -227,6 +228,37 @@ export async function updatePage(urlPath, frontmatter, body, {author} = {}) {
     return page;
 }
 
+/**
+ * Merge keys into a page's frontmatter as metadata, not as an edit: no
+ * revision, updatedAt unchanged, body byte-for-byte as it was. For admin-only
+ * keys (list tags) that rendering never reads. A key set to undefined is
+ * removed.
+ *
+ * @param {string} urlPath
+ * @param {object} patch
+ * @returns {Promise<void>}
+ * @throws {Error} With code ENOENT when the page does not exist
+ */
+export async function setPageFrontmatter(urlPath, patch) {
+    const filePath = await resolveExistingFilePath(urlPath);
+    if (!filePath) {
+        const err = new Error(`Page not found: ${urlPath}`);
+        err.code = 'ENOENT';
+        throw err;
+    }
+    const raw = await fs.readFile(filePath, 'utf8');
+    // gray-matter caches parses by input string and hands back the same
+    // object: copy before changing it.
+    const parsed = matter(raw);
+    const data = {...parsed.data};
+    for (const [k, v] of Object.entries(patch || {})) {
+        if (v === undefined) delete data[k];
+        else data[k] = v;
+    }
+    await fs.writeFile(filePath, serialiseMarkdown(data, parsed.content), 'utf8');
+    await cache.invalidateTags(['pages:list']);
+}
+
 /**
  * Rename (move) a page to a new URL path.
  * Creates any required parent directories for the destination.