@yuneta/gobj-ui 7.23.169 → 7.23.170

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuneta/gobj-ui",
-  "version": "7.23.169",
+  "version": "7.23.170",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@rollup/plugin-terser": "^1.0.0",
     "@vitest/coverage-v8": "^4.1.10",
-    "@yuneta/gobj-js": "^7.16.6",
+    "@yuneta/gobj-js": "^7.21.0",
     "vite": "^8.2.1",
     "vitest": "^4.1.10"
   },

package/src/c_yui_treedb_topic_with_form.js

@@ -96,7 +96,9 @@ import {t} from "i18next";
 
 import {yui_toolbar_icon} from "./yui_toolbar.js";
 
-import {plan_treedb_writes, READONLY_FORM_TOOLBAR} from "./treedb_write_plan.js";
+import {
+    plan_treedb_writes, READONLY_FORM_TOOLBAR, col_goes_back_to_treedb
+} from "./treedb_write_plan.js";
 import {
     yui_file_read, yui_files_manifest, yui_file_id_label, yui_file_size_label
 } from "./yui_file_field.js";
@@ -3262,42 +3264,6 @@ function get_schema_col(gobj, id)
     return null;
 }
 
-/************************************************************
- *  Does column `col` travel back to treedb on a write?
- *
- *  The form SHOWS every field and sends back only what the topic
- *  accepts: the writable cols, the fkeys (a link is edited by
- *  linking) and the pkey, which is not written but is what
- *  ADDRESSES the record.
- *
- *  It matters because `treedb_update_node()` does not check
- *  `writable` -- it writes any col it is handed -- so a read-only
- *  field travelling back is written with whatever the form made of
- *  it, and the fields that describe a record are exactly the ones
- *  that do not survive a round trip through a widget: a `time` is an
- *  integer rendered as a `datetime-local`, with no seconds, so every
- *  save moved it back up to 59 s. Nothing looked wrong until the
- *  stored timestamp had moved.
- *
- *  `is_file` and not the type: a `file` column IS an fkey (it is
- *  flagged ['fkey','file']) but answers `type: "file"`, and the write
- *  goes out with `autolink`, which rebuilds the links from what the
- *  record carries. Dropped, a read-only `file` column -- the one only
- *  a load fills -- was UNLINKED by every save of any other field.
- ************************************************************/
-function col_goes_back_to_treedb(gobj, col)
-{
-    let desc = gobj_read_attr(gobj, "desc");
-    let pkey = desc.pkey || "id";
-    const field_desc = treedb_get_field_desc(col);
-
-    if(field_desc.is_writable || field_desc.type === "fkey" ||
-            field_desc.is_file || col.id === pkey) {
-        return true;
-    }
-    return false;
-}
-
 /************************************************************
  *  The record the FORM hands over, without the columns that do
  *  not go back to treedb (see col_goes_back_to_treedb()). The
@@ -3309,7 +3275,7 @@ function strip_read_only_cols(gobj, record)
     let row = {};
     for(let field_name of Object.keys(record || {})) {
         let col = get_schema_col(gobj, field_name);
-        if(col && !col_goes_back_to_treedb(gobj, col)) {
+        if(col && !col_goes_back_to_treedb(gobj_read_attr(gobj, "desc"), col)) {
             continue;
         }
         row[field_name] = record[field_name];
@@ -3336,7 +3302,7 @@ function transform__form_record_2_treedb_record(gobj, kw, operation)
             continue;
         }
 
-        if(!col_goes_back_to_treedb(gobj, col)) {
+        if(!col_goes_back_to_treedb(gobj_read_attr(gobj, "desc"), col)) {
             continue;
         }
 

package/src/treedb_write_plan.js

@@ -19,6 +19,9 @@
  *          All Rights Reserved.
  ***********************************************************************/
 
+import {treedb_get_field_desc} from "@yuneta/gobj-js";
+import {topic_pkey2s} from "./schema_model.js";
+
 /*  What a read-only form keeps: reading a record includes taking it with
  *  you, so `copy` stays and the write half goes.  */
 const READONLY_FORM_TOOLBAR = ["copy"];
@@ -70,4 +73,47 @@ function plan_treedb_writes(flags)
 }
 
 
-export {plan_treedb_writes, READONLY_FORM_TOOLBAR};
+/************************************************************
+ *  Does column `col` travel back to treedb on a write?
+ *
+ *  The form SHOWS every field and sends back only what the topic
+ *  accepts: the writable cols, the fkeys (a link is edited by
+ *  linking) and the pkey, which is not written but is what
+ *  ADDRESSES the record.
+ *
+ *  It matters because `treedb_update_node()` does not check
+ *  `writable` -- it writes any col it is handed -- so a read-only
+ *  field travelling back is written with whatever the form made of
+ *  it, and the fields that describe a record are exactly the ones
+ *  that do not survive a round trip through a widget: a `time` is an
+ *  integer rendered as a `datetime-local`, with no seconds, so every
+ *  save moved it back up to 59 s. Nothing looked wrong until the
+ *  stored timestamp had moved.
+ *
+ *  `is_file` and not the type: a `file` column IS an fkey (it is
+ *  flagged ['fkey','file']) but answers `type: "file"`, and the write
+ *  goes out with `autolink`, which rebuilds the links from what the
+ *  record carries. Dropped, a read-only `file` column -- the one only
+ *  a load fills -- was UNLINKED by every save of any other field.
+ *
+ *  The pkey2s go back for the same reason as the pkey: a secondary key
+ *  names the INSTANCE the update is for (`yunos.yuno_release` in the
+ *  agent), and it is `persistent, required`, not `writable`. Dropped,
+ *  the update reached the backend with no pkey2 and C_NODE resolved it
+ *  to the PRIMARY instance -- right by chance while the table lists
+ *  primaries, wrong from a form opened on a row of `instances`.
+ ************************************************************/
+function col_goes_back_to_treedb(desc, col)
+{
+    let d = desc || {};
+    let pkey = d.pkey || "id";
+    const field_desc = treedb_get_field_desc(col);
+
+    if(field_desc.is_writable || field_desc.type === "fkey" ||
+            field_desc.is_file || col.id === pkey) {
+        return true;
+    }
+    return topic_pkey2s(d).includes(col.id);
+}
+
+export {plan_treedb_writes, READONLY_FORM_TOOLBAR, col_goes_back_to_treedb};

package/src/treedb_write_plan.test.js

@@ -8,7 +8,9 @@
  *      affordance back by accident.
  ***********************************************************************/
 import { describe, test, expect } from "vitest";
-import { plan_treedb_writes, READONLY_FORM_TOOLBAR } from "./treedb_write_plan.js";
+import {
+    plan_treedb_writes, READONLY_FORM_TOOLBAR, col_goes_back_to_treedb
+} from "./treedb_write_plan.js";
 
 const WRITES = ["edition_mode", "new_button", "delete_button", "paste_button", "in_row_icons"];
 
@@ -81,3 +83,53 @@ describe("readonly beats every with_*", () => {
         expect(plan_treedb_writes({readonly: "yes"}).new_button).toBe(false);
     });
 });
+
+
+/***********************************************************************
+ *  Which columns of a form go back in the write. The shape is the
+ *  agent's `yunos`: a pkey, a secondary key that is required but not
+ *  writable, and the read-only columns that never survive a widget.
+ ***********************************************************************/
+const YUNOS_DESC = {
+    pkey: "id",
+    pkey2s: ["yuno_release"],
+};
+const COL = {
+    id:           {id: "id",           type: "string",  flag: ["persistent", "required", "rowid"]},
+    yuno_release: {id: "yuno_release", type: "string",  flag: ["persistent", "required"]},
+    yuno_name:    {id: "yuno_name",    type: "string",  flag: ["persistent", "writable"]},
+    date:         {id: "date",         type: "integer", flag: ["persistent", "time"]},
+    realm_id:     {id: "realm_id",     type: "string",  flag: ["persistent", "fkey"]},
+    photo:        {id: "photo",        type: "string",  flag: ["persistent", "fkey", "file"]},
+    yunos:        {id: "yunos",        type: "object",  flag: ["hook"], hook: {yunos: "realm_id"}},
+};
+
+describe("what goes back to treedb from a form", () => {
+    test("a writable column, an fkey and a file column go back", () => {
+        expect(col_goes_back_to_treedb(YUNOS_DESC, COL.yuno_name)).toBe(true);
+        expect(col_goes_back_to_treedb(YUNOS_DESC, COL.realm_id)).toBe(true);
+        expect(col_goes_back_to_treedb(YUNOS_DESC, COL.photo)).toBe(true);
+    });
+
+    test("a read-only time and a hook stay: they do not survive the widget", () => {
+        expect(col_goes_back_to_treedb(YUNOS_DESC, COL.date)).toBe(false);
+        expect(col_goes_back_to_treedb(YUNOS_DESC, COL.yunos)).toBe(false);
+    });
+
+    test("the pkey goes back although it is not writable: it addresses the record", () => {
+        expect(col_goes_back_to_treedb(YUNOS_DESC, COL.id)).toBe(true);
+    });
+
+    test("a pkey2 goes back although it is not writable: it names the INSTANCE", () => {
+        expect(col_goes_back_to_treedb(YUNOS_DESC, COL.yuno_release)).toBe(true);
+    });
+
+    test("a pkey2s declared as a bare string (the C literal) counts the same", () => {
+        expect(col_goes_back_to_treedb({pkey: "id", pkey2s: "yuno_release"}, COL.yuno_release)).toBe(true);
+    });
+
+    test("without pkey2s in the desc the same column stays read-only", () => {
+        expect(col_goes_back_to_treedb({pkey: "id"}, COL.yuno_release)).toBe(false);
+        expect(col_goes_back_to_treedb(null, COL.yuno_release)).toBe(false);
+    });
+});