@fieldia/core 0.29.0 → 0.30.1

package/src/lib/record/form.mjs

@@ -1857,8 +1857,8 @@ function innerForm(options, within, place, outer) {
         }
         return shown;
     }
-    async function save(chain = []) {
-        return (await saving(chain)) === null;
+    async function save(chain = [], yes) {
+        return (await saving(chain, yes)) === null;
     }
     /** Every value, for a source that saves whole records: those of fields hidden from the person, which they never had, left out. */
     function sentValues() {
@@ -1887,14 +1887,14 @@ function innerForm(options, within, place, outer) {
      * save with the version the first got back, never as someone else's. A save
      * the page's own beforeSave steps ask for runs inside the one that set them off.
      */
-    function saving(chain) {
+    function saving(chain, yes) {
         if (chain.includes('on.beforeSave'))
-            return savingNow(chain);
+            return savingNow(chain, yes);
         const before = saveRunning;
         const mine = (async () => {
             if (before)
                 await before;
-            return savingNow(chain);
+            return savingNow(chain, yes);
         })();
         const done = mine.then(() => undefined, () => undefined);
         saveRunning = done;
@@ -1904,7 +1904,7 @@ function innerForm(options, within, place, outer) {
         });
         return mine;
     }
-    async function savingNow(chain) {
+    async function savingNow(chain, yes) {
         // A record its source does not let this person change is refused here, in its words or the form's: no source is asked.
         if (page.data.kind === 'record' && state.can?.edit === false) {
             const problem = { kind: 'rule', message: state.can.reason ?? named(messages.mayNotEditNoun, messages.mayNotEdit) };
@@ -1952,7 +1952,8 @@ function innerForm(options, within, place, outer) {
         if (page.on?.beforeSave) {
             // Its run stops of itself on a record shown by anything but its own steps (a `call`'s `{ record }`, a reload):
             // those move the save on with it.
-            const before = await moment('on.beforeSave', page.on.beforeSave, chain, false);
+            // Its questions' Yes goes on with what set the save off: its words (Submit, a button's).
+            const before = await moment('on.beforeSave', page.on.beforeSave, chain, false, yes);
             if (!before.done) {
                 // A check's problems, or an inner save's, are shown already; any other stop is this save's problem.
                 if (before.reason !== 'check' && before.reason !== 'save') {
@@ -2668,7 +2669,7 @@ function innerForm(options, within, place, outer) {
     });
     // A moment's run is on the record it was set off on: one set off again while its run goes, and run after it, is let
     // go when another record is shown by then (its steps were for that one).
-    const moment = createMoments((key, list, chain, on) => runTop(list, { id: key, chain, generation: on }), () => generation);
+    const moment = createMoments((key, list, chain, on, yes) => runTop(list, { id: key, chain, generation: on, yes }), () => generation);
     /**
      * Whether steps do something before their first save — set a status, call the app, open a page — so a record's
      * button made of them saves first. Steps that start with the save (Save and close), or only check before it, need
@@ -2694,12 +2695,14 @@ function innerForm(options, within, place, outer) {
             list.push({ do: builtin });
         const asked = builtin === 'archive' ? named(messages.archiveConfirmNoun, messages.archiveConfirm) : builtin === 'delete' ? named(messages.deleteConfirmNoun, messages.deleteConfirm) : undefined;
         const confirm = 'confirm' in source && source.confirm !== undefined ? source.confirm : asked;
+        // Its question's Yes, and its ask steps', say what it does: its own words, else Archive or Delete.
+        scope.yes ??= source.label || (builtin === 'archive' ? messages.archiveYes : builtin === 'delete' ? messages.deleteYes : undefined);
         // On the record it was pressed on: another shown while its question is asked, it does nothing to that one.
         scope.generation ??= generation;
         // Pressed by the person: what is typed is read before a step reads the form or hands its values on.
         scope.typed ??= 'first';
         return track((async () => {
-            if (confirm && !(await runner.ask(confirm))) {
+            if (confirm && !(await runner.ask(confirm, scope.yes))) {
                 const result = { done: false, reason: 'no', message: confirm };
                 emit('run', { id: scope.id, steps: list, result });
                 return result;
@@ -2718,7 +2721,7 @@ function innerForm(options, within, place, outer) {
             }
             // Then the save first, then the steps.
             if (saveFirst && (state.recordId == null || state.dirty.length > 0 || Object.keys(state.unread ?? {}).length > 0 || state.uploads.some(uploadGoing))) {
-                const first = await saving(scope.chain);
+                const first = await saving(scope.chain, scope.yes);
                 if (first) {
                     const result = { done: false, step: { do: 'save' }, reason: first.reason, ...(first.message !== undefined ? { message: first.message } : {}), ...(first.error !== undefined ? { error: first.error } : {}) };
                     emit('run', { id: scope.id, steps: list, result });
@@ -2885,7 +2888,7 @@ function innerForm(options, within, place, outer) {
             set({ errors });
             return Object.keys(errors).length === 0;
         },
-        save: () => track(save()),
+        save: (how) => track(save([], how?.yes)),
         canUpload: () => typeof options.dataSource?.upload === 'function',
         today,
         now: () => options.now?.() ?? new Date(),
@@ -3239,7 +3242,7 @@ function innerForm(options, within, place, outer) {
                 lines: { field: source.field, keys: [...keys], ids: lines.flatMap((line) => (line.id === undefined ? [] : [line.id])), values: lines.map((line) => structuredCopy(line.values)) },
             });
         },
-        run: (list, context = {}) => track(runTop(list, { id: context.id ?? 'run', chain: [], typed: 'first', ...(context.recordIds ? { recordIds: [...context.recordIds] } : {}) })),
+        run: (list, context = {}) => track(runTop(list, { id: context.id ?? 'run', chain: [], typed: 'first', ...(context.recordIds ? { recordIds: [...context.recordIds] } : {}), yes: context.yes })),
         shown(tab) {
             // A wizard's steps are told by the form itself, as they are entered.
             if (steps.includes(tab))
@@ -3640,7 +3643,14 @@ function indexLayout(root, functions) {
             ...(does.length ? { does } : {}),
             source,
         });
-        // A button's menu: each item a button of the record, hidden with it.
+        // A menu's built-in Archive shows while the record is active, Unarchive while it is not.
+        const builtin = source.builtin;
+        if (builtin === 'archive' || builtin === 'unarchive') {
+            const own = index.get(source.id);
+            const mine = own.invisible;
+            own.invisible = { ...mine, evaluate: (context, env) => (context['active'] === false) !== (builtin === 'unarchive') || mine.evaluate(context, env) };
+        }
+        // A button's menu, and a menu inside a menu: each item a button of the record, hidden with it.
         if (kind === 'button')
             for (const item of source.menu ?? [])
                 add(item, source.id, 'button', { invisible: item.invisible });
@@ -3749,16 +3759,10 @@ function indexLayout(root, functions) {
         walk(head?.band?.children ?? [], root.id);
         if (root.sidePanel)
             add(root.sidePanel, root.id, 'other', { invisible: root.sidePanel.invisible });
-        // The gear menu's items are buttons of the record; Archive shows while it is active, Unarchive while it is not.
-        for (const item of root.toolbar?.menu ?? []) {
+        // The gear menu's items are buttons of the record — those of a menu inside it too, hidden with the item that opens
+        // it (add's own); Archive shows while it is active, Unarchive while it is not.
+        for (const item of root.toolbar?.menu ?? [])
             add(item, root.id, 'button', { invisible: item.invisible });
-            if (item.builtin === 'archive' || item.builtin === 'unarchive') {
-                const own = index.get(item.id);
-                const mine = own.invisible;
-                const archived = item.builtin === 'unarchive';
-                own.invisible = { ...mine, evaluate: (context, env) => (context['active'] === false) !== archived || mine.evaluate(context, env) };
-            }
-        }
         if (root.attachmentPreview)
             add({ id: '#preview', ...root.attachmentPreview }, root.id, 'other', { invisible: root.attachmentPreview.invisible });
     }