lots of hooks

2026-03-26 07:38:33 -06:00 · 2024-08-30 11:25:23 -06:00
parent d975add636
commit 09f911c18a
12 changed files with 219 additions and 107 deletions
--- a/nextjs/src/hooks/hookHydration.ts
+++ b/nextjs/src/hooks/hookHydration.ts
@@ -1,5 +1,5 @@
 import { QueryClient } from "@tanstack/react-query";
-import { localCourseKeys } from "./localCoursesHooks";
+import { localCourseKeys } from "./localCourse/localCoursesHooks";
 import { fileStorageService } from "@/services/fileStorage/fileStorageService";

 export const hydrateCourses = async (queryClient: QueryClient) => {
--- a/nextjs/src/hooks/localCourse/assignmentHooks.ts
+++ b/nextjs/src/hooks/localCourse/assignmentHooks.ts
@@ -0,0 +1,59 @@
+import axios from "axios";
+import { localCourseKeys } from "./localCoursesHooks";
+import { LocalAssignment } from "@/models/local/assignmnet/localAssignment";
+import { useSuspenseQuery, useSuspenseQueries } from "@tanstack/react-query";
+
+export const useAssignmentNamesQuery = (
+  courseName: string,
+  moduleName: string
+) =>
+  useSuspenseQuery({
+    queryKey: localCourseKeys.moduleAssignmentNames(courseName, moduleName),
+    queryFn: async (): Promise<string[]> => {
+      const url = `/api/courses/${courseName}/modules/${moduleName}/assignments`;
+      const response = await axios.get(url);
+      return response.data;
+    },
+  });
+
+const getAssignmentQueryConfig = (
+  courseName: string,
+  moduleName: string,
+  assignmentName: string
+) => {
+  return {
+    queryKey: localCourseKeys.assignment(
+      courseName,
+      moduleName,
+      assignmentName
+    ),
+    queryFn: async (): Promise<LocalAssignment> => {
+      const url = `/api/courses/${courseName}/modules/${moduleName}/assignments/${assignmentName}`;
+      const response = await axios.get(url);
+      return response.data;
+    },
+  };
+};
+export const useAssignmentQuery = (
+  courseName: string,
+  moduleName: string,
+  assignmentName: string
+) =>
+  useSuspenseQuery(
+    getAssignmentQueryConfig(courseName, moduleName, assignmentName)
+  );
+
+export const useAssignmentsQueries = (
+  courseName: string,
+  moduleName: string,
+  assignmentNames: string[]
+) =>
+  useSuspenseQueries({
+    queries: assignmentNames.map((name) =>
+      getAssignmentQueryConfig(courseName, moduleName, name)
+    ),
+    combine: (results) => ({
+      data: results.map((r) => r.data),
+      pending: results.some((r) => r.isPending),
+    }),
+  });
--- a/nextjs/src/hooks/localCourse/localCoursesHooks.ts
+++ b/nextjs/src/hooks/localCourse/localCoursesHooks.ts
@@ -1,12 +1,5 @@
-import { LocalAssignment } from "@/models/local/assignmnet/localAssignment";
-import { LocalCourse, LocalCourseSettings } from "@/models/local/localCourse";
-import { LocalModule } from "@/models/local/localModules";
-import { LocalCoursePage } from "@/models/local/page/localCoursePage";
-import { LocalQuiz } from "@/models/local/quiz/localQuiz";
+import { LocalCourseSettings } from "@/models/local/localCourse";
 import {
-  useMutation,
-  useQueryClient,
-  useSuspenseQueries,
  useSuspenseQuery,
 } from "@tanstack/react-query";
 import axios from "axios";
@@ -97,89 +90,7 @@ export const useModuleNamesQuery = (courseName: string) =>
    },
  });

-export const useModuleAssignmentNamesQuery = (
-  courseName: string,
-  moduleName: string
-) =>
-  useSuspenseQuery({
-    queryKey: localCourseKeys.moduleAssignmentNames(courseName, moduleName),
-    queryFn: async (): Promise<string[]> => {
-      const url = `/api/courses/${courseName}/modules/${moduleName}/assignments`;
-      const response = await axios.get(url);
-      return response.data;
-    },
-  });
-export const useModuleQuizNamesQuery = (
-  courseName: string,
-  moduleName: string
-) =>
-  useSuspenseQuery({
-    queryKey: localCourseKeys.moduleQuizzeNames(courseName, moduleName),
-    queryFn: async (): Promise<string[]> => {
-      const url = `/api/courses/${courseName}/modules/${moduleName}/quizzes`;
-      const response = await axios.get(url);
-      return response.data;
-    },
-  });

-export const useModulePageNamesQuery = (
-  courseName: string,
-  moduleName: string
-) =>
-  useSuspenseQuery({
-    queryKey: localCourseKeys.modulePageNames(courseName, moduleName),
-    queryFn: async (): Promise<string[]> => {
-      const url = `/api/courses/${courseName}/modules/${moduleName}/pages`;
-      const response = await axios.get(url);
-      return response.data;
-    },
-  });
-
-export const useAssignmentQuery = (
-  courseName: string,
-  moduleName: string,
-  assignmentName: string
-) =>
-  useSuspenseQuery({
-    queryKey: localCourseKeys.assignment(
-      courseName,
-      moduleName,
-      assignmentName
-    ),
-    queryFn: async (): Promise<LocalAssignment> => {
-      const url = `/api/courses/${courseName}/modules/${moduleName}/assignments/${assignmentName}`;
-      const response = await axios.get(url);
-      return response.data;
-    },
-  });
-
-export const useQuizQuery = (
-  courseName: string,
-  moduleName: string,
-  quizName: string
-) =>
-  useSuspenseQuery({
-    queryKey: localCourseKeys.quiz(courseName, moduleName, quizName),
-    queryFn: async (): Promise<LocalQuiz> => {
-      const url = `/api/courses/${courseName}/modules/${moduleName}/quizzes/${quizName}`;
-      const response = await axios.get(url);
-      return response.data;
-    },
-  });
-
-export const usePageQuery = (
-  courseName: string,
-  moduleName: string,
-  pageName: string
-) =>
-  useSuspenseQuery({
-    queryKey: localCourseKeys.quiz(courseName, moduleName, pageName),
-    queryFn: async (): Promise<LocalCoursePage> => {
-      const url = `/api/courses/${courseName}/modules/${moduleName}/pages/${pageName}`;
-      const response = await axios.get(url);
-      return response.data;
-    },
-  });

 // export const useUpdateCourseMutation = (courseName: string) => {
 //   const queryClient = useQueryClient();
--- a/nextjs/src/hooks/localCourse/pageHooks.ts
+++ b/nextjs/src/hooks/localCourse/pageHooks.ts
@@ -0,0 +1,49 @@
+import { LocalCoursePage } from "@/models/local/page/localCoursePage";
+import { useSuspenseQueries, useSuspenseQuery } from "@tanstack/react-query";
+import axios from "axios";
+import { localCourseKeys } from "./localCoursesHooks";
+
+export const usePageNamesQuery = (courseName: string, moduleName: string) =>
+  useSuspenseQuery({
+    queryKey: localCourseKeys.modulePageNames(courseName, moduleName),
+    queryFn: async (): Promise<string[]> => {
+      const url = `/api/courses/${courseName}/modules/${moduleName}/pages`;
+      const response = await axios.get(url);
+      return response.data;
+    },
+  });
+export const usePageQuery = (
+  courseName: string,
+  moduleName: string,
+  pageName: string
+) => useSuspenseQuery(getPageQueryConfig(courseName, moduleName, pageName));
+
+export const usePagesQueries = (
+  courseName: string,
+  moduleName: string,
+  pageNames: string[]
+) =>
+  useSuspenseQueries({
+    queries: pageNames.map((name) =>
+      getPageQueryConfig(courseName, moduleName, name)
+    ),
+    combine: (results) => ({
+      data: results.map((r) => r.data),
+      pending: results.some((r) => r.isPending),
+    }),
+  });
+
+function getPageQueryConfig(
+  courseName: string,
+  moduleName: string,
+  pageName: string
+) {
+  return {
+    queryKey: localCourseKeys.quiz(courseName, moduleName, pageName),
+    queryFn: async (): Promise<LocalCoursePage> => {
+      const url = `/api/courses/${courseName}/modules/${moduleName}/pages/${pageName}`;
+      const response = await axios.get(url);
+      return response.data;
+    },
+  };
+}
--- a/nextjs/src/hooks/localCourse/quizHooks.ts
+++ b/nextjs/src/hooks/localCourse/quizHooks.ts
@@ -0,0 +1,50 @@
+import { LocalQuiz } from "@/models/local/quiz/localQuiz";
+import { useSuspenseQueries, useSuspenseQuery } from "@tanstack/react-query";
+import axios from "axios";
+import { localCourseKeys } from "./localCoursesHooks";
+
+export const useQuizNamesQuery = (courseName: string, moduleName: string) =>
+  useSuspenseQuery({
+    queryKey: localCourseKeys.moduleQuizzeNames(courseName, moduleName),
+    queryFn: async (): Promise<string[]> => {
+      const url = `/api/courses/${courseName}/modules/${moduleName}/quizzes`;
+      const response = await axios.get(url);
+      return response.data;
+    },
+  });
+
+export const useQuizQuery = (
+  courseName: string,
+  moduleName: string,
+  quizName: string
+) => useSuspenseQuery(getQuizQueryConfig(courseName, moduleName, quizName));
+
+export const useQuizzesQueries = (
+  courseName: string,
+  moduleName: string,
+  quizNames: string[]
+) =>
+  useSuspenseQueries({
+    queries: quizNames.map((name) =>
+      getQuizQueryConfig(courseName, moduleName, name)
+    ),
+    combine: (results) => ({
+      data: results.map((r) => r.data),
+      pending: results.some((r) => r.isPending),
+    }),
+  });
+
+function getQuizQueryConfig(
+  courseName: string,
+  moduleName: string,
+  quizName: string
+) {
+  return {
+    queryKey: localCourseKeys.quiz(courseName, moduleName, quizName),
+    queryFn: async (): Promise<LocalQuiz> => {
+      const url = `/api/courses/${courseName}/modules/${moduleName}/quizzes/${quizName}`;
+      const response = await axios.get(url);
+      return response.data;
+    },
+  };
+}