@yuneta/gobj-ui 7.23.187 → 7.23.188

package/dist/gobj-ui.cjs.js

@@ -30399,54 +30399,57 @@ function plan_graph_saves(live, saved) {
 *          treedb_node_label.js
 *
 *      Pure, testable logic behind the label of a node in the treedb
-*      graph: WHAT A RECORD IS CALLED, which is not always what it is
-*      keyed by. Kept out of the gclass so it can be unit-tested with
-*      no DOM and no G6.
+*      graph: WHAT A RECORD IS CALLED. Kept out of the gclass so it can
+*      be unit-tested with no DOM and no G6.
 *
 *          Copyright (c) 2026, ArtGins.
 *          All Rights Reserved.
 ***********************************************************************/
-/************************************************************
-*  What a node is CALLED, which is not always what it is
-*  keyed by.
-*
-*  A topic whose id column is flagged `rowid`, `uuid` or
-*  `qualified` keys its records by something that is not the
-*  name — a counter, a random string, or the name with every
-*  ancestor in front of it — and the name a human knows the
-*  record by lives in the secondary key the topic declares
-*  (`pkey2s`, carried in the desc since SDK > 7.13.0). The
-*  `topics` and `cols` topics of treedb_system_schema are the
-*  case that forced this: named in `value`, so every card in
-*  the graph read "181", "225", "193" while they were keyed by
-*  rowid, and reads the whole path now that they are
-*  qualified.
-*
-*  The pkey stays reachable: it is the card's tooltip.
-*
-*  Falls back to the id whenever the schema does not say
-*  otherwise — an older node whose desc carries no `pkey2s`
-*  included.
+var SEP = " · ";
+/************************************************************
+*  What a node is CALLED: **its id, and the secondary keys it
+*  carries**.
+*
+*  A record is one thing and an INSTANCE of it is another: the
+*  topic keys the record by `id` and the instance by the
+*  columns it declares in `pkey2s`. A card that shows one
+*  without the other is a card that cannot be identified --
+*  and it used to show one INSTEAD of the other, so the yunos
+*  of an agent read `7.23.0-1`, `7.23.0-1`, `7.23.0-1` (the
+*  release, which they share) and never said which yuno each
+*  one was, while a `configurations` card read `1`.
+*
+*  It came from the opposite case, and that one still works:
+*  the `topics` and `cols` of treedb_system_schema are keyed
+*  by a rowid, so the card said "181" and the name lived in
+*  the pkey2. Now it says both -- `181 · yuno_role` -- which
+*  is what the record is: that name, under that key.
+*
+*  Rules:
+*      - the id always opens the label;
+*      - every pkey2 the record carries follows it, in the
+*        order the topic declares them, separated by `·`;
+*      - a pkey2 whose value is empty, absent or equal to the
+*        id adds nothing;
+*      - a desc with no `pkey2s` (an older node's schema
+*        included) gives the bare id.
 ************************************************************/
 function node_label(desc, record) {
 	let id = record.id;
-	let id_col = null;
-	if (Array.isArray(desc.cols)) {
-		for (let col of desc.cols) if (col && col.id === (desc.pkey || "id")) {
-			id_col = col;
-			break;
-		}
-	}
-	if (!id_col || !Array.isArray(id_col.flag)) return id;
-	if (id_col.flag.indexOf("rowid") < 0 && id_col.flag.indexOf("uuid") < 0 && id_col.flag.indexOf("qualified") < 0) return id;
-	let pkey2s = desc.pkey2s;
+	let pkey2s = desc ? desc.pkey2s : null;
 	if (typeof pkey2s === "string") pkey2s = pkey2s ? [pkey2s] : [];
-	if (!Array.isArray(pkey2s)) return id;
+	if (!Array.isArray(pkey2s) || pkey2s.length === 0) return id;
+	let parts = [];
 	for (let name of pkey2s) {
+		if (!name) continue;
 		let value = record[name];
-		if (typeof value === "string" && value.length > 0) return value;
+		if (typeof value === "number") value = String(value);
+		if (typeof value !== "string" || value.length === 0) continue;
+		if (value === String(id)) continue;
+		parts.push(value);
 	}
-	return id;
+	if (parts.length === 0) return id;
+	return [id, ...parts].join(SEP);
 }
 //#endregion
 //#region src/treedb_fold_model.js

package/dist/gobj-ui.es.js

@@ -30394,54 +30394,57 @@ function plan_graph_saves(live, saved) {
 *          treedb_node_label.js
 *
 *      Pure, testable logic behind the label of a node in the treedb
-*      graph: WHAT A RECORD IS CALLED, which is not always what it is
-*      keyed by. Kept out of the gclass so it can be unit-tested with
-*      no DOM and no G6.
+*      graph: WHAT A RECORD IS CALLED. Kept out of the gclass so it can
+*      be unit-tested with no DOM and no G6.
 *
 *          Copyright (c) 2026, ArtGins.
 *          All Rights Reserved.
 ***********************************************************************/
-/************************************************************
-*  What a node is CALLED, which is not always what it is
-*  keyed by.
-*
-*  A topic whose id column is flagged `rowid`, `uuid` or
-*  `qualified` keys its records by something that is not the
-*  name — a counter, a random string, or the name with every
-*  ancestor in front of it — and the name a human knows the
-*  record by lives in the secondary key the topic declares
-*  (`pkey2s`, carried in the desc since SDK > 7.13.0). The
-*  `topics` and `cols` topics of treedb_system_schema are the
-*  case that forced this: named in `value`, so every card in
-*  the graph read "181", "225", "193" while they were keyed by
-*  rowid, and reads the whole path now that they are
-*  qualified.
-*
-*  The pkey stays reachable: it is the card's tooltip.
-*
-*  Falls back to the id whenever the schema does not say
-*  otherwise — an older node whose desc carries no `pkey2s`
-*  included.
+var SEP = " · ";
+/************************************************************
+*  What a node is CALLED: **its id, and the secondary keys it
+*  carries**.
+*
+*  A record is one thing and an INSTANCE of it is another: the
+*  topic keys the record by `id` and the instance by the
+*  columns it declares in `pkey2s`. A card that shows one
+*  without the other is a card that cannot be identified --
+*  and it used to show one INSTEAD of the other, so the yunos
+*  of an agent read `7.23.0-1`, `7.23.0-1`, `7.23.0-1` (the
+*  release, which they share) and never said which yuno each
+*  one was, while a `configurations` card read `1`.
+*
+*  It came from the opposite case, and that one still works:
+*  the `topics` and `cols` of treedb_system_schema are keyed
+*  by a rowid, so the card said "181" and the name lived in
+*  the pkey2. Now it says both -- `181 · yuno_role` -- which
+*  is what the record is: that name, under that key.
+*
+*  Rules:
+*      - the id always opens the label;
+*      - every pkey2 the record carries follows it, in the
+*        order the topic declares them, separated by `·`;
+*      - a pkey2 whose value is empty, absent or equal to the
+*        id adds nothing;
+*      - a desc with no `pkey2s` (an older node's schema
+*        included) gives the bare id.
 ************************************************************/
 function node_label(desc, record) {
 	let id = record.id;
-	let id_col = null;
-	if (Array.isArray(desc.cols)) {
-		for (let col of desc.cols) if (col && col.id === (desc.pkey || "id")) {
-			id_col = col;
-			break;
-		}
-	}
-	if (!id_col || !Array.isArray(id_col.flag)) return id;
-	if (id_col.flag.indexOf("rowid") < 0 && id_col.flag.indexOf("uuid") < 0 && id_col.flag.indexOf("qualified") < 0) return id;
-	let pkey2s = desc.pkey2s;
+	let pkey2s = desc ? desc.pkey2s : null;
 	if (typeof pkey2s === "string") pkey2s = pkey2s ? [pkey2s] : [];
-	if (!Array.isArray(pkey2s)) return id;
+	if (!Array.isArray(pkey2s) || pkey2s.length === 0) return id;
+	let parts = [];
 	for (let name of pkey2s) {
+		if (!name) continue;
 		let value = record[name];
-		if (typeof value === "string" && value.length > 0) return value;
+		if (typeof value === "number") value = String(value);
+		if (typeof value !== "string" || value.length === 0) continue;
+		if (value === String(id)) continue;
+		parts.push(value);
 	}
-	return id;
+	if (parts.length === 0) return id;
+	return [id, ...parts].join(SEP);
 }
 //#endregion
 //#region src/treedb_fold_model.js

package/package.json

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

package/src/treedb_node_label.js

@@ -2,78 +2,78 @@
  *          treedb_node_label.js
  *
  *      Pure, testable logic behind the label of a node in the treedb
- *      graph: WHAT A RECORD IS CALLED, which is not always what it is
- *      keyed by. Kept out of the gclass so it can be unit-tested with
- *      no DOM and no G6.
+ *      graph: WHAT A RECORD IS CALLED. Kept out of the gclass so it can
+ *      be unit-tested with no DOM and no G6.
  *
  *          Copyright (c) 2026, ArtGins.
  *          All Rights Reserved.
  ***********************************************************************/
 
+const SEP = " · ";     /*  the middle dot the shell titles use  */
+
 /************************************************************
- *  What a node is CALLED, which is not always what it is
- *  keyed by.
+ *  What a node is CALLED: **its id, and the secondary keys it
+ *  carries**.
  *
- *  A topic whose id column is flagged `rowid`, `uuid` or
- *  `qualified` keys its records by something that is not the
- *  name — a counter, a random string, or the name with every
- *  ancestor in front of it — and the name a human knows the
- *  record by lives in the secondary key the topic declares
- *  (`pkey2s`, carried in the desc since SDK > 7.13.0). The
- *  `topics` and `cols` topics of treedb_system_schema are the
- *  case that forced this: named in `value`, so every card in
- *  the graph read "181", "225", "193" while they were keyed by
- *  rowid, and reads the whole path now that they are
- *  qualified.
+ *  A record is one thing and an INSTANCE of it is another: the
+ *  topic keys the record by `id` and the instance by the
+ *  columns it declares in `pkey2s`. A card that shows one
+ *  without the other is a card that cannot be identified --
+ *  and it used to show one INSTEAD of the other, so the yunos
+ *  of an agent read `7.23.0-1`, `7.23.0-1`, `7.23.0-1` (the
+ *  release, which they share) and never said which yuno each
+ *  one was, while a `configurations` card read `1`.
  *
- *  The pkey stays reachable: it is the card's tooltip.
+ *  It came from the opposite case, and that one still works:
+ *  the `topics` and `cols` of treedb_system_schema are keyed
+ *  by a rowid, so the card said "181" and the name lived in
+ *  the pkey2. Now it says both -- `181 · yuno_role` -- which
+ *  is what the record is: that name, under that key.
  *
- *  Falls back to the id whenever the schema does not say
- *  otherwise — an older node whose desc carries no `pkey2s`
- *  included.
+ *  Rules:
+ *      - the id always opens the label;
+ *      - every pkey2 the record carries follows it, in the
+ *        order the topic declares them, separated by `·`;
+ *      - a pkey2 whose value is empty, absent or equal to the
+ *        id adds nothing;
+ *      - a desc with no `pkey2s` (an older node's schema
+ *        included) gives the bare id.
  ************************************************************/
 export function node_label(desc, record)
 {
-    /*  treedb stores every record under `id` (the pkey name is fixed in
-     *  tranger2_create_topic), so the fallback reads `id` while the FLAGS
-     *  are read from whatever column the desc names as the pkey.  */
+    /*  treedb stores every record under `id`: the pkey name is fixed in
+     *  tranger2_create_topic, whatever the desc calls it.  */
     let id = record.id;
 
-    let id_col = null;
-    if(Array.isArray(desc.cols)) {
-        for(let col of desc.cols) {
-            if(col && col.id === (desc.pkey || "id")) {
-                id_col = col;
-                break;
-            }
-        }
-    }
-    if(!id_col || !Array.isArray(id_col.flag)) {
-        return id;
-    }
-    if(id_col.flag.indexOf("rowid") < 0 &&
-        id_col.flag.indexOf("uuid") < 0 &&
-        id_col.flag.indexOf("qualified") < 0
-    ) {
-        return id;
-    }
-
+    let pkey2s = desc? desc.pkey2s : null;
     /*  `pkey2s` is a list in the desc, but the schema literal may
-     *  declare it as a bare string — take either.  */
-    let pkey2s = desc.pkey2s;
+     *  declare it as a bare string -- take either.  */
     if(typeof pkey2s === "string") {
         pkey2s = pkey2s? [pkey2s] : [];
     }
-    if(!Array.isArray(pkey2s)) {
+    if(!Array.isArray(pkey2s) || pkey2s.length === 0) {
         return id;
     }
+
+    let parts = [];
     for(let name of pkey2s) {
+        if(!name) {
+            continue;
+        }
         let value = record[name];
-        if(typeof value === "string" && value.length > 0) {
-            return value;
+        if(typeof value === "number") {
+            value = String(value);
+        }
+        if(typeof value !== "string" || value.length === 0) {
+            continue;
+        }
+        if(value === String(id)) {
+            continue;   /*  the same thing twice says nothing  */
         }
+        parts.push(value);
     }
-
-    return id;
+    if(parts.length === 0) {
+        return id;
+    }
+    return [id, ...parts].join(SEP);
 }
-

package/src/treedb_node_label.test.js

@@ -1,8 +1,10 @@
 /***********************************************************************
  *          treedb_node_label.test.js
  *
- *      The label of a treedb graph node: the pkey when it names the
- *      record, the secondary key when the pkey is synthetic.
+ *      The label of a treedb graph node: its id, and the secondary
+ *      keys it carries. A record is one thing and an INSTANCE of it
+ *      another, and a card that shows one without the other cannot be
+ *      identified.
  *
  *          Copyright (c) 2026, ArtGins.
  *          All Rights Reserved.
@@ -35,44 +37,67 @@ const REALMS_DESC = {
 };
 
 describe("node_label", () => {
-    it("uses the secondary key when the pkey is a rowid", () => {
+    const DOT = " \u00b7 ";
+
+    it("says the id AND the secondary key that names the record", () => {
         expect(node_label(COLS_DESC, {id: "181", value: "yuno_role"}))
-            .toBe("yuno_role");
+            .toBe("181" + DOT + "yuno_role");
+    });
+
+    it("says the id AND the instance: the case that brought it", () => {
+        /*  Three yunos of one agent, all of release 7.23.0-1: the cards
+         *  read `7.23.0-1` three times and never said which yuno.  */
+        let yunos = {
+            topic_name: "yunos",
+            pkey:       "id",
+            pkey2s:     ["yuno_release"],
+            cols: [
+                {id: "id",           type: "string", flag: ["persistent", "rowid"]},
+                {id: "yuno_release", type: "string", flag: ["persistent"]},
+            ],
+        };
+        expect(node_label(yunos, {id: "1", yuno_release: "7.23.0-1"}))
+            .toBe("1" + DOT + "7.23.0-1");
+        expect(node_label(yunos, {id: "1600", yuno_release: "1.8.1.0-2"}))
+            .toBe("1600" + DOT + "1.8.1.0-2");
     });
 
-    it("uses the pkey when it names the record", () => {
+    it("gives the bare id when the topic declares no secondary key", () => {
         expect(node_label(REALMS_DESC, {id: "artgins.utilities.all", realm_name: "all"}))
             .toBe("artgins.utilities.all");
     });
 
     it("accepts a pkey2s declared as a bare string", () => {
         let desc = {...COLS_DESC, pkey2s: "value"};
-        expect(node_label(desc, {id: "181", value: "yuno_role"})).toBe("yuno_role");
+        expect(node_label(desc, {id: "181", value: "yuno_role"}))
+            .toBe("181" + DOT + "yuno_role");
     });
 
-    it("treats a qualified pkey like a rowid one", () => {
-        let desc = {
-            ...COLS_DESC,
-            cols: [
-                {id: "id",    type: "string", flag: ["persistent", "qualified"]},
-                {id: "value", type: "string", flag: ["persistent", "required"]},
-            ],
-        };
-        expect(node_label(desc, {
-            id:    "treedb_yunovatioscodb.yunos.yuno_role",
-            value: "yuno_role",
-        })).toBe("yuno_role");
+    it("does not care what the id column is flagged", () => {
+        /*  rowid, uuid, qualified or nothing at all: the id is shown
+         *  either way, and the flags decide nothing here any more.  */
+        for(let flag of [["persistent", "uuid"], ["persistent", "qualified"], ["persistent"]]) {
+            let desc = {
+                ...COLS_DESC,
+                cols: [
+                    {id: "id",    type: "string", flag: flag},
+                    {id: "value", type: "string", flag: ["persistent", "required"]},
+                ],
+            };
+            expect(node_label(desc, {id: "k", value: "named"})).toBe("k" + DOT + "named");
+        }
     });
 
-    it("treats a uuid pkey like a rowid one", () => {
-        let desc = {
-            ...COLS_DESC,
-            cols: [
-                {id: "id",    type: "string", flag: ["persistent", "uuid"]},
-                {id: "value", type: "string", flag: ["persistent", "required"]},
-            ],
-        };
-        expect(node_label(desc, {id: "3f2a…", value: "named"})).toBe("named");
+    it("says every secondary key the topic declares, in its order", () => {
+        let desc = {topic_name: "x", pkey: "id", pkey2s: ["a", "b"], cols: []};
+        expect(node_label(desc, {id: "7", a: "one", b: "two"}))
+            .toBe("7" + DOT + "one" + DOT + "two");
+    });
+
+    it("skips a secondary key that is empty, absent or the id again", () => {
+        expect(node_label(COLS_DESC, {id: "181", value: ""})).toBe("181");
+        expect(node_label(COLS_DESC, {id: "181"})).toBe("181");
+        expect(node_label(COLS_DESC, {id: "181", value: "181"})).toBe("181");
     });
 
     it("falls back to the id when the desc carries no pkey2s (older node)", () => {
@@ -80,27 +105,13 @@ describe("node_label", () => {
         expect(node_label(desc, {id: "181", value: "yuno_role"})).toBe("181");
     });
 
-    it("falls back to the id when the secondary key is empty in the record", () => {
-        expect(node_label(COLS_DESC, {id: "181", value: ""})).toBe("181");
-        expect(node_label(COLS_DESC, {id: "181"})).toBe("181");
-    });
-
-    it("honours a pkey that is not called 'id'", () => {
-        let desc = {
-            topic_name: "x",
-            pkey:       "key",
-            pkey2s:     ["name"],
-            cols: [
-                {id: "key",  type: "string", flag: ["persistent", "rowid"]},
-                {id: "name", type: "string", flag: ["persistent", "required"]},
-                /*  A col called `id` that is NOT the pkey must not decide.  */
-                {id: "id",   type: "string", flag: ["persistent"]},
-            ],
-        };
-        expect(node_label(desc, {id: "7", key: "7", name: "seven"})).toBe("seven");
+    it("takes a numeric secondary key as the text it is", () => {
+        expect(node_label(COLS_DESC, {id: "emailsender.artgins", value: 1}))
+            .toBe("emailsender.artgins" + DOT + "1");
     });
 
-    it("survives a desc with no cols", () => {
+    it("survives a desc with no cols, and no desc at all", () => {
         expect(node_label({topic_name: "x", pkey: "id"}, {id: "42"})).toBe("42");
+        expect(node_label(null, {id: "42"})).toBe("42");
     });
 });