Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: added support for mapped task parent retryAttempt #756

Merged
merged 4 commits into from
May 11, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/console/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flyteorg/console",
"version": "0.0.30",
"version": "0.0.31",
"description": "Flyteconsole main app module",
"main": "./dist/index.js",
"module": "./lib/index.js",
Original file line number Diff line number Diff line change
@@ -74,7 +74,6 @@ export const MapTaskExecutionsListItem: React.FC<
<TaskExecutionError error={error} />
</section>
) : null}

{/* If main map task has log attached - show it here */}
{logs && logs.length > 0 ? (
<section className={styles.section}>
@@ -99,7 +98,6 @@ export const MapTaskExecutionsListItem: React.FC<
/>
);
})}

{/* If map task is actively started - show 'started' and 'run time' details */}
{taskHasStarted && (
<section className={styles.section}>
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import Typography from '@material-ui/core/Typography';
import classnames from 'classnames';
import { useCommonStyles } from 'components/common/styles';
import { TaskExecutionPhase } from 'models/Execution/enums';
import { TaskExecution } from 'models/Execution/types';
import { MapTaskExecution, TaskExecution } from 'models/Execution/types';
import { Core } from '@flyteorg/flyteidl-types';
import { ExternalConfigHoc } from 'basics/ExternalConfigHoc';
import { useExternalConfigurationContext } from 'basics/ExternalConfigurationProvider';
@@ -36,7 +36,7 @@ const useStyles = makeStyles((theme: Theme) => ({
}));

interface TaskExecutionLogsCardProps {
taskExecution: TaskExecution;
taskExecution: TaskExecution | MapTaskExecution;
headerText: string;
phase: TaskExecutionPhase;
logs: Core.ITaskLog[];
Original file line number Diff line number Diff line change
@@ -64,6 +64,7 @@ export const TaskNameList = ({
onTaskSelected({
...taskExecution,
taskIndex: (log as any).index,
parentRetryAttempt: taskExecution.id.retryAttempt,
});
};

1 change: 1 addition & 0 deletions packages/console/src/models/Execution/types.ts
Original file line number Diff line number Diff line change
@@ -118,6 +118,7 @@ export interface TaskExecutionIdentifier extends Core.ITaskExecutionIdentifier {
}
export interface MapTaskExecution extends TaskExecution {
taskIndex: number | null;
parentRetryAttempt?: number;
}

export interface TaskExecution extends Admin.ITaskExecution {
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
},
"dependencies": {
"@flyteorg/common": "^0.0.4",
"@flyteorg/console": "^0.0.30",
"@flyteorg/console": "^0.0.31",
"long": "^4.0.0",
"protobufjs": "~6.11.3",
"react-ga4": "^1.4.1",
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -2020,7 +2020,7 @@ __metadata:
resolution: "@flyteconsole/client-app@workspace:website"
dependencies:
"@flyteorg/common": ^0.0.4
"@flyteorg/console": ^0.0.30
"@flyteorg/console": ^0.0.31
"@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.30, @flyteorg/console@workspace:packages/console":
"@flyteorg/console@^0.0.31, @flyteorg/console@workspace:packages/console":
version: 0.0.0-use.local
resolution: "@flyteorg/console@workspace:packages/console"
dependencies: