Skip to content

Commit fc1067e

Browse files
Do not show resources for SSH fleets in UI (#3649)
Show `-` instead of resource spec ranges for SSH fleets in the fleet list and fleet details views, matching the CLI fix in #3632.
1 parent 5ce087c commit fc1067e

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

frontend/src/pages/Fleets/Details/FleetDetails/index.tsx

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ import { format } from 'date-fns';
66
import { Box, ColumnLayout, Container, Header, Loader, NavigateLink, StatusIndicator } from 'components';
77

88
import { DATE_TIME_FORMAT } from 'consts';
9-
import { formatFleetBackend, formatFleetResources, getFleetInstancesLinkText, getFleetPrice, getFleetStatusIconType } from 'libs/fleet';
9+
import {
10+
formatFleetBackend,
11+
formatFleetResources,
12+
getFleetInstancesLinkText,
13+
getFleetPrice,
14+
getFleetStatusIconType,
15+
} from 'libs/fleet';
1016
import { ROUTES } from 'routes';
1117
import { useGetFleetDetailsQuery } from 'services/fleet';
1218

@@ -69,7 +75,11 @@ export const FleetDetails = () => {
6975

7076
<div>
7177
<Box variant="awsui-key-label">{t('fleets.instances.resources')}</Box>
72-
<div>{formatFleetResources(data.spec.configuration.resources)}</div>
78+
<div>
79+
{data.spec.configuration.ssh_config
80+
? '-'
81+
: formatFleetResources(data.spec.configuration.resources)}
82+
</div>
7383
</div>
7484

7585
<div>
@@ -89,7 +99,12 @@ export const FleetDetails = () => {
8999

90100
<div>
91101
<Box variant="awsui-key-label">{t('fleets.instances.price')}</Box>
92-
<div>{(() => { const p = getFleetPrice(data); return typeof p === 'number' ? `$${p}` : '-'; })()}</div>
102+
<div>
103+
{(() => {
104+
const p = getFleetPrice(data);
105+
return typeof p === 'number' ? `$${p}` : '-';
106+
})()}
107+
</div>
93108
</div>
94109
</ColumnLayout>
95110
</Container>

frontend/src/pages/Fleets/List/hooks.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ export const useColumnsDefinitions = () => {
8989
{
9090
id: 'resources',
9191
header: t('fleets.instances.resources'),
92-
cell: (item) => formatFleetResources(item.spec.configuration.resources),
92+
cell: (item) =>
93+
item.spec.configuration.ssh_config ? '-' : formatFleetResources(item.spec.configuration.resources),
9394
},
9495
{
9596
id: 'instances',

0 commit comments

Comments
 (0)