@yuneta/gobj-ui 5.17.0 → 6.0.0

package/README.md

@@ -434,15 +434,17 @@ Logical DOM classes: `JSON_VIEWER`, `JSON_TOOLBAR`, `JSON_SEARCH`, `JSON_TREE`,
 
 `C_G6_NODES_TREE` (the record graph inside `C_YUI_TREEDB_GRAPH`) labels a card
 by what NAMES the record, which is not always what KEYS it. A topic whose id
-column is flagged `rowid` or `uuid` keys its records by a value nobody reads —
-that is the point of those flags — and the name lives in the secondary key the
+column is flagged `rowid`, `uuid` or `qualified` keys its records by something
+that is not the plain name — a counter, a random string, or the name with
+every ancestor in front of it — and the name lives in the secondary key the
 topic declares (`pkey2s`). `treedb_system_schema` is the case that forced it:
-its `topics` and `cols` records are keyed by rowid and named in `value`, so the
-graph drew cards reading `181`, `225`, `193`.
+its `topics` and `cols` records are named in `value`, so the graph drew cards
+reading `181`, `225`, `193` while they were keyed by rowid, and would read the
+whole path now that they are qualified.
 
 The rule is in **`treedb_node_label.js`** (pure, unit-tested): read the pkey
-column's flags from the desc; if the key is synthetic, take the first `pkey2s`
-field the record actually carries; otherwise keep the id. **The pkey is never
+column's flags from the desc; if the key is not the plain name, take the first
+`pkey2s` field the record actually carries; otherwise keep the id. **The pkey is never
 lost** — it is the card's tooltip, on the chip and on the entity card alike.
 
 It needs the descriptor to carry `pkey2s`, which `tranger2_topic_desc()` only

package/dist/gobj-ui.cjs.js

@@ -6472,6 +6472,7 @@ function build_form_field_conf(gobj, field_desc) {
 			field_conf.extras.pattern = "^-?\\d+(\\.\\d+)?$";
 			break;
 		case "rowid":
+		case "qualified":
 			field_conf.tag = "input";
 			field_conf.inputType = "text";
 			break;
@@ -6613,7 +6614,8 @@ function build_fkey_ref$1(gobj, field_desc, value) {
 /************************************************************
 *  Apply the form mode to the pkey field:
 *      "update" -> pkey readonly, not required
-*      "create" -> pkey writable and required (readonly if rowid)
+*      "create" -> pkey writable and required, unless the store
+*                  hands the key out itself (rowid, qualified)
 *  Empty form_mode keeps the template-declared behaviour
 *  (backward compatible).
 ************************************************************/
@@ -6626,8 +6628,8 @@ function apply_form_mode(gobj, $form) {
 		(0, _yuneta_gobj_js.log_error)((0, _yuneta_gobj_js.sprintf)("%s: form_mode '%s' but form has no pkey field '%s'", (0, _yuneta_gobj_js.gobj_short_name)(gobj), mode, pkey));
 		return;
 	}
-	let is_rowid = $input.field_desc && $input.field_desc.type === "rowid";
-	if (mode === "create" && !is_rowid) {
+	let type = $input.field_desc ? $input.field_desc.type : "";
+	if (mode === "create" && !(type === "rowid" || type === "qualified")) {
 		$input.removeAttribute("readonly");
 		$input.setAttribute("required", "");
 	} else {
@@ -7405,6 +7407,7 @@ function template2columns(gobj, columns, template, sub_elements) {
 				};
 				break;
 			case "rowid":
+			case "qualified":
 				column = null;
 				break;
 			case "boolean":
@@ -7770,6 +7773,7 @@ function treedb_value_2_form_value(gobj, field_desc, value) {
 		case "enum":
 		case "uuid":
 		case "rowid":
+		case "qualified":
 		case "password":
 		case "email":
 		case "url": break;
@@ -7853,6 +7857,7 @@ function form_value_2_treedb_value(gobj, field_desc, value) {
 		case "enum":
 		case "uuid":
 		case "rowid":
+		case "qualified":
 		case "password":
 		case "email":
 		case "url": break;
@@ -16930,7 +16935,8 @@ function transform__treedb_value_2_table_value(gobj, col, value, row, field) {
 		case "email":
 		case "tel":
 		case "url":
-		case "rowid": break;
+		case "rowid":
+		case "qualified": break;
 		case "integer": break;
 		case "real": break;
 		case "boolean": break;
@@ -17393,6 +17399,7 @@ function transform__form_value_2_treedb_value(gobj, col, value, operation) {
 	const field_desc = (0, _yuneta_gobj_js.treedb_get_field_desc)(col);
 	switch (field_desc.type) {
 		case "rowid":
+		case "qualified":
 			if (operation === "create") value = "";
 			break;
 		case "string":
@@ -20355,14 +20362,17 @@ function register_c_yui_treedb_schema() {
 *  What a node is CALLED, which is not always what it is
 *  keyed by.
 *
-*  A topic whose id column is flagged `rowid` or `uuid` keys
-*  its records by a value nobody reads — that is the point of
-*  those flags — 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: keyed by rowid, named in `value`, so every
-*  card in the graph read "181", "225", "193".
+*  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.
 *
@@ -20380,7 +20390,7 @@ function node_label(desc, record) {
 		}
 	}
 	if (!id_col || !Array.isArray(id_col.flag)) return id;
-	if (id_col.flag.indexOf("rowid") < 0 && id_col.flag.indexOf("uuid") < 0) 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;
 	if (typeof pkey2s === "string") pkey2s = pkey2s ? [pkey2s] : [];
 	if (!Array.isArray(pkey2s)) return id;

package/dist/gobj-ui.es.js

@@ -6467,6 +6467,7 @@ function build_form_field_conf(gobj, field_desc) {
 			field_conf.extras.pattern = "^-?\\d+(\\.\\d+)?$";
 			break;
 		case "rowid":
+		case "qualified":
 			field_conf.tag = "input";
 			field_conf.inputType = "text";
 			break;
@@ -6608,7 +6609,8 @@ function build_fkey_ref$1(gobj, field_desc, value) {
 /************************************************************
 *  Apply the form mode to the pkey field:
 *      "update" -> pkey readonly, not required
-*      "create" -> pkey writable and required (readonly if rowid)
+*      "create" -> pkey writable and required, unless the store
+*                  hands the key out itself (rowid, qualified)
 *  Empty form_mode keeps the template-declared behaviour
 *  (backward compatible).
 ************************************************************/
@@ -6621,8 +6623,8 @@ function apply_form_mode(gobj, $form) {
 		log_error(sprintf("%s: form_mode '%s' but form has no pkey field '%s'", gobj_short_name(gobj), mode, pkey));
 		return;
 	}
-	let is_rowid = $input.field_desc && $input.field_desc.type === "rowid";
-	if (mode === "create" && !is_rowid) {
+	let type = $input.field_desc ? $input.field_desc.type : "";
+	if (mode === "create" && !(type === "rowid" || type === "qualified")) {
 		$input.removeAttribute("readonly");
 		$input.setAttribute("required", "");
 	} else {
@@ -7400,6 +7402,7 @@ function template2columns(gobj, columns, template, sub_elements) {
 				};
 				break;
 			case "rowid":
+			case "qualified":
 				column = null;
 				break;
 			case "boolean":
@@ -7765,6 +7768,7 @@ function treedb_value_2_form_value(gobj, field_desc, value) {
 		case "enum":
 		case "uuid":
 		case "rowid":
+		case "qualified":
 		case "password":
 		case "email":
 		case "url": break;
@@ -7848,6 +7852,7 @@ function form_value_2_treedb_value(gobj, field_desc, value) {
 		case "enum":
 		case "uuid":
 		case "rowid":
+		case "qualified":
 		case "password":
 		case "email":
 		case "url": break;
@@ -16925,7 +16930,8 @@ function transform__treedb_value_2_table_value(gobj, col, value, row, field) {
 		case "email":
 		case "tel":
 		case "url":
-		case "rowid": break;
+		case "rowid":
+		case "qualified": break;
 		case "integer": break;
 		case "real": break;
 		case "boolean": break;
@@ -17388,6 +17394,7 @@ function transform__form_value_2_treedb_value(gobj, col, value, operation) {
 	const field_desc = treedb_get_field_desc(col);
 	switch (field_desc.type) {
 		case "rowid":
+		case "qualified":
 			if (operation === "create") value = "";
 			break;
 		case "string":
@@ -20342,14 +20349,17 @@ function register_c_yui_treedb_schema() {
 *  What a node is CALLED, which is not always what it is
 *  keyed by.
 *
-*  A topic whose id column is flagged `rowid` or `uuid` keys
-*  its records by a value nobody reads — that is the point of
-*  those flags — 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: keyed by rowid, named in `value`, so every
-*  card in the graph read "181", "225", "193".
+*  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.
 *
@@ -20367,7 +20377,7 @@ function node_label(desc, record) {
 		}
 	}
 	if (!id_col || !Array.isArray(id_col.flag)) return id;
-	if (id_col.flag.indexOf("rowid") < 0 && id_col.flag.indexOf("uuid") < 0) 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;
 	if (typeof pkey2s === "string") pkey2s = pkey2s ? [pkey2s] : [];
 	if (!Array.isArray(pkey2s)) return id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuneta/gobj-ui",
-  "version": "5.17.0",
+  "version": "6.0.0",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",
@@ -29,13 +29,13 @@
   "devDependencies": {
     "@rollup/plugin-terser": "^1.0.0",
     "@vitest/coverage-v8": "^4.1.10",
-    "@yuneta/gobj-js": "^7.8.7",
+    "@yuneta/gobj-js": "^7.13.2",
     "vite": "^8.2.1",
     "vitest": "^4.1.10"
   },
   "peerDependencies": {
     "@antv/g6": "^5.1.0",
-    "@yuneta/gobj-js": "^7.8.7",
+    "@yuneta/gobj-js": "^7.13.2",
     "bulma": "^1.0.4",
     "i18next": "^26.3.6",
     "maplibre-gl": "^6.1.0",

package/src/c_yui_form.js

@@ -676,6 +676,7 @@ function build_form_field_conf(gobj, field_desc)
             break;
 
         case "rowid":
+        case "qualified":
             field_conf.tag = 'input';
             field_conf.inputType = 'text';
             break;
@@ -878,7 +879,8 @@ function build_fkey_ref(gobj, field_desc, value)
 /************************************************************
  *  Apply the form mode to the pkey field:
  *      "update" -> pkey readonly, not required
- *      "create" -> pkey writable and required (readonly if rowid)
+ *      "create" -> pkey writable and required, unless the store
+ *                  hands the key out itself (rowid, qualified)
  *  Empty form_mode keeps the template-declared behaviour
  *  (backward compatible).
  ************************************************************/
@@ -898,8 +900,11 @@ function apply_form_mode(gobj, $form)
         return;
     }
 
-    let is_rowid = $input.field_desc && $input.field_desc.type === "rowid";
-    if(mode === "create" && !is_rowid) {
+    /*  A key the store composes is never typed: a rowid comes from the
+     *  topic size, a qualified id from the parent and the name.  */
+    let type = $input.field_desc? $input.field_desc.type: "";
+    let store_makes_the_key = (type === "rowid" || type === "qualified");
+    if(mode === "create" && !store_makes_the_key) {
         $input.removeAttribute("readonly");
         $input.setAttribute("required", "");
     } else {
@@ -1826,6 +1831,7 @@ function template2columns(gobj, columns, template, sub_elements)
                 break;
 
             case "rowid":
+            case "qualified":
                 // field_conf.tag = 'input';
                 // field_conf.inputType = 'text';
                 column = null;
@@ -2448,6 +2454,7 @@ function treedb_value_2_form_value(gobj, field_desc, value)
         case "enum":
         case "uuid":
         case "rowid":
+        case "qualified":
         case "password":
         case "email":
         case "url":
@@ -2572,6 +2579,7 @@ function form_value_2_treedb_value(gobj, field_desc, value)
         case "enum":
         case "uuid":
         case "rowid":
+        case "qualified":
         case "password":
         case "email":
         case "url":

package/src/c_yui_treedb_topic_with_form.js

@@ -1082,7 +1082,8 @@ function transform__treedb_value_2_table_value(gobj, col, value, row, field)
         case "email":   // string subtype — plain text in the cell
         case "tel":     // string subtype — plain text in the cell
         case "url":     // string subtype — plain text in the cell
-        case "rowid":   // the record's own key — shown as it comes
+        case "rowid":       // the record's own key — shown as it comes
+        case "qualified":   // idem, the name with its ancestors in front
             break;
         case "integer":
             break;
@@ -1758,6 +1759,9 @@ function transform__form_value_2_treedb_value(gobj, col, value, operation)
 
     switch(field_desc.type) {
         case "rowid":
+        case "qualified":
+            /*  The store hands the key out: a rowid from the topic size, a
+             *  qualified id from the parent and the name.  */
             if(operation==="create") {
                 value = "";
             }

package/src/treedb_node_label.js

@@ -14,14 +14,17 @@
  *  What a node is CALLED, which is not always what it is
  *  keyed by.
  *
- *  A topic whose id column is flagged `rowid` or `uuid` keys
- *  its records by a value nobody reads — that is the point of
- *  those flags — 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: keyed by rowid, named in `value`, so every
- *  card in the graph read "181", "225", "193".
+ *  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.
  *
@@ -48,7 +51,10 @@ export function node_label(desc, record)
     if(!id_col || !Array.isArray(id_col.flag)) {
         return id;
     }
-    if(id_col.flag.indexOf("rowid") < 0 && id_col.flag.indexOf("uuid") < 0) {
+    if(id_col.flag.indexOf("rowid") < 0 &&
+        id_col.flag.indexOf("uuid") < 0 &&
+        id_col.flag.indexOf("qualified") < 0
+    ) {
         return id;
     }
 

package/src/treedb_node_label.test.js

@@ -50,6 +50,20 @@ describe("node_label", () => {
         expect(node_label(desc, {id: "181", value: "yuno_role"})).toBe("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("treats a uuid pkey like a rowid one", () => {
         let desc = {
             ...COLS_DESC,