@kestra-io/ui-libs 0.0.17 → 0.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kestra-io/ui-libs",
-  "version": "v0.0.17",
+  "version": "v0.0.19",
   "type": "module",
   "files": [
     "src",

package/src/components/topology/Topology.vue

@@ -100,6 +100,14 @@
 
         nextTick(() => {
             forwardEvent("loading", true);
+
+            // Workaround due to start & end nodes regeneration when fetching the graph again
+            const oldCollapsed = collapsed.value;
+            collapsed.value = new Set();
+            hiddenNodes.value = [];
+            edgeReplacer.value = {};
+            oldCollapsed.forEach(n => collapseCluster(CLUSTER_PREFIX + n, false, false))
+
             const elements = VueflowUtils.generateGraph(
                 props.id,
                 props.flowId,
@@ -237,29 +245,21 @@
 
     const collapseCluster = (clusterUid, regenerate, recursive) => {
         const cluster = props.flowGraph.clusters.find(cluster => cluster.cluster.uid.endsWith(clusterUid));
-        const nodeId = clusterUid === "root.Triggers" ? "root.Triggers" : clusterUid.replace(CLUSTER_PREFIX, "");
+        const nodeId = clusterUid.replace(CLUSTER_PREFIX, "");
         collapsed.value.add(nodeId)
 
         hiddenNodes.value = hiddenNodes.value.concat(cluster.nodes.filter(e => e !== nodeId || recursive));
-        if (clusterUid !== "root.Triggers") {
-            hiddenNodes.value = hiddenNodes.value.concat([cluster.cluster.uid])
-            edgeReplacer.value = {
-                ...edgeReplacer.value,
-                [cluster.cluster.uid]: nodeId,
-                [cluster.start]: nodeId,
-                [cluster.end]: nodeId
-            }
+        hiddenNodes.value = hiddenNodes.value.concat([cluster.cluster.uid])
+        edgeReplacer.value = {
+            ...edgeReplacer.value,
+            [cluster.cluster.uid]: nodeId,
+            [cluster.start]: nodeId,
+            [cluster.end]: nodeId
+        }
 
-            for (let child of cluster.nodes) {
-                if (props.flowGraph.clusters.map(cluster => cluster.cluster.uid).includes(child)) {
-                    collapseCluster(child, false, true);
-                }
-            }
-        } else {
-            edgeReplacer.value = {
-                ...edgeReplacer.value,
-                [cluster.start]: nodeId,
-                [cluster.end]: nodeId
+        for (let child of cluster.nodes) {
+            if (props.flowGraph.clusters.map(cluster => cluster.cluster.uid).includes(child)) {
+                collapseCluster(child, false, true);
             }
         }
 

package/src/utils/YamlUtils.js

@@ -1,6 +1,6 @@
 import JsYaml from "js-yaml";
 import yaml, {Document, YAMLMap, isSeq, isMap, Pair, Scalar, YAMLSeq, LineCounter} from "yaml";
-import {cloneDeep} from "lodash/cloneDeep"
+import {cloneDeep} from "lodash/cloneDeep.js"
 import {SECTIONS} from "./constants.js";
 
 const TOSTRING_OPTIONS = {lineWidth: 0};

package/src/utils/global.js

@@ -15,9 +15,9 @@ String.prototype.hashCode = function () {
     return hash + "";
 }
 
+export const cssVariable = (name) => {
     const root = document.querySelector(":root");
     const rootStyle = getComputedStyle(root);
 
-    export const cssVariable = (name) => {
-        return rootStyle.getPropertyValue(name);
-    }
+    return rootStyle.getPropertyValue(name);
+}