Skip to content

Commit dd927f9

Browse files
committed
implemented was using new api for checking fleets
1 parent e2b6122 commit dd927f9

3 files changed

Lines changed: 30 additions & 13 deletions

File tree

frontend/src/api.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ export const API = {
6363
PROJECTS: {
6464
BASE: () => `${API.BASE()}/projects`,
6565
LIST: () => `${API.PROJECTS.BASE()}/list`,
66+
LIST_ONLY_NO_FLEETS: () => `${API.PROJECTS.BASE()}/list_only_no_fleets`,
6667
CREATE: () => `${API.PROJECTS.BASE()}/create`,
6768
CREATE_WIZARD: () => `${API.PROJECTS.BASE()}/create_wizard`,
6869
DELETE: () => `${API.PROJECTS.BASE()}/delete`,

frontend/src/hooks/useCheckingForFleetsInProjectsOfMember.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useMemo } from 'react';
22

3-
import { useGetProjectsQuery } from '../services/project';
3+
import { useGetOnlyNoFleetsProjectsQuery, useGetProjectsQuery } from 'services/project';
44

55
type Args = { projectNames?: IProject['project_name'][] };
66

@@ -9,14 +9,9 @@ export const useCheckingForFleetsInProjects = ({ projectNames }: Args) => {
99
skip: !!projectNames?.length,
1010
});
1111

12-
const { data: noFleetsProjectsData } = useGetProjectsQuery(
13-
{
14-
only_no_fleets: true,
15-
},
16-
{
17-
skip: !!projectNames?.length,
18-
},
19-
);
12+
const { data: noFleetsProjectsData } = useGetOnlyNoFleetsProjectsQuery(undefined, {
13+
skip: !!projectNames?.length,
14+
});
2015

2116
const projectNameForChecking = useMemo<IProject['project_name'][]>(() => {
2217
if (projectNames) {

frontend/src/services/project.ts

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ export const projectApi = createApi({
2020
prepareHeaders: fetchBaseQueryHeaders,
2121
}),
2222

23-
tagTypes: ['Projects', 'ProjectRepos', 'ProjectLogs', 'Backends'],
23+
tagTypes: ['Projects', 'NoFleetsProject', 'ProjectRepos', 'ProjectLogs', 'Backends'],
2424

2525
endpoints: (builder) => ({
26-
getProjects: builder.query<IProject[], TGetProjectsParams | void>({
27-
query: (body) => {
26+
getProjects: builder.query<IProject[], void>({
27+
query: () => {
2828
return {
2929
url: API.PROJECTS.LIST(),
3030
method: 'POST',
31-
body,
3231
};
3332
},
3433

@@ -41,6 +40,27 @@ export const projectApi = createApi({
4140
: ['Projects'],
4241
}),
4342

43+
getOnlyNoFleetsProjects: builder.query<IProject[], void>({
44+
query: (body) => {
45+
return {
46+
url: API.PROJECTS.LIST_ONLY_NO_FLEETS(),
47+
method: 'POST',
48+
body,
49+
};
50+
},
51+
52+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
53+
transformResponse: (response: any[]): IProject[] => response.map(transformProjectResponse),
54+
55+
providesTags: (result) =>
56+
result
57+
? [
58+
...result.map(({ project_name }) => ({ type: 'NoFleetsProject' as const, id: project_name })),
59+
'NoFleetsProject',
60+
]
61+
: ['NoFleetsProject'],
62+
}),
63+
4464
getProject: builder.query<IProject, { name: IProject['project_name'] }>({
4565
query: ({ name }) => {
4666
return {
@@ -181,6 +201,7 @@ export const projectApi = createApi({
181201

182202
export const {
183203
useGetProjectsQuery,
204+
useGetOnlyNoFleetsProjectsQuery,
184205
useLazyGetProjectsQuery,
185206
useGetProjectQuery,
186207
useCreateProjectMutation,

0 commit comments

Comments
 (0)