Skip to content
Closed
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
3 changes: 2 additions & 1 deletion frontend/src/libs/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { get as _get } from 'lodash';
import { StatusIndicatorProps } from '@cloudscape-design/components';

import { capitalize } from 'libs';

import { finishedRunStatuses } from '../pages/Runs/constants';

import { IModelExtended } from '../pages/Models/List/types';
Expand Down Expand Up @@ -45,7 +46,7 @@ export const getStatusIconColor = (
switch (status) {
case 'submitted':
case 'pending':
return 'blue';
return 'blue';
case 'pulling':
return 'green';
case 'aborted':
Expand Down
23 changes: 5 additions & 18 deletions frontend/src/pages/Runs/Details/RunDetails/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ import { useParams } from 'react-router-dom';
import { get as _get } from 'lodash';
import { format } from 'date-fns';

import { Box, ColumnLayout, Container, Header, Loader, NavigateLink, StatusIndicator } from 'components';
import { Box, ColumnLayout, Container, Header, Loader, NavigateLink } from 'components';

import { DATE_TIME_FORMAT } from 'consts';
import { getRunError, getRunPriority, getRunStatusMessage, getStatusIconColor, getStatusIconType } from 'libs/run';
import { getRunError, getRunPriority } from 'libs/run';
import { ROUTES } from 'routes';
import { useGetRunQuery } from 'services/run';

import { finishedRunStatuses } from 'pages/Runs/constants';

import { ROUTES } from '../../../../routes';
import { RunStatusIndicator } from '../../components/RunStatusIndicator';
import {
getRunListItemBackend,
getRunListItemInstanceId,
Expand Down Expand Up @@ -50,13 +49,6 @@ export const RunDetails = () => {

if (!runData) return null;

const status = finishedRunStatuses.includes(runData.status)
? runData.latest_job_submission?.status ?? runData.status
: runData.status;
const terminationReason = finishedRunStatuses.includes(runData.status)
? runData.latest_job_submission?.termination_reason
: null;

return (
<>
<Container header={<Header variant="h2">{t('common.general')}</Header>}>
Expand Down Expand Up @@ -105,12 +97,7 @@ export const RunDetails = () => {
<div>
<Box variant="awsui-key-label">{t('projects.run.status')}</Box>
<div>
<StatusIndicator
type={getStatusIconType(status, terminationReason)}
colorOverride={getStatusIconColor(status, terminationReason)}
>
{getRunStatusMessage(runData)}
</StatusIndicator>
<RunStatusIndicator run={runData} />
</div>
</div>

Expand Down
32 changes: 4 additions & 28 deletions frontend/src/pages/Runs/List/hooks/useColumnsDefinitions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,13 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import { format } from 'date-fns';

import { NavigateLink, StatusIndicator } from 'components';
import { NavigateLink } from 'components';

import { DATE_TIME_FORMAT } from 'consts';
import {
getRepoNameFromRun,
getRunError,
getRunPriority,
getRunStatusMessage,
getStatusIconColor,
getStatusIconType,
} from 'libs/run';
import { getRepoNameFromRun, getRunError, getRunPriority } from 'libs/run';
import { ROUTES } from 'routes';

import { finishedRunStatuses } from 'pages/Runs/constants';

import { RunStatusIndicator } from '../../components/RunStatusIndicator';
import {
getRunListItemBackend,
getRunListItemInstance,
Expand Down Expand Up @@ -73,23 +65,7 @@ export const useColumnsDefinitions = () => {
{
id: 'status',
header: t('projects.run.status'),
cell: (item: IRun) => {
const status = finishedRunStatuses.includes(item.status)
? item.latest_job_submission?.status ?? item.status
: item.status;
const terminationReason = finishedRunStatuses.includes(item.status)
? item.latest_job_submission?.termination_reason
: null;

return (
<StatusIndicator
type={getStatusIconType(status, terminationReason)}
colorOverride={getStatusIconColor(status, terminationReason)}
>
{getRunStatusMessage(item)}
</StatusIndicator>
);
},
cell: (item: IRun) => <RunStatusIndicator run={item} />,
},
{
id: 'error',
Expand Down
53 changes: 53 additions & 0 deletions frontend/src/pages/Runs/components/RunStatusIndicator/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import React, { useRef } from 'react';

import { Box, Icon, Popover, StatusIndicator } from 'components';

import { getRunStatusMessage, getStatusIconColor, getStatusIconType } from 'libs/run';

import { finishedRunStatuses } from '../../constants';

import styles from './styles.module.scss';

type RunStatusIndicatorProps = {
run: IRun;
};

export const RunStatusIndicator: React.FC<RunStatusIndicatorProps> = ({ run }) => {
const buttonRef = useRef<HTMLButtonElement>(null);
const status = finishedRunStatuses.includes(run.status) ? run.latest_job_submission?.status ?? run.status : run.status;

const terminationReason = finishedRunStatuses.includes(run.status) ? run.latest_job_submission?.termination_reason : null;

const isShowInfo = ['no offers', 'error'].includes(run.latest_job_submission?.status_message ?? '');

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Also for interrupted

return (
<div className={styles.runStatus}>
<StatusIndicator
type={getStatusIconType(status, terminationReason)}
colorOverride={getStatusIconColor(status, terminationReason)}
>
{getRunStatusMessage(run)}
</StatusIndicator>

{isShowInfo && (
<div
className={styles.infoIcon}
onMouseEnter={() => buttonRef.current?.click()}
onMouseLeave={() => document.dispatchEvent(new MouseEvent('mousedown'))}
>
<Icon name="status-info" />

<Popover
dismissButton={false}
position="top"
size="medium"
triggerType="custom"
content={<Box>Type your text here</Box>}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should ne diffrent depending on the value

>
<button ref={buttonRef} style={{ display: 'none' }} aria-hidden="true" />
</Popover>
</div>
)}
</div>
);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.runStatus {
display: flex;
align-items: center;
gap: 10px
}

.infoIcon {
position: relative;

[class*="awsui_popover"] {
& > div {
transform: translate(-8px, -14px);
}
}
}
Loading