@yuneta/gobj-ui 7.25.9 → 7.25.11

package/dist/gobj-ui.es.js

@@ -3156,6 +3156,8 @@ function yui_shell_show_modal(shell, content, opts) {
 						{
 							class: "MODAL_BACK yui-dialog-back",
 							type: "button",
+							title: t("back"),
+							"data-i18n-title": "back",
 							"aria-label": t("back"),
 							"data-i18n-aria-label": "back"
 						},
@@ -3336,7 +3338,13 @@ function build_dialog(shell, message, buttons, opts) {
 			type: "button",
 			"data-modal-button-value": b.value
 		};
-		if (typeof b.label === "string") btn_attrs.i18n = b.label;
+		if (typeof b.label === "string") {
+			btn_attrs.i18n = b.label;
+			btn_attrs.title = t(b.label);
+			btn_attrs["data-i18n-title"] = b.label;
+			btn_attrs["aria-label"] = t(b.label);
+			btn_attrs["data-i18n-aria-label"] = b.label;
+		}
 		return [
 			"button",
 			btn_attrs,
@@ -72097,9 +72105,10 @@ function write_options(op) {
 *      the owner's design of M36 (2026-09-21 review) every write here
 *      raised both versions, so an edit half made was already the
 *      schema of the next start. The topic list marks what this session
-*      wrote and has not saved (the host's EV_REFRESH after a save is
-*      what forgets it) and what the host says is not saved (EV_DRAFTS,
-*      replaced whole each time it is sent).
+*      wrote and has not saved (EV_REFRESH forgets it: the view's own
+*      Refresh button sends it, and a host may after a save -- the
+*      agent console's does not) and what the host says is not saved
+*      (EV_DRAFTS, replaced whole each time it is sent).
 *
 *      WHAT ELSE IS HERE, and why each is here and not somewhere else:
 *
@@ -72377,6 +72386,45 @@ function built_on_a_replaced_model(gobj, event, kw) {
 	yui_shell_show_error(yui_shell_of(gobj), "the schemas were read again: open the dialog again", { t });
 	return true;
 }
+/***************************************************************
+*  The reload a load refused IN session left owed (a routing
+*  adapter's deadline on a slow `nodes`, ac_mt_command_answer()):
+*  the model shown is kept, and it may be older than the store.
+*  The session is up, so no reconnect will ask for it again -- it
+*  was owed for as long as the session lasted, and a form opened
+*  on that model wrote every field of it over the newer record
+*  (fifth independent review; A3 of the fourth, by another path).
+*
+*  So the operator's NEXT action asks it. An edit -- a form, a
+*  write, a confirmation, what reads the model whole (check,
+*  export) -- is refused and said: it would be computed on what
+*  the store may no longer hold, and the load that lands closes a
+*  dialog built on the old model anyway (end_load()). A move is
+*  not refused (reload_after_move()): it goes, and reads there.
+*
+*  Not on a timer, and not at once: a load refused on a deadline
+*  asked again at once is refused the same way, and one asked on a
+*  clock is polling. Out of session nothing is asked; the reconnect
+*  does it (ac_transport_state()). The reload keeps this session's
+*  draft chips: the host did not ask for it.
+***************************************************************/
+function owes_reload(gobj) {
+	let state = gobj_current_state(gobj);
+	return gobj.priv.reload_on_open && transport_in_session(gobj) && state !== "ST_LOADING" && state !== "ST_SAVING";
+}
+function reload_first(gobj, event) {
+	if (!owes_reload(gobj)) return false;
+	gobj.priv.reload_on_open = false;
+	log_warning(`${gobj_short_name(gobj)}: ${event} refused, the schemas shown may be out of date: they are read again first`);
+	yui_shell_show_error(yui_shell_of(gobj), "the schemas shown may be out of date: they are read again, try again when they are in", { t });
+	request_model(gobj, true);
+	return true;
+}
+function reload_after_move(gobj) {
+	if (!owes_reload(gobj)) return 0;
+	gobj.priv.reload_on_open = false;
+	return request_model(gobj, true);
+}
 /***************************
 *      The model
 ***************************/
@@ -72395,11 +72443,14 @@ function built_on_a_replaced_model(gobj, event, kw) {
 *  and a load that LANDS closes it (end_load()): it was built on the
 *  model the load replaced, and its Save sends every field it shows.
 *  An import plan is forgotten here for the same reason: it is a list
-*  of writes computed against the model going away.
+*  of writes computed against the model going away -- once the load
+*  has LEFT (one that could not be sent replaces nothing).
 *
-*  `keep_written`: a load the host did not ask for -- the reconnect,
-*  a write that turned out done -- keeps what this session wrote.
-*  Only the host's EV_REFRESH (a Save sends it) forgets it.
+*  `keep_written`: a load nobody ASKED for -- the reconnect, a write
+*  that turned out done, the reload a refused load owed -- keeps what
+*  this session wrote. Only EV_REFRESH forgets it: the view's own
+*  Refresh button, or a host that sends it (after a Save, say; the
+*  agent console does not).
 *
 *  A load that cannot leave WHOLE did not happen (out of session it
 *  is not even asked): the records the model was built on are put
@@ -72412,8 +72463,7 @@ function built_on_a_replaced_model(gobj, event, kw) {
 function request_model(gobj, keep_written) {
 	let priv = gobj.priv;
 	if (!gobj_read_pointer_attr(gobj, "gobj_remote_yuno")) return -1;
-	forget_import_plan(gobj);
-	let previous = priv.records;
+	let previous = gobj_current_state(gobj) === "ST_LOADING" ? priv.records_before : priv.records;
 	priv.records_before = previous;
 	priv.records = {
 		treedbs: [],
@@ -72448,6 +72498,7 @@ function request_model(gobj, keep_written) {
 		end_load(gobj);
 		return -1;
 	}
+	forget_import_plan(gobj);
 	priv.pending = left;
 	return 0;
 }
@@ -72513,8 +72564,8 @@ function build_model(gobj) {
 *  Called ONLY when records arrive from the store: that is what a
 *  measurement of "changed since" can be measured against.
 *
-*  `written` is forgotten only by a load the HOST asked for (its
-*  EV_REFRESH, which a Save sends). Since M36 a write moves no
+*  `written` is forgotten only by an EV_REFRESH (the view's own
+*  Refresh button, or a host that sends one). Since M36 a write moves no
 *  version, so `written` is the draft chip of what this session
 *  wrote and no longer half of a version measurement: a reload of
 *  the reconnect, or of a write that turned out done, forgot the
@@ -72536,10 +72587,12 @@ function start_measuring(gobj) {
 *  until the host saves it (C_TREEDB's save-schema, which raises the
 *  versions of what changed). Two sources say a topic is one, and
 *  they are kept APART because they are forgotten differently:
-*    - `written`: what THIS session wrote. Only a load the HOST asked
-*      for forgets it (its EV_REFRESH, which a Save sends); the
-*      reconnect's reload, the one owed after a write and a late
-*      write's keep it (start_measuring(), request_model());
+*    - `written`: what THIS session wrote. Only EV_REFRESH forgets
+*      it -- the view's own Refresh button sends it (in the agent
+*      console that is the only sender), and a host may after a
+*      Save; the reconnect's reload, the one owed after a write, a
+*      refused load's and a late write's keep it (start_measuring(),
+*      request_model());
 *    - `host_ids`: what the host said last (EV_DRAFTS), replaced WHOLE
 *      by the next EV_DRAFTS. Folded into `written`, a topic the host
 *      named once stayed a draft after the Save that published it.
@@ -74248,40 +74301,40 @@ function open_export(gobj, treedb) {
 		[
 			[
 				"div",
-				{ class: "SCHEMA_EXPORT_TABS tabs is-toggle mb-2" },
+				{ class: "SCHEMA_EXPORT_TABS buttons has-addons mb-2" },
 				[[
-					"ul",
-					{},
+					"button",
+					{
+						class: "SCHEMA_EXPORT_TAB button selected_state",
+						type: "button",
+						"data-pane": "c",
+						"aria-pressed": "true",
+						title: t("schema as c source"),
+						"data-i18n-title": "schema as c source",
+						"aria-label": t("schema as c source"),
+						"data-i18n-aria-label": "schema as c source"
+					},
 					[[
-						"li",
-						{
-							class: "SCHEMA_EXPORT_TAB is-active",
-							"data-pane": "c"
-						},
-						[[
-							"a",
-							{},
-							[[
-								"span",
-								{},
-								"C"
-							]]
-						]]
-					], [
-						"li",
-						{
-							class: "SCHEMA_EXPORT_TAB",
-							"data-pane": "json"
-						},
-						[[
-							"a",
-							{},
-							[[
-								"span",
-								{},
-								"JSON"
-							]]
-						]]
+						"span",
+						{},
+						"C"
+					]]
+				], [
+					"button",
+					{
+						class: "SCHEMA_EXPORT_TAB button",
+						type: "button",
+						"data-pane": "json",
+						"aria-pressed": "false",
+						title: t("schema as json"),
+						"data-i18n-title": "schema as json",
+						"aria-label": t("schema as json"),
+						"data-i18n-aria-label": "schema as json"
+					},
+					[[
+						"span",
+						{},
+						"JSON"
 					]]
 				]]
 			],
@@ -74351,7 +74404,10 @@ function open_export(gobj, treedb) {
 	let $text = $content.querySelector(".SCHEMA_EXPORT_TEXT");
 	for (let $tab of $content.querySelectorAll(".SCHEMA_EXPORT_TAB")) $tab.addEventListener("click", (evt) => {
 		evt.stopPropagation();
-		for (let $other of $content.querySelectorAll(".SCHEMA_EXPORT_TAB")) $other.classList.toggle("is-active", $other === $tab);
+		for (let $other of $content.querySelectorAll(".SCHEMA_EXPORT_TAB")) {
+			$other.classList.toggle("selected_state", $other === $tab);
+			$other.setAttribute("aria-pressed", $other === $tab ? "true" : "false");
+		}
 		$text.value = $tab.dataset.pane === "c" ? c_text : json_text;
 	});
 	$content.querySelector(".SCHEMA_EXPORT_COPY").addEventListener("click", (evt) => {
@@ -75073,7 +75129,7 @@ function ac_mt_command_answer(gobj, event, kw, src) {
 				priv.records = priv.records_before;
 				priv.records_before = null;
 				priv.reload_on_open = true;
-				yui_shell_show_error(yui_shell_of(gobj), "cannot read the schemas again: the previous ones stay", { t });
+				yui_shell_show_error(yui_shell_of(gobj), "cannot read the schemas again: the ones shown may be out of date, your next change reads them first", { t });
 				return end_load(gobj);
 			}
 			priv.model = null;
@@ -75285,6 +75341,23 @@ function ac_wait_for_the_load(gobj, event, kw, src) {
 	return -1;
 }
 /***************************************************************
+*  A confirmation answered where no treedb is open: ST_EMPTY (a
+*  reload landed on zero treedbs while it was up) or ST_IDLE (no
+*  model). A confirmation is a shell modal, not this view's dialog,
+*  so the load that lands does not close it, and its Yes arrives
+*  anyway. Undeclared, it answered "Event NOT DEFINED" (fifth
+*  independent review).
+*
+*  Refused with the stamp's own words: whatever it was decided on
+*  is not on screen any more.
+***************************************************************/
+function ac_confirmed_on_nothing(gobj, event, kw, src) {
+	if (built_on_a_replaced_model(gobj, event, kw)) return -1;
+	log_warning(`${gobj_short_name(gobj)}: ${event} refused, no treedb is open`);
+	yui_shell_show_error(yui_shell_of(gobj), "the schemas were read again: open the dialog again", { t });
+	return -1;
+}
+/***************************************************************
 *  {drafts: {treedb_name: [topic names]}} -- the host says which
 *  topics hold a draft in __system__ that is not saved (C_TREEDB's
 *  saved-schema, `draft_changed`). The mark of a write lived in this
@@ -75309,20 +75382,23 @@ function ac_drafts(gobj, event, kw, src) {
 *  Moving about.
 ***************************************************************/
 function ac_select_treedb(gobj, event, kw, src) {
-	return go(gobj, kw.treedb, "", false, true);
+	go(gobj, kw.treedb, "", false, true);
+	return reload_after_move(gobj);
 }
 function ac_select_topic(gobj, event, kw, src) {
-	return go(gobj, gobj.priv.treedb_id, kw.topic, false, true);
+	go(gobj, gobj.priv.treedb_id, kw.topic, false, true);
+	return reload_after_move(gobj);
 }
 function ac_back(gobj, event, kw, src) {
 	let priv = gobj.priv;
-	if (priv.diagram) return go(gobj, priv.treedb_id, "", false, true);
-	if (priv.topic_name) return go(gobj, priv.treedb_id, "", false, true);
-	return go(gobj, "", "", false, true);
+	if (priv.diagram || priv.topic_name) go(gobj, priv.treedb_id, "", false, true);
+	else go(gobj, "", "", false, true);
+	return reload_after_move(gobj);
 }
 function ac_toggle_diagram(gobj, event, kw, src) {
 	let priv = gobj.priv;
-	return go(gobj, priv.treedb_id, priv.topic_name, !priv.diagram, true);
+	go(gobj, priv.treedb_id, priv.topic_name, !priv.diagram, true);
+	return reload_after_move(gobj);
 }
 /***************************************************************
 *  A topic clicked in the drawing. The diagram is a CHILD here
@@ -75332,9 +75408,11 @@ function ac_toggle_diagram(gobj, event, kw, src) {
 function ac_node_click(gobj, event, kw, src) {
 	let topic = kw && kw.topic;
 	if (!topic) return 0;
-	return go(gobj, gobj.priv.treedb_id, topic, false, true);
+	go(gobj, gobj.priv.treedb_id, topic, false, true);
+	return reload_after_move(gobj);
 }
 function ac_show_orphans(gobj, event, kw, src) {
+	if (reload_first(gobj, event)) return -1;
 	open_orphans(gobj);
 	return 0;
 }
@@ -75350,7 +75428,9 @@ function confirm_then(gobj, message, detail, kw) {
 	kw = Object.assign({ model_gen: gobj.priv.model_gen }, kw);
 	yui_shell_confirm_danger(yui_shell_of(gobj), message, {
 		t,
-		detail
+		detail,
+		confirm_label: "delete",
+		cancel_label: "cancel"
 	}).then((yes) => {
 		if (!yes || gobj_is_destroying(gobj)) return;
 		gobj_send_event(gobj, "EV_CONFIRMED", kw, gobj);
@@ -75362,6 +75442,7 @@ function confirm_then(gobj, message, detail, kw) {
 function ac_add_column(gobj, event, kw, src) {
 	let topic = current_topic(gobj);
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (!topic) {
 		log_error(`${gobj_short_name(gobj)}: ${event} with no topic open`);
 		return -1;
@@ -75374,6 +75455,7 @@ function ac_edit_column(gobj, event, kw, src) {
 	let topic = current_topic(gobj);
 	let col = topic ? find_col(priv.model, priv.treedb_id, topic.name, kw.col) : null;
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (!col) {
 		log_error(`${gobj_short_name(gobj)}: ${event} names no column: ${kw.col}`);
 		return -1;
@@ -75391,6 +75473,7 @@ function ac_duplicate_column(gobj, event, kw, src) {
 	let topic = current_topic(gobj);
 	let col = topic ? find_col(priv.model, priv.treedb_id, topic.name, kw.col) : null;
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (!col) {
 		log_error(`${gobj_short_name(gobj)}: ${event} names no column: ${kw.col}`);
 		return -1;
@@ -75409,6 +75492,7 @@ function ac_save_column(gobj, event, kw, src) {
 	let topic = find_topic(priv.model, priv.treedb_id, kw.topic);
 	let col = kw.creating ? null : find_col(priv.model, priv.treedb_id, kw.topic, kw.col);
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (built_on_a_replaced_model(gobj, event, kw)) return -1;
 	if (!topic || !kw.creating && !col) {
 		log_error(`${gobj_short_name(gobj)}: ${event} names no column: ${kw.topic}.${kw.col}`);
@@ -75435,6 +75519,7 @@ function ac_delete_column(gobj, event, kw, src) {
 	let topic = current_topic(gobj);
 	let col = topic ? find_col(priv.model, priv.treedb_id, topic.name, kw.col) : null;
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (!col) {
 		log_error(`${gobj_short_name(gobj)}: ${event} names no column: ${kw.col}`);
 		return -1;
@@ -75454,6 +75539,7 @@ function ac_delete_column(gobj, event, kw, src) {
 function ac_move_column(gobj, event, kw, src) {
 	let topic = current_topic(gobj);
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (!topic) {
 		log_error(`${gobj_short_name(gobj)}: ${event} with no topic open`);
 		return -1;
@@ -75489,6 +75575,7 @@ function ac_undo_order(gobj, event, kw, src) {
 	let priv = gobj.priv;
 	let topic = current_topic(gobj);
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (!topic) {
 		log_error(`${gobj_short_name(gobj)}: ${event} with no topic open`);
 		return -1;
@@ -75507,6 +75594,7 @@ function ac_undo_order(gobj, event, kw, src) {
 function ac_add_topic(gobj, event, kw, src) {
 	let treedb = current_treedb(gobj);
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (!treedb) {
 		log_error(`${gobj_short_name(gobj)}: ${event} with no treedb open`);
 		return -1;
@@ -75519,6 +75607,7 @@ function ac_edit_topic(gobj, event, kw, src) {
 	let treedb = current_treedb(gobj);
 	let topic = treedb ? find_topic(priv.model, priv.treedb_id, kw.topic) : null;
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (!topic) {
 		log_error(`${gobj_short_name(gobj)}: ${event} names no topic: ${kw.topic}`);
 		return -1;
@@ -75531,6 +75620,7 @@ function ac_save_topic(gobj, event, kw, src) {
 	let treedb = current_treedb(gobj);
 	let topic = kw.creating ? null : find_topic(priv.model, priv.treedb_id, kw.topic);
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (built_on_a_replaced_model(gobj, event, kw)) return -1;
 	if (!treedb || !kw.creating && !topic) {
 		log_error(`${gobj_short_name(gobj)}: ${event} names no topic: ${kw.topic}`);
@@ -75559,6 +75649,7 @@ function ac_delete_topic(gobj, event, kw, src) {
 	let priv = gobj.priv;
 	let topic = find_topic(priv.model, priv.treedb_id, kw.topic);
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (!topic) {
 		log_error(`${gobj_short_name(gobj)}: ${event} names no topic: ${kw.topic}`);
 		return -1;
@@ -75574,6 +75665,7 @@ function ac_delete_topic(gobj, event, kw, src) {
 ***************************************************************/
 function ac_delete_orphan(gobj, event, kw, src) {
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (built_on_a_replaced_model(gobj, event, kw)) return -1;
 	if (empty_string(kw.id)) {
 		log_error(`${gobj_short_name(gobj)}: ${event} names nothing`);
@@ -75592,6 +75684,7 @@ function ac_delete_orphan(gobj, event, kw, src) {
 function ac_validate(gobj, event, kw, src) {
 	let priv = gobj.priv;
 	let treedb = current_treedb(gobj);
+	if (reload_first(gobj, event)) return -1;
 	if (!treedb) {
 		log_error(`${gobj_short_name(gobj)}: ${event} with no treedb open`);
 		return -1;
@@ -75606,6 +75699,7 @@ function ac_validate(gobj, event, kw, src) {
 }
 function ac_export(gobj, event, kw, src) {
 	let treedb = current_treedb(gobj);
+	if (reload_first(gobj, event)) return -1;
 	if (!treedb) {
 		log_error(`${gobj_short_name(gobj)}: ${event} with no treedb open`);
 		return -1;
@@ -75616,6 +75710,7 @@ function ac_export(gobj, event, kw, src) {
 function ac_import(gobj, event, kw, src) {
 	let treedb = current_treedb(gobj);
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (!treedb) {
 		log_error(`${gobj_short_name(gobj)}: ${event} with no treedb open`);
 		return -1;
@@ -75631,6 +75726,7 @@ function ac_preview_import(gobj, event, kw, src) {
 	let priv = gobj.priv;
 	let treedb = current_treedb(gobj);
 	let incoming = null;
+	if (reload_first(gobj, event)) return -1;
 	if (built_on_a_replaced_model(gobj, event, kw)) return -1;
 	if (!treedb) {
 		log_error(`${gobj_short_name(gobj)}: ${event} with no treedb open`);
@@ -75659,6 +75755,7 @@ function ac_preview_import(gobj, event, kw, src) {
 function ac_apply_import(gobj, event, kw, src) {
 	let plan = gobj.priv.import_plan;
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (built_on_a_replaced_model(gobj, event, kw)) return -1;
 	if (!plan || plan.writes.length === 0) {
 		log_error(`${gobj_short_name(gobj)}: ${event} with no plan to run`);
@@ -75677,7 +75774,8 @@ function run_import(gobj) {
 	let priv = gobj.priv;
 	let plan = priv.import_plan;
 	if (!plan) {
-		log_error(`${gobj_short_name(gobj)}: the import plan is gone`);
+		log_warning(`${gobj_short_name(gobj)}: the import plan is gone`);
+		yui_shell_show_error(yui_shell_of(gobj), "the import plan is gone: preview it again", { t });
 		return -1;
 	}
 	close_dialog(gobj);
@@ -75702,6 +75800,7 @@ function run_import(gobj) {
 function ac_confirmed(gobj, event, kw, src) {
 	let priv = gobj.priv;
 	if (refuse_if_readonly(gobj, event)) return -1;
+	if (reload_first(gobj, event)) return -1;
 	if (built_on_a_replaced_model(gobj, event, kw)) return -1;
 	if (kw.what === "import") return run_import(gobj);
 	if (kw.what === "topic") {
@@ -75836,7 +75935,11 @@ function create_gclass$1(gclass_name) {
 		]
 	];
 	const states = [
-		["ST_IDLE", COMMON.slice()],
+		["ST_IDLE", COMMON.concat([[
+			"EV_CONFIRMED",
+			ac_confirmed_on_nothing,
+			null
+		]])],
 		["ST_LOADING", COMMON.concat([
 			[
 				"EV_SAVE_COLUMN",
@@ -75869,7 +75972,11 @@ function create_gclass$1(gclass_name) {
 				null
 			]
 		])],
-		["ST_EMPTY", COMMON.slice()],
+		["ST_EMPTY", COMMON.concat([[
+			"EV_CONFIRMED",
+			ac_confirmed_on_nothing,
+			null
+		]])],
 		["ST_TREEDBS", COMMON.concat([
 			[
 				"EV_SELECT_TREEDB",

package/package.json

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