Skip to content

Commit 6c6baea

Browse files
rbessinrbessin
committed
style: fix prettier issues on multiple files
1 parent 889b1ee commit 6c6baea

7 files changed

Lines changed: 126 additions & 66 deletions

File tree

‎src/frontend/src/hooks/change-requests.hooks.ts‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,13 @@ import {
3939
*/
4040
export const useAllChangeRequests = () => {
4141
const { selectedCar } = useGlobalCarFilter();
42-
return useQuery<ChangeRequest[], Error>(['change requests', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
43-
const { data } = await getAllChangeRequests();
44-
return data;
45-
});
42+
return useQuery<ChangeRequest[], Error>(
43+
['change requests', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
44+
async () => {
45+
const { data } = await getAllChangeRequests();
46+
return data;
47+
}
48+
);
4649
};
4750

4851
export const useAllGuestChangeRequests = () => {
@@ -54,26 +57,35 @@ export const useAllGuestChangeRequests = () => {
5457

5558
export const useGetToReviewChangeRequests = () => {
5659
const { selectedCar } = useGlobalCarFilter();
57-
return useQuery<ChangeRequest[], Error>(['change requests', 'to-review', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
58-
const { data } = await getToReviewChangeRequests();
59-
return data;
60-
});
60+
return useQuery<ChangeRequest[], Error>(
61+
['change requests', 'to-review', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
62+
async () => {
63+
const { data } = await getToReviewChangeRequests();
64+
return data;
65+
}
66+
);
6167
};
6268

6369
export const useGetUnreviewedChangeRequests = (wbsNum?: WbsNumber) => {
6470
const { selectedCar } = useGlobalCarFilter();
65-
return useQuery<ChangeRequest[], Error>(['change requests', 'unreviewed', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id, wbsNum], async () => {
66-
const { data } = await getUnreviewedChangeRequests(wbsNum);
67-
return data;
68-
});
71+
return useQuery<ChangeRequest[], Error>(
72+
['change requests', 'unreviewed', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id, wbsNum],
73+
async () => {
74+
const { data } = await getUnreviewedChangeRequests(wbsNum);
75+
return data;
76+
}
77+
);
6978
};
7079

7180
export const useGetApprovedChangeRequests = (wbsNum?: WbsNumber) => {
7281
const { selectedCar } = useGlobalCarFilter();
73-
return useQuery<ChangeRequest[], Error>(['change requests', 'approved', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id, wbsNum], async () => {
74-
const { data } = await getApprovedChangeRequests(wbsNum);
75-
return data;
76-
});
82+
return useQuery<ChangeRequest[], Error>(
83+
['change requests', 'approved', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id, wbsNum],
84+
async () => {
85+
const { data } = await getApprovedChangeRequests(wbsNum);
86+
return data;
87+
}
88+
);
7789
};
7890

7991
/**

‎src/frontend/src/hooks/finance.hooks.ts‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -467,32 +467,41 @@ export const useGetAllAccountCodes = () => {
467467
*/
468468
export const useCurrentUserReimbursementRequests = () => {
469469
const { selectedCar } = useGlobalCarFilter();
470-
return useQuery<ReimbursementRequest[], Error>(['reimbursement-requests', 'user', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
471-
const { data } = await getCurrentUserReimbursementRequests();
472-
return data;
473-
});
470+
return useQuery<ReimbursementRequest[], Error>(
471+
['reimbursement-requests', 'user', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
472+
async () => {
473+
const { data } = await getCurrentUserReimbursementRequests();
474+
return data;
475+
}
476+
);
474477
};
475478

476479
/**
477480
* Custom React Hook to get the reimbursement requests assigned to the current user
478481
*/
479482
export const useCurrentUserAssignedReimbursementRequests = () => {
480483
const { selectedCar } = useGlobalCarFilter();
481-
return useQuery<ReimbursementRequest[], Error>(['reimbursement-requests', 'assignee', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
482-
const { data } = await getCurrentUserAssignedReimbursementRequests();
483-
return data;
484-
});
484+
return useQuery<ReimbursementRequest[], Error>(
485+
['reimbursement-requests', 'assignee', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
486+
async () => {
487+
const { data } = await getCurrentUserAssignedReimbursementRequests();
488+
return data;
489+
}
490+
);
485491
};
486492

487493
/**
488494
* Custom React Hook to get the reimbursement requests for the current user's teams
489495
*/
490496
export const useCurrentUsersTeamsReimbursementRequests = () => {
491497
const { selectedCar } = useGlobalCarFilter();
492-
return useQuery<ReimbursementRequest[], Error>(['reimbursement-requests', 'teams', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
493-
const { data } = await getCurrentUsersTeamsReimbursementRequests();
494-
return data;
495-
});
498+
return useQuery<ReimbursementRequest[], Error>(
499+
['reimbursement-requests', 'teams', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
500+
async () => {
501+
const { data } = await getCurrentUsersTeamsReimbursementRequests();
502+
return data;
503+
}
504+
);
496505
};
497506

498507
/**
@@ -542,10 +551,13 @@ export const useSetTaxExemptStatus = () => {
542551
*/
543552
export const useAllReimbursementRequests = () => {
544553
const { selectedCar } = useGlobalCarFilter();
545-
return useQuery<ReimbursementRequest[], Error>(['reimbursement-requests', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
546-
const { data } = await getAllReimbursementRequests();
547-
return data;
548-
});
554+
return useQuery<ReimbursementRequest[], Error>(
555+
['reimbursement-requests', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
556+
async () => {
557+
const { data } = await getAllReimbursementRequests();
558+
return data;
559+
}
560+
);
549561
};
550562

551563
/**

‎src/frontend/src/hooks/projects.hooks.ts‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,43 +56,55 @@ export const useAllProjectsGantt = () => {
5656
*/
5757
export const useAllProjects = () => {
5858
const { selectedCar } = useGlobalCarFilter();
59-
return useQuery<ProjectPreview[], Error>(['projects', 'previews', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
60-
const { data } = await getAllProjects();
61-
return data;
62-
});
59+
return useQuery<ProjectPreview[], Error>(
60+
['projects', 'previews', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
61+
async () => {
62+
const { data } = await getAllProjects();
63+
return data;
64+
}
65+
);
6366
};
6467

6568
/**
6669
* Custom React Hook to supply all of the projects that are on the users teams
6770
*/
6871
export const useGetUsersTeamsProjects = () => {
6972
const { selectedCar } = useGlobalCarFilter();
70-
return useQuery<ProjectOverview[], Error>(['projects', 'teams', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
71-
const { data } = await getUsersTeamsProjects();
72-
return data;
73-
});
73+
return useQuery<ProjectOverview[], Error>(
74+
['projects', 'teams', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
75+
async () => {
76+
const { data } = await getUsersTeamsProjects();
77+
return data;
78+
}
79+
);
7480
};
7581

7682
/**
7783
* Custom React Hook to supply all of the projects that the user is the manager or lead of
7884
*/
7985
export const useGetUsersLeadingProjects = () => {
8086
const { selectedCar } = useGlobalCarFilter();
81-
return useQuery<ProjectOverview[], Error>(['projects', 'leading', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
82-
const { data } = await getUsersLeadingProjects();
83-
return data;
84-
});
87+
return useQuery<ProjectOverview[], Error>(
88+
['projects', 'leading', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
89+
async () => {
90+
const { data } = await getUsersLeadingProjects();
91+
return data;
92+
}
93+
);
8594
};
8695

8796
/**
8897
* Custom React Hook to supply all of the projects for a given team
8998
*/
9099
export const useGetTeamsProjects = (teamId: string) => {
91100
const { selectedCar } = useGlobalCarFilter();
92-
return useQuery<Project[], Error>(['projects', 'teams', teamId, selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
93-
const { data } = await getTeamsProjects(teamId);
94-
return data;
95-
});
101+
return useQuery<Project[], Error>(
102+
['projects', 'teams', teamId, selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
103+
async () => {
104+
const { data } = await getTeamsProjects(teamId);
105+
return data;
106+
}
107+
);
96108
};
97109

98110
/**

‎src/frontend/src/hooks/users.hooks.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,13 @@ export const useUserScheduleSettings = (id: string) => {
190190
*/
191191
export const useUsersFavoriteProjects = (id: string) => {
192192
const { selectedCar } = useGlobalCarFilter();
193-
return useQuery<ProjectOverview[], Error>(['users', id, 'favorite projects', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
194-
const { data } = await getUsersFavoriteProjects(id);
195-
return data;
196-
});
193+
return useQuery<ProjectOverview[], Error>(
194+
['users', id, 'favorite projects', selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
195+
async () => {
196+
const { data } = await getUsersFavoriteProjects(id);
197+
return data;
198+
}
199+
);
197200
};
198201

199202
/**

‎src/frontend/src/hooks/work-packages.hooks.ts‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,27 @@ import { useGlobalCarFilter } from '../app/AppGlobalCarFilterContext';
2626
*/
2727
export const useAllWorkPackages = (queryParams?: { [field: string]: string }) => {
2828
const { selectedCar } = useGlobalCarFilter();
29-
return useQuery<WorkPackage[], Error>(['work packages', queryParams, selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
30-
const { data } = await getAllWorkPackages(queryParams);
31-
return data;
32-
});
29+
return useQuery<WorkPackage[], Error>(
30+
['work packages', queryParams, selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
31+
async () => {
32+
const { data } = await getAllWorkPackages(queryParams);
33+
return data;
34+
}
35+
);
3336
};
3437

3538
/**
3639
* Custom React Hook to supply all work packages in preview format (minimal data).
3740
*/
3841
export const useAllWorkPackagesPreview = (status?: string) => {
3942
const { selectedCar } = useGlobalCarFilter();
40-
return useQuery<WorkPackagePreview[], Error>(['work packages', 'preview', status, selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
41-
const { data } = await getAllWorkPackagesPreview(status);
42-
return data;
43-
});
43+
return useQuery<WorkPackagePreview[], Error>(
44+
['work packages', 'preview', status, selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
45+
async () => {
46+
const { data } = await getAllWorkPackagesPreview(status);
47+
return data;
48+
}
49+
);
4450
};
4551

4652
/**
@@ -153,8 +159,11 @@ export const useSlackUpcomingDeadlines = () => {
153159

154160
export const useHomeScreenWorkPackages = (selection: WorkPackageSelection) => {
155161
const { selectedCar } = useGlobalCarFilter();
156-
return useQuery<WorkPackage[], Error>(['teams', 'work-packages', selection, selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id], async () => {
157-
const { data } = await getHomePageWorkPackages(selection);
158-
return data;
159-
});
162+
return useQuery<WorkPackage[], Error>(
163+
['teams', 'work-packages', selection, selectedCar === 'all-cars' ? 'all-cars' : selectedCar.id],
164+
async () => {
165+
const { data } = await getHomePageWorkPackages(selection);
166+
return data;
167+
}
168+
);
160169
};

‎src/frontend/src/tests/app/AppContextQuery.test.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ import { useAllChangeRequests } from '../../hooks/change-requests.hooks';
88
import AppContextQuery from '../../app/AppContextQuery';
99

1010
vi.mock('../../app/AppGlobalCarFilterContext', () => ({
11-
useGlobalCarFilter: () => ({ selectedCar: 'all-cars', allCars: [], setSelectedCar: vi.fn(), isLoading: false, error: null })
11+
useGlobalCarFilter: () => ({
12+
selectedCar: 'all-cars',
13+
allCars: [],
14+
setSelectedCar: vi.fn(),
15+
isLoading: false,
16+
error: null
17+
})
1218
}));
1319

1420
describe('app context', () => {

‎src/frontend/src/tests/hooks/ChangeRequests.hooks.test.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@ import { useAllChangeRequests, useSingleChangeRequest } from '../../hooks/change
1414

1515
vi.mock('../../apis/change-requests.api');
1616
vi.mock('../../app/AppGlobalCarFilterContext', () => ({
17-
useGlobalCarFilter: () => ({ selectedCar: 'all-cars', allCars: [], setSelectedCar: vi.fn(), isLoading: false, error: null })
17+
useGlobalCarFilter: () => ({
18+
selectedCar: 'all-cars',
19+
allCars: [],
20+
setSelectedCar: vi.fn(),
21+
isLoading: false,
22+
error: null
23+
})
1824
}));
1925

2026
describe('change request hooks', () => {

0 commit comments

Comments
 (0)