Skip to content

Commit 178abdc

Browse files
authored
Revert "No fleets notification #373 (#3418)" (#3424)
This reverts commit 0644871.
1 parent 6be8f53 commit 178abdc

File tree

9 files changed

+66
-249
lines changed

9 files changed

+66
-249
lines changed

frontend/src/hooks/useCheckingForFleetsInProjectsOfMember.ts

Lines changed: 0 additions & 51 deletions
This file was deleted.

frontend/src/locale/en.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -564,11 +564,6 @@
564564
},
565565

566566
"fleets": {
567-
"no_alert": {
568-
"title": "No fleets",
569-
"description": "The project has no fleets. Create one before submitting a run.",
570-
"button_title": "Create a fleet"
571-
},
572567
"fleet": "Fleet",
573568
"fleet_placeholder": "Filtering by fleet",
574569
"fleet_name": "Fleet name",

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

Lines changed: 20 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import React from 'react';
22
import { useTranslation } from 'react-i18next';
3-
import { ButtonProps } from '@cloudscape-design/components/button';
43

5-
import { Alert, Button, Header, Loader, PropertyFilter, SpaceBetween, Table, Toggle } from 'components';
4+
import { Button, Header, Loader, PropertyFilter, SpaceBetween, Table, Toggle } from 'components';
65

76
import { DEFAULT_TABLE_PAGE_SIZE } from 'consts';
87
import { useBreadcrumbs, useCollection, useInfiniteScroll } from 'hooks';
9-
import { useCheckingForFleetsInProjects } from 'hooks/useCheckingForFleetsInProjectsOfMember';
10-
import { goToUrl } from 'libs';
118
import { ROUTES } from 'routes';
129
import { useLazyGetFleetsQuery } from 'services/fleet';
1310

@@ -38,8 +35,6 @@ export const FleetList: React.FC = () => {
3835
isDisabledClearFilter,
3936
} = useFilters();
4037

41-
const projectHavingFleetMap = useCheckingForFleetsInProjects({});
42-
4338
const { data, isLoading, refreshList, isLoadingMore } = useInfiniteScroll<IFleet, TFleetListRequestParams>({
4439
useLazyQuery: useLazyGetFleetsQuery,
4540
args: { ...filteringRequestParams, limit: DEFAULT_TABLE_PAGE_SIZE },
@@ -72,13 +67,6 @@ export const FleetList: React.FC = () => {
7267
deleteFleets([...selectedItems]).catch(console.log);
7368
};
7469

75-
const projectDontHasFleet = Object.keys(projectHavingFleetMap).find((project) => !projectHavingFleetMap[project]);
76-
77-
const onCreateAFleet: ButtonProps['onClick'] = (event) => {
78-
event.preventDefault();
79-
goToUrl('https://dstack.ai/docs/quickstart/#create-a-fleet', true);
80-
};
81-
8270
return (
8371
<Table
8472
{...collectionProps}
@@ -90,44 +78,25 @@ export const FleetList: React.FC = () => {
9078
stickyHeader={true}
9179
selectionType="multi"
9280
header={
93-
<>
94-
{projectDontHasFleet && (
95-
<div className={styles.alertBox}>
96-
<Alert
97-
header={t('fleets.no_alert.title')}
98-
type="info"
99-
action={
100-
<Button iconName="external" formAction="none" onClick={onCreateAFleet}>
101-
{t('fleets.no_alert.button_title')}
102-
</Button>
103-
}
104-
>
105-
The project <code>{projectDontHasFleet}</code> has no fleets. Create one before submitting a
106-
run.
107-
</Alert>
108-
</div>
109-
)}
110-
111-
<Header
112-
variant="awsui-h1-sticky"
113-
actions={
114-
<SpaceBetween size="xs" direction="horizontal">
115-
<Button formAction="none" onClick={deleteClickHandle} disabled={isDisabledDeleteButton}>
116-
{t('common.delete')}
117-
</Button>
118-
119-
<Button
120-
iconName="refresh"
121-
disabled={isLoading}
122-
ariaLabel={t('common.refresh')}
123-
onClick={refreshList}
124-
/>
125-
</SpaceBetween>
126-
}
127-
>
128-
{t('navigation.fleets')}
129-
</Header>
130-
</>
81+
<Header
82+
variant="awsui-h1-sticky"
83+
actions={
84+
<SpaceBetween size="xs" direction="horizontal">
85+
<Button formAction="none" onClick={deleteClickHandle} disabled={isDisabledDeleteButton}>
86+
{t('common.delete')}
87+
</Button>
88+
89+
<Button
90+
iconName="refresh"
91+
disabled={isLoading}
92+
ariaLabel={t('common.refresh')}
93+
onClick={refreshList}
94+
/>
95+
</SpaceBetween>
96+
}
97+
>
98+
{t('navigation.fleets')}
99+
</Header>
131100
}
132101
filter={
133102
<div className={styles.filters}>

frontend/src/pages/Fleets/List/styles.module.scss

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
.alertBox {
2-
margin-bottom: 12px;
3-
4-
:global {
5-
& [class^="awsui_alert"] {
6-
& [class^="awsui_action-slot"] {
7-
display: flex;
8-
align-items: center;
9-
}
10-
}
11-
}
12-
}
131
.filters {
142
display: flex;
153
flex-wrap: wrap;

frontend/src/pages/Project/Details/Settings/index.tsx

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ import { useTranslation } from 'react-i18next';
33
import { useNavigate, useParams } from 'react-router-dom';
44
import { debounce } from 'lodash';
55
import { ExpandableSection, Tabs } from '@cloudscape-design/components';
6-
import { ButtonProps } from '@cloudscape-design/components/button';
76
import Wizard from '@cloudscape-design/components/wizard';
87

98
import {
10-
Alert,
119
Box,
1210
Button,
1311
ButtonWithConfirmation,
@@ -24,7 +22,7 @@ import {
2422
import { HotspotIds } from 'layouts/AppLayout/TutorialPanel/constants';
2523

2624
import { useBreadcrumbs, useNotifications } from 'hooks';
27-
import { goToUrl, riseRouterException } from 'libs';
25+
import { riseRouterException } from 'libs';
2826
import { copyToClipboard } from 'libs';
2927
import { ROUTES } from 'routes';
3028
import { useGetProjectQuery, useUpdateProjectMembersMutation, useUpdateProjectMutation } from 'services/project';
@@ -37,7 +35,6 @@ import { useDeleteProject } from 'pages/Project/hooks/useDeleteProject';
3735
import { ProjectMembers } from 'pages/Project/Members';
3836
import { getProjectRoleByUserName } from 'pages/Project/utils';
3937

40-
import { useCheckingForFleetsInProjects } from '../../../../hooks/useCheckingForFleetsInProjectsOfMember';
4138
import { useBackendsTable } from '../../Backends/hooks';
4239
import { BackendsTable } from '../../Backends/Table';
4340
import { GatewaysTable } from '../../Gateways';
@@ -63,10 +60,6 @@ export const ProjectSettings: React.FC = () => {
6360
const { deleteProject, isDeleting } = useDeleteProject();
6461
const { data: currentUser } = useGetUserDataQuery({});
6562

66-
const projectNames = useMemo(() => [paramProjectName], [paramProjectName]);
67-
68-
const projectHavingFleetMap = useCheckingForFleetsInProjects({ projectNames });
69-
7063
const { data, isLoading, error } = useGetProjectQuery({ name: paramProjectName });
7164

7265
const { data: runsData } = useGetRunsQuery({
@@ -187,13 +180,6 @@ export const ProjectSettings: React.FC = () => {
187180

188181
const [activeStepIndex, setActiveStepIndex] = React.useState(0);
189182

190-
const projectDontHasFleet = !projectHavingFleetMap?.[paramProjectName];
191-
192-
const onCreateAFleet: ButtonProps['onClick'] = (event) => {
193-
event.preventDefault();
194-
goToUrl('https://dstack.ai/docs/quickstart/#create-a-fleet', true);
195-
};
196-
197183
if (isLoadingPage)
198184
return (
199185
<Container>
@@ -205,22 +191,6 @@ export const ProjectSettings: React.FC = () => {
205191
<>
206192
{data && backendsData && gatewaysData && (
207193
<SpaceBetween size="l">
208-
{projectDontHasFleet && (
209-
<div className={styles.alertBox}>
210-
<Alert
211-
header={t('fleets.no_alert.title')}
212-
type="info"
213-
action={
214-
<Button iconName="external" formAction="none" onClick={onCreateAFleet}>
215-
{t('fleets.no_alert.button_title')}
216-
</Button>
217-
}
218-
>
219-
The project <code>{paramProjectName}</code> has no fleets. Create one before submitting a run.
220-
</Alert>
221-
</div>
222-
)}
223-
224194
{isProjectMember && (
225195
<ExpandableSection
226196
variant="container"

frontend/src/pages/Project/Details/Settings/styles.module.scss

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,6 @@
88
width: 300px;
99
}
1010

11-
.alertBox {
12-
:global {
13-
& [class^="awsui_alert"] {
14-
& [class^="awsui_action-slot"] {
15-
display: flex;
16-
align-items: center;
17-
}
18-
}
19-
}
20-
}
21-
2211
.codeWrapper {
2312
position: relative;
2413

0 commit comments

Comments
 (0)