@yuneta/gobj-ui 7.25.15 → 7.25.17

package/src/shell_modals.js

@@ -613,9 +613,30 @@ function build_dialog(shell, message, buttons, opts)
 }
 
 
+/***************************************************************
+ *  The labels a confirmation shows when the caller names none.
+ *
+ *  They are i18n KEYS, lower-case like every key: a button
+ *  translates its label with the app's t() -- its text, its title
+ *  and its aria-label. Until 7.25.16 they were "OK", "Yes", "No",
+ *  "Delete" and "Cancel", keys that no locale carries, so a dialog
+ *  that took the defaults read in English in every language.
+ *
+ *  Written as `i18n:` entries so the validate-locales script of a
+ *  consumer finds them when it scans this module: an app that
+ *  mounts these dialogs must define the five keys.
+ ***************************************************************/
+const DEFAULT_LABEL = Object.freeze({
+    ok:     Object.freeze({i18n: "ok"}),
+    yes:    Object.freeze({i18n: "yes"}),
+    no:     Object.freeze({i18n: "no"}),
+    delete: Object.freeze({i18n: "delete"}),
+    cancel: Object.freeze({i18n: "cancel"})
+});
+
 export function yui_shell_confirm_ok(shell, message, opts)
 {
-    let label = (opts && opts.ok_label) || "OK";
+    let label = (opts && opts.ok_label) || DEFAULT_LABEL.ok.i18n;
     if(!opts || !opts.type) {
         opts = Object.assign({}, opts, {type: "success"});
     }
@@ -626,8 +647,8 @@ export function yui_shell_confirm_ok(shell, message, opts)
 
 export function yui_shell_confirm_yesno(shell, message, opts)
 {
-    let yes_label = (opts && opts.yes_label) || "Yes";
-    let no_label  = (opts && opts.no_label)  || "No";
+    let yes_label = (opts && opts.yes_label) || DEFAULT_LABEL.yes.i18n;
+    let no_label  = (opts && opts.no_label)  || DEFAULT_LABEL.no.i18n;
     return build_dialog(shell, message, [
         {label: yes_label, value: "yes", kind: "primary"},
         {label: no_label,  value: "no"}
@@ -650,8 +671,8 @@ export function yui_shell_confirm_yesno(shell, message, opts)
  ***************************************************************/
 export function yui_shell_confirm_danger(shell, message, opts)
 {
-    let confirm_label = (opts && opts.confirm_label) || "Delete";
-    let cancel_label  = (opts && opts.cancel_label)  || "Cancel";
+    let confirm_label = (opts && opts.confirm_label) || DEFAULT_LABEL.delete.i18n;
+    let cancel_label  = (opts && opts.cancel_label)  || DEFAULT_LABEL.cancel.i18n;
     if(!opts || !opts.type) {
         opts = Object.assign({}, opts, {type: "danger"});
     }
@@ -663,9 +684,9 @@ export function yui_shell_confirm_danger(shell, message, opts)
 
 export function yui_shell_confirm_yesnocancel(shell, message, opts)
 {
-    let yes_label    = (opts && opts.yes_label)    || "Yes";
-    let no_label     = (opts && opts.no_label)     || "No";
-    let cancel_label = (opts && opts.cancel_label) || "Cancel";
+    let yes_label    = (opts && opts.yes_label)    || DEFAULT_LABEL.yes.i18n;
+    let no_label     = (opts && opts.no_label)     || DEFAULT_LABEL.no.i18n;
+    let cancel_label = (opts && opts.cancel_label) || DEFAULT_LABEL.cancel.i18n;
     return build_dialog(shell, message, [
         {label: yes_label,    value: "yes", kind: "primary"},
         {label: no_label,     value: "no"},

package/src/shell_toast_once.test.js

@@ -30,6 +30,9 @@ const {
     yui_shell_show_info,
     yui_shell_show_modal,
     yui_shell_confirm_danger,
+    yui_shell_confirm_ok,
+    yui_shell_confirm_yesno,
+    yui_shell_confirm_yesnocancel,
 } = await import("./shell_modals.js");
 
 let shell = null;
@@ -200,3 +203,63 @@ describe("every other button of a dialog is named", () => {
         ]);
     });
 });
+
+/*
+ *  A confirmation that names no label shows the DEFAULT ones, and those
+ *  are i18n keys like every other label: lower-case, translated by the
+ *  app's t(), and carried as the key of the text, the title and the
+ *  aria-label. They were "OK", "Yes", "No", "Delete" and "Cancel" --
+ *  keys no locale has, so the button read in English in every language.
+ */
+describe("the default labels of a confirmation are i18n keys", () => {
+
+    function keys_of($layer)
+    {
+        return [...$layer.querySelectorAll(".CONFIRM_BTN")].map(($b) => [
+            $b.getAttribute("data-i18n"),
+            $b.getAttribute("data-i18n-title"),
+            $b.getAttribute("data-i18n-aria-label"),
+        ]);
+    }
+
+    /*  What the reader hears: the aria-label, translated by t() when
+     *  the button is built.  */
+    function texts_of($layer)
+    {
+        return [...$layer.querySelectorAll(".CONFIRM_BTN")].map(($b) => $b.getAttribute("aria-label"));
+    }
+
+    const k = (key) => [key, key, key];
+
+    /*  A translator that tells a key it knows from one it does not.  */
+    const ES = {ok: "Aceptar", yes: "Sí", no: "No", delete: "Borrar", cancel: "Cancelar"};
+    const t = (key) => ES[key] || `?${key}?`;
+
+    test("ok", () => {
+        shell.priv.layers.modal = document.createElement("div");
+        yui_shell_confirm_ok(shell, "saved", {t: t});
+        expect(keys_of(shell.priv.layers.modal)).toEqual([k("ok")]);
+        expect(texts_of(shell.priv.layers.modal)).toEqual(["Aceptar"]);
+    });
+
+    test("yes / no", () => {
+        shell.priv.layers.modal = document.createElement("div");
+        yui_shell_confirm_yesno(shell, "go on?", {t: t});
+        expect(keys_of(shell.priv.layers.modal)).toEqual([k("yes"), k("no")]);
+        expect(texts_of(shell.priv.layers.modal)).toEqual(["Sí", "No"]);
+    });
+
+    test("yes / no / cancel", () => {
+        shell.priv.layers.modal = document.createElement("div");
+        yui_shell_confirm_yesnocancel(shell, "keep it?", {t: t});
+        expect(keys_of(shell.priv.layers.modal)).toEqual([k("yes"), k("no"), k("cancel")]);
+        expect(texts_of(shell.priv.layers.modal)).toEqual(["Sí", "No", "Cancelar"]);
+    });
+
+    test("delete / cancel", () => {
+        shell.priv.layers.modal = document.createElement("div");
+        yui_shell_confirm_danger(shell, "delete this column?", {t: t});
+        expect(keys_of(shell.priv.layers.modal)).toEqual([k("delete"), k("cancel")]);
+        expect(texts_of(shell.priv.layers.modal)).toEqual(["Borrar", "Cancelar"]);
+    });
+});

package/src/table_cell_text.test.js

@@ -9,7 +9,7 @@ const doc = {
 describe("table_cell_text", () => {
 
     it("record text is a text node, markup included", () => {
-        /*  M31: Tabulator puts a string through innerHTML  */
+        /*  Tabulator puts a string through innerHTML  */
         const node = cell_text("limit a<b and c>d", doc);
         expect(node.nodeType).toBe(3);
         expect(node.textContent).toBe("limit a<b and c>d");

package/src/treedb_graph_writes.wiring.test.js

@@ -149,13 +149,19 @@ function save_arrangement(engine, topic)
     });
 }
 
+/*  The answer as the real transports build it: the command frame
+ *  carries ONLY the request's `__md_command__` (C_IEVENT_CLI's
+ *  mt_command, gui_agent's C_AGENT_TREEDB_LINK), never the request's
+ *  own kw. Echoing the whole kw here once hid that the refusal read
+ *  its topic from a `record` no real answer carries.  */
 function answer(host, remote, request, result, comment)
 {
+    const md_command = request.kw.__md_command__ || {};
     gobj_send_event(host, "EV_MT_COMMAND_ANSWER", {
         result: result,
         comment: comment || "",
         data: null,
-        __md_iev__: {command_stack: [{command: request.command, kw: request.kw}]}
+        __md_iev__: {command_stack: [{command: request.command, kw: md_command}]}
     }, remote);
 }
 
@@ -172,6 +178,7 @@ describe("a __graphs__ write that does not land is said to the engine", () => {
         expect(commands.length).toBe(1);
         answer(host, remote, commands[0], -1, "not authorized");
         expect(refused()).toEqual(["yunos"]);
+        expect(logged.filter((l) => /names no topic/.test(l.msg))).toEqual([]);
     });
 
     test("landed: nothing is said", () => {

package/src/treedb_topics_transport.wiring.test.js

@@ -169,7 +169,7 @@ function errors()
     return logged.filter((l) => l.level === "error").map((l) => l.msg);
 }
 
-describe("a Save in flight when the backend drops (M8)", () => {
+describe("a Save in flight when the backend drops", () => {
 
     test("the shell's connection edge answers every form, with no host forwarding", () => {
         const {shell, topics, forms} = build("t1");

package/src/yui_install.js

@@ -194,6 +194,17 @@ function yui_install_start_watch()
  *      app can call yui_install_prompt() from a button of its
  *      own whenever it likes.
  ***************************************************************/
+/*  The question and its answers when the app names none. They are i18n
+ *  KEYS, lower-case, and the ones every consumer already defines; the
+ *  question was "Install this app?" until 7.25.16, a key no locale
+ *  carries. Written as `i18n:` entries so the validate-locales script of
+ *  a consumer finds them when it scans this module.  */
+const DEFAULT_ASK = Object.freeze({
+    message: Object.freeze({i18n: "install this app"}),
+    yes:     Object.freeze({i18n: "install"}),
+    no:      Object.freeze({i18n: "not now"})
+});
+
 function yui_install_ask_once(shell, opts)
 {
     opts = opts || {};
@@ -213,10 +224,10 @@ function yui_install_ask_once(shell, opts)
         S.asking = true;
         kw_set_local_storage_value(ASKED_KEY, true);
 
-        yui_shell_confirm_yesno(shell, opts.message || "Install this app?", {
+        yui_shell_confirm_yesno(shell, opts.message || DEFAULT_ASK.message.i18n, {
             t:         opts.t,
-            yes_label: opts.yes_label || "install",
-            no_label:  opts.no_label  || "not now"
+            yes_label: opts.yes_label || DEFAULT_ASK.yes.i18n,
+            no_label:  opts.no_label  || DEFAULT_ASK.no.i18n
         }).then(function(yes) {
             S.asking = false;
             if(yes) {

package/src/yui_install.test.js

@@ -140,3 +140,26 @@ test("subscribe(): a throwing listener does not break the others", async () => {
     off1();
     off2();
 });
+
+/*  The question asked when the app names none is an i18n KEY, the one
+ *  every consumer already defines ("install this app"). It was
+ *  "Install this app?", a key no locale carries, so an app that took
+ *  the default asked in English in every language.  */
+test("ask_once(): the default question and answers are i18n keys", async () => {
+    const asked = [];
+    vi.resetModules();
+    vi.doMock("./shell_modals.js", () => ({
+        yui_shell_confirm_yesno: (shell, message, opts) => {
+            asked.push({message, yes: opts.yes_label, no: opts.no_label});
+            return new Promise(() => {});
+        }
+    }));
+    try {
+        const {yui_install_ask_once} = await import("./yui_install.js");
+        window[STASH] = fake_event("accepted");
+        yui_install_ask_once({fake_shell: true}, {});
+        expect(asked).toEqual([{message: "install this app", yes: "install", no: "not now"}]);
+    } finally {
+        vi.doUnmock("./shell_modals.js");
+    }
+});