From f8c49783190eaa8cc9b12aa63dcd44d7215e71ca Mon Sep 17 00:00:00 2001
From: Alex Mickelson <alexmickelson96@gmail.com>
Date: Mon, 30 Sep 2024 22:30:34 -0600
Subject: [PATCH] can delete without errors

---
 .../[assignmentName]/AssignmentButtons.tsx    | 10 ++++-----
 .../page/[pageName]/EditPageButtons.tsx       | 11 ++++++----
 .../quiz/[quizName]/QuizButton.tsx            |  5 ++---
 nextjs/src/components/editor/MonacoEditor.tsx |  1 -
 .../src/hooks/localCourse/courseItemHooks.ts  | 22 +++++++++----------
 .../localCourse/localCourseModuleHooks.ts     | 11 ++++------
 nextjs/src/hooks/localCourse/pageHooks.ts     | 14 ------------
 7 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/nextjs/src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/AssignmentButtons.tsx b/nextjs/src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/AssignmentButtons.tsx
index 832c6e1..5aa2180 100644
--- a/nextjs/src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/AssignmentButtons.tsx
+++ b/nextjs/src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/AssignmentButtons.tsx
@@ -127,11 +127,11 @@ export function AssignmentButtons({
                 <div className="flex justify-around gap-3">
                   <button
                     onClick={() => {
-                      deleteLocal
-                        .mutateAsync({ moduleName, itemName: assignmentName })
-                        .then(() => {
-                          router.push(getCourseUrl(courseName));
-                        });
+                      router.push(getCourseUrl(courseName));
+                      deleteLocal.mutate({
+                        moduleName,
+                        itemName: assignmentName,
+                      });
                     }}
                     className="btn-danger"
                   >
diff --git a/nextjs/src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPageButtons.tsx b/nextjs/src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPageButtons.tsx
index ee2e9a5..fcea07c 100644
--- a/nextjs/src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPageButtons.tsx
+++ b/nextjs/src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPageButtons.tsx
@@ -14,6 +14,7 @@ import {
 } from "@/hooks/localCourse/pageHooks";
 import { baseCanvasUrl } from "@/services/canvas/canvasServiceUtils";
 import { getCourseUrl } from "@/services/urlUtils";
+import { revalidatePath } from "next/cache";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import React from "react";
@@ -99,10 +100,12 @@ export default function EditPageButtons({
               <br />
               <div className="flex justify-around gap-3">
                 <button
-                  onClick={async () => {
-                    deletePageLocal
-                      .mutateAsync({ moduleName, itemName: pageName })
-                      .then(() => router.push(getCourseUrl(courseName)));
+                  onClick={() => {
+                    router.push(getCourseUrl(courseName));
+                    deletePageLocal.mutate({
+                      moduleName,
+                      itemName: pageName,
+                    });
                   }}
                   className="btn-danger"
                 >
diff --git a/nextjs/src/app/course/[courseName]/modules/[moduleName]/quiz/[quizName]/QuizButton.tsx b/nextjs/src/app/course/[courseName]/modules/[moduleName]/quiz/[quizName]/QuizButton.tsx
index 5f7eaf1..cc1cea8 100644
--- a/nextjs/src/app/course/[courseName]/modules/[moduleName]/quiz/[quizName]/QuizButton.tsx
+++ b/nextjs/src/app/course/[courseName]/modules/[moduleName]/quiz/[quizName]/QuizButton.tsx
@@ -87,9 +87,8 @@ export function QuizButtons({
                 <div className="flex justify-around gap-3">
                   <button
                     onClick={async () => {
-                      deleteLocal
-                        .mutateAsync({ moduleName, itemName: quizName })
-                        .then(() => router.push(getCourseUrl(courseName)));
+                      router.push(getCourseUrl(courseName));
+                      deleteLocal.mutate({ moduleName, itemName: quizName });
                     }}
                     className="btn-danger"
                   >
diff --git a/nextjs/src/components/editor/MonacoEditor.tsx b/nextjs/src/components/editor/MonacoEditor.tsx
index 23ce93f..489ffaa 100755
--- a/nextjs/src/components/editor/MonacoEditor.tsx
+++ b/nextjs/src/components/editor/MonacoEditor.tsx
@@ -13,7 +13,6 @@ export const MonacoEditor: React.FC<{
 }> = ({ value, onChange }) => {
   const [salt, setSalt] = useState(Date.now());
   useEffect(() => {
-    console.log("onchange changed");
     setSalt(Date.now());
   }, [onChange]);
   return <InnerMonacoEditor key={salt} value={value} onChange={onChange} />;
diff --git a/nextjs/src/hooks/localCourse/courseItemHooks.ts b/nextjs/src/hooks/localCourse/courseItemHooks.ts
index 062a168..9b2a8b5 100644
--- a/nextjs/src/hooks/localCourse/courseItemHooks.ts
+++ b/nextjs/src/hooks/localCourse/courseItemHooks.ts
@@ -230,17 +230,6 @@ export const useDeleteItemMutation = <T extends CourseItemType>(type: T) => {
       moduleName: string;
       itemName: string;
     }) => {
-      queryClient.removeQueries({
-        queryKey: localCourseKeys.itemOfType(
-          courseName,
-          moduleName,
-          itemName,
-          type
-        ),
-      });
-      queryClient.removeQueries({
-        queryKey: localCourseKeys.allItemsOfType(courseName, moduleName, type),
-      });
       const url =
         "/api/courses/" +
         encodeURIComponent(courseName) +
@@ -253,8 +242,19 @@ export const useDeleteItemMutation = <T extends CourseItemType>(type: T) => {
       await axiosClient.delete(url);
     },
     onSuccess: async (_, { moduleName, itemName }) => {
+
       queryClient.invalidateQueries({
         queryKey: localCourseKeys.allItemsOfType(courseName, moduleName, type),
+        refetchType: "all"
+      });
+      queryClient.invalidateQueries({
+        queryKey: localCourseKeys.itemOfType(
+          courseName,
+          moduleName,
+          itemName,
+          type
+        ),
+        refetchType: "none"
       });
     },
   });
diff --git a/nextjs/src/hooks/localCourse/localCourseModuleHooks.ts b/nextjs/src/hooks/localCourse/localCourseModuleHooks.ts
index 51b1aba..0e51c91 100644
--- a/nextjs/src/hooks/localCourse/localCourseModuleHooks.ts
+++ b/nextjs/src/hooks/localCourse/localCourseModuleHooks.ts
@@ -7,12 +7,9 @@ import {
   useSuspenseQuery,
 } from "@tanstack/react-query";
 import { localCourseKeys } from "./localCourseKeys";
-import {
-  getAllAssignmentsQueryConfig,
-  getAssignmentQueryConfig,
-} from "./assignmentHooks";
-import { getAllPagesQueryConfig, getPageQueryConfig } from "./pageHooks";
-import { getAllQuizzesQueryConfig, getQuizQueryConfig } from "./quizHooks";
+import { getAllAssignmentsQueryConfig } from "./assignmentHooks";
+import { getAllQuizzesQueryConfig } from "./quizHooks";
+import { getAllItemsQueryConfig } from "./courseItemHooks";
 
 export const useModuleNamesQuery = () => {
   const { courseName } = useCourseContext();
@@ -109,7 +106,7 @@ export const useAllCourseDataQuery = () => {
 
   const { data: pagesAndModules } = useSuspenseQueries({
     queries: moduleNames.map((moduleName) =>
-      getAllPagesQueryConfig(courseName, moduleName)
+      getAllItemsQueryConfig(courseName, moduleName, "Page")
     ),
     combine: (results) => ({
       data: results.flatMap((r, i) =>
diff --git a/nextjs/src/hooks/localCourse/pageHooks.ts b/nextjs/src/hooks/localCourse/pageHooks.ts
index bc4ec98..c47cf80 100644
--- a/nextjs/src/hooks/localCourse/pageHooks.ts
+++ b/nextjs/src/hooks/localCourse/pageHooks.ts
@@ -1,7 +1,5 @@
 "use client";
 import {
-  getAllItemsQueryConfig,
-  getItemQueryConfig,
   useCreateItemMutation,
   useDeleteItemMutation,
   useItemQuery,
@@ -9,18 +7,6 @@ import {
   useUpdateItemMutation,
 } from "./courseItemHooks";
 
-export function getAllPagesQueryConfig(courseName: string, moduleName: string) {
-  return getAllItemsQueryConfig(courseName, moduleName, "Page");
-}
-
-export function getPageQueryConfig(
-  courseName: string,
-  moduleName: string,
-  pageName: string
-) {
-  return getItemQueryConfig(courseName, moduleName, pageName, "Page");
-}
-
 export const usePageQuery = (moduleName: string, pageName: string) =>
   useItemQuery(moduleName, pageName, "Page");