Skip to content

Improve CLI settings section and fix status indicator colors #3650

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.

Sign up for GitHub

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

Merged
peterschmidt85 merged 2 commits into from
Mar 12, 2026
Merged

Improve CLI settings section and fix status indicator colors #3650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f47827
Simplify CLI section in project settings
Mar 11, 2026
a023662
Fix status indicator colors for runs and instances
Mar 11, 2026
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
12 changes: 12 additions & 0 deletions frontend/src/libs/fleet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,18 @@ export const getStatusIconType = (status: IInstance['status']): StatusIndicatorP
}
};

export const getStatusIconColor = (status: IInstance['status']): StatusIndicatorProps.Color | undefined => {
switch (status) {
case 'busy':
case 'provisioning':
case 'starting':
case 'terminating':
return 'blue';
default:
return undefined;
}
};

export const getFleetStatusIconType = (status: IFleet['status']): StatusIndicatorProps['type'] => {
switch (status) {
case 'submitted':
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/libs/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@ export const getStatusIconColor = (
switch (status) {
case 'submitted':
case 'pending':
return 'blue';
case 'provisioning':
case 'pulling':
return 'green';
case 'terminating':
return 'blue';
case 'aborted':
return 'yellow';
case 'done':
Expand Down
19 changes: 8 additions & 11 deletions frontend/src/pages/Instances/Details/InstanceDetails/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { format } from 'date-fns';
import { Box, ColumnLayout, Container, Header, Loader, NavigateLink, StatusIndicator } from 'components';

import { DATE_TIME_FORMAT } from 'consts';
import { formatBackend, getStatusIconType } from 'libs/fleet';
import { formatBackend, getStatusIconColor, getStatusIconType } from 'libs/fleet';
import { getHealthStatusIconType, prettyEnumValue } from 'libs/instance';
import { formatResources } from 'libs/resources';
import { ROUTES } from 'routes';
Expand Down Expand Up @@ -52,9 +52,7 @@ export const InstanceDetails = () => {
<Box variant="awsui-key-label">{t('fleets.fleet')}</Box>
<div>
{data.fleet_name && data.fleet_id ? (
<NavigateLink
href={ROUTES.FLEETS.DETAILS.FORMAT(data.project_name, data.fleet_id)}
>
<NavigateLink href={ROUTES.FLEETS.DETAILS.FORMAT(data.project_name, data.fleet_id)}>
{data.fleet_name}
</NavigateLink>
) : (
Expand All @@ -66,7 +64,10 @@ export const InstanceDetails = () => {
<div>
<Box variant="awsui-key-label">{t('fleets.instances.status')}</Box>
<div>
<StatusIndicator type={getStatusIconType(data.status)}>
<StatusIndicator
type={getStatusIconType(data.status)}
colorOverride={getStatusIconColor(data.status)}
>
{(data.status === 'idle' || data.status === 'busy') &&
data.total_blocks !== null &&
data.total_blocks > 1
Expand Down Expand Up @@ -98,17 +99,13 @@ export const InstanceDetails = () => {

<div>
<Box variant="awsui-key-label">{t('fleets.instances.finished_at')}</Box>
<div>
{data.finished_at ? format(new Date(data.finished_at), DATE_TIME_FORMAT) : '-'}
</div>
<div>{data.finished_at ? format(new Date(data.finished_at), DATE_TIME_FORMAT) : '-'}</div>
</div>

{data.termination_reason && (
<div>
<Box variant="awsui-key-label">{t('fleets.instances.termination_reason')}</Box>
<div>
{data.termination_reason_message ?? prettyEnumValue(data.termination_reason)}
</div>
<div>{data.termination_reason_message ?? prettyEnumValue(data.termination_reason)}</div>
</div>
)}

Expand Down
6 changes: 4 additions & 2 deletions frontend/src/pages/Instances/List/hooks/useColumnDefinitions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { format } from 'date-fns';
import { Icon, NavigateLink, StatusIndicator, TableProps } from 'components';

import { DATE_TIME_FORMAT } from 'consts';
import { formatBackend, getStatusIconType } from 'libs/fleet';
import { formatBackend, getStatusIconColor, getStatusIconType } from 'libs/fleet';
import { formatInstanceStatusText, getHealthStatusIconType, prettyEnumValue } from 'libs/instance';
import { formatResources } from 'libs/resources';
import { ROUTES } from 'routes';
Expand Down Expand Up @@ -50,7 +50,9 @@ export const useColumnsDefinitions = () => {
id: 'status',
header: t('fleets.instances.status'),
cell: (item) => (
<StatusIndicator type={getStatusIconType(item.status)}>{formatInstanceStatusText(item)}</StatusIndicator>
<StatusIndicator type={getStatusIconType(item.status)} colorOverride={getStatusIconColor(item.status)}>
{formatInstanceStatusText(item)}
</StatusIndicator>
),
},
{
Expand Down
Loading
Loading