@yuneta/gobj-ui 7.5.4 → 7.5.6

package/dist/gobj-ui.cjs.js

@@ -55701,31 +55701,34 @@ function show_node_detail_popover(gobj, node_id) {
 *  junction diamonds get their neutral fill/stroke re-themed.
 ************************************************************/
 /************************************************************
-*  Has anybody ever PLACED a node of this treedb?
-*
-*  Saved positions live in `__graphs__` (per topic, per node) and, on
-*  older data, in a `_geometry` on the record itself. Both are read.
+*  How many nodes of this treedb carry a saved position, and how many
+*  there are. Positions live in `__graphs__` (per topic, per node) and,
+*  on older data, in a `_geometry` on the record itself; both are read.
 ************************************************************/
 function geometry_has_position(g) {
 	if (!(0, _yuneta_gobj_js.is_object)(g)) return false;
 	return (0, _yuneta_gobj_js.is_number)(g.x) || (0, _yuneta_gobj_js.is_number)(g.y);
 }
-function has_saved_geometry(gobj) {
+function count_saved_geometry(gobj) {
 	let priv = gobj.priv;
-	for (let topic of Object.keys(priv._graph_properties || {})) {
-		let props = priv._graph_properties[topic];
-		if (!props || !(0, _yuneta_gobj_js.is_object)(props.nodes)) continue;
-		for (let node_id of Object.keys(props.nodes)) if (geometry_has_position(props.nodes[node_id])) return true;
-	}
+	let saved = 0;
+	let total = 0;
 	for (let topic of Object.keys(priv.records || {})) {
 		let records = priv.records[topic];
 		if (!(0, _yuneta_gobj_js.is_array)(records)) continue;
-		for (let record of records) if (record && geometry_has_position(record._geometry)) {
-			(0, _yuneta_gobj_js.log_warning)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: saved geometry: ${topic}/${record.id} = ${JSON.stringify(record._geometry)}`);
-			return true;
+		let props = priv._graph_properties ? priv._graph_properties[topic] : null;
+		let nodes = props && (0, _yuneta_gobj_js.is_object)(props.nodes) ? props.nodes : null;
+		for (let record of records) {
+			if (!record) continue;
+			total++;
+			if (nodes && geometry_has_position(nodes[record.id])) saved++;
+			else if (geometry_has_position(record._geometry)) saved++;
 		}
 	}
-	return false;
+	return {
+		saved,
+		total
+	};
 }
 /************************************************************
 *  Choose a layout for a treedb nobody has arranged yet.
@@ -55744,10 +55747,20 @@ function has_saved_geometry(gobj) {
 ************************************************************/
 function auto_layout(gobj) {
 	let priv = gobj.priv;
-	(0, _yuneta_gobj_js.log_warning)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: auto_layout: asked='${priv._layout_asked}' saved=${has_saved_geometry(gobj)} graph=${!!priv.graph} topics=${Object.keys(priv.records || {}).length} gprops=${JSON.stringify(Object.keys(priv._graph_properties || {}))}`);
-	if (priv._layout_asked) return;
-	if (has_saved_geometry(gobj)) return;
-	if (!priv.graph) return;
+	if (priv._layout_asked) {
+		(0, _yuneta_gobj_js.log_warning)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: AL: bail asked='${priv._layout_asked}'`);
+		return;
+	}
+	let g = count_saved_geometry(gobj);
+	(0, _yuneta_gobj_js.log_warning)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: AL: saved=${g.saved}/${g.total} graph=${!!priv.graph}`);
+	if (g.total > 0 && g.saved * 2 > g.total) {
+		(0, _yuneta_gobj_js.log_warning)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: AL: bail majority`);
+		return;
+	}
+	if (!priv.graph) {
+		(0, _yuneta_gobj_js.log_warning)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: AL: bail no graph`);
+		return;
+	}
 	let name = "dagre";
 	(0, _yuneta_gobj_js.gobj_write_attr)(gobj, "layout", name);
 	try {
@@ -55756,7 +55769,7 @@ function auto_layout(gobj) {
 		(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: cannot set the '${name}' layout: ${e}`);
 		return;
 	}
-	(0, _yuneta_gobj_js.log_warning)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: auto_layout: set '${name}'`);
+	(0, _yuneta_gobj_js.log_warning)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: AL: set dagre, publishing`);
 	(0, _yuneta_gobj_js.gobj_publish_event)(gobj, "EV_LAYOUT_AUTOSET", { layout: name });
 }
 /************************************************************

package/dist/gobj-ui.es.js

@@ -55688,31 +55688,34 @@ function show_node_detail_popover(gobj, node_id) {
 *  junction diamonds get their neutral fill/stroke re-themed.
 ************************************************************/
 /************************************************************
-*  Has anybody ever PLACED a node of this treedb?
-*
-*  Saved positions live in `__graphs__` (per topic, per node) and, on
-*  older data, in a `_geometry` on the record itself. Both are read.
+*  How many nodes of this treedb carry a saved position, and how many
+*  there are. Positions live in `__graphs__` (per topic, per node) and,
+*  on older data, in a `_geometry` on the record itself; both are read.
 ************************************************************/
 function geometry_has_position(g) {
 	if (!is_object(g)) return false;
 	return is_number(g.x) || is_number(g.y);
 }
-function has_saved_geometry(gobj) {
+function count_saved_geometry(gobj) {
 	let priv = gobj.priv;
-	for (let topic of Object.keys(priv._graph_properties || {})) {
-		let props = priv._graph_properties[topic];
-		if (!props || !is_object(props.nodes)) continue;
-		for (let node_id of Object.keys(props.nodes)) if (geometry_has_position(props.nodes[node_id])) return true;
-	}
+	let saved = 0;
+	let total = 0;
 	for (let topic of Object.keys(priv.records || {})) {
 		let records = priv.records[topic];
 		if (!is_array(records)) continue;
-		for (let record of records) if (record && geometry_has_position(record._geometry)) {
-			log_warning(`${gobj_short_name(gobj)}: saved geometry: ${topic}/${record.id} = ${JSON.stringify(record._geometry)}`);
-			return true;
+		let props = priv._graph_properties ? priv._graph_properties[topic] : null;
+		let nodes = props && is_object(props.nodes) ? props.nodes : null;
+		for (let record of records) {
+			if (!record) continue;
+			total++;
+			if (nodes && geometry_has_position(nodes[record.id])) saved++;
+			else if (geometry_has_position(record._geometry)) saved++;
 		}
 	}
-	return false;
+	return {
+		saved,
+		total
+	};
 }
 /************************************************************
 *  Choose a layout for a treedb nobody has arranged yet.
@@ -55731,10 +55734,20 @@ function has_saved_geometry(gobj) {
 ************************************************************/
 function auto_layout(gobj) {
 	let priv = gobj.priv;
-	log_warning(`${gobj_short_name(gobj)}: auto_layout: asked='${priv._layout_asked}' saved=${has_saved_geometry(gobj)} graph=${!!priv.graph} topics=${Object.keys(priv.records || {}).length} gprops=${JSON.stringify(Object.keys(priv._graph_properties || {}))}`);
-	if (priv._layout_asked) return;
-	if (has_saved_geometry(gobj)) return;
-	if (!priv.graph) return;
+	if (priv._layout_asked) {
+		log_warning(`${gobj_short_name(gobj)}: AL: bail asked='${priv._layout_asked}'`);
+		return;
+	}
+	let g = count_saved_geometry(gobj);
+	log_warning(`${gobj_short_name(gobj)}: AL: saved=${g.saved}/${g.total} graph=${!!priv.graph}`);
+	if (g.total > 0 && g.saved * 2 > g.total) {
+		log_warning(`${gobj_short_name(gobj)}: AL: bail majority`);
+		return;
+	}
+	if (!priv.graph) {
+		log_warning(`${gobj_short_name(gobj)}: AL: bail no graph`);
+		return;
+	}
 	let name = "dagre";
 	gobj_write_attr(gobj, "layout", name);
 	try {
@@ -55743,7 +55756,7 @@ function auto_layout(gobj) {
 		log_error(`${gobj_short_name(gobj)}: cannot set the '${name}' layout: ${e}`);
 		return;
 	}
-	log_warning(`${gobj_short_name(gobj)}: auto_layout: set '${name}'`);
+	log_warning(`${gobj_short_name(gobj)}: AL: set dagre, publishing`);
 	gobj_publish_event(gobj, "EV_LAYOUT_AUTOSET", { layout: name });
 }
 /************************************************************

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -4495,54 +4495,50 @@ function show_node_detail_popover(gobj, node_id)
  *  junction diamonds get their neutral fill/stroke re-themed.
  ************************************************************/
 /************************************************************
- *  Has anybody ever PLACED a node of this treedb?
- *
- *  Saved positions live in `__graphs__` (per topic, per node) and, on
- *  older data, in a `_geometry` on the record itself. Both are read.
+ *  How many nodes of this treedb carry a saved position, and how many
+ *  there are. Positions live in `__graphs__` (per topic, per node) and,
+ *  on older data, in a `_geometry` on the record itself; both are read.
  ************************************************************/
 function geometry_has_position(g)
 {
-    /*  An EMPTY object is not a position. A treedb hands back `_geometry: {}`
-     *  for a record nobody ever moved, and a node entry can hold a port size
-     *  with no coordinates — both are objects, and taking either for "this
-     *  was arranged" is what kept the cascade in place. Only x or y counts. */
+    /*  An EMPTY object is not a position. A treedb hands back
+     *  `_geometry: {}` for a record nobody ever moved, and a `__graphs__`
+     *  node entry can hold a port size with no coordinates — both are
+     *  objects, and taking either for "this was placed" is wrong. */
     if(!is_object(g)) {
         return false;
     }
     return is_number(g.x) || is_number(g.y);
 }
 
-function has_saved_geometry(gobj)
+function count_saved_geometry(gobj)
 {
     let priv = gobj.priv;
-
-    for(let topic of Object.keys(priv._graph_properties || {})) {
-        let props = priv._graph_properties[topic];
-        if(!props || !is_object(props.nodes)) {
-            continue;
-        }
-        for(let node_id of Object.keys(props.nodes)) {
-            if(geometry_has_position(props.nodes[node_id])) {
-                return true;
-            }
-        }
-    }
+    let saved = 0;
+    let total = 0;
 
     for(let topic of Object.keys(priv.records || {})) {
         let records = priv.records[topic];
         if(!is_array(records)) {
             continue;
         }
+        let props = priv._graph_properties? priv._graph_properties[topic] : null;
+        let nodes = (props && is_object(props.nodes))? props.nodes : null;
+
         for(let record of records) {
-            if(record && geometry_has_position(record._geometry)) {
-                log_warning(`${gobj_short_name(gobj)}: saved geometry: ` +
-                            `${topic}/${record.id} = ${JSON.stringify(record._geometry)}`);
-                return true;
+            if(!record) {
+                continue;
+            }
+            total++;
+            if(nodes && geometry_has_position(nodes[record.id])) {
+                saved++;
+            } else if(geometry_has_position(record._geometry)) {
+                saved++;
             }
         }
     }
 
-    return false;
+    return {saved: saved, total: total};
 }
 
 /************************************************************
@@ -4564,20 +4560,25 @@ function auto_layout(gobj)
 {
     let priv = gobj.priv;
 
-    log_warning(`${gobj_short_name(gobj)}: auto_layout: ` +
-                `asked='${priv._layout_asked}' ` +
-                `saved=${has_saved_geometry(gobj)} ` +
-                `graph=${!!priv.graph} ` +
-                `topics=${Object.keys(priv.records || {}).length} ` +
-                `gprops=${JSON.stringify(Object.keys(priv._graph_properties || {}))}`);
-
     if(priv._layout_asked) {
+        log_warning(`${gobj_short_name(gobj)}: AL: bail asked='${priv._layout_asked}'`);
         return;         /*  the user picked one for this treedb  */
     }
-    if(has_saved_geometry(gobj)) {
+    /*  MOST of the nodes, not one of them.
+     *
+     *  The app saves the position it invented as readily as one a human
+     *  chose, so a single stored coordinate proves nothing: the treedb
+     *  that forced this had exactly ONE node of 126 carrying a geometry,
+     *  and it was `{x:100, y:100}` — the first cascade slot, saved. One
+     *  leftover is not an arrangement. A majority is. */
+    let g = count_saved_geometry(gobj);
+    log_warning(`${gobj_short_name(gobj)}: AL: saved=${g.saved}/${g.total} graph=${!!priv.graph}`);
+    if(g.total > 0 && g.saved * 2 > g.total) {
+        log_warning(`${gobj_short_name(gobj)}: AL: bail majority`);
         return;         /*  somebody arranged it: leave it alone  */
     }
     if(!priv.graph) {
+        log_warning(`${gobj_short_name(gobj)}: AL: bail no graph`);
         return;
     }
 
@@ -4591,7 +4592,7 @@ function auto_layout(gobj)
     }
     /*  The toolbar's select was filled before the data arrived, so it is
      *  still showing `manual`: tell it what the graph is actually doing. */
-    log_warning(`${gobj_short_name(gobj)}: auto_layout: set '${name}'`);
+    log_warning(`${gobj_short_name(gobj)}: AL: set dagre, publishing`);
     gobj_publish_event(gobj, "EV_LAYOUT_AUTOSET", {layout: name});
 }