Fix all Admin Library modals

Author: ji-mmyliu

backend/rest/courseRoutes.ts

@@ -447,16 +447,12 @@ courseRouter.delete(
 );
 
 courseRouter.patch(
-  "/:unitId/:moduleId/publish",
+  "/:moduleId/publish",
   isAuthorizedByRole(new Set(["Administrator"])),
-  moduleBelongsToUnitValidator,
   async (req, res) => {
-    const { unitId, moduleId } = req.params;
+    const { moduleId } = req.params;
     try {
-      const updated = await courseModuleService.publishCourseModule(
-        unitId,
-        moduleId,
-      );
+      const updated = await courseModuleService.publishCourseModule(moduleId);
       res.json(updated);
     } catch (e: unknown) {
       res.status(500).send(getErrorMessage(e));
@@ -465,16 +461,12 @@ courseRouter.patch(
 );
 
 courseRouter.patch(
-  "/:unitId/:moduleId/unpublish",
+  "/:moduleId/unpublish",
   isAuthorizedByRole(new Set(["Administrator"])),
-  moduleBelongsToUnitValidator,
   async (req, res) => {
-    const { unitId, moduleId } = req.params;
+    const { moduleId } = req.params;
     try {
-      const updated = await courseModuleService.unpublishCourseModule(
-        unitId,
-        moduleId,
-      );
+      const updated = await courseModuleService.unpublishCourseModule(moduleId);
       res.json(updated);
     } catch (e: unknown) {
       res.status(500).send(getErrorMessage(e));

backend/services/implementations/courseModuleService.ts

@@ -1,5 +1,5 @@
 /* eslint-disable class-methods-use-this */
-import mongoose, { ClientSession, Schema, startSession } from "mongoose";
+import { ClientSession, Schema, startSession } from "mongoose";
 import { PDFDocument } from "pdf-lib";
 import MgCourseModule, {
   CourseModule,
@@ -10,6 +10,7 @@ import CoursePageModel, {
 import MgCourseUnit, { CourseUnit } from "../../models/courseunit.mgmodel";
 import {
   CourseModuleDTO,
+  CourseModuleLeanDTO,
   CreateCourseModuleDTO,
   ModuleStatus,
   UpdateCourseModuleDTO,
@@ -276,54 +277,33 @@ class CourseModuleService implements ICourseModuleService {
   /**
    * Publish a module (Draft → Published or Unpublished → Published).
    */
-  async publishCourseModule(
-    courseUnitId: string,
-    moduleId: string,
-  ): Promise<CourseModuleDTO> {
-    return this.changeStatus(courseUnitId, moduleId, ModuleStatus.Published);
+  async publishCourseModule(moduleId: string): Promise<CourseModuleLeanDTO> {
+    return this.changeStatus(moduleId, ModuleStatus.Published);
   }
 
   /**
    * Unpublish a module (Published → Unpublished).
    */
-  async unpublishCourseModule(
-    courseUnitId: string,
-    moduleId: string,
-  ): Promise<CourseModuleDTO> {
-    return this.changeStatus(courseUnitId, moduleId, ModuleStatus.Unpublished);
+  async unpublishCourseModule(moduleId: string): Promise<CourseModuleLeanDTO> {
+    return this.changeStatus(moduleId, ModuleStatus.Unpublished);
   }
 
   /**
    * Internal helper that validates state transitions.
    */
   private async changeStatus(
-    courseUnitId: string,
     moduleId: string,
     newStatus: ModuleStatus,
-  ): Promise<CourseModuleDTO> {
+  ): Promise<CourseModuleLeanDTO> {
     const session = await startSession();
     session.startTransaction();
     try {
-      const courseUnit = await MgCourseUnit.findById(courseUnitId).session(
-        session,
-      );
-      const newModuleId = new mongoose.Types.ObjectId(moduleId);
-
-      const belongsToUnit = courseUnit?.modules.some((m) =>
-        (m as unknown as mongoose.Types.ObjectId).equals(newModuleId),
-      );
-      if (!courseUnit || !belongsToUnit) {
-        throw new Error("Module not found in specified unit");
-      }
-
       const module = await MgCourseModule.findById(moduleId).session(session);
       if (!module) {
         throw new Error("Module not found");
       }
 
-      if (
-        !validTransitions[module.status as ModuleStatus].includes(newStatus)
-      ) {
+      if (!validTransitions[module.status].includes(newStatus)) {
         const msg = `Cannot transition from "${module.status}" to "${newStatus}"`;
         throw new Error(msg);
       }
@@ -332,11 +312,7 @@ class CourseModuleService implements ICourseModuleService {
       await module.save({ session });
       await session.commitTransaction();
 
-      return {
-        id: module.id,
-        title: module.title,
-        status: module.status as ModuleStatus,
-      } as CourseModuleDTO;
+      return module.toObject();
     } catch (error) {
       await session.abortTransaction();
       Logger.error(

backend/services/interfaces/courseModuleService.ts

@@ -1,6 +1,7 @@
 import { ClientSession } from "mongoose";
 import {
   CourseModuleDTO,
+  CourseModuleLeanDTO,
   CreateCourseModuleDTO,
   UpdateCourseModuleDTO,
 } from "../../types/courseTypes";
@@ -67,25 +68,17 @@ interface ICourseModuleService {
 
   /**
    * Publish a module (Draft → Published, or Unpublished → Published)
-   * @param courseUnitId the id of the unit that contains the module
    * @param moduleId the id of the module to publish
    * @throws Error if the status transition is invalid or module/unit not found
    */
-  publishCourseModule(
-    courseUnitId: string,
-    moduleId: string,
-  ): Promise<CourseModuleDTO>;
+  publishCourseModule(moduleId: string): Promise<CourseModuleLeanDTO>;
 
   /**
    * Unpublish a module (Published → Unpublished)
-   * @param courseUnitId the id of the unit that contains the module
    * @param moduleId the id of the module to unpublish
    * @throws Error if the status transition is invalid or module/unit not found
    */
-  unpublishCourseModule(
-    courseUnitId: string,
-    moduleId: string,
-  ): Promise<CourseModuleDTO>;
+  unpublishCourseModule(moduleId: string): Promise<CourseModuleLeanDTO>;
 
   /**
    * Reorder pages within a module

backend/types/courseTypes.ts

@@ -1,3 +1,5 @@
+import { ObjectId } from "mongoose";
+
 export type CourseUnitDTO = {
   id: string;
   displayIndex: number;
@@ -25,6 +27,15 @@ export type CourseModuleDTO = {
   status: ModuleStatus;
 };
 
+export type CourseModuleLeanDTO = {
+  id: string;
+  title: string;
+  imageURL?: string;
+  pages: ObjectId[];
+  unitId?: string;
+  status: ModuleStatus;
+};
+
 export type CreateCourseModuleDTO = Pick<CourseModuleDTO, "title">;
 export type UpdateCourseModuleDTO = Partial<
   Pick<CourseModuleDTO, "title" | "imageURL">

frontend/src/APIClients/CourseAPIClient.ts

@@ -102,7 +102,10 @@ const createModule = async (unitId: string, title: string) => {
   }
 };
 
-const uploadThumbnail = async (moduleID: string, uploadedImage: FormData) => {
+const uploadThumbnail = async (
+  moduleID: string,
+  uploadedImage: FormData,
+): Promise<string | null> => {
   const bearerToken = `Bearer ${getLocalStorageObjProperty(
     AUTHENTICATED_USER_KEY,
     "accessToken",
@@ -183,6 +186,27 @@ const editModule = async (
   }
 };
 
+const deleteModule = async (
+  unitId: string,
+  moduleId: string,
+): Promise<string | null> => {
+  const bearerToken = `Bearer ${getLocalStorageObjProperty(
+    AUTHENTICATED_USER_KEY,
+    "accessToken",
+  )}`;
+  try {
+    const { data } = await baseAPIClient.delete(
+      `/course/${unitId}/${moduleId}`,
+      {
+        headers: { Authorization: bearerToken },
+      },
+    );
+    return data.id;
+  } catch (error) {
+    return null;
+  }
+};
+
 const deletePage = async (
   moduleId: string,
   pageId: string,
@@ -247,6 +271,48 @@ const reorderPages = async (
   }
 };
 
+const publishModule = async (
+  moduleId: string,
+): Promise<CourseModule | null> => {
+  const bearerToken = `Bearer ${getLocalStorageObjProperty(
+    AUTHENTICATED_USER_KEY,
+    "accessToken",
+  )}`;
+  try {
+    const { data } = await baseAPIClient.patch(
+      `/course/${moduleId}/publish`,
+      {},
+      {
+        headers: { Authorization: bearerToken },
+      },
+    );
+    return data;
+  } catch (error) {
+    return null;
+  }
+};
+
+const unpublishModule = async (
+  moduleId: string,
+): Promise<CourseModule | null> => {
+  const bearerToken = `Bearer ${getLocalStorageObjProperty(
+    AUTHENTICATED_USER_KEY,
+    "accessToken",
+  )}`;
+  try {
+    const { data } = await baseAPIClient.patch(
+      `/course/${moduleId}/unpublish`,
+      {},
+      {
+        headers: { Authorization: bearerToken },
+      },
+    );
+    return data;
+  } catch (error) {
+    return null;
+  }
+};
+
 export default {
   getUnits,
   createUnit,
@@ -258,7 +324,10 @@ export default {
   lessonUpload,
   getModuleById,
   editModule,
+  deleteModule,
   deletePage,
   reorderPages,
   reorderModules,
+  publishModule,
+  unpublishModule,
 };