@yuneta/gobj-ui 7.23.135 → 7.23.136

package/dist/gobj-ui.cjs.js

@@ -61339,13 +61339,13 @@ function ac_descs(gobj, event, kw, src) {
 	gobj.priv;
 	let descs = kw;
 	(0, _yuneta_gobj_js.gobj_write_attr)(gobj, "descs", descs);
-	let idx = 0;
-	for (const [topic_name, desc] of Object.entries(descs)) {
-		calculate_hooks_fkeys_counter(desc);
-		if (topic_name.substring(0, 2) === "__") continue;
-		desc.color = node_colors[idx % node_colors.length];
-		idx++;
-	}
+	for (const desc of Object.values(descs)) calculate_hooks_fkeys_counter(desc);
+	let names = Object.keys(descs).filter((topic_name) => {
+		return topic_name.substring(0, 2) !== "__";
+	}).sort((a, b) => {
+		return a.localeCompare(b);
+	});
+	for (let idx = 0; idx < names.length; idx++) descs[names[idx]].color = node_colors[idx % node_colors.length];
 	return 0;
 }
 /************************************************************
@@ -65162,17 +65162,21 @@ function schema_to_graph(gobj) {
 		nodes,
 		edges: []
 	};
-	let idx = 0;
+	let rank = {};
+	Object.keys(descs).filter((topic) => {
+		return topic.substring(0, 2) !== "__";
+	}).sort((a, b) => {
+		return a.localeCompare(b);
+	}).forEach((topic, i) => {
+		rank[topic] = i;
+	});
 	for (let topic of Object.keys(descs)) {
 		let is_system = topic.substring(0, 2) === "__";
 		if (!system && is_system) continue;
 		let rows = schema_rows(descs[topic]);
 		let color;
 		if (is_system) color = SYSTEM_TOPIC_COLOR;
-		else {
-			color = topic_colors[idx % topic_colors.length];
-			idx++;
-		}
+		else color = topic_colors[rank[topic] % topic_colors.length];
 		cards[topic] = {
 			rows,
 			size: card_size(rows),

package/dist/gobj-ui.es.js

@@ -61334,13 +61334,13 @@ function ac_descs(gobj, event, kw, src) {
 	gobj.priv;
 	let descs = kw;
 	gobj_write_attr(gobj, "descs", descs);
-	let idx = 0;
-	for (const [topic_name, desc] of Object.entries(descs)) {
-		calculate_hooks_fkeys_counter(desc);
-		if (topic_name.substring(0, 2) === "__") continue;
-		desc.color = node_colors[idx % node_colors.length];
-		idx++;
-	}
+	for (const desc of Object.values(descs)) calculate_hooks_fkeys_counter(desc);
+	let names = Object.keys(descs).filter((topic_name) => {
+		return topic_name.substring(0, 2) !== "__";
+	}).sort((a, b) => {
+		return a.localeCompare(b);
+	});
+	for (let idx = 0; idx < names.length; idx++) descs[names[idx]].color = node_colors[idx % node_colors.length];
 	return 0;
 }
 /************************************************************
@@ -65157,17 +65157,21 @@ function schema_to_graph(gobj) {
 		nodes,
 		edges: []
 	};
-	let idx = 0;
+	let rank = {};
+	Object.keys(descs).filter((topic) => {
+		return topic.substring(0, 2) !== "__";
+	}).sort((a, b) => {
+		return a.localeCompare(b);
+	}).forEach((topic, i) => {
+		rank[topic] = i;
+	});
 	for (let topic of Object.keys(descs)) {
 		let is_system = topic.substring(0, 2) === "__";
 		if (!system && is_system) continue;
 		let rows = schema_rows(descs[topic]);
 		let color;
 		if (is_system) color = SYSTEM_TOPIC_COLOR;
-		else {
-			color = topic_colors[idx % topic_colors.length];
-			idx++;
-		}
+		else color = topic_colors[rank[topic] % topic_colors.length];
 		cards[topic] = {
 			rows,
 			size: card_size(rows),

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -9825,15 +9825,23 @@ function ac_descs(gobj, event, kw, src)
     /*
      *  Assign colors and calculate counters
      *  descs is a dict: { __snaps__: {…}, roles: {…}, users: {…} }
+     *
+     *  The palette goes by ALPHABETICAL order of the topic names, not
+     *  by the order the backend lists them in: that one is not the same
+     *  from one load to the next, and two topics swapped colours with
+     *  it. The legend is alphabetical too, so the strip reads as the
+     *  palette in order.
      */
-    let idx = 0;
-    for(const [topic_name, desc] of Object.entries(descs)) {
+    for(const desc of Object.values(descs)) {
         calculate_hooks_fkeys_counter(desc);
-        if(topic_name.substring(0, 2) === "__") {
-            continue;
-        }
-        desc.color = node_colors[idx % node_colors.length];
-        idx++;
+    }
+    let names = Object.keys(descs).filter((topic_name) => {
+        return topic_name.substring(0, 2) !== "__";
+    }).sort((a, b) => {
+        return a.localeCompare(b);
+    });
+    for(let idx = 0; idx < names.length; idx++) {
+        descs[names[idx]].color = node_colors[idx % node_colors.length];
     }
 
     return 0;

package/src/c_yui_treedb_schema.js

@@ -406,7 +406,19 @@ function schema_to_graph(gobj)
         return {nodes: nodes, edges: []};
     }
 
-    let idx = 0;
+    /*  The palette by ALPHABETICAL rank, as the treedb graph does it:
+     *  the backend's order is not the same from one load to the next,
+     *  and a topic's colour must not change with it. The cards keep
+     *  the backend's order; only the colour is ranked.  */
+    let rank = {};
+    Object.keys(descs).filter((topic) => {
+        return topic.substring(0, 2) !== "__";
+    }).sort((a, b) => {
+        return a.localeCompare(b);
+    }).forEach((topic, i) => {
+        rank[topic] = i;
+    });
+
     for(let topic of Object.keys(descs)) {
         let is_system = (topic.substring(0, 2) === "__");
         if(!system && is_system) {
@@ -417,8 +429,7 @@ function schema_to_graph(gobj)
         if(is_system) {
             color = SYSTEM_TOPIC_COLOR;
         } else {
-            color = topic_colors[idx % topic_colors.length];
-            idx++;
+            color = topic_colors[rank[topic] % topic_colors.length];
         }
         cards[topic] = {rows: rows, size: card_size(rows), color: color};
     }