fix: added fallback for reason

Signed-off-by: James <[email protected]>
flyteorg · Apr 19, 2023 · 6d93cb0 · 6d93cb0
1 parent 334c560
commit 6d93cb0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/packages/console/src/components/Executions/ExecutionDetails/utils.ts b/packages/console/src/components/Executions/ExecutionDetails/utils.ts
@@ -6,7 +6,7 @@ import {
 } from 'models/Execution/types';
 import { Routes } from 'routes/routes';
 import { PaginatedEntityResponse } from 'models/AdminEntity/types';
-import { compareTimestampsAscending, timestampToDate } from 'common/utils';
+import { timestampToDate } from 'common';
 import { formatDateUTC } from 'common/formatters';
 
 export function isSingleTaskExecution(execution: Execution) {
@@ -29,18 +29,21 @@ export function getExecutionBackLink(execution: Execution): string {
 export function getTaskExecutionDetailReasons(
   taskExecutionDetails?: PaginatedEntityResponse<TaskExecution>,
 ): (string | null | undefined)[] {
-  const reasons = (
-    taskExecutionDetails?.entities.map(
-      taskExecution => taskExecution.closure.reasons || [],
-    ) || []
-  )
-    .flat()
-    .sort((a, b) => {
-      if (!a || !a.occurredAt) return -1;
-      if (!b || !b.occurredAt) return 1;
-      return compareTimestampsAscending(a.occurredAt, b.occurredAt);
-    });
-  return reasons.map(reason => reason.message);
+  let reasons: string[] = [];
+  taskExecutionDetails?.entities.forEach(taskExecution => {
+    if (taskExecution.closure.reasons)
+      reasons = reasons.concat(
+        taskExecution.closure.reasons.map(
+          reason =>
+            (reason.occurredAt
+              ? formatDateUTC(timestampToDate(reason.occurredAt)) + ' '
+              : '') + reason.message,
+        ),
+      );
+    else if (taskExecution.closure.reason)
+      reasons.push(taskExecution.closure.reason);
+  });
+  return reasons;
 }
 
 export function isChildGroupsFetched(

diff --git a/packages/console/src/models/Execution/types.ts b/packages/console/src/models/Execution/types.ts
@@ -145,6 +145,7 @@ export interface TaskExecutionClosure extends Admin.ITaskExecutionClosure {
   startedAt?: Protobuf.ITimestamp;
   eventVersion?: number;
   reasons?: Admin.IReason[];
+  reason?: string;
 }
 
 /** Execution data */