From b532c22dc30bbb9d5080b8df8915f9fa7e25fdb1 Mon Sep 17 00:00:00 2001 From: Alex Mickelson Date: Mon, 23 Sep 2024 20:20:56 -0600 Subject: [PATCH] ordered cache invalidatin --- nextjs/src/app/globals.css | 2 +- .../src/hooks/localCourse/assignmentHooks.ts | 20 +++++++++---------- nextjs/src/hooks/localCourse/pageHooks.ts | 16 +++++++-------- nextjs/src/hooks/localCourse/quizHooks.ts | 20 +++++++++---------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/nextjs/src/app/globals.css b/nextjs/src/app/globals.css index 69a79a8..31d54ac 100644 --- a/nextjs/src/app/globals.css +++ b/nextjs/src/app/globals.css @@ -99,7 +99,7 @@ button, .btn { @apply font-bold py-1 px-3 rounded transition-all duration-200; } -button:not(.unstyled), .btn:not(.unstyled) { +button:not(.unstyled):not(.btn-danger), .btn:not(.unstyled):not(.btn-danger) { @apply bg-blue-900 hover:bg-blue-700 text-blue-50; } diff --git a/nextjs/src/hooks/localCourse/assignmentHooks.ts b/nextjs/src/hooks/localCourse/assignmentHooks.ts index 29189e5..42699ec 100644 --- a/nextjs/src/hooks/localCourse/assignmentHooks.ts +++ b/nextjs/src/hooks/localCourse/assignmentHooks.ts @@ -140,17 +140,17 @@ export const useUpdateAssignmentMutation = () => { previousAssignmentName, }); }, - onSuccess: (_, { moduleName, assignmentName }) => { - queryClient.invalidateQueries({ + onSuccess: async (_, { moduleName, assignmentName }) => { + await queryClient.invalidateQueries({ + queryKey: localCourseKeys.assignmentNames(courseName, moduleName), + }); + await queryClient.invalidateQueries({ queryKey: localCourseKeys.assignment( courseName, moduleName, assignmentName ), }); - queryClient.invalidateQueries({ - queryKey: localCourseKeys.assignmentNames(courseName, moduleName), - }); }, }); }; @@ -181,17 +181,17 @@ export const useCreateAssignmentMutation = () => { encodeURIComponent(assignmentName); await axiosClient.post(url, assignment); }, - onSuccess: (_, { moduleName, assignmentName }) => { - queryClient.invalidateQueries({ + onSuccess: async (_, { moduleName, assignmentName }) => { + await queryClient.invalidateQueries({ + queryKey: localCourseKeys.assignmentNames(courseName, moduleName), + }); + await queryClient.invalidateQueries({ queryKey: localCourseKeys.assignment( courseName, moduleName, assignmentName ), }); - queryClient.invalidateQueries({ - queryKey: localCourseKeys.assignmentNames(courseName, moduleName), - }); }, }); }; diff --git a/nextjs/src/hooks/localCourse/pageHooks.ts b/nextjs/src/hooks/localCourse/pageHooks.ts index d101225..6327dac 100644 --- a/nextjs/src/hooks/localCourse/pageHooks.ts +++ b/nextjs/src/hooks/localCourse/pageHooks.ts @@ -129,13 +129,13 @@ export const useUpdatePageMutation = () => { previousPageName, }); }, - onSuccess: (_, { moduleName, pageName }) => { - queryClient.invalidateQueries({ - queryKey: localCourseKeys.page(courseName, moduleName, pageName), - }); - queryClient.invalidateQueries({ + onSuccess: async (_, { moduleName, pageName }) => { + await queryClient.invalidateQueries({ queryKey: localCourseKeys.pageNames(courseName, moduleName), }); + await queryClient.invalidateQueries({ + queryKey: localCourseKeys.page(courseName, moduleName, pageName), + }); }, }); }; @@ -204,11 +204,11 @@ export const useDeletePageMutation = () => { await axiosClient.delete(url); }, - onSuccess: (_, { moduleName, pageName }) => { - queryClient.invalidateQueries({ + onSuccess: async (_, { moduleName, pageName }) => { + await queryClient.invalidateQueries({ queryKey: localCourseKeys.pageNames(courseName, moduleName), }); - queryClient.invalidateQueries({ + await queryClient.invalidateQueries({ queryKey: localCourseKeys.page(courseName, moduleName, pageName), }); }, diff --git a/nextjs/src/hooks/localCourse/quizHooks.ts b/nextjs/src/hooks/localCourse/quizHooks.ts index 886a4a9..60ed308 100644 --- a/nextjs/src/hooks/localCourse/quizHooks.ts +++ b/nextjs/src/hooks/localCourse/quizHooks.ts @@ -126,13 +126,13 @@ export const useUpdateQuizMutation = () => { // getQuizNamesQueryConfig(courseName, previousModuleName) // ); }, - onSuccess: (_, { moduleName, quizName }) => { - queryClient.invalidateQueries({ - queryKey: localCourseKeys.quiz(courseName, moduleName, quizName), - }); - queryClient.invalidateQueries({ + onSuccess: async (_, { moduleName, quizName }) => { + await queryClient.invalidateQueries({ queryKey: localCourseKeys.quizNames(courseName, moduleName), }); + await queryClient.invalidateQueries({ + queryKey: localCourseKeys.quiz(courseName, moduleName, quizName), + }); }, }); }; @@ -163,13 +163,13 @@ export const useCreateQuizMutation = () => { encodeURIComponent(quizName); await axiosClient.post(url, quiz); }, - onSuccess: (_, { moduleName, quizName }) => { - queryClient.invalidateQueries({ - queryKey: localCourseKeys.quiz(courseName, moduleName, quizName), - }); - queryClient.invalidateQueries({ + onSuccess: async (_, { moduleName, quizName }) => { + await queryClient.invalidateQueries({ queryKey: localCourseKeys.quizNames(courseName, moduleName), }); + await queryClient.invalidateQueries({ + queryKey: localCourseKeys.quiz(courseName, moduleName, quizName), + }); }, }); };