mirror of
https://github.com/alexmickelson/canvasManagement.git
synced 2026-03-26 07:38:33 -06:00
can delete without errors
This commit is contained in:
@@ -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"
|
||||
>
|
||||
|
||||
@@ -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"
|
||||
>
|
||||
|
||||
@@ -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"
|
||||
>
|
||||
|
||||
@@ -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} />;
|
||||
|
||||
@@ -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"
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
@@ -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) =>
|
||||
|
||||
@@ -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");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user