@yuneta/gobj-ui 7.26.23 → 7.26.24

package/dist/gobj-ui.cjs.js

@@ -73644,17 +73644,23 @@ function plan_import(treedb, incoming, options) {
 				topic: name || "",
 				col: in_col.name
 			});
+			let inner_id = (in_col.col || {}).id;
+			if (typeof inner_id === "string" && inner_id !== in_col.name && col_name_breaks_the_rule(inner_id)) conflicts.push({
+				code: "column name breaks the name rule",
+				topic: name || "",
+				col: inner_id
+			});
 			let hook = (in_col.col || {}).hook;
 			if (hook && typeof hook === "object" && !Array.isArray(hook)) for (let [child_topic, fkey_col] of Object.entries(hook)) {
 				if (topic_name_breaks_the_rule(child_topic)) conflicts.push({
 					code: "topic name breaks the name rule",
-					topic: name || "",
-					col: in_col.name
+					topic: child_topic,
+					col: ""
 				});
 				if (col_name_breaks_the_rule(fkey_col)) conflicts.push({
 					code: "column name breaks the name rule",
-					topic: name || "",
-					col: in_col.name
+					topic: child_topic,
+					col: String(fkey_col)
 				});
 			}
 		}
@@ -76963,13 +76969,19 @@ function render_import_plan(gobj, plan) {
 			"div",
 			{ class: "SCHEMA_IMPORT_CONFLICTS notification is-danger is-light p-3" },
 			plan.conflicts.map((conflict) => {
+				let where = conflict.col ? `${conflict.topic}.${conflict.col}` : conflict.topic;
 				return [
 					"p",
-					{
-						class: "SCHEMA_IMPORT_CONFLICT is-size-7",
-						i18n: conflict.code
-					},
-					(0, i18next.t)(conflict.code)
+					{ class: "SCHEMA_IMPORT_CONFLICT is-size-7" },
+					[[
+						"span",
+						{ i18n: conflict.code },
+						(0, i18next.t)(conflict.code)
+					], where ? [
+						"code",
+						{ class: "SCHEMA_IMPORT_CONFLICT_NAME ml-2" },
+						text_node(where)
+					] : null].filter(Boolean)
 				];
 			})
 		]));

package/dist/gobj-ui.es.js

@@ -73639,17 +73639,23 @@ function plan_import(treedb, incoming, options) {
 				topic: name || "",
 				col: in_col.name
 			});
+			let inner_id = (in_col.col || {}).id;
+			if (typeof inner_id === "string" && inner_id !== in_col.name && col_name_breaks_the_rule(inner_id)) conflicts.push({
+				code: "column name breaks the name rule",
+				topic: name || "",
+				col: inner_id
+			});
 			let hook = (in_col.col || {}).hook;
 			if (hook && typeof hook === "object" && !Array.isArray(hook)) for (let [child_topic, fkey_col] of Object.entries(hook)) {
 				if (topic_name_breaks_the_rule(child_topic)) conflicts.push({
 					code: "topic name breaks the name rule",
-					topic: name || "",
-					col: in_col.name
+					topic: child_topic,
+					col: ""
 				});
 				if (col_name_breaks_the_rule(fkey_col)) conflicts.push({
 					code: "column name breaks the name rule",
-					topic: name || "",
-					col: in_col.name
+					topic: child_topic,
+					col: String(fkey_col)
 				});
 			}
 		}
@@ -76958,13 +76964,19 @@ function render_import_plan(gobj, plan) {
 			"div",
 			{ class: "SCHEMA_IMPORT_CONFLICTS notification is-danger is-light p-3" },
 			plan.conflicts.map((conflict) => {
+				let where = conflict.col ? `${conflict.topic}.${conflict.col}` : conflict.topic;
 				return [
 					"p",
-					{
-						class: "SCHEMA_IMPORT_CONFLICT is-size-7",
-						i18n: conflict.code
-					},
-					t(conflict.code)
+					{ class: "SCHEMA_IMPORT_CONFLICT is-size-7" },
+					[[
+						"span",
+						{ i18n: conflict.code },
+						t(conflict.code)
+					], where ? [
+						"code",
+						{ class: "SCHEMA_IMPORT_CONFLICT_NAME ml-2" },
+						text_node(where)
+					] : null].filter(Boolean)
 				];
 			})
 		]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuneta/gobj-ui",
-  "version": "7.26.23",
+  "version": "7.26.24",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",

package/src/c_yui_schema_editor.js

@@ -2684,8 +2684,15 @@ function render_import_plan(gobj, plan)
         $pane.appendChild(createElement2(
             ["div", {class: "SCHEMA_IMPORT_CONFLICTS notification is-danger is-light p-3"},
                 plan.conflicts.map((conflict) => {
-                    return ["p", {class: "SCHEMA_IMPORT_CONFLICT is-size-7", i18n: conflict.code},
-                        t(conflict.code)];
+                    /*  What the conflict is about, said: two bad entries of
+                     *  one hook map were two identical lines.  */
+                    let where = conflict.col
+                        ? `${conflict.topic}.${conflict.col}`
+                        : conflict.topic;
+                    return ["p", {class: "SCHEMA_IMPORT_CONFLICT is-size-7"}, [
+                        ["span", {i18n: conflict.code}, t(conflict.code)],
+                        where ? ["code", {class: "SCHEMA_IMPORT_CONFLICT_NAME ml-2"}, text_node(where)] : null
+                    ].filter(Boolean)];
                 })]
         ));
         if(priv.import_run) {

package/src/schema_editor_reload.wiring.test.js

@@ -1768,6 +1768,8 @@ describe("aria-invalid of the name field", () => {
         };
         save("a/b");
         expect($value.getAttribute("aria-invalid")).toBe("true");
+        save("users");      // a duplicate: the topic is there
+        expect($value.getAttribute("aria-invalid")).toBe("true");
         save("ok_name");
         expect($value.getAttribute("aria-invalid")).toBe(null);
         take("update-node");

package/src/schema_import.js

@@ -233,18 +233,28 @@ function plan_import(treedb, incoming, options)
             if(col_name_breaks_the_rule(in_col.name)) {
                 conflicts.push({code: "column name breaks the name rule", topic: name || "", col: in_col.name});
             }
+            /*  A dict column carries its id twice: the key (what is
+             *  imported) and its own `id`. One that breaks the rule is said
+             *  too, not imported under the key in silence.  */
+            let inner_id = (in_col.col || {}).id;
+            if(typeof inner_id === "string" && inner_id !== in_col.name &&
+                    col_name_breaks_the_rule(inner_id)) {
+                conflicts.push({code: "column name breaks the name rule", topic: name || "", col: inner_id});
+            }
             /*  The hook map names a child topic and its fkey column: names
              *  the treedb refuses too, even when no column declares them.  */
             let hook = (in_col.col || {}).hook;
             if(hook && typeof hook === "object" && !Array.isArray(hook)) {
                 for(let [child_topic, fkey_col] of Object.entries(hook)) {
+                    /*  The conflict names the BAD name (the child topic, its
+                     *  fkey), not the hook column that maps to it.  */
                     if(topic_name_breaks_the_rule(child_topic)) {
                         conflicts.push({code: "topic name breaks the name rule",
-                                        topic: name || "", col: in_col.name});
+                                        topic: child_topic, col: ""});
                     }
                     if(col_name_breaks_the_rule(fkey_col)) {
                         conflicts.push({code: "column name breaks the name rule",
-                                        topic: name || "", col: in_col.name});
+                                        topic: child_topic, col: String(fkey_col)});
                     }
                 }
             }

package/src/schema_import.test.js

@@ -310,3 +310,22 @@ describe("the import reads the hook map and the treedb id (REV-CLOUD V15.4)", ()
         expect(codes).toContain("column has no name");
     });
 });
+
+
+describe("a conflict names the bad name (REV-CLOUD V16.5)", () => {
+    test("the child topic and the fkey of a hook map, and a dict column's inner id", () => {
+        let plan = plan_import(null, {
+            id: "db", schema_version: "1",
+            topics: [{id: "p", pkey: "id", cols: {
+                "id": {id: "id", type: "string"},
+                "kids": {id: "kids", type: "dict", flag: ["hook"], hook: {"a/b": "x`y"}},
+                "good": {id: "go`od", type: "string"},
+            }}]
+        });
+        expect(plan.writes).toEqual([]);
+        let named = plan.conflicts.map((c) => `${c.code}|${c.topic}|${c.col}`);
+        expect(named).toContain("topic name breaks the name rule|a/b|");
+        expect(named).toContain("column name breaks the name rule|a/b|x`y");
+        expect(named).toContain("column name breaks the name rule|p|go`od");
+    });
+});