@kestra-io/ui-libs 0.0.16 → 0.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kestra-io/ui-libs",
-  "version": "v0.0.16",
+  "version": "v0.0.18",
   "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,
@@ -187,21 +195,19 @@
         lastPosition.value = null;
     })
 
-    const subflowNestedTasks = computed(() => {
+    const subflowPrefixes = computed(() => {
         if(!props.flowGraph) {
             return [];
         }
 
         return props.flowGraph.clusters.filter(cluster => cluster.cluster.type.endsWith("SubflowGraphCluster"))
-            .flatMap(cluster =>
-                cluster.nodes.filter(node => node !== cluster.cluster.taskNode.uid)
-            );
+            .map(cluster => cluster.cluster.taskNode.uid + ".");
     })
 
     onNodeDrag((e) => {
         resetNodesStyle();
-        getNodes.value.filter(n => Utils.afterLastDot(n.id) !== Utils.afterLastDot(e.node.id)).forEach(n => {
-            if (n.type === "trigger" || (n.type === "task" && n.id.startsWith(e.node.id + ".")) || subflowNestedTasks.value.includes(n.id)) {
+        getNodes.value.filter(n => n.id !== e.node.id).forEach(n => {
+            if (n.type === "trigger" || (n.type === "task" && (n.id.startsWith(e.node.id + ".") || e.node.id.startsWith(n.id + "."))) || subflowPrefixes.value.some(subflowPrefix => n.id.startsWith(subflowPrefix))) {
                 n.style = {...n.style, opacity: "0.5"}
             } else {
                 n.style = {...n.style, opacity: "1"}
@@ -239,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);
             }
         }