From 2770f91a9baacc04768f630e913c9f511c2fc53c Mon Sep 17 00:00:00 2001
From: YannC <ycoornaert@kestra.io>
Date: Thu, 25 Apr 2024 12:50:16 +0200
Subject: [PATCH] feat: changes related to execution page

---
 src/components/misc/ExecutionInformations.vue | 6 +++++-
 src/components/nodes/TaskNode.vue             | 4 ++--
 src/utils/VueFlowUtils.js                     | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/misc/ExecutionInformations.vue b/src/components/misc/ExecutionInformations.vue
index 6fbf9c0..103e188 100644
--- a/src/components/misc/ExecutionInformations.vue
+++ b/src/components/misc/ExecutionInformations.vue
@@ -22,7 +22,7 @@
                 return this.execution && this.execution.taskRunList ? this.execution.taskRunList : []
             },
             taskRuns() {
-                return this.taskRunList.filter(t => t.taskId === Utils.afterLastDot(this.task.id))
+                return this.taskRunList.filter(t => t.taskId === Utils.afterLastDot(this.uid))
             },
             state() {
                 if (!this.taskRuns) {
@@ -89,6 +89,10 @@
             task: {
                 type: Object,
                 default: null
+            },
+            uid: {
+                type: String,
+                default: null
             }
         }
     }
diff --git a/src/components/nodes/TaskNode.vue b/src/components/nodes/TaskNode.vue
index caf7ea5..58a7e5a 100644
--- a/src/components/nodes/TaskNode.vue
+++ b/src/components/nodes/TaskNode.vue
@@ -14,7 +14,7 @@
         @mouseleave="forwardEvent(EVENTS.MOUSE_LEAVE)"
     >
         <template #content>
-            <execution-informations v-if="taskExecution" :execution="taskExecution" :task="data.node.task" :color="color" />
+            <execution-informations v-if="taskExecution" :execution="taskExecution" :task="data.node.task" :color="color" :uid="data.node.uid" />
         </template>
         <template #badge-button-before>
             <span
@@ -117,7 +117,7 @@
                 return undefined;
             },
             taskRuns() {
-                return this.taskRunList.filter(t => t.taskId === Utils.afterLastDot(this.data.node.task.id))
+                return this.taskRunList.filter(t => t.taskId === Utils.afterLastDot(this.data.node.uid))
             },
             state() {
                 if (!this.taskRuns) {
diff --git a/src/utils/VueFlowUtils.js b/src/utils/VueFlowUtils.js
index 3a9e291..d5f2f52 100644
--- a/src/utils/VueFlowUtils.js
+++ b/src/utils/VueFlowUtils.js
@@ -162,11 +162,11 @@ export default class VueFlowUtils {
     }
 
     static isTaskNode(node) {
-        return node.task !== undefined && ["GraphTask", "SubflowGraphTask"].some(t => node.type.endsWith(t));
+        return ["GraphTask", "SubflowGraphTask"].some(t => node.type.endsWith(t));
     }
 
     static isTriggerNode(node) {
-        return node.triggerDeclaration !== undefined && node.type.endsWith("GraphTrigger");
+        return node.type.endsWith("GraphTrigger");
     }
 
     static isCollapsedCluster(node) {
@@ -299,7 +299,7 @@ export default class VueFlowUtils {
 
         const clustersWithoutRootNode = [CLUSTER_PREFIX + TRIGGERS_NODE_UID];
 
-        if (!flowGraph || !this.flowHaveTasks(flowSource)) {
+        if (!flowGraph || (flowSource && !this.flowHaveTasks(flowSource))) {
             elements.push({
                 id: "start",
                 type: "dot",
@@ -402,7 +402,7 @@ export default class VueFlowUtils {
                     nodeType = "collapsedcluster";
                 }
 
-                const color = this.nodeColor(node, collapsed, flowSource);
+                const color = this.nodeColor(node, collapsed);
                 // If task type includes '$', it's an inner class so it's probably an internal class not supposed to be editable
                 // In such case, only the root task will be editable
                 const isReadOnlyTask = isReadOnly || node.task?.type?.includes("$") || readOnlyUidPrefixes.some(prefix => node.uid.startsWith(prefix + "."));