Skip to content

Commit b7c4b80

Browse files
feat: added support for mapped task parent retryAttempt (#756)
* feat: added support for mapped task parent retryAttempt Signed-off-by: Jason Porter <[email protected]> * chore: upgrade pkg Signed-off-by: Carina Ursu <[email protected]> * chore: yarn.lock Signed-off-by: Carina Ursu <[email protected]> --------- Signed-off-by: Jason Porter <[email protected]> Signed-off-by: Carina Ursu <[email protected]> Co-authored-by: Carina Ursu <[email protected]>
1 parent d985dfd commit b7c4b80

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

packages/console/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@flyteorg/console",
3-
"version": "0.0.30",
3+
"version": "0.0.31",
44
"description": "Flyteconsole main app module",
55
"main": "./dist/index.js",
66
"module": "./lib/index.js",

packages/console/src/components/Executions/TaskExecutionsList/MapTaskExecutionListItem.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ export const MapTaskExecutionsListItem: React.FC<
7474
<TaskExecutionError error={error} />
7575
</section>
7676
) : null}
77-
7877
{/* If main map task has log attached - show it here */}
7978
{logs && logs.length > 0 ? (
8079
<section className={styles.section}>
@@ -99,7 +98,6 @@ export const MapTaskExecutionsListItem: React.FC<
9998
/>
10099
);
101100
})}
102-
103101
{/* If map task is actively started - show 'started' and 'run time' details */}
104102
{taskHasStarted && (
105103
<section className={styles.section}>

packages/console/src/components/Executions/TaskExecutionsList/TaskExecutionLogsCard.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Typography from '@material-ui/core/Typography';
44
import classnames from 'classnames';
55
import { useCommonStyles } from 'components/common/styles';
66
import { TaskExecutionPhase } from 'models/Execution/enums';
7-
import { TaskExecution } from 'models/Execution/types';
7+
import { MapTaskExecution, TaskExecution } from 'models/Execution/types';
88
import { Core } from '@flyteorg/flyteidl-types';
99
import { ExternalConfigHoc } from 'basics/ExternalConfigHoc';
1010
import { useExternalConfigurationContext } from 'basics/ExternalConfigurationProvider';
@@ -36,7 +36,7 @@ const useStyles = makeStyles((theme: Theme) => ({
3636
}));
3737

3838
interface TaskExecutionLogsCardProps {
39-
taskExecution: TaskExecution;
39+
taskExecution: TaskExecution | MapTaskExecution;
4040
headerText: string;
4141
phase: TaskExecutionPhase;
4242
logs: Core.ITaskLog[];

packages/console/src/components/common/MapTaskExecutionsList/TaskNameList.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ export const TaskNameList = ({
6464
onTaskSelected({
6565
...taskExecution,
6666
taskIndex: (log as any).index,
67+
parentRetryAttempt: taskExecution.id.retryAttempt,
6768
});
6869
};
6970

packages/console/src/models/Execution/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ export interface TaskExecutionIdentifier extends Core.ITaskExecutionIdentifier {
118118
}
119119
export interface MapTaskExecution extends TaskExecution {
120120
taskIndex: number | null;
121+
parentRetryAttempt?: number;
121122
}
122123

123124
export interface TaskExecution extends Admin.ITaskExecution {

website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
"dependencies": {
3939
"@flyteorg/common": "^0.0.4",
40-
"@flyteorg/console": "^0.0.30",
40+
"@flyteorg/console": "^0.0.31",
4141
"long": "^4.0.0",
4242
"protobufjs": "~6.11.3",
4343
"react-ga4": "^1.4.1",

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2020,7 +2020,7 @@ __metadata:
20202020
resolution: "@flyteconsole/client-app@workspace:website"
20212021
dependencies:
20222022
"@flyteorg/common": ^0.0.4
2023-
"@flyteorg/console": ^0.0.30
2023+
"@flyteorg/console": ^0.0.31
20242024
"@types/long": ^3.0.32
20252025
long: ^4.0.0
20262026
protobufjs: ~6.11.3
@@ -2059,7 +2059,7 @@ __metadata:
20592059
languageName: unknown
20602060
linkType: soft
20612061

2062-
"@flyteorg/console@^0.0.30, @flyteorg/console@workspace:packages/console":
2062+
"@flyteorg/console@^0.0.31, @flyteorg/console@workspace:packages/console":
20632063
version: 0.0.0-use.local
20642064
resolution: "@flyteorg/console@workspace:packages/console"
20652065
dependencies:

0 commit comments

Comments
 (0)