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: show launchplan in execution table #738

Merged
merged 6 commits into from
Apr 11, 2023
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { ExecutionStatusBadge } from 'components/Executions/ExecutionStatusBadge
import { Execution } from 'models/Execution/types';
import { ExecutionState, WorkflowExecutionPhase } from 'models/Execution/enums';
import classnames from 'classnames';
import { LaunchPlanLink } from 'components/LaunchPlan/LaunchPlanLink';
import { WorkflowExecutionsTableState } from '../types';
import { WorkflowExecutionLink } from '../WorkflowExecutionLink';
import { getWorkflowExecutionTimingMS, isExecutionArchived } from '../../utils';
Expand Down Expand Up @@ -99,6 +100,28 @@ export function getDurationCell(execution: Execution): React.ReactNode {
);
}

export function getLaunchPlanCell(
execution: Execution,
className: string,
): React.ReactNode {
const isArchived = isExecutionArchived(execution);
const lp = execution.spec.launchPlan;
const version = execution.spec.launchPlan.version;

return (
<>
<LaunchPlanLink id={lp} color={isArchived ? 'disabled' : 'primary'} />
<Typography
className={className}
variant="subtitle1"
color="textSecondary"
>
{version}
</Typography>
</>
);
}

export const showOnHoverClass = 'showOnHover';
export function getActionsCell(
execution: Execution,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Protobuf } from '@flyteorg/flyteidl-types';

const str = {
tableLabel_name: 'execution id',
tableLabel_launchPlan: 'launch plan',
tableLabel_phase: 'status',
tableLabel_startedAt: 'start time',
tableLabel_duration: 'duration',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ export const useStyles = makeStyles((theme: Theme) => ({
flexBasis: workflowExecutionsTableColumnWidths.name,
whiteSpace: 'normal',
},
columnLaunchPlan: {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering how this would handle a really large string; could we add something like overflow:hidden here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, it's ugly without overflow:hidden
Fixed it.

Screen.Recording.2023-04-06.at.9.38.47.PM.mov

flexGrow: 1,
flexBasis: workflowExecutionsTableColumnWidths.launchPlan,
overflow: 'hidden',
},
columnLastRun: {
flexBasis: workflowExecutionsTableColumnWidths.lastRun,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
getExecutionIdCell,
getStartTimeCell,
getStatusCell,
getLaunchPlanCell,
} from './cells';
import { useStyles } from './styles';
import t, { patternKey } from './strings';
Expand Down Expand Up @@ -44,6 +45,13 @@ export function useWorkflowExecutionsTableColumns(
key: 'name',
label: t(patternKey('tableLabel', 'name')),
},
{
cellRenderer: ({ execution }) =>
getLaunchPlanCell(execution, commonStyles.textWrapped),
className: styles.columnLaunchPlan,
key: 'launchPlan',
label: t(patternKey('tableLabel', 'launchPlan')),
},
{
cellRenderer: ({ execution }) => getStatusCell(execution),
className: styles.columnStatus,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ export const workflowExecutionsTableColumnWidths = {
duration: 100,
actions: 130,
lastRun: 130,
name: 360,
name: 240,
launchPlan: 120,
phase: 120,
startedAt: 200,
};
Expand Down
27 changes: 27 additions & 0 deletions packages/console/src/components/LaunchPlan/LaunchPlanLink.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import classnames from 'classnames';
import { useCommonStyles } from 'components/common/styles';
import { LaunchPlanId } from 'models/Launch/types';
import * as React from 'react';
import { Link as RouterLink } from 'react-router-dom';
import { Routes } from 'routes/routes';

/** A simple component to render a link to a specific LaunchPlan */
export const LaunchPlanLink: React.FC<{
className?: string;
color?: 'primary' | 'disabled';
id: LaunchPlanId;
}> = ({ className, color = 'primary', id }) => {
const commonStyles = useCommonStyles();
const linkColor =
color === 'disabled'
? commonStyles.secondaryLink
: commonStyles.primaryLink;
return (
<RouterLink
className={classnames(linkColor, className)}
to={`${Routes.LaunchPlanDetails.makeUrl(id.project, id.domain, id.name)}`}
>
{id.name}
</RouterLink>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ describe('ProjectDashboard', () => {
mockUseUserProfile.mockReturnValue(
loadedFetchable(sampleUserProfile, jest.fn()),
);
const { getByText, queryByText, getAllByRole } = renderView();
const { getAllByText, queryAllByText, getAllByRole } = renderView();
await waitFor(() => {});
expect(mockUseUserProfile).toHaveBeenCalled();

Expand All @@ -224,13 +224,15 @@ describe('ProjectDashboard', () => {
expect(checkboxes[0]).toBeTruthy();
expect(checkboxes[0]?.checked).toEqual(false);
await waitFor(() =>
expect(getByText(executions1[0].closure.workflowId.name)),
expect(getAllByText(executions1[0].closure.workflowId.name)),
);
await fireEvent.click(checkboxes[0]);

// when user selects checkbox, table should have no executions to display
await waitFor(() =>
expect(queryByText(executions1[0].closure.workflowId.name)).toBeNull(),
expect(
queryAllByText(executions1[0].closure.workflowId.name),
).toHaveLength(0),
);
});

Expand Down