domma-cms 1.7.0 → 1.7.1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.7.1] - 2026-10-15
+
+- **Email… opens Email Pro, not your desktop mail program.** In Contacts, form submissions and call links (and in Booking, Shopping Cart, Blog and Support), an Email action now opens Email Pro's compose window, already addressed, when you have a mailbox there; otherwise your device's mail program as before. Groups and selections can be emailed (everyone in Bcc). A prefilled message sits above your signature. A list too long for a mail link is copied for you to paste into Bcc, and says what was left out. New `admin/js/lib/mail-compose.js` (`openEmail`) for any screen - never `location.href = 'mailto:'`; the hand-off is `#/plugins/email-pro?compose=1&to=…`, read once by the mail reader.
+- **Free Tools:** Booking 1.7.1, Shopping Cart 1.7.1, Blog 1.10.1 and Support 1.2.1 - their email actions go through `openEmail`, and stored addresses are encoded into links.
+
 ## [1.7.0] - 2026-10-15
 
 - **20 celebration scenes in every site.** Add New Year, Chinese New Year, Easter, Summer Garden, Winter, Autumn, Graduation, Birthday, Anniversary, standalone sparkler greetings, weather rain and Money Rain. Choose them in the Effects builder or right-click Celebrations menu, with controls for each scene's decorations.

package/admin/js/lib/mail-compose.js

@@ -0,0 +1 @@
+import{isPathAllowed as m}from"./admin-scope.js";export const MAIL_PLUGIN="email-pro",MAIL_ROUTE=`#/plugins/${MAIL_PLUGIN}`;const d=2e3;export const MAILTO_LIMIT=1800;export function looksLikeAddress(t){return typeof t=="string"&&/^[^\s@<>,;"]+@[^\s@<>,;"]+$/.test(t)}export function recipientList(t){const e=new Set,n=[],o=(Array.isArray(t)?t:t==null?[]:[t]).flatMap(c=>typeof c=="string"?c.split(/[,;]/).map(f):[c]);for(const c of o){const s=String(typeof c=="string"?c:c?.address??c?.email??"").trim();if(!looksLikeAddress(s))continue;const r=s.toLowerCase();if(e.has(r))continue;e.add(r);const a=typeof c=="object"&&c?String(c.name??"").replace(/[\r\n<>",;]+/g," ").replace(/\s+/g," ").trim():"";n.push({name:a,address:s})}return n}function f(t){const e=String(t).trim().match(/^(.*?)\s*<([^<>]+)>$/);return e?{name:e[1].replace(/^["']|["']$/g,""),address:e[2].trim()}:String(t).trim()}function h(t){return t.map(e=>e.name?`${e.name} <${e.address}>`:e.address).join(", ")}function l(t){return recipientList(String(t??""))}function u(t,{oneLine:e=!1}={}){let n=String(t??"");return e&&(n=n.replace(/[\r\n]+/g," ")),n.slice(0,d).trim()}export function composeRequest({to:t,cc:e,bcc:n,subject:o,body:c}={}){return{to:recipientList(t),cc:recipientList(e),bcc:recipientList(n),subject:u(o,{oneLine:!0}),body:u(c)}}export function composeHash(t){const e=composeRequest(t),n=new URLSearchParams({compose:"1"});for(const o of["to","cc","bcc"])e[o].length&&n.set(o,h(e[o]));return e.subject&&n.set("subject",e.subject),e.body&&n.set("body",e.body),`${MAIL_ROUTE}?${n}`}export function readComposeRequest(t){const e=String(t??"").match(/^#\/plugins\/[\w-]+\?(.*)$/);if(!e)return null;const n=new URLSearchParams(e[1]);return n.get("compose")!=="1"?null:composeRequest({to:l(n.get("to")),cc:l(n.get("cc")),bcc:l(n.get("bcc")),subject:n.get("subject")??"",body:n.get("body")??""})}export function mailtoHref(t){const e=composeRequest(t),n=c=>c.map(s=>encodeURIComponent(s.address).replace(/%40/g,"@")).join(","),o=[];return e.cc.length&&o.push(`cc=${n(e.cc)}`),e.bcc.length&&o.push(`bcc=${n(e.bcc)}`),e.subject&&o.push(`subject=${encodeURIComponent(e.subject)}`),e.body&&o.push(`body=${encodeURIComponent(e.body)}`),`mailto:${n(e.to)}${o.length?`?${o.join("&")}`:""}`}export function composeAvailable({routes:t,accounts:e,scope:n=null}={}){const o=`/plugins/${MAIL_PLUGIN}`;return Array.isArray(t)&&t.some(s=>s?.path===o)&&m(n,o)&&Array.isArray(e)&&e.length>0}export function allAddresses(t){const e=composeRequest(t);return[...e.to,...e.cc,...e.bcc].map(n=>n.address)}export function copyNotice(t){const e=composeRequest(t),n=allAddresses(e).length,o=e.bcc.length?"Bcc":"To",c=n===1?"the address":`${n} addresses`,s=[e.subject&&`the subject "${e.subject.length>60?`${e.subject.slice(0,57)}...`:e.subject}"`,e.body&&"the message"].filter(Boolean),r=s.length?` ${s.join(" and ").replace(/^./,a=>a.toUpperCase())} ${s.length>1?"weren't":"wasn't"} included.`:"";return`Copied ${c} - paste ${n===1?"it":"them"} into ${o}.${r}`}const g=1e4;let i=null;export function emailReady(){if(i&&Date.now()-i.at<g)return i.answer;const t={at:Date.now(),answer:null};return t.answer=(async()=>{const e=await b();return!e&&i===t&&(i=null),e})(),i=t,t.answer}async function b(){try{const{apiRequest:t}=await import("/admin/js/api.js"),[e,n]=await Promise.all([t("/plugins/admin-config",{method:"GET"}),t("/auth/permissions",{method:"GET"}).catch(()=>null)]),o=n?.adminScope||null;if(!composeAvailable({routes:e?.routes,accounts:[1],scope:o}))return!1;const c=await t(`/plugins/${MAIL_PLUGIN}/accounts`,{method:"GET"});return composeAvailable({routes:e.routes,accounts:c?.accounts,scope:o})}catch{return!1}}function p(t,e="info"){try{globalThis.E?.toast?.(t,{type:e})}catch{}}async function y(t){try{if(!navigator.clipboard?.writeText)throw new Error("no async clipboard");return await navigator.clipboard.writeText(t),!0}catch{try{const e=document.createElement("textarea");e.value=t,e.style.cssText="position:fixed;opacity:0",document.body.appendChild(e),e.select();const n=document.execCommand("copy");return e.remove(),n}catch{return!1}}}function w(t){const e=allAddresses(t),n=E.modal({title:`${e.length} ${e.length===1?"address":"addresses"}`,size:"md"}),o=document.createElement("div");o.className="flex flex-col gap-2";const c=document.createElement("p");c.className="text-sm",c.textContent=`Too many for your mail program to take from a link, and the browser would not copy them. Select them, copy, and paste into ${t.bcc.length?"Bcc":"To"}.`;const s=document.createElement("textarea");if(s.className="form-textarea mail-compose-addresses",s.readOnly=!0,s.rows=8,s.value=e.join(", "),o.append(c,s),t.subject){const r=document.createElement("label");r.className="form-label",r.textContent="Subject";const a=document.createElement("input");a.className="form-input",a.readOnly=!0,a.value=t.subject,o.append(r,a)}n.element.appendChild(o),n.open(),setTimeout(()=>{s.focus(),s.select()},60)}export async function openEmail(t){const e=composeRequest(t);if(!e.to.length&&!e.cc.length&&!e.bcc.length)return p("There is no valid email address to write to.","warning"),"none";if(await emailReady())return location.hash=composeHash(e),"compose";const n=mailtoHref(e);return n.length>MAILTO_LIMIT?await y(allAddresses(e).join(", "))?(p(copyNotice(e),"info"),"copied"):(w(e),"shown"):(location.href=n,"mailto")}

package/admin/js/templates/call-new.html

@@ -51,7 +51,7 @@
             <input id="cnx-link" class="form-input cnx-link" readonly data-bind-value="joinUrl.value" data-on-focus="selectLink">
             <div class="cnx-actions is-start">
                 <button type="button" class="btn btn-sm btn-outline" data-on-click="copyLink"><span data-icon="copy" data-icon-size="13"></span> Copy</button>
-                <a class="btn btn-sm btn-ghost" data-bind-href="mailto.value"><span data-icon="mail" data-icon-size="13"></span> Email it…</a>
+                <a class="btn btn-sm btn-ghost" data-bind-href="mailto.value" data-on-click="emailIt"><span data-icon="mail" data-icon-size="13"></span> Email it…</a>
                 <span class="cnx-spacer"></span>
                 <button type="button" class="btn btn-sm btn-ghost" data-on-click="close">Done</button>
             </div>

package/admin/js/views/call-new.js

@@ -1 +1 @@
-import{apiRequest as p}from"../api.js";import{helpPopovers as V}from"../lib/help-popover.js";import{viewLifetime as Y}from"../lib/tool-kit.js";const z=/^#\/calls\/new\/?(\?.*)?$/,G=/^[^\s@<>"]+@[^\s@<>"]+\.[^\s@<>"]+$/,f=Y(z);export function openHostTab(){let t=null;try{t=window.open("","_blank")}catch{t=null}if(t)try{t.document.title="Starting the call\u2026",t.document.body.style.font="16px system-ui, sans-serif",t.document.body.textContent="Starting the call\u2026"}catch{}return t}export function aimTab(t,o){if(!t||t.closed)return!1;try{t.opener=null}catch{}return t.location.href=o,!0}const R=t=>(t?.message||String(t||"Something went wrong")).replace(/^HTTP \d+$/,"Something went wrong");export const callNewView={templateUrl:"/admin/js/templates/call-new.html",async onMount(t){f.reset();const o=t.get(0).querySelector(".cnx")||t.get(0),y=new URLSearchParams(location.hash.split("?")[1]||""),g=M.observable(!0),q=M.observable(""),s=M.observable(String(y.get("name")||"").slice(0,120)),i=M.observable(String(y.get("email")||"").slice(0,200)),c=M.observable(""),u=M.observable(""),r=M.observable(!0),m=M.observable(!1),w=M.observable(""),d=M.observable([]),k=M.observable(!1),h=M.observable(!1),v=M.observable(!1),b=M.observable(""),I=M.computed(()=>G.test(String(i.value||"").trim())),S=M.observable(!1),L=M.observable(!1),j=M.observable(""),T=M.observable(""),O=M.observable(""),P=M.observable("");let N=0,C=0;const x=M.effect(()=>{const e=String(w.value||"").trim();clearTimeout(C);const U=++N;if(e.length<2){d.value=[],k.value=!1;return}C=setTimeout(async()=>{try{const l=await p(`/calls/contacts?q=${encodeURIComponent(e)}`,{method:"GET"});if(U!==N)return;const a=(Array.isArray(l)?l:[]).slice(0,8).map(n=>({id:String(n.id),name:n.name||n.email||"(no name)",email:n.email||"",note:n.mine===!1?"shared with you":""}));d.value=a,k.value=a.length===0}catch(l){(l?.status===403||l?.status===404)&&(h.value=!1),d.value=[]}},200)});f.add(()=>{clearTimeout(C);try{typeof x=="function"?x():x?.dispose?.()}catch{}});const A={loading:g,unavailable:q,name:s,email:i,contactId:c,contactName:u,mailReady:r,notify:m,q:w,matches:d,noMatch:k,contactsOn:h,busy:v,err:b,hasEmail:I,started:S,blocked:L,hostUrl:j,joinUrl:T,emailLine:O,mailto:P,pick(e){c.value=e.id,u.value=e.name,s.value=e.name==="(no name)"?"":e.name,i.value=e.email,m.value=!!e.email&&r.peek(),w.value=""},clearContact(){c.value="",u.value="",s.value="",i.value="",m.value=!1},close:()=>{history.length>1?history.back():location.hash="#/"},async copyLink(){try{await navigator.clipboard.writeText(T.peek()),E.toast("Their link is copied",{type:"success",duration:1500})}catch{o.querySelector(".cnx-link")?.select?.(),E.toast("Copy it from the box (Ctrl+C)",{type:"info"})}},selectLink:e=>{try{e?.target?.select?.()}catch{}},save(){if(v.peek()||S.peek())return;const e={name:String(s.peek()||"").trim(),email:String(i.peek()||"").trim()};if(e.email&&!G.test(e.email)){b.value="That email address does not look right.";return}const U=m.peek()===!0&&!!e.email&&r.peek();b.value="";const l=openHostTab();v.value=!0,p("/calls",{method:"POST",body:JSON.stringify({...e,contactId:c.peek(),notify:U})}).then(a=>{const n=new URL(a.hostUrl,location.origin).href,_=aimTab(l,n);j.value=n,T.value=a.joinUrl,L.value=!_;const $=e.name||e.email||"them";O.value=a.emailed===!0?`Emailed ${$} their link.`:a.emailLimited===!0?`Not emailed: ${$} has had several call emails in the last hour. Send them the link below, or read it out.`:e.email?`${$} has not been emailed - send them the link below, or read it out.`:"Send them the link below, or read it out.",P.value=`mailto:${encodeURIComponent(e.email)}?subject=${encodeURIComponent("Join the call")}&body=${encodeURIComponent(`Join the call: ${a.joinUrl}`)}`,S.value=!0,setTimeout(()=>o.querySelector(".cnx-link")?.focus(),60)}).catch(a=>{try{l?.close()}catch{}b.value=a?.status===404?"Calls are not available on this site.":a?.status===429?"That is a lot of calls in a minute - wait a moment and try again.":`No call: ${R(a)}`}).finally(()=>{v.value=!1})}};f.add(V(o)),window.I?.scan?.(o);const J=Object.fromEntries(Object.entries(A).filter(([,e])=>typeof e=="function"&&!M.isObservable?.(e))),H=M.applyBindings(A,o,{methods:J});f.add(()=>{try{H?.dispose?.()}catch{}});try{const e=await p("/calls/status",{method:"GET"});r.value=e?.mailReady!==!1,h.value=e?.contacts===!0}catch(e){g.value=!1,q.value=e?.status===404?"Calls need a Pro Tool with calls - Booking Pro, Contacts Pro or Calendar.":e?.status===403?"Your role cannot start calls. Ask an administrator for the Calls permission.":`Calls could not load: ${R(e)}`;return}const B=y.get("contact");if(B)try{const e=await p(`/calls/contact/${encodeURIComponent(B)}`,{method:"GET"});c.value=e.id,u.value=e.name||e.email||"(no name)",s.value=e.name||"",i.value=e.email||""}catch(e){E.toast(`That contact could not be read: ${R(e)}`,{type:"warning"})}m.value=I.peek()&&r.peek(),g.value=!1,setTimeout(()=>o.querySelector(c.peek()||s.peek()?"#cnx-email":h.peek()?"#cnx-q":"#cnx-name")?.focus(),60)}};
+import{apiRequest as p}from"../api.js";import{helpPopovers as V}from"../lib/help-popover.js";import{viewLifetime as Y}from"../lib/tool-kit.js";import{mailtoHref as z,openEmail as F}from"../lib/mail-compose.js";const K=/^#\/calls\/new\/?(\?.*)?$/,H=/^[^\s@<>"]+@[^\s@<>"]+\.[^\s@<>"]+$/,y=Y(K);export function openHostTab(){let t=null;try{t=window.open("","_blank")}catch{t=null}if(t)try{t.document.title="Starting the call\u2026",t.document.body.style.font="16px system-ui, sans-serif",t.document.body.textContent="Starting the call\u2026"}catch{}return t}export function aimTab(t,l){if(!t||t.closed)return!1;try{t.opener=null}catch{}return t.location.href=l,!0}const R=t=>(t?.message||String(t||"Something went wrong")).replace(/^HTTP \d+$/,"Something went wrong");export const callNewView={templateUrl:"/admin/js/templates/call-new.html",async onMount(t){y.reset();const l=t.get(0).querySelector(".cnx")||t.get(0),g=new URLSearchParams(location.hash.split("?")[1]||""),w=M.observable(!0),L=M.observable(""),s=M.observable(String(g.get("name")||"").slice(0,120)),i=M.observable(String(g.get("email")||"").slice(0,200)),r=M.observable(""),u=M.observable(""),c=M.observable(!0),m=M.observable(!1),k=M.observable(""),d=M.observable([]),S=M.observable(!1),h=M.observable(!1),v=M.observable(!1),b=M.observable(""),j=M.computed(()=>H.test(String(i.value||"").trim())),T=M.observable(!1),I=M.observable(!1),O=M.observable(""),x=M.observable(""),P=M.observable(""),N=M.observable("");let f=null,A=0,C=0;const q=M.effect(()=>{const e=String(k.value||"").trim();clearTimeout(C);const U=++A;if(e.length<2){d.value=[],S.value=!1;return}C=setTimeout(async()=>{try{const o=await p(`/calls/contacts?q=${encodeURIComponent(e)}`,{method:"GET"});if(U!==A)return;const a=(Array.isArray(o)?o:[]).slice(0,8).map(n=>({id:String(n.id),name:n.name||n.email||"(no name)",email:n.email||"",note:n.mine===!1?"shared with you":""}));d.value=a,S.value=a.length===0}catch(o){(o?.status===403||o?.status===404)&&(h.value=!1),d.value=[]}},200)});y.add(()=>{clearTimeout(C);try{typeof q=="function"?q():q?.dispose?.()}catch{}});const B={loading:w,unavailable:L,name:s,email:i,contactId:r,contactName:u,mailReady:c,notify:m,q:k,matches:d,noMatch:S,contactsOn:h,busy:v,err:b,hasEmail:j,started:T,blocked:I,hostUrl:O,joinUrl:x,emailLine:P,mailto:N,pick(e){r.value=e.id,u.value=e.name,s.value=e.name==="(no name)"?"":e.name,i.value=e.email,m.value=!!e.email&&c.peek(),k.value=""},clearContact(){r.value="",u.value="",s.value="",i.value="",m.value=!1},close:()=>{history.length>1?history.back():location.hash="#/"},async copyLink(){try{await navigator.clipboard.writeText(x.peek()),E.toast("Their link is copied",{type:"success",duration:1500})}catch{l.querySelector(".cnx-link")?.select?.(),E.toast("Copy it from the box (Ctrl+C)",{type:"info"})}},emailIt(e){f?.to.length&&(e?.preventDefault?.(),F(f))},selectLink:e=>{try{e?.target?.select?.()}catch{}},save(){if(v.peek()||T.peek())return;const e={name:String(s.peek()||"").trim(),email:String(i.peek()||"").trim()};if(e.email&&!H.test(e.email)){b.value="That email address does not look right.";return}const U=m.peek()===!0&&!!e.email&&c.peek();b.value="";const o=openHostTab();v.value=!0,p("/calls",{method:"POST",body:JSON.stringify({...e,contactId:r.peek(),notify:U})}).then(a=>{const n=new URL(a.hostUrl,location.origin).href,D=aimTab(o,n);O.value=n,x.value=a.joinUrl,I.value=!D;const $=e.name||e.email||"them";P.value=a.emailed===!0?`Emailed ${$} their link.`:a.emailLimited===!0?`Not emailed: ${$} has had several call emails in the last hour. Send them the link below, or read it out.`:e.email?`${$} has not been emailed - send them the link below, or read it out.`:"Send them the link below, or read it out.",f={to:e.email?[{name:e.name,address:e.email}]:[],subject:"Join the call",body:`Join the call: ${a.joinUrl}`},N.value=z(f),T.value=!0,setTimeout(()=>l.querySelector(".cnx-link")?.focus(),60)}).catch(a=>{try{o?.close()}catch{}b.value=a?.status===404?"Calls are not available on this site.":a?.status===429?"That is a lot of calls in a minute - wait a moment and try again.":`No call: ${R(a)}`}).finally(()=>{v.value=!1})}};y.add(V(l)),window.I?.scan?.(l);const J=Object.fromEntries(Object.entries(B).filter(([,e])=>typeof e=="function"&&!M.isObservable?.(e))),_=M.applyBindings(B,l,{methods:J});y.add(()=>{try{_?.dispose?.()}catch{}});try{const e=await p("/calls/status",{method:"GET"});c.value=e?.mailReady!==!1,h.value=e?.contacts===!0}catch(e){w.value=!1,L.value=e?.status===404?"Calls need a Pro Tool with calls - Booking Pro, Contacts Pro or Calendar.":e?.status===403?"Your role cannot start calls. Ask an administrator for the Calls permission.":`Calls could not load: ${R(e)}`;return}const G=g.get("contact");if(G)try{const e=await p(`/calls/contact/${encodeURIComponent(G)}`,{method:"GET"});r.value=e.id,u.value=e.name||e.email||"(no name)",s.value=e.name||"",i.value=e.email||""}catch(e){E.toast(`That contact could not be read: ${R(e)}`,{type:"warning"})}m.value=j.peek()&&c.peek(),w.value=!1,setTimeout(()=>l.querySelector(r.peek()||s.peek()?"#cnx-email":h.peek()?"#cnx-q":"#cnx-name")?.focus(),60)}};

package/admin/js/views/contacts.js

@@ -1,4 +1,4 @@
-import{protectToolEditor as bt,mountToolTrash as yt,mountGroupBatch as gt,orphanToolDrafts as kt}from"../lib/tool-recovery.js";import{SHAPES as wt,whileLoading as Et}from"../lib/loading.js";import{apiRequest as St}from"../api.js";import{addBannerAction as Mt}from"../lib/plugin-chrome.js";import{mountRelated as $t,relatedMenuItems as Ct,relatedProviders as Tt}from"../lib/related.js";import{helpPopovers as ie}from"../lib/help-popover.js";import{onceClosed as ye,openMenuAt as Q,promptWith as xt,settingsStore as At,sidebarCount as Nt,viewLifetime as Lt}from"../lib/tool-kit.js";import{arrangeContacts as Ot,countContacts as Bt,DEFAULT_SETTINGS as Ue,duplicateBody as Gt,initials as Pt,normaliseSettings as He,primaryEmail as Ke,primaryPhone as Ye,withGroup as We}from"../lib/contacts-arrange.js";const ze=At("contacts.settings",He),w=(G,d="GET",q)=>St(G,{method:d,...q!==void 0?{body:JSON.stringify(q)}:{}}),ge={company:"Company",jobTitle:"Job title",website:"Website",billingEmail:"Billing email",vatNumber:"VAT number",companyNumber:"Company number",reference:"Their reference",paymentTerms:"Payment terms",currency:"Preferred currency",accountName:"Account name",bankName:"Bank",sortCode:"Sort code",accountNumber:"Account number",iban:"IBAN",bic:"BIC / SWIFT"},Dt=["accountName","bankName","sortCode","accountNumber","iban","bic"],N={addresses:{title:"Addresses",add:"Add address",empty:"No address yet.",help:'Tick "Use for invoices" on the one an invoice should be addressed to.',columns:[{key:"label",placeholder:"Label (Office, Home\u2026)"},{key:"line1",placeholder:"Address line 1",wide:!0},{key:"line2",placeholder:"Address line 2",wide:!0},{key:"city",placeholder:"City"},{key:"region",placeholder:"County / Region"},{key:"postcode",placeholder:"Postcode"},{key:"country",placeholder:"Country"},{key:"isBilling",label:"Use for invoices",check:!0}]},emails:{title:"More email addresses",add:"Add email",empty:"None.",help:"Besides the main email above. Search finds a contact by these too.",columns:[{key:"label",placeholder:"Label (Accounts, Personal\u2026)"},{key:"address",placeholder:"name@example.com",wide:!0}]},phones:{title:"More phone numbers",add:"Add phone",empty:"None.",help:"Besides the main phone above. Call in the menu uses the main one, or the first of these.",columns:[{key:"label",placeholder:"Label (Mobile, Office\u2026)"},{key:"number",placeholder:"+44 \u2026",wide:!0}]}},It=`
+import{protectToolEditor as yt,mountToolTrash as gt,mountGroupBatch as kt,orphanToolDrafts as wt}from"../lib/tool-recovery.js";import{SHAPES as Et,whileLoading as St}from"../lib/loading.js";import{apiRequest as Mt}from"../api.js";import{addBannerAction as $t}from"../lib/plugin-chrome.js";import{mountRelated as Ct,relatedMenuItems as Tt,relatedProviders as xt}from"../lib/related.js";import{helpPopovers as de}from"../lib/help-popover.js";import{onceClosed as ke,openMenuAt as Q,promptWith as At,settingsStore as Nt,sidebarCount as Lt,viewLifetime as Ot}from"../lib/tool-kit.js";import{arrangeContacts as Bt,countContacts as Gt,DEFAULT_SETTINGS as Ke,duplicateBody as Pt,initials as Dt,normaliseSettings as Ye,primaryEmail as ne,primaryPhone as We,withGroup as ze}from"../lib/contacts-arrange.js";import{openEmail as It}from"../lib/mail-compose.js";const _e=Nt("contacts.settings",Ye),$=(G,d="GET",U)=>Mt(G,{method:d,...U!==void 0?{body:JSON.stringify(U)}:{}}),we={company:"Company",jobTitle:"Job title",website:"Website",billingEmail:"Billing email",vatNumber:"VAT number",companyNumber:"Company number",reference:"Their reference",paymentTerms:"Payment terms",currency:"Preferred currency",accountName:"Account name",bankName:"Bank",sortCode:"Sort code",accountNumber:"Account number",iban:"IBAN",bic:"BIC / SWIFT"},Rt=["accountName","bankName","sortCode","accountNumber","iban","bic"],N={addresses:{title:"Addresses",add:"Add address",empty:"No address yet.",help:'Tick "Use for invoices" on the one an invoice should be addressed to.',columns:[{key:"label",placeholder:"Label (Office, Home\u2026)"},{key:"line1",placeholder:"Address line 1",wide:!0},{key:"line2",placeholder:"Address line 2",wide:!0},{key:"city",placeholder:"City"},{key:"region",placeholder:"County / Region"},{key:"postcode",placeholder:"Postcode"},{key:"country",placeholder:"Country"},{key:"isBilling",label:"Use for invoices",check:!0}]},emails:{title:"More email addresses",add:"Add email",empty:"None.",help:"Besides the main email above. Search finds a contact by these too.",columns:[{key:"label",placeholder:"Label (Accounts, Personal\u2026)"},{key:"address",placeholder:"name@example.com",wide:!0}]},phones:{title:"More phone numbers",add:"Add phone",empty:"None.",help:"Besides the main phone above. Call in the menu uses the main one, or the first of these.",columns:[{key:"label",placeholder:"Label (Mobile, Office\u2026)"},{key:"number",placeholder:"+44 \u2026",wide:!0}]}},jt=`
 <div class="ct-row{{selClass}}" data-id="{{id}}" tabindex="0">
     <input type="checkbox" class="ct-select" aria-label="Select {{name}}" data-bind-checked="selected">
     <button type="button" class="ct-fav{{favClass}}" title="{{favTitle}}" aria-label="{{favTitle}}">\u2605</button>
@@ -11,17 +11,17 @@ import{protectToolEditor as bt,mountToolTrash as yt,mountGroupBatch as gt,orphan
     <span class="ct-col ct-phone">{{phone}}</span>
     <span class="ct-col ct-groups"><span class="ct-groups-text" title="{{groupsText}}">{{groupsText}}</span></span>
     <button type="button" class="ct-kebab" aria-label="Actions for {{name}}" title="Actions">\u22EE</button>
-</div>`,Rt='<button type="button" class="ct-chip{{cls}}" data-chip="{{key}}" title="{{title}}">{{label}} <b>{{count}}</b></button>',jt='<button type="button" class="ct-chip{{cls}}" data-group="{{name}}" aria-pressed="{{on}}">{{name}}</button>',qt=`
+</div>`,qt='<button type="button" class="ct-chip{{cls}}" data-chip="{{key}}" title="{{title}}">{{label}} <b>{{count}}</b></button>',Ft='<button type="button" class="ct-chip{{cls}}" data-group="{{name}}" aria-pressed="{{on}}">{{name}}</button>',Ut=`
 <div class="ct-group-row" data-group="{{name}}" tabindex="0">
     <span>{{name}}</span><small>{{countText}}</small>
     <button type="button" class="btn btn-sm btn-ghost" data-act="show">Show</button>
     <button type="button" class="btn btn-sm btn-ghost" data-act="rename" data-bind-disabled="locked" title="{{lockTitle}}">Rename</button>
     <button type="button" class="btn btn-sm btn-ghost text-danger" data-act="delete" data-bind-disabled="locked" title="{{lockTitle}}">Delete</button>
-</div>`,Ft="Groups are shared by everyone who uses Contacts, so renaming or deleting one changes their contacts too. Only the person who created a group can do that, or someone whose role has Manage groups in Contacts (admins do, unless it was taken away). Groups made before creators were recorded belong to the Manage groups holders. You can still file your own contacts in any group.";function ke(G){const d=document.createElement("template");return d.innerHTML=G.trim(),d.content.firstElementChild}const B=(G,d,q=`${d}s`)=>`${G} ${G===1?d:q}`,h=Lt(/^#\/contacts\b/);export const contactsView={templateUrl:"/admin/js/templates/contacts.html",async onMount(G){h.reset();const d=G.get(0);let q=!1;h.add(()=>{q=!0});const u=()=>!q,_e=d.querySelector(".ct-loading"),X={editor:null,settings:null,groups:null};let we=[];Tt("contact").then(e=>{u()&&(we=e)});const L=M.observable(ze.read()),p=M.observable([]),g=M.observable([]),ne=M.observable(!0),F=M.observable(!1),se=M.observable(""),Z=M.observable([]),ce=M.observable(null),Ee=M.observable(""),x=M.observable({kind:"all"}),m=M.observable(new Set),Se=M.observable(!1),Me=M.computed(()=>Bt(p.value,g.value)),Je=M.computed(()=>Ot(p.value,{query:Ee.value,filter:x.value,sort:L.value.sort,favouritesFirst:L.value.favouritesFirst})),O=M.observable([]);h.add(M.effect(()=>{const e=m.value;O.value=Je.value.map(t=>({id:t.id,name:t.name||"Unnamed",sub:[t.jobTitle,t.company&&!L.value.showCompany?t.company:""].filter(Boolean).join(" \xB7 "),initials:Pt(t.name),company:t.company||"",email:Ke(t),phone:Ye(t),groupsText:(t.groups||[]).join(", "),favClass:t.favourite===!0?" is-on":"",favTitle:t.favourite===!0?"Starred - click to unstar":"Star this contact",selected:e.has(t.id),selClass:e.has(t.id)?" is-selected":""}))}));const $e=M.observable([]);h.add(M.effect(()=>{const e=Me.value,t=x.value;$e.value=[{key:"all",label:"All",count:e.all,title:"Everyone",cls:t.kind==="all"?" is-active":""},{key:"fav",label:"\u2605 Starred",count:e.fav,title:"Only starred contacts",cls:t.kind==="fav"?" is-active":""},...g.value.map(a=>({key:`group:${a}`,label:a,count:e.groups[a]??0,title:`Only the ${a} group`,cls:t.kind==="group"&&t.value===a?" is-active":""}))]})),h.add(M.effect(()=>{const e=x.value;e.kind==="group"&&!g.value.includes(e.value)&&(x.value={kind:"all"})}));const Ve={loadError:se,rows:O,chips:$e,loading:ne,query:Ee,searchFocus:Se,firstLoad:M.computed(()=>ne.value&&!F.value),hasOrphans:M.computed(()=>Z.value.length>0),orphanText:M.computed(()=>{const e=Z.value;return e.length?e.length===1?`You left unsaved changes to "${e[0].name}", which has since been deleted.`:`You left unsaved changes to ${B(e.length,"contact")} that have since been deleted.`:""}),hasRows:M.computed(()=>O.value.length>0),isEmpty:M.computed(()=>F.value&&!se.value&&O.value.length===0),emptyText:M.computed(()=>p.value.length?"No contacts match. Clear the search or pick All.":"No contacts yet. New contact adds one, or \u22EE > Import brings a file in."),countText:M.computed(()=>{if(!F.value)return"";const e=O.value.length,t=p.value.length;return e===t?B(t,"contact"):`${e} of ${t}`}),hasSelection:M.computed(()=>m.value.size>0),selectionText:M.computed(()=>`${B(m.value.size,"contact")} selected`),allSelected:M.computed(()=>O.value.length>0&&O.value.every(e=>m.value.has(e.id)))};h.add(M.effect(()=>ze.write(L.value)));const Qe=(e,t)=>{L.value=He({...L.peek(),[e]:t})},U=e=>p.peek().find(t=>t.id===e),Xe=e=>{p.value=p.peek().map(t=>t.id===e.id?e:t)};let le=0;async function W(){const e=++le;ne.value=!0;const t=Promise.all([w("/contacts/contacts"),w("/contacts/groups"),et()]);de();try{const[a,n,c]=F.peek()?await t:await Et(_e,t,wt.iconRows);if(!u()||e!==le)return;p.value=Array.isArray(a)?a:a?.data??[],g.value=Array.isArray(n)?n:[],ee=c,se.value="",F.value=!0,Te()}catch{if(!u()||e!==le)return;se.value="Could not load this list. Your items have not been removed.",E.toast("Failed to load contacts.",{type:"error"})}finally{u()&&e===le&&(ne.value=!1)}}async function Ze(){try{const e=await w("/contacts/groups");u()&&(g.value=Array.isArray(e)?e:g.peek())}catch{}}async function de(){try{const e=await w("/contacts/groups/access");u()&&(ce.value=new Map((e?.groups||[]).map(t=>[t.name,t.canManage===!0])))}catch{u()&&(ce.value=new Map)}}const ue=e=>ce.peek()?.get(e)===!0;let ee=null;async function et(){try{const e=await w("/contacts/trash");return new Set((Array.isArray(e)?e:[]).map(t=>t.id))}catch{return null}}const Ce=e=>{if(ee)for(const t of e)ee.add(t)};function Te(){if(F.peek()){if(!ee){Z.value=[];return}Z.value=kt("contacts",[...p.peek().map(e=>e.id),...ee]).map(({id:e,draft:t})=>({id:e,name:String(t.values?.fields?.name||"").trim()||"Unnamed"}))}}h.add(M.effect(()=>{p.value,g.value,F.peek()&&Nt("#/contacts")}));async function te(e,t,a){try{const n=await w(`/contacts/contacts/${e}`,"PUT",t);return u()&&Xe(n),a&&E.toast(a,{type:"success"}),n||null}catch(n){return E.toast(n?.message||"Failed to update the contact.",{type:"error"}),null}}async function xe(e){const t=U(e);if(L.peek().confirmDelete&&!await E.confirm("Move this contact to Trash? You can restore it later."))return!1;try{if(await w(`/contacts/contacts/${e}`,"DELETE"),Ce([e]),u()){p.value=p.peek().filter(n=>n.id!==e);const a=new Set(m.peek());a.delete(e)&&(m.value=a)}return E.toast(`${t?.name?"Contact":"It"} deleted.`,{type:"success"}),!0}catch{return E.toast("Failed to delete the contact.",{type:"error"}),!1}}async function tt(e){const t=U(e);if(t)try{const a=await w("/contacts/contacts","POST",Gt(t));if(!u())return;if(p.value=[...p.peek(),a],X.editor){E.toast("Copied.",{type:"success"});return}E.toast("Copied - the copy is open to edit.",{type:"success"}),H(a.id)}catch{E.toast("Failed to duplicate the contact.",{type:"error"})}}async function ae(e){if(g.peek().includes(e))return!0;try{return await w("/contacts/groups","POST",{name:e}),await Ze(),!0}catch(t){return E.toast(t?.message||"Could not create the group.",{type:"error"}),!1}}async function at(e,t,a){const n=U(e);n&&(a&&!await ae(t)||await te(e,{groups:We(n.groups,t,a)},a?`Added to ${t}.`:`Removed from ${t}.`))}async function Ae(e){const t=String(await E.prompt("New group name:")??"").trim();t&&await Ie.run(e,t)}async function Ne(e,t){try{await navigator.clipboard.writeText(e),E.toast(`${t} copied.`,{type:"success"})}catch{E.toast("The browser would not allow copying.",{type:"error"})}}async function ot(){const e=[...m.peek()];if(e.length&&await E.confirm(`Delete ${B(e.length,"contact")}? You can restore it from Trash.`))try{const t=await w("/contacts/contacts/bulk","DELETE",{ids:e});if(!u())return;const a=t?.deletedIds??[];Ce(a),p.value=p.peek().filter(n=>!a.includes(n.id)),m.value=new Set(t?.failedIds??[]),E.toast(`${B(t?.deleted??e.length,"contact")} moved to Trash${t?.failedIds?.length?` \xB7 ${t.failedIds.length} failed (still selected)`:""}.`,{type:t?.failedIds?.length?"warning":"success"})}catch{E.toast("Bulk delete failed.",{type:"error"})}}async function nt(e){await Ie.run([...m.peek()],e)}const Le=e=>{const t=new Set(m.peek());t.delete(e)||t.add(e),m.value=t};async function st(){try{const e=await w("/contacts/export"),t=new Blob([JSON.stringify(e,null,2)],{type:"application/json"}),a=URL.createObjectURL(t),n=document.createElement("a");n.href=a,n.download="contacts.json",document.body.appendChild(n),n.click(),n.remove(),setTimeout(()=>URL.revokeObjectURL(a),1e3),E.toast("Contacts exported.",{type:"success"})}catch{E.toast("Export failed.",{type:"error"})}}const re=d.querySelector(".ct-import-file");re.addEventListener("change",async()=>{const e=re.files?.[0];if(re.value="",!!e)try{const t=JSON.parse(await e.text()),a=Array.isArray(t)?t:t.contacts;if(!Array.isArray(a))throw new Error("Invalid format");const n=await w("/contacts/import","POST",{contacts:a});E.toast(`Imported ${B(n?.imported??0,"contact")}.`,{type:"success"}),u()&&await W()}catch{E.toast("Import failed. The file must be a contacts JSON export.",{type:"error"})}});function H(e,{draftId:t=null}={}){const a=e?U(e):null;e&&!a||pe("editor",n=>ct(a,t,n))}function pe(e,t){if(X[e]||!u())return;const a={};X[e]=a;const n=()=>{X[e]===a&&(X[e]=null)};try{t(n)}catch(c){n(),E.toast("Could not open that panel.",{type:"error"}),console.error(c)}}function ct(e,t,a){const n=E.slideover({title:e?"Edit contact":t?"New contact (from unsaved changes)":"New contact",size:"lg",position:"right"}),c=(o,l,{type:y="text",mono:f=!1,placeholder:$="",wide:A=!1}={})=>`
+</div>`,Ht="Groups are shared by everyone who uses Contacts, so renaming or deleting one changes their contacts too. Only the person who created a group can do that, or someone whose role has Manage groups in Contacts (admins do, unless it was taken away). Groups made before creators were recorded belong to the Manage groups holders. You can still file your own contacts in any group.";function Ee(G){const d=document.createElement("template");return d.innerHTML=G.trim(),d.content.firstElementChild}const B=(G,d,U=`${d}s`)=>`${G} ${G===1?d:U}`,v=Ot(/^#\/contacts\b/);export const contactsView={templateUrl:"/admin/js/templates/contacts.html",async onMount(G){v.reset();const d=G.get(0);let U=!1;v.add(()=>{U=!0});const f=()=>!U,Je=d.querySelector(".ct-loading"),X={editor:null,settings:null,groups:null};let Se=[];xt("contact").then(e=>{f()&&(Se=e)});const L=M.observable(_e.read()),h=M.observable([]),w=M.observable([]),se=M.observable(!0),H=M.observable(!1),ce=M.observable(""),Z=M.observable([]),le=M.observable(null),Me=M.observable(""),x=M.observable({kind:"all"}),p=M.observable(new Set),$e=M.observable(!1),Ce=M.computed(()=>Gt(h.value,w.value)),Ve=M.computed(()=>Bt(h.value,{query:Me.value,filter:x.value,sort:L.value.sort,favouritesFirst:L.value.favouritesFirst})),O=M.observable([]);v.add(M.effect(()=>{const e=p.value;O.value=Ve.value.map(t=>({id:t.id,name:t.name||"Unnamed",sub:[t.jobTitle,t.company&&!L.value.showCompany?t.company:""].filter(Boolean).join(" \xB7 "),initials:Dt(t.name),company:t.company||"",email:ne(t),phone:We(t),groupsText:(t.groups||[]).join(", "),favClass:t.favourite===!0?" is-on":"",favTitle:t.favourite===!0?"Starred - click to unstar":"Star this contact",selected:e.has(t.id),selClass:e.has(t.id)?" is-selected":""}))}));const Te=M.observable([]);v.add(M.effect(()=>{const e=Ce.value,t=x.value;Te.value=[{key:"all",label:"All",count:e.all,title:"Everyone",cls:t.kind==="all"?" is-active":""},{key:"fav",label:"\u2605 Starred",count:e.fav,title:"Only starred contacts",cls:t.kind==="fav"?" is-active":""},...w.value.map(a=>({key:`group:${a}`,label:a,count:e.groups[a]??0,title:`Only the ${a} group`,cls:t.kind==="group"&&t.value===a?" is-active":""}))]})),v.add(M.effect(()=>{const e=x.value;e.kind==="group"&&!w.value.includes(e.value)&&(x.value={kind:"all"})}));const Qe={loadError:ce,rows:O,chips:Te,loading:se,query:Me,searchFocus:$e,firstLoad:M.computed(()=>se.value&&!H.value),hasOrphans:M.computed(()=>Z.value.length>0),orphanText:M.computed(()=>{const e=Z.value;return e.length?e.length===1?`You left unsaved changes to "${e[0].name}", which has since been deleted.`:`You left unsaved changes to ${B(e.length,"contact")} that have since been deleted.`:""}),hasRows:M.computed(()=>O.value.length>0),isEmpty:M.computed(()=>H.value&&!ce.value&&O.value.length===0),emptyText:M.computed(()=>h.value.length?"No contacts match. Clear the search or pick All.":"No contacts yet. New contact adds one, or \u22EE > Import brings a file in."),countText:M.computed(()=>{if(!H.value)return"";const e=O.value.length,t=h.value.length;return e===t?B(t,"contact"):`${e} of ${t}`}),hasSelection:M.computed(()=>p.value.size>0),selectionText:M.computed(()=>`${B(p.value.size,"contact")} selected`),allSelected:M.computed(()=>O.value.length>0&&O.value.every(e=>p.value.has(e.id)))};v.add(M.effect(()=>_e.write(L.value)));const Xe=(e,t)=>{L.value=Ye({...L.peek(),[e]:t})},P=e=>h.peek().find(t=>t.id===e),Ze=e=>{h.value=h.peek().map(t=>t.id===e.id?e:t)};let re=0;async function z(){const e=++re;se.value=!0;const t=Promise.all([$("/contacts/contacts"),$("/contacts/groups"),tt()]);ue();try{const[a,n,c]=H.peek()?await t:await St(Je,t,Et.iconRows);if(!f()||e!==re)return;h.value=Array.isArray(a)?a:a?.data??[],w.value=Array.isArray(n)?n:[],ee=c,ce.value="",H.value=!0,Ae()}catch{if(!f()||e!==re)return;ce.value="Could not load this list. Your items have not been removed.",E.toast("Failed to load contacts.",{type:"error"})}finally{f()&&e===re&&(se.value=!1)}}async function et(){try{const e=await $("/contacts/groups");f()&&(w.value=Array.isArray(e)?e:w.peek())}catch{}}async function ue(){try{const e=await $("/contacts/groups/access");f()&&(le.value=new Map((e?.groups||[]).map(t=>[t.name,t.canManage===!0])))}catch{f()&&(le.value=new Map)}}const pe=e=>le.peek()?.get(e)===!0;let ee=null;async function tt(){try{const e=await $("/contacts/trash");return new Set((Array.isArray(e)?e:[]).map(t=>t.id))}catch{return null}}const xe=e=>{if(ee)for(const t of e)ee.add(t)};function Ae(){if(H.peek()){if(!ee){Z.value=[];return}Z.value=wt("contacts",[...h.peek().map(e=>e.id),...ee]).map(({id:e,draft:t})=>({id:e,name:String(t.values?.fields?.name||"").trim()||"Unnamed"}))}}v.add(M.effect(()=>{h.value,w.value,H.peek()&&Lt("#/contacts")}));async function te(e,t,a){try{const n=await $(`/contacts/contacts/${e}`,"PUT",t);return f()&&Ze(n),a&&E.toast(a,{type:"success"}),n||null}catch(n){return E.toast(n?.message||"Failed to update the contact.",{type:"error"}),null}}async function Ne(e){const t=P(e);if(L.peek().confirmDelete&&!await E.confirm("Move this contact to Trash? You can restore it later."))return!1;try{if(await $(`/contacts/contacts/${e}`,"DELETE"),xe([e]),f()){h.value=h.peek().filter(n=>n.id!==e);const a=new Set(p.peek());a.delete(e)&&(p.value=a)}return E.toast(`${t?.name?"Contact":"It"} deleted.`,{type:"success"}),!0}catch{return E.toast("Failed to delete the contact.",{type:"error"}),!1}}async function at(e){const t=P(e);if(t)try{const a=await $("/contacts/contacts","POST",Pt(t));if(!f())return;if(h.value=[...h.peek(),a],X.editor){E.toast("Copied.",{type:"success"});return}E.toast("Copied - the copy is open to edit.",{type:"success"}),K(a.id)}catch{E.toast("Failed to duplicate the contact.",{type:"error"})}}async function ae(e){if(w.peek().includes(e))return!0;try{return await $("/contacts/groups","POST",{name:e}),await et(),!0}catch(t){return E.toast(t?.message||"Could not create the group.",{type:"error"}),!1}}async function ot(e,t,a){const n=P(e);n&&(a&&!await ae(t)||await te(e,{groups:ze(n.groups,t,a)},a?`Added to ${t}.`:`Removed from ${t}.`))}async function Le(e){const t=String(await E.prompt("New group name:")??"").trim();t&&await je.run(e,t)}async function Oe(e,t){try{await navigator.clipboard.writeText(e),E.toast(`${t} copied.`,{type:"success"})}catch{E.toast("The browser would not allow copying.",{type:"error"})}}async function nt(){const e=[...p.peek()];if(e.length&&await E.confirm(`Delete ${B(e.length,"contact")}? You can restore it from Trash.`))try{const t=await $("/contacts/contacts/bulk","DELETE",{ids:e});if(!f())return;const a=t?.deletedIds??[];xe(a),h.value=h.peek().filter(n=>!a.includes(n.id)),p.value=new Set(t?.failedIds??[]),E.toast(`${B(t?.deleted??e.length,"contact")} moved to Trash${t?.failedIds?.length?` \xB7 ${t.failedIds.length} failed (still selected)`:""}.`,{type:t?.failedIds?.length?"warning":"success"})}catch{E.toast("Bulk delete failed.",{type:"error"})}}async function st(e){await je.run([...p.peek()],e)}const Be=e=>{const t=new Set(p.peek());t.delete(e)||t.add(e),p.value=t};async function ct(){try{const e=await $("/contacts/export"),t=new Blob([JSON.stringify(e,null,2)],{type:"application/json"}),a=URL.createObjectURL(t),n=document.createElement("a");n.href=a,n.download="contacts.json",document.body.appendChild(n),n.click(),n.remove(),setTimeout(()=>URL.revokeObjectURL(a),1e3),E.toast("Contacts exported.",{type:"success"})}catch{E.toast("Export failed.",{type:"error"})}}const ie=d.querySelector(".ct-import-file");ie.addEventListener("change",async()=>{const e=ie.files?.[0];if(ie.value="",!!e)try{const t=JSON.parse(await e.text()),a=Array.isArray(t)?t:t.contacts;if(!Array.isArray(a))throw new Error("Invalid format");const n=await $("/contacts/import","POST",{contacts:a});E.toast(`Imported ${B(n?.imported??0,"contact")}.`,{type:"success"}),f()&&await z()}catch{E.toast("Import failed. The file must be a contacts JSON export.",{type:"error"})}});function K(e,{draftId:t=null}={}){const a=e?P(e):null;e&&!a||me("editor",n=>lt(a,t,n))}function me(e,t){if(X[e]||!f())return;const a={};X[e]=a;const n=()=>{X[e]===a&&(X[e]=null)};try{t(n)}catch(c){n(),E.toast("Could not open that panel.",{type:"error"}),console.error(c)}}function lt(e,t,a){const n=E.slideover({title:e?"Edit contact":t?"New contact (from unsaved changes)":"New contact",size:"lg",position:"right"}),c=(o,l,{type:k="text",mono:b=!1,placeholder:C="",wide:A=!1}={})=>`
                 <div${A?' class="ct-wide"':""}>
                     <label class="form-label" for="ct-f-${o}">${l}</label>
-                    <input id="ct-f-${o}" type="${y}" class="form-input${f?" font-mono":""}" placeholder="${$}" data-model="${o}.value">
-                </div>`,k=o=>`
+                    <input id="ct-f-${o}" type="${k}" class="form-input${b?" font-mono":""}" placeholder="${C}" data-model="${o}.value">
+                </div>`,S=o=>`
                 <div class="ct-repeater" data-repeater="${o}">
                     <div class="ct-subhead">
                         <strong>${N[o].title} <span data-help="${N[o].help}"></span></strong>
@@ -30,7 +30,7 @@ import{protectToolEditor as bt,mountToolTrash as yt,mountGroupBatch as gt,orphan
                     </div>
                     <div class="ct-repeater-list"></div>
                     <p class="text-muted text-sm contacts-empty-row">${N[o].empty}</p>
-                </div>`,i=ke(`
+                </div>`,r=Ee(`
                 <div class="ct-panel">
                     <div class="ct-grid">
                         <div class="ct-wide">
@@ -98,15 +98,15 @@ import{protectToolEditor as bt,mountToolTrash as yt,mountGroupBatch as gt,orphan
                                     ${c("bic","BIC / SWIFT",{mono:!0,placeholder:"NWBKGB2L"})}
                                 </div>
                             </div>
-                            ${k("addresses")}
+                            ${S("addresses")}
                         </div>
                     </details>
 
                     <details class="ct-section">
                         <summary>More emails &amp; phones <span class="ct-section-sum" data-bind-text="extraSummary.value"></span></summary>
                         <div class="ct-section-body">
-                            ${k("emails")}
-                            ${k("phones")}
+                            ${S("emails")}
+                            ${S("phones")}
                         </div>
                     </details>
 
@@ -121,11 +121,11 @@ import{protectToolEditor as bt,mountToolTrash as yt,mountGroupBatch as gt,orphan
                         <button type="button" class="btn btn-sm btn-primary" data-on-click="save" data-bind-disabled="cannotSave.value">
                             <span data-icon="save" data-icon-size="13"></span> Save</button>
                     </div>
-                </div>`),S=o=>o==null?"":String(o),s={name:M.observable(S(e?.name)),email:M.observable(S(e?.email)),phone:M.observable(S(e?.phone)),notes:M.observable(S(e?.notes)),favourite:M.observable(e?.favourite===!0),chosen:M.observable(Array.isArray(e?.groups)?[...e.groups]:[]),isEdit:!!e,meta:e?`Added ${e.createdAt?D(e.createdAt).format("D MMM YYYY"):"earlier"}${e.updatedAt?`, last changed ${D(e.updatedAt).format("D MMM YYYY HH:mm")}`:""}. Ctrl+Enter saves.`:"Ctrl+Enter saves."};for(const o of Object.keys(ge))s[o]=M.observable(S(e?.[o]));const C=Object.fromEntries(Object.keys(N).map(o=>[o,M.observable(0)]));s.pick=M.observable([]);const z=M.effect(()=>{const o=s.chosen.value;s.pick.value=[...new Set([...g.value,...o])].map(l=>({name:l,on:String(o.includes(l)),cls:o.includes(l)?" is-active":""}))});s.noGroups=M.computed(()=>s.pick.value.length===0),s.cannotSave=M.computed(()=>!s.name.value.trim()),s.billingSummary=M.computed(()=>{const o=[];s.company.value.trim()&&o.push(s.company.value.trim()),s.vatNumber.value.trim()&&o.push("VAT"),(s.sortCode.value.trim()||s.iban.value.trim())&&o.push("bank details");const l=C.addresses.value;return l&&o.push(B(l,"address","addresses")),o.join(" \xB7 ")}),s.extraSummary=M.computed(()=>{const o=C.emails.value+C.phones.value;return o?B(o,"more"):""});function _(o,l){const y=N[o],f=i.querySelector(`[data-repeater="${o}"]`),$=f.querySelector(".ct-repeater-list");$.replaceChildren(),f.querySelector(".contacts-empty-row").style.display=l.length?"none":"",l.forEach((A,P)=>{const R=document.createElement("div");R.className="contacts-row";for(const T of y.columns){if(T.check){const ve=document.createElement("label");ve.className="form-check contacts-row-check";const j=document.createElement("input");j.type="checkbox",j.className="form-check-input",j.dataset.key=T.key,j.checked=A[T.key]===!0,j.addEventListener("change",()=>{j.checked&&$.querySelectorAll(`input[data-key="${T.key}"]`).forEach(Fe=>{Fe!==j&&(Fe.checked=!1)})});const be=document.createElement("span");be.className="form-check-label",be.textContent=T.label,ve.append(j,be),R.appendChild(ve);continue}const V=document.createElement("input");V.type="text",V.className="form-input"+(T.wide?" contacts-row-wide":""),V.dataset.key=T.key,V.placeholder=T.placeholder??"",V.value=A[T.key]??"",R.appendChild(V)}const J=document.createElement("button");J.type="button",J.className="btn btn-sm btn-ghost contacts-row-remove",J.title="Remove",J.textContent="\xD7",J.addEventListener("click",()=>{const T=r(o,{keepBlank:!0});T.splice(P,1),_(o,T)}),R.appendChild(J),$.appendChild(R)}),C[o].value=l.length}function r(o,{keepBlank:l=!1}={}){const y=N[o],f=[...i.querySelectorAll(`[data-repeater="${o}"] .contacts-row`)].map($=>{const A={};for(const P of y.columns){const R=$.querySelector(`[data-key="${P.key}"]`);A[P.key]=P.check?R?.checked===!0:(R?.value??"").trim()}return A});return l?f:f.filter($=>Object.entries($).some(([A,P])=>A!=="label"&&P!==""&&P!==!1))}i.addEventListener("click",o=>{const l=o.target.closest("[data-add]");if(l){const f=l.dataset.add;_(f,[...r(f,{keepBlank:!0}),{}]),i.querySelector(`[data-repeater="${f}"] .contacts-row:last-child input`)?.focus();return}const y=o.target.closest(".ct-pick [data-group]");if(y){const f=y.dataset.group,$=s.chosen.peek();s.chosen.value=$.includes(f)?$.filter(A=>A!==f):[...$,f]}});const v=()=>{const o={name:s.name.peek().trim(),email:s.email.peek().trim(),phone:s.phone.peek().trim(),notes:s.notes.peek().trim(),favourite:s.favourite.peek()===!0,groups:[...s.chosen.peek()]};for(const l of Object.keys(ge))o[l]=String(s[l].peek()??"").trim();for(const l of Object.keys(N))o[l]=r(l);return o};let Y=!1,b=e?.id??null;const oe=o=>{i.inert=o,i.classList.toggle("is-saving",o)},je=async()=>{if(Y||s.cannotSave.peek())return;Y=!0,oe(!0);let o=!1;try{const l=v();for(const f of l.groups)g.peek().includes(f)||await ae(f);let y;if(b){if(y=await te(b,l,"Contact saved."),!y)return}else y=await w("/contacts/contacts","POST",l),b=y.id,u()&&(p.value=[...p.peek(),y]),E.toast("Contact added.",{type:"success"});he.saved({id:y.id??b,was:String(y.updatedAt??"")}),o=await n.close()!==!1}catch(l){E.toast(l?.message||"Failed to save the contact.",{type:"error"})}finally{Y=!1,o||oe(!1)}};n.element.appendChild(i),e&&$t(i.querySelector(".related-box"),"contact",e.id,{onOpen:()=>n.close(),name:e.name});const ht=ie(i);for(const o of Object.keys(N))_(o,Array.isArray(e?.[o])?e[o]:[]);i.querySelector(".ct-pick").innerHTML=jt;const vt=M.applyBindings(s,i,{methods:{save:je,cancel:()=>n.close(),del:async()=>{e&&await xe(e.id)&&(he?.discard(),n.close())},async newGroup(){const o=String(await E.prompt("New group name:")??"").trim();!o||!await ae(o)||s.chosen.peek().includes(o)||(s.chosen.value=[...s.chosen.peek(),o])}}});s.billingSummary.peek()&&(i.querySelector(".ct-section").open=!0),i.addEventListener("keydown",o=>{(o.ctrlKey||o.metaKey)&&o.key==="Enter"&&(o.preventDefault(),je())}),I.scan(i),ye(n,()=>{z?.(),vt.dispose(),ht(),a(),u()&&setTimeout(()=>{u()&&Te()},0)});const qe=["name","email","phone","notes","favourite","chosen",...Object.keys(ge)],he=bt({so:n,panel:i,tool:"contacts",id:e?.id??t,lifetime:h,was:e?String(e.updatedAt??""):void 0,gone:!!t,noun:"contact",persist:o=>{for(const l of Dt)delete o.fields?.[l];return o},read:()=>({fields:Object.fromEntries(qe.map(o=>[o,s[o].peek()])),lists:Object.fromEntries(Object.keys(N).map(o=>[o,r(o,{keepBlank:!0})]))}),write:o=>{for(const l of qe)l in(o.fields||{})&&(s[l].value=o.fields[l]);for(const l of Object.keys(N))_(l,Array.isArray(o.lists?.[l])?o.lists[l]:[]);s.billingSummary.peek()&&(i.querySelector(".ct-section").open=!0)}});t&&he.asked.then(o=>{o==="thrown"&&n.close()}),n.open(),setTimeout(()=>i.querySelector("#ct-f-name")?.focus(),60)}function lt(){pe("settings",rt)}function rt(e){const t=E.slideover({title:"Contacts settings",size:"sm",position:"right"}),a=(s,C,z)=>`
+                </div>`),m=o=>o==null?"":String(o),s={name:M.observable(m(e?.name)),email:M.observable(m(e?.email)),phone:M.observable(m(e?.phone)),notes:M.observable(m(e?.notes)),favourite:M.observable(e?.favourite===!0),chosen:M.observable(Array.isArray(e?.groups)?[...e.groups]:[]),isEdit:!!e,meta:e?`Added ${e.createdAt?D(e.createdAt).format("D MMM YYYY"):"earlier"}${e.updatedAt?`, last changed ${D(e.updatedAt).format("D MMM YYYY HH:mm")}`:""}. Ctrl+Enter saves.`:"Ctrl+Enter saves."};for(const o of Object.keys(we))s[o]=M.observable(m(e?.[o]));const u=Object.fromEntries(Object.keys(N).map(o=>[o,M.observable(0)]));s.pick=M.observable([]);const R=M.effect(()=>{const o=s.chosen.value;s.pick.value=[...new Set([...w.value,...o])].map(l=>({name:l,on:String(o.includes(l)),cls:o.includes(l)?" is-active":""}))});s.noGroups=M.computed(()=>s.pick.value.length===0),s.cannotSave=M.computed(()=>!s.name.value.trim()),s.billingSummary=M.computed(()=>{const o=[];s.company.value.trim()&&o.push(s.company.value.trim()),s.vatNumber.value.trim()&&o.push("VAT"),(s.sortCode.value.trim()||s.iban.value.trim())&&o.push("bank details");const l=u.addresses.value;return l&&o.push(B(l,"address","addresses")),o.join(" \xB7 ")}),s.extraSummary=M.computed(()=>{const o=u.emails.value+u.phones.value;return o?B(o,"more"):""});function _(o,l){const k=N[o],b=r.querySelector(`[data-repeater="${o}"]`),C=b.querySelector(".ct-repeater-list");C.replaceChildren(),b.querySelector(".contacts-empty-row").style.display=l.length?"none":"",l.forEach((A,j)=>{const q=document.createElement("div");q.className="contacts-row";for(const T of k.columns){if(T.check){const ye=document.createElement("label");ye.className="form-check contacts-row-check";const F=document.createElement("input");F.type="checkbox",F.className="form-check-input",F.dataset.key=T.key,F.checked=A[T.key]===!0,F.addEventListener("change",()=>{F.checked&&C.querySelectorAll(`input[data-key="${T.key}"]`).forEach(He=>{He!==F&&(He.checked=!1)})});const ge=document.createElement("span");ge.className="form-check-label",ge.textContent=T.label,ye.append(F,ge),q.appendChild(ye);continue}const V=document.createElement("input");V.type="text",V.className="form-input"+(T.wide?" contacts-row-wide":""),V.dataset.key=T.key,V.placeholder=T.placeholder??"",V.value=A[T.key]??"",q.appendChild(V)}const J=document.createElement("button");J.type="button",J.className="btn btn-sm btn-ghost contacts-row-remove",J.title="Remove",J.textContent="\xD7",J.addEventListener("click",()=>{const T=i(o,{keepBlank:!0});T.splice(j,1),_(o,T)}),q.appendChild(J),C.appendChild(q)}),u[o].value=l.length}function i(o,{keepBlank:l=!1}={}){const k=N[o],b=[...r.querySelectorAll(`[data-repeater="${o}"] .contacts-row`)].map(C=>{const A={};for(const j of k.columns){const q=C.querySelector(`[data-key="${j.key}"]`);A[j.key]=j.check?q?.checked===!0:(q?.value??"").trim()}return A});return l?b:b.filter(C=>Object.entries(C).some(([A,j])=>A!=="label"&&j!==""&&j!==!1))}r.addEventListener("click",o=>{const l=o.target.closest("[data-add]");if(l){const b=l.dataset.add;_(b,[...i(b,{keepBlank:!0}),{}]),r.querySelector(`[data-repeater="${b}"] .contacts-row:last-child input`)?.focus();return}const k=o.target.closest(".ct-pick [data-group]");if(k){const b=k.dataset.group,C=s.chosen.peek();s.chosen.value=C.includes(b)?C.filter(A=>A!==b):[...C,b]}});const y=()=>{const o={name:s.name.peek().trim(),email:s.email.peek().trim(),phone:s.phone.peek().trim(),notes:s.notes.peek().trim(),favourite:s.favourite.peek()===!0,groups:[...s.chosen.peek()]};for(const l of Object.keys(we))o[l]=String(s[l].peek()??"").trim();for(const l of Object.keys(N))o[l]=i(l);return o};let W=!1,g=e?.id??null;const oe=o=>{r.inert=o,r.classList.toggle("is-saving",o)},Fe=async()=>{if(W||s.cannotSave.peek())return;W=!0,oe(!0);let o=!1;try{const l=y();for(const b of l.groups)w.peek().includes(b)||await ae(b);let k;if(g){if(k=await te(g,l,"Contact saved."),!k)return}else k=await $("/contacts/contacts","POST",l),g=k.id,f()&&(h.value=[...h.peek(),k]),E.toast("Contact added.",{type:"success"});ve.saved({id:k.id??g,was:String(k.updatedAt??"")}),o=await n.close()!==!1}catch(l){E.toast(l?.message||"Failed to save the contact.",{type:"error"})}finally{W=!1,o||oe(!1)}};n.element.appendChild(r),e&&Ct(r.querySelector(".related-box"),"contact",e.id,{onOpen:()=>n.close(),name:e.name});const bt=de(r);for(const o of Object.keys(N))_(o,Array.isArray(e?.[o])?e[o]:[]);r.querySelector(".ct-pick").innerHTML=Ft;const vt=M.applyBindings(s,r,{methods:{save:Fe,cancel:()=>n.close(),del:async()=>{e&&await Ne(e.id)&&(ve?.discard(),n.close())},async newGroup(){const o=String(await E.prompt("New group name:")??"").trim();!o||!await ae(o)||s.chosen.peek().includes(o)||(s.chosen.value=[...s.chosen.peek(),o])}}});s.billingSummary.peek()&&(r.querySelector(".ct-section").open=!0),r.addEventListener("keydown",o=>{(o.ctrlKey||o.metaKey)&&o.key==="Enter"&&(o.preventDefault(),Fe())}),I.scan(r),ke(n,()=>{R?.(),vt.dispose(),bt(),a(),f()&&setTimeout(()=>{f()&&Ae()},0)});const Ue=["name","email","phone","notes","favourite","chosen",...Object.keys(we)],ve=yt({so:n,panel:r,tool:"contacts",id:e?.id??t,lifetime:v,was:e?String(e.updatedAt??""):void 0,gone:!!t,noun:"contact",persist:o=>{for(const l of Rt)delete o.fields?.[l];return o},read:()=>({fields:Object.fromEntries(Ue.map(o=>[o,s[o].peek()])),lists:Object.fromEntries(Object.keys(N).map(o=>[o,i(o,{keepBlank:!0})]))}),write:o=>{for(const l of Ue)l in(o.fields||{})&&(s[l].value=o.fields[l]);for(const l of Object.keys(N))_(l,Array.isArray(o.lists?.[l])?o.lists[l]:[]);s.billingSummary.peek()&&(r.querySelector(".ct-section").open=!0)}});t&&ve.asked.then(o=>{o==="thrown"&&n.close()}),n.open(),setTimeout(()=>r.querySelector("#ct-f-name")?.focus(),60)}function rt(){me("settings",it)}function it(e){const t=E.slideover({title:"Contacts settings",size:"sm",position:"right"}),a=(s,u,R)=>`
                 <div class="ct-setting-row">
-                    <label class="form-label" for="ct-set-${s}" style="margin:0">${C}${z?` <span data-help="${z}"></span>`:""}</label>
+                    <label class="form-label" for="ct-set-${s}" style="margin:0">${u}${R?` <span data-help="${R}"></span>`:""}</label>
                     <input id="ct-set-${s}" type="checkbox" class="form-switch" data-model="${s}.value">
-                </div>`,n=ke(`
+                </div>`,n=Ee(`
                 <div class="ct-panel">
                     <div>
                         <label class="form-label" for="ct-set-sort">Sort by</label>
@@ -160,7 +160,7 @@ import{protectToolEditor as bt,mountToolTrash as yt,mountGroupBatch as gt,orphan
                         <span class="spacer"></span>
                         <button type="button" class="btn btn-sm btn-primary" data-on-click="done">Done</button>
                     </div>
-                </div>`),c=s=>M.computed({read:()=>L.value[s],write:C=>Qe(s,C)}),k=Object.fromEntries(Object.keys(Ue).map(s=>[s,c(s)]));t.element.appendChild(n);const i=ie(n),S=M.applyBindings(k,n,{methods:{done:()=>t.close(),reset:()=>{L.value={...Ue}}}});ye(t,()=>{S.dispose(),i(),e()}),t.open()}async function Oe(e){if(!ue(e))return;const t=String(await xt("Rename the group to:",{},e)??"").trim();if(!(!t||t===e||!u()))try{await w(`/contacts/groups/${encodeURIComponent(e)}`,"PUT",{newName:t}),u()&&await W(),E.toast("Group renamed.",{type:"success"})}catch(a){E.toast(a?.message||"Failed to rename the group.",{type:"error"})}}async function Be(e){if(ue(e)&&!(!await E.confirm("Delete this group? Its contacts stay - they are just no longer in it.",{title:"Delete group",confirmText:"Delete group"})||!u()))try{await w(`/contacts/groups/${encodeURIComponent(e)}`,"DELETE"),u()&&await W(),E.toast("Group deleted.",{type:"success"})}catch(t){E.toast(t?.message||"Failed to delete the group.",{type:"error"})}}function Ge(e,{panel:t=null}={}){const a=!ue(e),n=a?" (not yours to change)":"",c=p.peek().filter(k=>(k.groups||[]).includes(e)).map(k=>k.id);return[{label:"Show only this group",icon:"filter",action:()=>{x.value={kind:"group",value:e},t?.close()}},{label:`Select its ${B(c.length,"contact")}`,icon:"check-square",disabled:!c.length,action:()=>{x.value={kind:"group",value:e},m.value=new Set(c),t?.close()}},{type:"divider"},{label:`Rename\u2026${n}`,icon:"edit",disabled:a,action:()=>Oe(e)},{label:`Delete\u2026${n}`,icon:"trash",danger:!0,disabled:a,action:()=>Be(e)},...t?[]:[{type:"divider"},{label:"Manage groups\u2026",icon:"folder",action:me}]]}function me(){pe("groups",it)}function it(e){const t=E.slideover({title:"Groups",size:"sm",position:"right"}),a=ke(`
+                </div>`),c=s=>M.computed({read:()=>L.value[s],write:u=>Xe(s,u)}),S=Object.fromEntries(Object.keys(Ke).map(s=>[s,c(s)]));t.element.appendChild(n);const r=de(n),m=M.applyBindings(S,n,{methods:{done:()=>t.close(),reset:()=>{L.value={...Ke}}}});ke(t,()=>{m.dispose(),r(),e()}),t.open()}async function Ge(e){if(!pe(e))return;const t=String(await At("Rename the group to:",{},e)??"").trim();if(!(!t||t===e||!f()))try{await $(`/contacts/groups/${encodeURIComponent(e)}`,"PUT",{newName:t}),f()&&await z(),E.toast("Group renamed.",{type:"success"})}catch(a){E.toast(a?.message||"Failed to rename the group.",{type:"error"})}}async function Pe(e){if(pe(e)&&!(!await E.confirm("Delete this group? Its contacts stay - they are just no longer in it.",{title:"Delete group",confirmText:"Delete group"})||!f()))try{await $(`/contacts/groups/${encodeURIComponent(e)}`,"DELETE"),f()&&await z(),E.toast("Group deleted.",{type:"success"})}catch(t){E.toast(t?.message||"Failed to delete the group.",{type:"error"})}}function fe(e,t={}){const a=e.map(n=>({name:n.name,address:ne(n)})).filter(n=>n.address);a.length&&It(a.length===1?{to:a,...t}:{bcc:a,...t})}function De(e,{panel:t=null}={}){const a=!pe(e),n=a?" (not yours to change)":"",c=h.peek().filter(m=>(m.groups||[]).includes(e)),S=c.map(m=>m.id),r=c.filter(m=>ne(m));return[{label:"Show only this group",icon:"filter",action:()=>{x.value={kind:"group",value:e},t?.close()}},{label:`Select its ${B(S.length,"contact")}`,icon:"check-square",disabled:!S.length,action:()=>{x.value={kind:"group",value:e},p.value=new Set(S),t?.close()}},{label:"Email this group\u2026",icon:"mail",disabled:!r.length,action:()=>{t?.close(),fe(r)}},{type:"divider"},{label:`Rename\u2026${n}`,icon:"edit",disabled:a,action:()=>Ge(e)},{label:`Delete\u2026${n}`,icon:"trash",danger:!0,disabled:a,action:()=>Pe(e)},...t?[]:[{type:"divider"},{label:"Manage groups\u2026",icon:"folder",action:he}]]}function he(){me("groups",dt)}function dt(e){const t=E.slideover({title:"Groups",size:"sm",position:"right"}),a=Ee(`
                 <div class="ct-panel">
                     <form class="ct-add-group" data-on-submit="add">
                         <input type="text" class="form-input" placeholder="New group name\u2026" aria-label="New group name" data-model="draft.value">
@@ -169,9 +169,9 @@ import{protectToolEditor as bt,mountToolTrash as yt,mountGroupBatch as gt,orphan
                     <p class="ct-panel-meta" style="margin:0">Renaming a group renames it on every contact in it - everyone's, since groups are shared; deleting one takes it off them.
                         <span data-help="Contacts themselves are never deleted from here. Right-click a group (or Shift+F10 on it) for the same actions."></span></p>
                     <p class="ct-panel-meta" style="margin:0" data-bind-hidden="!someLocked.value">Some groups cannot be renamed or deleted by you.
-                        <span data-help-title="Why is Rename greyed out?" data-help="${Ft}"></span></p>
+                        <span data-help-title="Why is Rename greyed out?" data-help="${Ht}"></span></p>
                     <div class="ct-groups-list" data-if="hasGroups.value">
                         <div class="ct-groups-rows" data-each="list.value key=name"></div>
                     </div>
                     <p class="text-muted" data-if="noGroups.value">No groups yet. Add one above.</p>
-                </div>`),n=M.observable(""),c={draft:n,list:M.observable([]),someLocked:M.observable(!1)};let k=!1;de();const i=M.effect(()=>{const r=Me.value.groups,v=ce.value,Y=g.value.map(b=>{const oe=!(v&&v.get(b)===!0);return{name:b,countText:B(r[b]??0,"contact"),locked:oe,lockTitle:oe?"Only its creator, or someone allowed to manage every group, can change this group":""}});c.list.value=Y,c.someLocked.value=v!==null&&Y.some(b=>b.locked)});c.hasGroups=M.computed(()=>c.list.value.length>0),c.noGroups=M.computed(()=>c.list.value.length===0),c.cannotAdd=M.computed(()=>!n.value.trim());let S=!1;async function s(){const r=n.peek().trim();if(!(!r||S)){S=!0;try{await ae(r)&&(await de(),!k&&n.peek().trim()===r&&(n.value=""),E.toast("Group added.",{type:"success"}))}finally{S=!1}}}a.addEventListener("click",r=>{const v=r.target.closest("[data-act]"),b=r.target.closest(".ct-group-row")?.dataset.group;if(b){if(!v){x.value={kind:"group",value:b},t.close();return}v.disabled||(v.dataset.act==="show"?(x.value={kind:"group",value:b},t.close()):v.dataset.act==="rename"?Oe(b):v.dataset.act==="delete"&&Be(b))}}),a.addEventListener("keydown",r=>{const v=r.target.closest?.(".ct-group-row");!v||r.target!==v||(r.key==="F10"&&r.shiftKey?(r.preventDefault(),Q(v)):r.key==="Enter"&&(r.preventDefault(),x.value={kind:"group",value:v.dataset.group},t.close()))});const C=E.contextMenu(a,{cursor:"glyph",match:".ct-group-row",inherit:!1,density:"compact",items:r=>r?.dataset.group?Ge(r.dataset.group,{panel:t}):[]});t.element.appendChild(a);const z=ie(a);a.querySelector(".ct-groups-rows").innerHTML=qt;const _=M.applyBindings(c,a,{methods:{add:()=>(s(),!1)}});ye(t,()=>{k=!0,i?.(),_.dispose(),z(),C?.destroy?.(),e()}),t.open()}Mt(G,{id:"contacts-settings",icon:"settings",title:"Contacts settings",onClick:lt}),d.querySelector(".ct-rows").innerHTML=It,d.querySelector(".ct-chips").innerHTML=Rt;const K=d.querySelector(".ct-list"),Pe=d.querySelector(".ct-bar"),fe=d.querySelector(".ct-chips-row"),De=d.querySelector(".ct-bulk");h.add(ie(d,{position:"bottom"}));const dt=M.applyBindings(Ve,d,{methods:{create:()=>H(null),retry:W,reviewOrphan:()=>{const e=Z.peek()[0];e&&H(null,{draftId:e.id})},bulkDelete:ot,clearSelection:()=>{m.value=new Set}}});h.add(()=>dt.dispose()),yt({root:d,toolbar:d.querySelector(".ct-bar"),tool:"contacts",endpoint:"/contacts",itemPath:"/contacts",label:"Contacts",titleOf:e=>e.name,reload:W,lifetime:h});const Ie=gt({root:d,ensureGroup:ae,byId:U,patch:te,withGroup:We,lifetime:h});h.add(M.effect(()=>{const e=L.value;K.classList.toggle("is-compact",e.density==="compact");const t={company:!e.showCompany,email:!e.showEmail,phone:!e.showPhone,groups:!e.showGroups};for(const[n,c]of Object.entries(t))K.classList.toggle(`hide-${n}`,c);const a=["1.1rem","1.5rem","minmax(10rem, 1.4fr)"];t.company||a.push("minmax(0, 1fr)"),t.email||a.push("minmax(0, 1.2fr)"),t.phone||a.push("minmax(0, .9fr)"),t.groups||a.push("minmax(0, 1fr)"),a.push("1.75rem"),K.style.setProperty("--ct-cols",a.join(" "))}));const ut=E.contextMenu(K,{cursor:"glyph",match:".ct-row",inherit:!1,density:"compact",items:e=>{const t=e.dataset.id,a=U(t);if(!a)return[];const n=Ke(a),c=Ye(a),k=a.groups||[],i=s=>s.filter(C=>C.visible!==!1),S=Ct(we,t,s=>s.label.replace("{name}",a.name||"them"));return i([{label:"Edit\u2026",icon:"edit",action:()=>H(t)},...S,{type:"divider"},{label:`Email ${n}`,icon:"mail",visible:!!n,action:()=>{location.href=`mailto:${encodeURIComponent(n).replace(/%40/g,"@")}`}},{label:`Call ${c}`,icon:"phone",visible:!!c,action:()=>{location.href=`tel:${c.replace(/[^\d+]/g,"")}`}},{label:"Copy email",icon:"copy",visible:!!n,action:()=>Ne(n,"Email")},{label:"Copy phone",icon:"copy",visible:!!c,action:()=>Ne(c,"Phone")},{type:"divider",visible:!!(n||c)},{label:a.favourite===!0?"Unstar":"Star",icon:"star",action:()=>te(t,{favourite:a.favourite!==!0})},{label:"Groups",icon:"folder",submenu:[...g.peek().map(s=>({label:`${k.includes(s)?"\u2713 ":""}${s}`,action:()=>at(t,s,!k.includes(s))})),...g.peek().length?[{type:"divider"}]:[],{label:"New group\u2026",action:()=>Ae([t])}]},{label:"Duplicate",icon:"copy",action:()=>tt(t)},{label:m.peek().has(t)?"Deselect":"Select",icon:"check-square",action:()=>Le(t)},{type:"divider"},{label:"Delete",icon:"trash",danger:!0,action:()=>xe(t)}])}});h.add(()=>ut?.destroy?.());const pt=E.contextMenu(fe,{cursor:"glyph",match:".ct-chip",inherit:!1,density:"compact",items:e=>{const t=e?.dataset.chip||"";return t.startsWith("group:")?Ge(t.slice(6)):[{label:t==="fav"?"Show only starred":"Show everyone",icon:"filter",action:()=>{x.value=t==="fav"?{kind:"fav"}:{kind:"all"}}},{type:"divider"},{label:"Manage groups\u2026",icon:"folder",action:me}]}});h.add(()=>pt?.destroy?.()),fe.addEventListener("keydown",e=>{const t=e.target.closest?.(".ct-chip");t&&e.key==="F10"&&e.shiftKey&&(e.preventDefault(),Q(t))});const mt=E.contextMenu(Pe,{cursor:"glyph",match:".ct-more",inherit:!1,density:"compact",items:()=>[{label:"Manage groups\u2026",icon:"folder",action:me},{type:"divider"},{label:"Export all (JSON)",icon:"download",action:st},{label:"Import from file\u2026",icon:"upload",action:()=>re.click()},{type:"divider"},{label:"Select all shown",icon:"check-square",disabled:!O.peek().length,action:()=>{m.value=new Set(O.peek().map(e=>e.id))}},{label:"Clear selection",icon:"x",disabled:!m.peek().size,action:()=>{m.value=new Set}}]});h.add(()=>mt?.destroy?.());const ft=E.contextMenu(De,{cursor:"glyph",match:".ct-bulk-group",inherit:!1,density:"compact",items:()=>[...g.peek().map(e=>({label:e,action:()=>nt(e)})),...g.peek().length?[{type:"divider"}]:[],{label:"New group\u2026",action:()=>Ae([...m.peek()])}]});h.add(()=>ft?.destroy?.()),Pe.addEventListener("click",e=>{const t=e.target.closest(".ct-more");t&&Q(t)}),De.addEventListener("click",e=>{const t=e.target.closest(".ct-bulk-group");t&&Q(t)}),fe.addEventListener("click",e=>{const t=e.target.closest(".ct-chip");if(!t)return;const a=t.dataset.chip;x.value=a==="fav"?{kind:"fav"}:a.startsWith("group:")?{kind:"group",value:a.slice(6)}:{kind:"all"}}),K.addEventListener("click",e=>{if(e.target.closest(".ct-select-all"))return;const t=e.target.closest(".ct-row");if(!t)return;const a=t.dataset.id;if(e.target.closest(".ct-kebab"))return Q(e.target.closest(".ct-kebab"));if(!e.target.closest(".ct-select")){if(e.target.closest(".ct-fav")){const n=U(a);n&&te(a,{favourite:n.favourite!==!0});return}H(a)}}),K.addEventListener("change",e=>{if(e.target.matches(".ct-select")&&Le(e.target.closest(".ct-row").dataset.id),e.target.matches(".ct-select-all")){const t=O.peek().map(a=>a.id);m.value=e.target.checked?new Set(t):new Set}}),K.addEventListener("keydown",e=>{const t=e.target.closest?.(".ct-row");!t||e.target!==t||(e.key==="Enter"?(e.preventDefault(),H(t.dataset.id)):e.key==="F10"&&e.shiftKey&&(e.preventDefault(),Q(t.querySelector(".ct-kebab")||t)))});const Re=e=>{e.ctrlKey||e.metaKey||e.altKey||e.target.closest?.("input, textarea, select, [contenteditable], .dm-slideover")||(e.key==="/"?(e.preventDefault(),Se.value=!0):(e.key==="n"||e.key==="N")&&(e.preventDefault(),H(null)))};document.addEventListener("keydown",Re),h.add(()=>document.removeEventListener("keydown",Re)),I.scan(d),await W()}};
+                </div>`),n=M.observable(""),c={draft:n,list:M.observable([]),someLocked:M.observable(!1)};let S=!1;ue();const r=M.effect(()=>{const i=Ce.value.groups,y=le.value,W=w.value.map(g=>{const oe=!(y&&y.get(g)===!0);return{name:g,countText:B(i[g]??0,"contact"),locked:oe,lockTitle:oe?"Only its creator, or someone allowed to manage every group, can change this group":""}});c.list.value=W,c.someLocked.value=y!==null&&W.some(g=>g.locked)});c.hasGroups=M.computed(()=>c.list.value.length>0),c.noGroups=M.computed(()=>c.list.value.length===0),c.cannotAdd=M.computed(()=>!n.value.trim());let m=!1;async function s(){const i=n.peek().trim();if(!(!i||m)){m=!0;try{await ae(i)&&(await ue(),!S&&n.peek().trim()===i&&(n.value=""),E.toast("Group added.",{type:"success"}))}finally{m=!1}}}a.addEventListener("click",i=>{const y=i.target.closest("[data-act]"),g=i.target.closest(".ct-group-row")?.dataset.group;if(g){if(!y){x.value={kind:"group",value:g},t.close();return}y.disabled||(y.dataset.act==="show"?(x.value={kind:"group",value:g},t.close()):y.dataset.act==="rename"?Ge(g):y.dataset.act==="delete"&&Pe(g))}}),a.addEventListener("keydown",i=>{const y=i.target.closest?.(".ct-group-row");!y||i.target!==y||(i.key==="F10"&&i.shiftKey?(i.preventDefault(),Q(y)):i.key==="Enter"&&(i.preventDefault(),x.value={kind:"group",value:y.dataset.group},t.close()))});const u=E.contextMenu(a,{cursor:"glyph",match:".ct-group-row",inherit:!1,density:"compact",items:i=>i?.dataset.group?De(i.dataset.group,{panel:t}):[]});t.element.appendChild(a);const R=de(a);a.querySelector(".ct-groups-rows").innerHTML=Ut;const _=M.applyBindings(c,a,{methods:{add:()=>(s(),!1)}});ke(t,()=>{S=!0,r?.(),_.dispose(),R(),u?.destroy?.(),e()}),t.open()}$t(G,{id:"contacts-settings",icon:"settings",title:"Contacts settings",onClick:rt}),d.querySelector(".ct-rows").innerHTML=jt,d.querySelector(".ct-chips").innerHTML=qt;const Y=d.querySelector(".ct-list"),Ie=d.querySelector(".ct-bar"),be=d.querySelector(".ct-chips-row"),Re=d.querySelector(".ct-bulk");v.add(de(d,{position:"bottom"}));const ut=M.applyBindings(Qe,d,{methods:{create:()=>K(null),retry:z,reviewOrphan:()=>{const e=Z.peek()[0];e&&K(null,{draftId:e.id})},bulkDelete:nt,clearSelection:()=>{p.value=new Set}}});v.add(()=>ut.dispose()),gt({root:d,toolbar:d.querySelector(".ct-bar"),tool:"contacts",endpoint:"/contacts",itemPath:"/contacts",label:"Contacts",titleOf:e=>e.name,reload:z,lifetime:v});const je=kt({root:d,ensureGroup:ae,byId:P,patch:te,withGroup:ze,lifetime:v});v.add(M.effect(()=>{const e=L.value;Y.classList.toggle("is-compact",e.density==="compact");const t={company:!e.showCompany,email:!e.showEmail,phone:!e.showPhone,groups:!e.showGroups};for(const[n,c]of Object.entries(t))Y.classList.toggle(`hide-${n}`,c);const a=["1.1rem","1.5rem","minmax(10rem, 1.4fr)"];t.company||a.push("minmax(0, 1fr)"),t.email||a.push("minmax(0, 1.2fr)"),t.phone||a.push("minmax(0, .9fr)"),t.groups||a.push("minmax(0, 1fr)"),a.push("1.75rem"),Y.style.setProperty("--ct-cols",a.join(" "))}));const pt=E.contextMenu(Y,{cursor:"glyph",match:".ct-row",inherit:!1,density:"compact",items:e=>{const t=e.dataset.id,a=P(t);if(!a)return[];const n=ne(a),c=We(a),S=a.groups||[],r=u=>u.filter(R=>R.visible!==!1),m=p.peek().has(t)?[...p.peek()].map(P).filter(u=>u&&ne(u)):[],s=Tt(Se,t,u=>u.label.replace("{name}",a.name||"them"));return r([{label:"Edit\u2026",icon:"edit",action:()=>K(t)},...s,{type:"divider"},{label:`Email ${n}`,icon:"mail",visible:!!n,action:()=>fe([a])},{label:`Email the ${m.length} selected\u2026`,icon:"mail",visible:m.length>1,action:()=>fe(m)},{label:`Call ${c}`,icon:"phone",visible:!!c,action:()=>{location.href=`tel:${c.replace(/[^\d+]/g,"")}`}},{label:"Copy email",icon:"copy",visible:!!n,action:()=>Oe(n,"Email")},{label:"Copy phone",icon:"copy",visible:!!c,action:()=>Oe(c,"Phone")},{type:"divider",visible:!!(n||c)},{label:a.favourite===!0?"Unstar":"Star",icon:"star",action:()=>te(t,{favourite:a.favourite!==!0})},{label:"Groups",icon:"folder",submenu:[...w.peek().map(u=>({label:`${S.includes(u)?"\u2713 ":""}${u}`,action:()=>ot(t,u,!S.includes(u))})),...w.peek().length?[{type:"divider"}]:[],{label:"New group\u2026",action:()=>Le([t])}]},{label:"Duplicate",icon:"copy",action:()=>at(t)},{label:p.peek().has(t)?"Deselect":"Select",icon:"check-square",action:()=>Be(t)},{type:"divider"},{label:"Delete",icon:"trash",danger:!0,action:()=>Ne(t)}])}});v.add(()=>pt?.destroy?.());const mt=E.contextMenu(be,{cursor:"glyph",match:".ct-chip",inherit:!1,density:"compact",items:e=>{const t=e?.dataset.chip||"";return t.startsWith("group:")?De(t.slice(6)):[{label:t==="fav"?"Show only starred":"Show everyone",icon:"filter",action:()=>{x.value=t==="fav"?{kind:"fav"}:{kind:"all"}}},{type:"divider"},{label:"Manage groups\u2026",icon:"folder",action:he}]}});v.add(()=>mt?.destroy?.()),be.addEventListener("keydown",e=>{const t=e.target.closest?.(".ct-chip");t&&e.key==="F10"&&e.shiftKey&&(e.preventDefault(),Q(t))});const ft=E.contextMenu(Ie,{cursor:"glyph",match:".ct-more",inherit:!1,density:"compact",items:()=>[{label:"Manage groups\u2026",icon:"folder",action:he},{type:"divider"},{label:"Export all (JSON)",icon:"download",action:ct},{label:"Import from file\u2026",icon:"upload",action:()=>ie.click()},{type:"divider"},{label:"Select all shown",icon:"check-square",disabled:!O.peek().length,action:()=>{p.value=new Set(O.peek().map(e=>e.id))}},{label:"Clear selection",icon:"x",disabled:!p.peek().size,action:()=>{p.value=new Set}}]});v.add(()=>ft?.destroy?.());const ht=E.contextMenu(Re,{cursor:"glyph",match:".ct-bulk-group",inherit:!1,density:"compact",items:()=>[...w.peek().map(e=>({label:e,action:()=>st(e)})),...w.peek().length?[{type:"divider"}]:[],{label:"New group\u2026",action:()=>Le([...p.peek()])}]});v.add(()=>ht?.destroy?.()),Ie.addEventListener("click",e=>{const t=e.target.closest(".ct-more");t&&Q(t)}),Re.addEventListener("click",e=>{const t=e.target.closest(".ct-bulk-group");t&&Q(t)}),be.addEventListener("click",e=>{const t=e.target.closest(".ct-chip");if(!t)return;const a=t.dataset.chip;x.value=a==="fav"?{kind:"fav"}:a.startsWith("group:")?{kind:"group",value:a.slice(6)}:{kind:"all"}}),Y.addEventListener("click",e=>{if(e.target.closest(".ct-select-all"))return;const t=e.target.closest(".ct-row");if(!t)return;const a=t.dataset.id;if(e.target.closest(".ct-kebab"))return Q(e.target.closest(".ct-kebab"));if(!e.target.closest(".ct-select")){if(e.target.closest(".ct-fav")){const n=P(a);n&&te(a,{favourite:n.favourite!==!0});return}K(a)}}),Y.addEventListener("change",e=>{if(e.target.matches(".ct-select")&&Be(e.target.closest(".ct-row").dataset.id),e.target.matches(".ct-select-all")){const t=O.peek().map(a=>a.id);p.value=e.target.checked?new Set(t):new Set}}),Y.addEventListener("keydown",e=>{const t=e.target.closest?.(".ct-row");!t||e.target!==t||(e.key==="Enter"?(e.preventDefault(),K(t.dataset.id)):e.key==="F10"&&e.shiftKey&&(e.preventDefault(),Q(t.querySelector(".ct-kebab")||t)))});const qe=e=>{e.ctrlKey||e.metaKey||e.altKey||e.target.closest?.("input, textarea, select, [contenteditable], .dm-slideover")||(e.key==="/"?(e.preventDefault(),$e.value=!0):(e.key==="n"||e.key==="N")&&(e.preventDefault(),K(null)))};document.addEventListener("keydown",qe),v.add(()=>document.removeEventListener("keydown",qe)),I.scan(d),await z()}};

package/admin/js/views/form-submissions.js

@@ -1,4 +1,4 @@
-import{apiRequest as A}from"/admin/js/api.js";import{addBannerAction as Y}from"/admin/js/lib/plugin-chrome.js";import{SHAPES as De,whileLoading as Le}from"/admin/js/lib/loading.js";import{helpPopovers as me}from"/admin/js/lib/help-popover.js";import{onceClosed as Re,openMenuAt as pe,sidebarCount as Q,viewLifetime as Ie}from"/admin/js/lib/tool-kit.js";import{FILTERS as Oe,answerFields as Ue,answerText as U,arrangeSubmissions as qe,submissionCounts as je,submissionRow as L,submissionText as Fe}from"/admin/js/lib/form-submissions-arrange.js";import{fmtDateTime as Pe}from"../lib/dates.js";const ue=/^#\/forms\/[^/?#]+\/submissions\/?(\?.*)?$/,Z="form-submissions.filter",Be=`
+import{apiRequest as A}from"/admin/js/api.js";import{addBannerAction as Y}from"/admin/js/lib/plugin-chrome.js";import{SHAPES as De,whileLoading as Le}from"/admin/js/lib/loading.js";import{helpPopovers as me}from"/admin/js/lib/help-popover.js";import{onceClosed as Re,openMenuAt as pe,sidebarCount as Q,viewLifetime as Ie}from"/admin/js/lib/tool-kit.js";import{FILTERS as Oe,answerFields as qe,answerText as q,arrangeSubmissions as Ue,submissionCounts as Fe,submissionRow as L,submissionText as je}from"/admin/js/lib/form-submissions-arrange.js";import{fmtDateTime as Pe}from"../lib/dates.js";import{openEmail as Be}from"../lib/mail-compose.js";const ue=/^#\/forms\/[^/?#]+\/submissions\/?(\?.*)?$/,Z="form-submissions.filter",Ke=`
 <div class="fsx-row" data-id="{{id}}" tabindex="0" data-bind-class="rowCls">
     <span class="fsx-dot" aria-hidden="true"></span>
     <span class="fsx-main"><strong>{{title}}</strong><small>{{meta}}</small></span>
@@ -8,4 +8,4 @@ import{apiRequest as A}from"/admin/js/api.js";import{addBannerAction as Y}from"/
     </span>
     <span class="fsx-when" title="{{whenFull}}">{{when}}</span>
     <button type="button" class="fsx-kebab" aria-label="Actions for this submission" title="Actions">\u22EE</button>
-</div>`,ee=i=>String(i??"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;"),q=(i,r,y=`${r}s`)=>`${i} ${i===1?r:y}`,te=i=>i?Pe(i):"";async function fe(i){try{return await navigator.clipboard.writeText(i),!0}catch{}try{const r=document.createElement("textarea");r.value=i,r.style.cssText="position:fixed;opacity:0;",document.body.appendChild(r),r.select();const y=document.execCommand("copy");return r.remove(),y}catch{return!1}}const b=Ie(ue);export const formSubmissionsView={templateUrl:"/admin/js/templates/form-submissions.html",async onMount(i){b.reset();const r=i.get(0).querySelector(".fsx")||i.get(0),y=()=>ue.test(location.hash)&&r.isConnected,u=decodeURIComponent((location.hash.match(/^#\/forms\/([^/?#]+)\/submissions/)||[])[1]||"");if(!u){E.toast("No form selected.",{type:"error"});return}const k=encodeURIComponent(u),w=M.observable(null),l=M.observable([]),ne=M.observable(!0),j=M.observable("");let se="inbox";try{se=Oe.includes(S.get(Z))?S.get(Z):"inbox"}catch{}const v=M.observable(se),oe=M.observable(""),F=M.observable(""),P=M.observable("");b.add(M.effect(()=>{const e=v.value;try{S.set(Z,e)}catch{}}));const $=M.computed(()=>Ue(w.value||{})),B=M.observable([]);b.add(M.effect(()=>{const e=Date.now(),t=qe(l.value,{filter:v.value,query:oe.value,from:F.value,to:P.value,now:e}),n=$.value;B.value=t.map(a=>{const s=L(a,n,e);return{...s,when:s.at?D(s.at).fromNow():"",whenFull:te(s.at)}})}));const he=M.computed(()=>je(l.value)),be=M.computed(()=>{const e=B.value.length,t=l.value.length;return t?e===t?q(t,"submission"):`${e} of ${q(t,"submission")}`:""}),ye=M.computed(()=>l.value.length?v.value==="spam"?"Nothing marked as spam.":"No submissions match.":"No submissions yet - they appear here as people send the form."),we=M.computed(()=>w.value?`What people sent through "${w.value.title||u}".`:"What people sent through this form."),R=e=>l.peek().find(t=>String(t.id)===String(e));async function Ee(){try{const[e,t]=await Le(r.querySelector(".dm-loading-slot"),Promise.all([A(`/forms/${k}`),A(`/forms/${k}/submissions`)]),De.rows);if(!y())return;w.value=e||null,l.value=Array.isArray(t)?t:[],j.value="",ve(e?.title||u)}catch(e){if(!y())return;j.value=`Could not load the submissions: ${e.message||e}`}finally{ne.value=!1}}function ve(e){const t=i.get(0).querySelector(".dm-plugin-banner-name"),n=t?.lastChild;n&&n.nodeType===Node.TEXT_NODE&&t.querySelector(".dm-plugin-banner-sep")&&(n.textContent=`${e} submissions`),document.title=`${e} - Submissions - Domma CMS`}const K=(e,t)=>ce(e.id,()=>xe(e,t)),W=e=>ce(e.id,()=>ge(e));async function xe(e,t){try{const n=await A(`/forms/${k}/submissions/${encodeURIComponent(e.id)}/spam`,{method:"POST",body:JSON.stringify({spam:t})});return l.value=l.peek().map(a=>String(a.id)===String(e.id)?{...a,data:n?.entry?.data||{...a.data,spam:t}}:a),E.toast(t?"Marked as spam - it is under Spam now.":"Back in the inbox.",{type:"success"}),Q("#/forms"),!0}catch(n){return E.toast(`Not changed: ${n.message||n}`,{type:"error"}),!1}}async function ge(e){const t=L(e,$.peek()).title;if(!await E.confirm(`Delete the submission from "${ee(t)}"? This cannot be undone.`,{confirmText:"Delete"}))return!1;try{return await A(`/forms/${k}/submissions/${encodeURIComponent(e.id)}`,{method:"DELETE"}),l.value=l.peek().filter(n=>String(n.id)!==String(e.id)),E.toast("Submission deleted.",{type:"success"}),Q("#/forms"),!0}catch(n){return E.toast(`Not deleted: ${n.message||n}`,{type:"error"}),!1}}let _=!1;async function Ce(){if(!_){_=!0;try{await ke()}finally{_=!1}}}async function ke(){const e=l.peek().length;if(!e){E.toast("There are no submissions to clear.",{type:"info"});return}const t=w.peek()?.title||u;if(await E.confirm(`Delete all ${q(e,"submission")} to "${ee(t)}", spam included? This cannot be undone - Export them first if you may need them.`))try{await A(`/forms/${k}/submissions`,{method:"DELETE"}),l.value=[],E.toast("All submissions cleared.",{type:"success"}),Q("#/forms")}catch(n){E.toast(`Not cleared: ${n.message||n}`,{type:"error"})}}const ae=async e=>{const t=Fe(e,$.peek(),{formTitle:w.peek()?.title||u,when:te(e.meta?.createdAt)});E.toast(await fe(t)?"Copied.":"Copy failed.",{type:"info"})},Se=async e=>{E.toast(await fe(e)?`Copied ${e}.`:"Copy failed.",{type:"info"})},ie=e=>{const t=L(e,$.peek()).email;if(!t)return;const n=`Re: ${w.peek()?.title||u}`;window.location.href=`mailto:${encodeURIComponent(t)}?subject=${encodeURIComponent(n)}`};async function $e(e,t){try{const n=await fetch(`/api/forms/${k}/submissions/${e}`,{headers:{Authorization:`Bearer ${S.get("auth_token")||""}`}});if(!n.ok)throw new Error(`${n.status} ${n.statusText}`);const a=await n.blob(),s=document.createElement("a");return s.href=URL.createObjectURL(a),s.download=t,document.body.appendChild(s),s.click(),s.remove(),setTimeout(()=>URL.revokeObjectURL(s.href),1e3),!0}catch(n){return E.toast(`Export failed: ${n.message||n}`,{type:"error"}),!1}}const H=new Set,O=new Set;function re(e,t,n,a="md"){if(O.has(e))return null;O.add(e);let s;try{s=E.slideover({title:ee(t),size:a,position:"right"}),s.element.appendChild(n);const m=me(n);return H.add(s),Re(s,()=>{O.delete(e),H.delete(s),m()}),I.scan(n),s.open(),s}catch(m){O.delete(e);try{s?.destroy?.(),s?.element?.remove()}catch{}return E.toast(`Could not open it: ${m.message||m}`,{type:"error"}),null}}const J=new Set;async function ce(e,t){const n=String(e);if(J.has(n))return!1;J.add(n);try{return await t()}finally{J.delete(n)}}function Ne(){const e=l.peek().length,t=document.createElement("div");t.className="fsx-export";const n=document.createElement("p");n.className="fsx-note",n.textContent=e?`All ${q(e,"submission")}, spam included.`:"There are no submissions yet - the file will be empty.",t.appendChild(n);let a;const s=(m,x,z,G,N)=>{const c=document.createElement("button");c.type="button",c.className="btn btn-ghost";const g=document.createElement("span");g.setAttribute("data-icon",x),c.append(g,document.createTextNode(` ${m}`));const T=document.createElement("span");T.setAttribute("data-help",N),c.addEventListener("click",async()=>{if(!c.disabled){c.disabled=!0;try{await $e(z,`${u}-submissions.${G}`)&&a?.close()}finally{c.disabled=!1}}});const o=document.createElement("div");o.append(c,T),t.appendChild(o)};s("Export as CSV","file-text","export","csv","One row per submission, one column per question - opens in Excel, Numbers or Google Sheets."),s("Export as JSON","code","export/json","json","Every submission exactly as stored, with its id and dates - for importing elsewhere or keeping a full copy."),a=re("export","Export submissions",t,"sm")}function V(e){if(!e)return;const t=$.peek(),n=L(e,t),a=document.createElement("div");a.className="fsx-detail";const s=document.createElement("div");s.className="fsx-facts";const m=o=>{const d=document.createElement("span");d.textContent=o,s.appendChild(d)};e.meta?.createdAt&&m(`Sent ${te(e.meta.createdAt)} (${D(e.meta.createdAt).fromNow()})`),e.meta?.ip&&m(`IP ${e.meta.ip}`),n.spam&&m("Marked as spam"),a.appendChild(s);const x=document.createElement("dl");x.className="fsx-answers";const z=t.filter(o=>U(e.data?.[o.name])!=="");for(const o of z){const d=document.createElement("div");d.className="fsx-answer";const h=document.createElement("dt");h.textContent=o.label;const C=document.createElement("dd");C.textContent=U(e.data[o.name]),d.append(h,C),x.appendChild(d)}const G=new Set(t.map(o=>o.name));for(const[o,d]of Object.entries(e.data||{})){if(G.has(o)||o==="spam"||U(d)==="")continue;const h=document.createElement("div");h.className="fsx-answer";const C=document.createElement("dt");C.textContent=`${o} (no longer on the form)`;const p=document.createElement("dd");p.textContent=U(d),h.append(C,p),x.appendChild(h)}if(x.children.length)a.appendChild(x);else{const o=document.createElement("p");o.className="fsx-note",o.textContent="Nothing was filled in.",a.appendChild(o)}const N=document.createElement("div");N.className="fsx-actions";const c=(o,d,h,C)=>{const p=document.createElement("button");p.type="button",p.className=`btn btn-sm ${h}`;const X=document.createElement("span");return X.setAttribute("data-icon",d),X.setAttribute("data-icon-size","13"),p.append(X,document.createTextNode(` ${o}`)),p.addEventListener("click",C),N.appendChild(p),p};let g;c("Copy","copy","btn-ghost",()=>ae(e)),n.email&&c("Email them","mail","btn-ghost",()=>ie(e)),c(n.spam?"Not spam":"Mark as spam",n.spam?"inbox":"alert-triangle","btn-ghost",async()=>{await K(e,!n.spam)&&g?.close()});const T=document.createElement("span");T.className="fsx-spacer",N.appendChild(T),c("Delete","trash","btn-ghost text-danger",async()=>{await W(e)&&g?.close()}),c("Close","x","btn-ghost",()=>g?.close()),a.appendChild(N),g=re(`sub:${e.id}`,n.title,a)}function Te(e){const t=R(e);if(!t)return[];const n=L(t,$.peek());return[{header:n.title},{label:"Open\u2026",icon:"eye",action:()=>V(t)},{label:"Copy submission",icon:"copy",action:()=>ae(t)},{type:"divider"},{label:n.email?`Copy ${n.email}`:"Copy email",icon:"at-sign",disabled:!n.email,action:()=>Se(n.email)},{label:"Email them\u2026",icon:"mail",disabled:!n.email,action:()=>ie(t)},{type:"divider"},n.spam?{label:"Not spam - back to the inbox",icon:"inbox",action:()=>K(t,!1)}:{label:"Mark as spam",icon:"alert-triangle",action:()=>K(t,!0)},{label:"Delete\u2026",icon:"trash",danger:!0,action:()=>W(t)}]}const f=r.querySelector(".fsx-list");f.innerHTML=Be;const Me=M.applyBindings({loading:ne,loadError:j,filter:v,query:oe,from:F,to:P,rows:B,counts:he,summary:be,emptyText:ye,intro:we},r,{methods:{showInbox:()=>{v.value="inbox"},showNew:()=>{v.value="new"},showSpam:()=>{v.value="spam"},clearDates:()=>{F.value="",P.value=""}}});b.add(()=>Me.dispose()),b.add(me(r,{position:"bottom"}));const Ae=E.contextMenu(f,{cursor:"glyph",match:".fsx-row",inherit:!1,density:"compact",items:e=>Te(e.dataset.id)});b.add(()=>Ae?.destroy?.());const le=e=>{const t=e.target.closest(".fsx-row");if(!t)return;const n=e.target.closest(".fsx-kebab");if(n){pe(n);return}V(R(t.dataset.id))},de=e=>{const t=e.target.closest(".fsx-row");if(!(!t||e.target!==t)){if(e.key==="F10"&&e.shiftKey)e.preventDefault(),pe(t);else if(e.key==="Enter")V(R(t.dataset.id));else if(e.key==="Delete"){e.preventDefault();const n=R(t.dataset.id);n&&W(n)}}};f.addEventListener("click",le),f.addEventListener("keydown",de),b.add(()=>{f.removeEventListener("click",le),f.removeEventListener("keydown",de)}),Y(i,{id:"form-submissions-back",icon:"arrow-left",title:"All forms",onClick:()=>{location.hash="#/forms"}}),Y(i,{id:"form-submissions-export",icon:"download",title:"Export (CSV or JSON)",onClick:Ne}),Y(i,{id:"form-submissions-clear",icon:"trash",title:"Clear all submissions",onClick:Ce}),b.add(()=>{[...H].forEach(e=>{try{e.close()}catch{}})}),I.scan(r),await Ee(),y()&&requestAnimationFrame(()=>{f.isConnected&&I.scan(f)})}};
+</div>`,ee=i=>String(i??"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;"),U=(i,r,y=`${r}s`)=>`${i} ${i===1?r:y}`,te=i=>i?Pe(i):"";async function fe(i){try{return await navigator.clipboard.writeText(i),!0}catch{}try{const r=document.createElement("textarea");r.value=i,r.style.cssText="position:fixed;opacity:0;",document.body.appendChild(r),r.select();const y=document.execCommand("copy");return r.remove(),y}catch{return!1}}const b=Ie(ue);export const formSubmissionsView={templateUrl:"/admin/js/templates/form-submissions.html",async onMount(i){b.reset();const r=i.get(0).querySelector(".fsx")||i.get(0),y=()=>ue.test(location.hash)&&r.isConnected,u=decodeURIComponent((location.hash.match(/^#\/forms\/([^/?#]+)\/submissions/)||[])[1]||"");if(!u){E.toast("No form selected.",{type:"error"});return}const k=encodeURIComponent(u),w=M.observable(null),l=M.observable([]),ne=M.observable(!0),F=M.observable("");let se="inbox";try{se=Oe.includes(S.get(Z))?S.get(Z):"inbox"}catch{}const v=M.observable(se),oe=M.observable(""),j=M.observable(""),P=M.observable("");b.add(M.effect(()=>{const e=v.value;try{S.set(Z,e)}catch{}}));const $=M.computed(()=>qe(w.value||{})),B=M.observable([]);b.add(M.effect(()=>{const e=Date.now(),t=Ue(l.value,{filter:v.value,query:oe.value,from:j.value,to:P.value,now:e}),n=$.value;B.value=t.map(a=>{const s=L(a,n,e);return{...s,when:s.at?D(s.at).fromNow():"",whenFull:te(s.at)}})}));const he=M.computed(()=>Fe(l.value)),be=M.computed(()=>{const e=B.value.length,t=l.value.length;return t?e===t?U(t,"submission"):`${e} of ${U(t,"submission")}`:""}),ye=M.computed(()=>l.value.length?v.value==="spam"?"Nothing marked as spam.":"No submissions match.":"No submissions yet - they appear here as people send the form."),we=M.computed(()=>w.value?`What people sent through "${w.value.title||u}".`:"What people sent through this form."),R=e=>l.peek().find(t=>String(t.id)===String(e));async function Ee(){try{const[e,t]=await Le(r.querySelector(".dm-loading-slot"),Promise.all([A(`/forms/${k}`),A(`/forms/${k}/submissions`)]),De.rows);if(!y())return;w.value=e||null,l.value=Array.isArray(t)?t:[],F.value="",ve(e?.title||u)}catch(e){if(!y())return;F.value=`Could not load the submissions: ${e.message||e}`}finally{ne.value=!1}}function ve(e){const t=i.get(0).querySelector(".dm-plugin-banner-name"),n=t?.lastChild;n&&n.nodeType===Node.TEXT_NODE&&t.querySelector(".dm-plugin-banner-sep")&&(n.textContent=`${e} submissions`),document.title=`${e} - Submissions - Domma CMS`}const K=(e,t)=>ce(e.id,()=>xe(e,t)),W=e=>ce(e.id,()=>ge(e));async function xe(e,t){try{const n=await A(`/forms/${k}/submissions/${encodeURIComponent(e.id)}/spam`,{method:"POST",body:JSON.stringify({spam:t})});return l.value=l.peek().map(a=>String(a.id)===String(e.id)?{...a,data:n?.entry?.data||{...a.data,spam:t}}:a),E.toast(t?"Marked as spam - it is under Spam now.":"Back in the inbox.",{type:"success"}),Q("#/forms"),!0}catch(n){return E.toast(`Not changed: ${n.message||n}`,{type:"error"}),!1}}async function ge(e){const t=L(e,$.peek()).title;if(!await E.confirm(`Delete the submission from "${ee(t)}"? This cannot be undone.`,{confirmText:"Delete"}))return!1;try{return await A(`/forms/${k}/submissions/${encodeURIComponent(e.id)}`,{method:"DELETE"}),l.value=l.peek().filter(n=>String(n.id)!==String(e.id)),E.toast("Submission deleted.",{type:"success"}),Q("#/forms"),!0}catch(n){return E.toast(`Not deleted: ${n.message||n}`,{type:"error"}),!1}}let _=!1;async function Ce(){if(!_){_=!0;try{await ke()}finally{_=!1}}}async function ke(){const e=l.peek().length;if(!e){E.toast("There are no submissions to clear.",{type:"info"});return}const t=w.peek()?.title||u;if(await E.confirm(`Delete all ${U(e,"submission")} to "${ee(t)}", spam included? This cannot be undone - Export them first if you may need them.`))try{await A(`/forms/${k}/submissions`,{method:"DELETE"}),l.value=[],E.toast("All submissions cleared.",{type:"success"}),Q("#/forms")}catch(n){E.toast(`Not cleared: ${n.message||n}`,{type:"error"})}}const ae=async e=>{const t=je(e,$.peek(),{formTitle:w.peek()?.title||u,when:te(e.meta?.createdAt)});E.toast(await fe(t)?"Copied.":"Copy failed.",{type:"info"})},Se=async e=>{E.toast(await fe(e)?`Copied ${e}.`:"Copy failed.",{type:"info"})},ie=e=>{const t=L(e,$.peek()).email;t&&Be({to:[t],subject:`Re: ${w.peek()?.title||u}`})};async function $e(e,t){try{const n=await fetch(`/api/forms/${k}/submissions/${e}`,{headers:{Authorization:`Bearer ${S.get("auth_token")||""}`}});if(!n.ok)throw new Error(`${n.status} ${n.statusText}`);const a=await n.blob(),s=document.createElement("a");return s.href=URL.createObjectURL(a),s.download=t,document.body.appendChild(s),s.click(),s.remove(),setTimeout(()=>URL.revokeObjectURL(s.href),1e3),!0}catch(n){return E.toast(`Export failed: ${n.message||n}`,{type:"error"}),!1}}const H=new Set,O=new Set;function re(e,t,n,a="md"){if(O.has(e))return null;O.add(e);let s;try{s=E.slideover({title:ee(t),size:a,position:"right"}),s.element.appendChild(n);const m=me(n);return H.add(s),Re(s,()=>{O.delete(e),H.delete(s),m()}),I.scan(n),s.open(),s}catch(m){O.delete(e);try{s?.destroy?.(),s?.element?.remove()}catch{}return E.toast(`Could not open it: ${m.message||m}`,{type:"error"}),null}}const J=new Set;async function ce(e,t){const n=String(e);if(J.has(n))return!1;J.add(n);try{return await t()}finally{J.delete(n)}}function Ne(){const e=l.peek().length,t=document.createElement("div");t.className="fsx-export";const n=document.createElement("p");n.className="fsx-note",n.textContent=e?`All ${U(e,"submission")}, spam included.`:"There are no submissions yet - the file will be empty.",t.appendChild(n);let a;const s=(m,x,z,G,N)=>{const c=document.createElement("button");c.type="button",c.className="btn btn-ghost";const g=document.createElement("span");g.setAttribute("data-icon",x),c.append(g,document.createTextNode(` ${m}`));const T=document.createElement("span");T.setAttribute("data-help",N),c.addEventListener("click",async()=>{if(!c.disabled){c.disabled=!0;try{await $e(z,`${u}-submissions.${G}`)&&a?.close()}finally{c.disabled=!1}}});const o=document.createElement("div");o.append(c,T),t.appendChild(o)};s("Export as CSV","file-text","export","csv","One row per submission, one column per question - opens in Excel, Numbers or Google Sheets."),s("Export as JSON","code","export/json","json","Every submission exactly as stored, with its id and dates - for importing elsewhere or keeping a full copy."),a=re("export","Export submissions",t,"sm")}function V(e){if(!e)return;const t=$.peek(),n=L(e,t),a=document.createElement("div");a.className="fsx-detail";const s=document.createElement("div");s.className="fsx-facts";const m=o=>{const d=document.createElement("span");d.textContent=o,s.appendChild(d)};e.meta?.createdAt&&m(`Sent ${te(e.meta.createdAt)} (${D(e.meta.createdAt).fromNow()})`),e.meta?.ip&&m(`IP ${e.meta.ip}`),n.spam&&m("Marked as spam"),a.appendChild(s);const x=document.createElement("dl");x.className="fsx-answers";const z=t.filter(o=>q(e.data?.[o.name])!=="");for(const o of z){const d=document.createElement("div");d.className="fsx-answer";const h=document.createElement("dt");h.textContent=o.label;const C=document.createElement("dd");C.textContent=q(e.data[o.name]),d.append(h,C),x.appendChild(d)}const G=new Set(t.map(o=>o.name));for(const[o,d]of Object.entries(e.data||{})){if(G.has(o)||o==="spam"||q(d)==="")continue;const h=document.createElement("div");h.className="fsx-answer";const C=document.createElement("dt");C.textContent=`${o} (no longer on the form)`;const p=document.createElement("dd");p.textContent=q(d),h.append(C,p),x.appendChild(h)}if(x.children.length)a.appendChild(x);else{const o=document.createElement("p");o.className="fsx-note",o.textContent="Nothing was filled in.",a.appendChild(o)}const N=document.createElement("div");N.className="fsx-actions";const c=(o,d,h,C)=>{const p=document.createElement("button");p.type="button",p.className=`btn btn-sm ${h}`;const X=document.createElement("span");return X.setAttribute("data-icon",d),X.setAttribute("data-icon-size","13"),p.append(X,document.createTextNode(` ${o}`)),p.addEventListener("click",C),N.appendChild(p),p};let g;c("Copy","copy","btn-ghost",()=>ae(e)),n.email&&c("Email them","mail","btn-ghost",()=>ie(e)),c(n.spam?"Not spam":"Mark as spam",n.spam?"inbox":"alert-triangle","btn-ghost",async()=>{await K(e,!n.spam)&&g?.close()});const T=document.createElement("span");T.className="fsx-spacer",N.appendChild(T),c("Delete","trash","btn-ghost text-danger",async()=>{await W(e)&&g?.close()}),c("Close","x","btn-ghost",()=>g?.close()),a.appendChild(N),g=re(`sub:${e.id}`,n.title,a)}function Te(e){const t=R(e);if(!t)return[];const n=L(t,$.peek());return[{header:n.title},{label:"Open\u2026",icon:"eye",action:()=>V(t)},{label:"Copy submission",icon:"copy",action:()=>ae(t)},{type:"divider"},{label:n.email?`Copy ${n.email}`:"Copy email",icon:"at-sign",disabled:!n.email,action:()=>Se(n.email)},{label:"Email them\u2026",icon:"mail",disabled:!n.email,action:()=>ie(t)},{type:"divider"},n.spam?{label:"Not spam - back to the inbox",icon:"inbox",action:()=>K(t,!1)}:{label:"Mark as spam",icon:"alert-triangle",action:()=>K(t,!0)},{label:"Delete\u2026",icon:"trash",danger:!0,action:()=>W(t)}]}const f=r.querySelector(".fsx-list");f.innerHTML=Ke;const Me=M.applyBindings({loading:ne,loadError:F,filter:v,query:oe,from:j,to:P,rows:B,counts:he,summary:be,emptyText:ye,intro:we},r,{methods:{showInbox:()=>{v.value="inbox"},showNew:()=>{v.value="new"},showSpam:()=>{v.value="spam"},clearDates:()=>{j.value="",P.value=""}}});b.add(()=>Me.dispose()),b.add(me(r,{position:"bottom"}));const Ae=E.contextMenu(f,{cursor:"glyph",match:".fsx-row",inherit:!1,density:"compact",items:e=>Te(e.dataset.id)});b.add(()=>Ae?.destroy?.());const le=e=>{const t=e.target.closest(".fsx-row");if(!t)return;const n=e.target.closest(".fsx-kebab");if(n){pe(n);return}V(R(t.dataset.id))},de=e=>{const t=e.target.closest(".fsx-row");if(!(!t||e.target!==t)){if(e.key==="F10"&&e.shiftKey)e.preventDefault(),pe(t);else if(e.key==="Enter")V(R(t.dataset.id));else if(e.key==="Delete"){e.preventDefault();const n=R(t.dataset.id);n&&W(n)}}};f.addEventListener("click",le),f.addEventListener("keydown",de),b.add(()=>{f.removeEventListener("click",le),f.removeEventListener("keydown",de)}),Y(i,{id:"form-submissions-back",icon:"arrow-left",title:"All forms",onClick:()=>{location.hash="#/forms"}}),Y(i,{id:"form-submissions-export",icon:"download",title:"Export (CSV or JSON)",onClick:Ne}),Y(i,{id:"form-submissions-clear",icon:"trash",title:"Clear all submissions",onClick:Ce}),b.add(()=>{[...H].forEach(e=>{try{e.close()}catch{}})}),I.scan(r),await Ee(),y()&&requestAnimationFrame(()=>{f.isConnected&&I.scan(f)})}};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "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/plugins/_lib/admin/mail/compose-window.js

@@ -337,7 +337,9 @@ export function openCompose({
     const slideover = E.slideover({
         title: draft.savedUid
             ? 'Draft'
-            : (draft.inReplyTo ? 'Reply' : (draft.subject ? 'Forward' : 'New message')),
+            // From the mode, not the subject: a new message can arrive with
+            // a subject already in it (Contacts' "Send birthday wishes").
+            : (draft.inReplyTo ? 'Reply' : (openedAs === 'forward' ? 'Forward' : 'New message')),
         size: 'lg',
         position: 'right'
     });

package/plugins/_lib/admin/mail/identity.js

@@ -241,7 +241,21 @@ export function signsOn(identity, mode) {
  * @returns {object}
  */
 export function applyIdentity(draft, identity, mode = 'new') {
-    if (!signsOn(identity, mode)) return draft;
+    // `lead`: text another screen asked to start the message with (Contacts'
+    // Email…, a call link). It goes ABOVE the signature, where the cursor
+    // would be - put in `body`/`html` it would land under it, or be lost to
+    // the HTML part entirely.
+    const leadText = String(draft?.lead ?? '').trim();
+    const {lead: _unused, ...rest} = draft ?? {};
+    draft = rest;
+    if (!signsOn(identity, mode)) {
+        if (!leadText) return draft;
+        return {
+            ...draft,
+            html: textToHtml(leadText) + String(draft.html ?? ''),
+            body: draft.body ? `${leadText}\n\n${draft.body}` : leadText
+        };
+    }
 
     const id = normaliseIdentity(identity);
     const sigHtml = id.signatureHtml || textToHtml(id.signatureText);
@@ -254,7 +268,7 @@ export function applyIdentity(draft, identity, mode = 'new') {
     const block = `<div class="dm-mail-signature">${sigHtml}</div>`;
     // An empty paragraph above everything, which is where the cursor lands
     // and where the message gets written.
-    const lead = '<p><br></p>';
+    const lead = leadText ? textToHtml(leadText) : '<p><br></p>';
     const quoted = String(draft.html ?? '');
     const quotedText = String(draft.body ?? '');
     const below = id.placement === 'below-quote' && quoted;
@@ -262,7 +276,8 @@ export function applyIdentity(draft, identity, mode = 'new') {
     return {
         ...draft,
         html: below ? lead + quoted + block : lead + block + quoted,
-        body: below ? `${quotedText}\n\n${sigText}` : `\n\n${sigText}${quotedText}`
+        body: below ? `${leadText}${leadText ? '\n\n' : ''}${quotedText}\n\n${sigText}`
+            : `${leadText}\n\n${sigText}${quotedText}`
     };
 }
 

package/plugins/_lib/admin/mail/reader-view.js

@@ -6089,15 +6089,43 @@ return {
             });
         }
 
-        /** A new, empty message - the banner's Compose and the pane's. */
-        async function startNewMessage() {
+        /**
+         * A new message - the banner's Compose and the pane's, empty; or one
+         * another screen asked for (Contacts' Email…), already addressed.
+         *
+         * @param {object} [draft] - `{to, cc, bcc, subject, body}`
+         */
+        async function startNewMessage(draft) {
             try {
-                openCompose(composeOptions(await identitySoon(), {mode: 'new'}));
+                openCompose(composeOptions(await identitySoon(), {mode: 'new', ...(draft ? {draft} : {})}));
             } catch (err) {
                 E.toast(err.message || 'Compose could not be opened.', {type: 'error'});
             }
         }
 
+        /**
+         * Another screen sent someone here to write to a person:
+         * `#/plugins/<name>?compose=1&to=…` (admin/js/lib/mail-compose.js).
+         * Opened once, then taken off the address so a reload or Back does
+         * not open it again. A core that predates the helper has no
+         * requests to read, and nothing happens.
+         */
+        async function takeComposeRequest() {
+            const mail = await import('/admin/js/lib/mail-compose.js').catch(() => null);
+            const request = mail?.readComposeRequest(location.hash);
+            if (!request) return;
+            history.replaceState(history.state, '', `${location.pathname}${location.search}#/plugins/${pluginName}`);
+            if (!features.send) return;
+            if (!currentAccountId) {
+                E.toast('Add a mailbox first, then write your message.', {type: 'warning'});
+                return;
+            }
+            const draft = {to: request.to, cc: request.cc, bcc: request.bcc, subject: request.subject};
+            // Above the signature, in both parts - applyIdentity places it.
+            if (request.body) draft.lead = request.body;
+            await startNewMessage(draft);
+        }
+
         if (features.send) {
             const compose = $container.find('#mail-compose-btn').get(0);
             if (compose && bannerCompose) compose.remove();
@@ -6149,6 +6177,7 @@ return {
 
         await start();
         if (!here()) return;
+        await takeComposeRequest();
         // The sidebar updates independently; keep an open inbox in step with
         // the mirror without interrupting selection, search or older pages.
         refreshTimer = setInterval(async () => {

package/plugins/blog/CLAUDE.md

@@ -353,3 +353,7 @@ Declared in plugin.json `permissions` (granted once to `admin`), checked on EVER
 - `menuKeys(list, rowSel)`: Shift+F10 on a focused row opens its menu. `pokeSidebar()` after any change that moves
   the badge. `withSkeleton(slot, promise, shape)` wraps core's loading.js (slot must be a block element).
 - Settings: leaving always keeps the draft (the old `unloading` flag is gone).
+
+## 1.10.1
+
+- **Email (openEmail).** Email actions go through `admin/lib/email.js`: `emailTo()` for menu actions (several people always in Bcc), `routeMailLinks(root)` for visible `mailto:` links. Core's `/admin/js/lib/mail-compose.js` (CMS 1.6.61+) opens Email Pro's compose window when the user has a mailbox there; older cores keep a cleaned, capped `mailto:` (over 1800 chars the addresses are copied instead). Stored addresses are encoded into links, or shown as text when invalid. Never set `location.href = 'mailto:…'` directly.