From f5252e17fffc7decb760d923b68a89bdd12eba5d Mon Sep 17 00:00:00 2001 From: Jason Porter Date: Wed, 17 May 2023 10:25:41 -0700 Subject: [PATCH 1/3] feat: (wip) add item when mapped task Signed-off-by: Jason Porter --- .../Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx | 2 +- .../Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx b/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx index 0c768567c..0acffa816 100644 --- a/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx +++ b/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx @@ -28,7 +28,6 @@ export const MapTaskExecutionDetails: React.FC< {filteredResources.map(item => { const attempt = item.retryAttempt ?? 0; const headerText = formatRetryAttempt(attempt); - return (
); diff --git a/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx b/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx index 76f7b881d..34dbde0d9 100644 --- a/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx +++ b/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx @@ -40,6 +40,7 @@ interface TaskExecutionLogsCardProps { headerText: string; phase: TaskExecutionPhase; logs: Core.ITaskLog[]; + mappedItem?: any; } export const TaskExecutionLogsCard: React.FC< From 7063f6ffd05801fc501ca7c4db303abf28937061 Mon Sep 17 00:00:00 2001 From: Carina Ursu Date: Wed, 17 May 2023 16:57:01 -0700 Subject: [PATCH 2/3] chore: progress Signed-off-by: Carina Ursu --- packages/console/package.json | 2 +- .../Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx | 1 - .../Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx | 1 - packages/console/src/components/Executions/contexts.ts | 4 ++-- packages/console/src/models/Task/index.ts | 1 + website/package.json | 2 +- yarn.lock | 4 ++-- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/console/package.json b/packages/console/package.json index a555487ce..dc9306430 100644 --- a/packages/console/package.json +++ b/packages/console/package.json @@ -1,6 +1,6 @@ { "name": "@flyteorg/console", - "version": "0.0.33", + "version": "0.0.35", "description": "Flyteconsole main app module", "main": "./dist/index.js", "module": "./lib/index.js", diff --git a/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx b/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx index 0acffa816..ec65747d5 100644 --- a/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx +++ b/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx @@ -35,7 +35,6 @@ export const MapTaskExecutionDetails: React.FC< headerText={headerText} phase={item.phase ?? TaskExecutionPhase.UNDEFINED} logs={item.logs ?? []} - mappedItem={item} /> ); diff --git a/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx b/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx index 34dbde0d9..76f7b881d 100644 --- a/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx +++ b/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx @@ -40,7 +40,6 @@ interface TaskExecutionLogsCardProps { headerText: string; phase: TaskExecutionPhase; logs: Core.ITaskLog[]; - mappedItem?: any; } export const TaskExecutionLogsCard: React.FC< diff --git a/packages/console/src/components/Executions/contexts.ts b/packages/console/src/components/Executions/contexts.ts index 3a1afce63..9a8ea77e3 100644 --- a/packages/console/src/components/Executions/contexts.ts +++ b/packages/console/src/components/Executions/contexts.ts @@ -3,8 +3,8 @@ import { Execution, ExecutionData, LogsByPhase, + MapTaskExecution, NodeExecution, - TaskExecution, } from 'models/Execution/types'; import { dNode } from 'models/Graph/types'; import { createContext } from 'react'; @@ -13,7 +13,7 @@ export interface ExecutionContextData { execution: Execution; } -export type WorkflowTaskExecution = TaskExecution & { +export type WorkflowTaskExecution = MapTaskExecution & { task?: Task; taskData?: ExecutionData; }; diff --git a/packages/console/src/models/Task/index.ts b/packages/console/src/models/Task/index.ts index 0b9aab677..7c072126e 100644 --- a/packages/console/src/models/Task/index.ts +++ b/packages/console/src/models/Task/index.ts @@ -1,3 +1,4 @@ export * from './constants'; export * from './types'; export * from './api'; +export * from './utils'; diff --git a/website/package.json b/website/package.json index 688d22db8..f9a78a0c3 100644 --- a/website/package.json +++ b/website/package.json @@ -37,7 +37,7 @@ }, "dependencies": { "@flyteorg/common": "^0.0.4", - "@flyteorg/console": "^0.0.33", + "@flyteorg/console": "^0.0.35", "long": "^4.0.0", "protobufjs": "~6.11.3", "react-ga4": "^1.4.1", diff --git a/yarn.lock b/yarn.lock index 17b652ff7..b14d1c56c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2020,7 +2020,7 @@ __metadata: resolution: "@flyteconsole/client-app@workspace:website" dependencies: "@flyteorg/common": ^0.0.4 - "@flyteorg/console": ^0.0.33 + "@flyteorg/console": ^0.0.35 "@types/long": ^3.0.32 long: ^4.0.0 protobufjs: ~6.11.3 @@ -2059,7 +2059,7 @@ __metadata: languageName: unknown linkType: soft -"@flyteorg/console@^0.0.33, @flyteorg/console@workspace:packages/console": +"@flyteorg/console@^0.0.35, @flyteorg/console@workspace:packages/console": version: 0.0.0-use.local resolution: "@flyteorg/console@workspace:packages/console" dependencies: From 74d78681b12ffe149349dbc48c8e6ab2dd7ea363 Mon Sep 17 00:00:00 2001 From: Carina Ursu Date: Thu, 18 May 2023 11:37:45 -0700 Subject: [PATCH 3/3] chore: pass mapped item Signed-off-by: Carina Ursu --- .../Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx | 1 + .../Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx b/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx index ec65747d5..0acffa816 100644 --- a/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx +++ b/packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionDetails.tsx @@ -35,6 +35,7 @@ export const MapTaskExecutionDetails: React.FC< headerText={headerText} phase={item.phase ?? TaskExecutionPhase.UNDEFINED} logs={item.logs ?? []} + mappedItem={item} /> ); diff --git a/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx b/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx index 76f7b881d..34dbde0d9 100644 --- a/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx +++ b/packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx @@ -40,6 +40,7 @@ interface TaskExecutionLogsCardProps { headerText: string; phase: TaskExecutionPhase; logs: Core.ITaskLog[]; + mappedItem?: any; } export const TaskExecutionLogsCard: React.FC<