Skip to content

Commit 6c42cc4

Browse files
committed
#2228 - fix hook
1 parent afb9d1f commit 6c42cc4

4 files changed

Lines changed: 16 additions & 11 deletions

File tree

src/backend/src/services/design-reviews.services.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ export default class DesignReviewsService {
158158
throw new NotFoundException('User Settings', 'Cannot find settings of members');
159159
}
160160

161-
console.log(memberUserSettings);
162161
// send a slack message to all leadership invited to the design review
163162
for (const memberUserSetting of memberUserSettings) {
164163
if (memberUserSetting.slackId) {
@@ -355,7 +354,7 @@ export default class DesignReviewsService {
355354

356355
// If all requested attendees have confirmed their schedule, mark design review as confirmed
357356
if (
358-
designReview.confirmedMembers.length ===
357+
updatedDesignReview.confirmedMembers.length ===
359358
designReview.requiredMembers.length + designReview.optionalMembers.length
360359
) {
361360
await prisma.design_Review.update({

src/frontend/src/hooks/design-reviews.hooks.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,15 @@ export const useAllTeamTypes = () => {
103103
*
104104
* @returns a single design review
105105
*/
106-
export const useSingleDesignReview = (id: string) => {
107-
return useQuery<DesignReview, Error>(['design-reviews', id], async () => {
108-
const { data } = await getSingleDesignReview(id);
109-
return data;
110-
});
106+
export const useSingleDesignReview = (id?: string) => {
107+
return useQuery<DesignReview, Error>(
108+
['design-reviews', id],
109+
async () => {
110+
const { data } = await getSingleDesignReview(id!);
111+
return data;
112+
},
113+
{ enabled: !!id }
114+
);
111115
};
112116

113117
export const useMarkUserConfirmed = (id: string) => {

src/frontend/src/pages/SettingsPage/UserScheduleSettings/UserScheduleSettings.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const UserScheduleSettings = ({ user }: { user: User }) => {
4646
isError: designReviewIsError,
4747
error: designReviewError,
4848
isLoading: designReviewIsLoading
49-
} = useSingleDesignReview(designReviewId || '');
49+
} = useSingleDesignReview(designReviewId ?? undefined);
5050

5151
if (designReviewId && (!designReview || designReviewIsLoading)) return <LoadingIndicator />;
5252
if (!data || isLoading || updateUserScheduleSettingsIsLoading) return <LoadingIndicator />;

src/frontend/src/pages/SettingsPage/UserScheduleSettings/UserScheduleSettingsView.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ const UserScheduleSettingsView = ({
2828
const [confirmAvailabilityOpen, setConfirmAvailabilityOpen] = useState(defaultOpen || false);
2929
const [confirmedAvailabilities, setConfirmedAvailabilities] = useState(scheduleSettings.availability);
3030
const { mutateAsync } = useMarkUserConfirmed(designReview?.designReviewId || '');
31-
const confirmModalTitle = `Update your availability for the ${
32-
designReview?.wbsName
33-
} Design Review on the week of ${designReview?.dateScheduled.toLocaleDateString()}`;
31+
const confirmModalTitle = designReview
32+
? `Update your availability for the ${
33+
designReview?.wbsName
34+
} Design Review on the week of ${designReview?.dateScheduled.toLocaleDateString()}`
35+
: '';
3436

3537
const handleConfirm = async (payload: { availability: number[] }) => {
3638
setConfirmAvailabilityOpen(false);

0 commit comments

Comments
 (0)