@appcorp/fusion-storybook 0.2.40 → 0.2.44

package/base-modules/attendance/more-actions.js

@@ -1,38 +1,47 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { EnhancedRadio } from "@appcorp/shadcn/components/enhanced-radio";
 import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
-import { getCachedCoursesSync } from "../course/cache";
-import { getCachedEnrollmentsSync } from "../enrollment/cache";
-import { getCachedStudentProfilesSync } from "../student-profile/cache";
-import { useMemo, useState } from "react";
+import { useState } from "react";
+import { ATTENDANCE_API_ROUTES } from "./constants";
 export const AttendanceMoreActions = ({ labelAttendanceStatus, labelCourse, labelCourseInfo, labelCoursePlaceholder, labelNoCourseFound, labelRemarks, labelRemarksInfo, labelRemarksPlaceholder, labelSearchCourses, labelStatusAbsent, labelStatusExcused, labelStatusHalfDay, labelStatusLate, labelStatusPresent, }) => {
-    const enrollment = getCachedEnrollmentsSync().items;
-    const studentProfiles = getCachedStudentProfilesSync().items;
-    const courses = getCachedCoursesSync().items;
+    // const enrollment = getCachedEnrollmentsSync().items;
+    // const studentProfiles = getCachedStudentProfilesSync().items;
+    // const courses = getCachedCoursesSync().items;
     const [courseId, setCourseId] = useState("");
     const [remarks, setRemarks] = useState({});
     const [attendance, setAttendance] = useState({});
     const [errors] = useState({});
+    const { enhancedComboboxElement: courseIdCombo } = useEnhancedCombobox({
+        emptyText: labelNoCourseFound,
+        id: "courseId",
+        info: labelCourseInfo,
+        label: labelCourse,
+        onValueChange: (value) => setCourseId(value),
+        options: [{ id: "", code: "" }].map((c) => ({
+            id: c.id,
+            name: c.code.trim(),
+        })),
+        placeholder: labelCoursePlaceholder,
+        required: true,
+        searchEndpoint: ATTENDANCE_API_ROUTES.UNIT,
+        searchPlaceholder: labelSearchCourses,
+        value: courseId || "",
+    });
     // Find the section for the selected course, then get students enrolled in that section
-    const studentsInCourse = useMemo(() => {
-        const courseObj = courses.find((c) => c.id === courseId);
-        if (!courseObj)
-            return [];
-        return enrollment
-            .filter((e) => e.sectionId === courseObj.sectionId)
-            .map((e) => e.studentProfileId);
-    }, [enrollment, courseId, courses]);
-    return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedCombobox, { emptyText: labelNoCourseFound, error: errors.courseId, id: "courseId", info: labelCourseInfo, label: labelCourse, onValueChange: (value) => setCourseId(value), options: getCachedCoursesSync().items.map((c) => ({
-                    label: c.code.trim(),
-                    value: c.id,
-                })), placeholder: labelCoursePlaceholder, required: true, searchPlaceholder: labelSearchCourses, value: courseId || "" }), courseId &&
-                studentsInCourse.length > 0 &&
-                studentsInCourse.map((s) => {
-                    var _a, _b, _c, _d;
-                    const student = studentProfiles.find((sp) => sp.id === s);
-                    return (_jsxs("div", { children: [_jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsxs("div", { className: "flex flex-col items-center justify-center", children: [_jsxs("p", { children: [(_a = student === null || student === void 0 ? void 0 : student.familyMember) === null || _a === void 0 ? void 0 : _a.firstName, " ", (_b = student === null || student === void 0 ? void 0 : student.familyMember) === null || _b === void 0 ? void 0 : _b.lastName] }), _jsx("img", { src: (_c = student === null || student === void 0 ? void 0 : student.familyMember) === null || _c === void 0 ? void 0 : _c.avatar, alt: (_d = student === null || student === void 0 ? void 0 : student.familyMember) === null || _d === void 0 ? void 0 : _d.firstName, width: 100, height: 100, className: "rounded-full" })] }), _jsx("div", { children: _jsx(EnhancedRadio, { label: labelAttendanceStatus, name: "attendanceStatus", value: attendance[s] || "PRESENT", options: [
+    // const studentsInCourse = useMemo(() => {
+    //   const courseObj = courses.find((c) => c.id === courseId);
+    //   if (!courseObj) return [];
+    //   return enrollment
+    //     .filter((e) => e.sectionId === courseObj.sectionId)
+    //     .map((e) => e.studentProfileId);
+    // }, [enrollment, courseId, courses]);
+    return (_jsxs("div", { className: "space-y-4", children: [courseIdCombo, courseId &&
+                [].length > 0 &&
+                [].map((s) => {
+                    // const student = studentProfiles.find((sp) => sp.id === s);
+                    return (_jsxs("div", { children: [_jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsxs("div", { className: "flex flex-col items-center justify-center", children: [_jsx("p", { children: " " }), _jsx("img", { src: "student?.familyMember?.avatar", alt: "student?.familyMember?.firstName", width: 100, height: 100, className: "rounded-full" })] }), _jsx("div", { children: _jsx(EnhancedRadio, { label: labelAttendanceStatus, name: "attendanceStatus", value: attendance[s] || "PRESENT", options: [
                                                 { label: labelStatusPresent, value: "PRESENT" },
                                                 { label: labelStatusAbsent, value: "ABSENT" },
                                                 { label: labelStatusLate, value: "LATE" },

package/base-modules/campus/context.js

@@ -397,19 +397,19 @@ export const useCampusModule = () => {
         {
             enabled: false,
             handleOnClick: handleMoreActions,
-            label: t("actionHeaderMoreActions"),
+            label: t("actionsButtonMoreActions"),
             order: 0,
         },
         {
             enabled: true,
             handleOnClick: handleFilters,
-            label: t("actionHeaderFilters"),
+            label: t("actionsButtonFilters"),
             order: 1,
         },
         {
             enabled: true,
             handleOnClick: handleCreate,
-            label: t("actionHeaderAdd"),
+            label: t("actionsButtonAdd"),
             order: 2,
         },
     ], [handleCreate, handleFilters, handleMoreActions, t]);
@@ -417,26 +417,26 @@ export const useCampusModule = () => {
         {
             enabled: true,
             handleOnClick: handleView,
-            label: t("actionRowView"),
+            label: t("actionsButtonView"),
             order: 1,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.enabled) === true,
             handleOnClick: handleEdit,
-            label: t("actionRowEdit"),
+            label: t("actionsButtonEdit"),
             order: 2,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.enabled) === false,
             handleOnClick: handleDelete,
-            label: t("actionRowDelete"),
+            label: t("actionsButtonDelete"),
             order: 3,
             variant: "destructive",
         },
         {
             enabled: false,
             handleOnClick: toggleStatus,
-            label: t("actionRowToggleStatus"),
+            label: t("actionsButtonToggleStatus"),
             order: 4,
         },
     ], [handleDelete, handleEdit, handleView, t, toggleStatus]);

package/base-modules/class/cache.js

@@ -22,7 +22,6 @@ export const getCachedClasses = ({ params, }) => getCachedData({
     params,
     headers: {
         "Content-Type": "application/json",
-        // "x-api-token": process.env.NEXT_PUBLIC_API_KEY!,
     },
 });
 export const getCachedClassById = (classId) => getCachedItemById(LS_KEYS.CLASSES, classId);

package/base-modules/class/context.js

@@ -28,7 +28,6 @@ import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-com
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { CLASS_API_ROUTES, pageLimit } from "./constants";
 import { classFormValidation } from "./validate";
-import { getCachedClasses, invalidateClassesCache } from "./cache";
 import { getCachedWorkspaceSync } from "../workspace/cache";
 // ============================================================================
 // 1.1 DRAWER TYPES
@@ -159,7 +158,6 @@ export const useClassModule = () => {
         }
         if (data) {
             const isCreated = isCreatedOrUpdated(data);
-            invalidateClassesCache();
             showToast(isCreated ? t("messagesCreateSuccess") : t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
             resetFormAndCloseDrawer();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
@@ -184,7 +182,6 @@ export const useClassModule = () => {
             return;
         }
         if (data) {
-            invalidateClassesCache();
             showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
@@ -378,19 +375,19 @@ export const useClassModule = () => {
         {
             enabled: true,
             handleOnClick: handleMoreActions,
-            label: t("actionHeaderMoreActions"),
+            label: t("actionsButtonMoreActions"),
             order: 0,
         },
         {
             enabled: true,
             handleOnClick: handleFilters,
-            label: t("actionHeaderFilters"),
+            label: t("actionsButtonFilters"),
             order: 1,
         },
         {
             enabled: true,
             handleOnClick: handleCreate,
-            label: t("actionHeaderAdd"),
+            label: t("actionsButtonAdd"),
             order: 2,
         },
     ], [handleCreate, handleFilters, handleMoreActions, t]);
@@ -398,74 +395,39 @@ export const useClassModule = () => {
         {
             enabled: true,
             handleOnClick: handleView,
-            label: t("actionRowView"),
+            label: t("actionsButtonView"),
             order: 1,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.enabled) === true,
             handleOnClick: handleEdit,
-            label: t("actionRowEdit"),
+            label: t("actionsButtonEdit"),
             order: 2,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.enabled) === false,
             handleOnClick: handleDelete,
-            label: t("actionRowDelete"),
+            label: t("actionsButtonDelete"),
             order: 3,
             variant: "destructive",
         },
         {
             enabled: false,
             handleOnClick: toggleStatus,
-            label: t("actionRowToggleStatus"),
+            label: t("actionsButtonToggleStatus"),
             order: 4,
         },
     ], [handleDelete, handleEdit, handleView, t, toggleStatus]);
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
-    // Always keep the ref current so the main effect can call the latest listFetchNow
-    // without including it in the dependency array (listFetchNow changes identity every
-    // render because useModuleEntityV2 passes an inline headers object to useFetch).
-    // Declared first so the ref is populated before the fetch effect runs.
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
-    // Initial load via cache; re-fetch directly from API on page/pageLimit/filter/search changes.
-    // listFetchNow is intentionally excluded from deps — it changes every render due to the
-    // inline headers object in useModuleEntityV2. We call it via the stable ref instead.
+    }, [listFetchNow]);
     useEffect(() => {
         var _a;
-        if (!schoolId)
-            return;
-        const currentPage = Number(listParams.currentPage) || 1;
-        const currentPageLimit = Number(listParams.pageLimit) || pageLimit;
-        const isDefaultLoad = currentPage === 1 &&
-            currentPageLimit === pageLimit &&
-            !listParams.searchQuery &&
-            listParams.filterEnabled === undefined;
-        if (isDefaultLoad) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedClasses({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: CLASS_ACTION_TYPES.SET_ITEMS,
-                        payload: { items: items || [], count: count || 0 },
-                    });
-                }
-                catch (_a) {
-                    showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-                }
-            })();
-        }
-        else {
-            // Bypass cache for pagination, pageLimit, filter and search changes.
-            // Use ref to avoid the infinite-loop caused by listFetchNow's unstable identity.
-            (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-        }
-    }, [dispatch, listParams, schoolId, showToast, t]);
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [listParams]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

package/base-modules/class/more-actions.js

@@ -7,7 +7,6 @@ import converter from "json-2-csv";
 import { Timeline } from "../../components/timeline";
 import { useTranslations } from "next-intl";
 import { CLASS_API_ROUTES, pageLimit } from "./constants";
-import { invalidateClassesCache } from "./cache";
 import { CLASS_ACTION_TYPES, useClassContext } from "./context";
 import { useRef, useEffect, useCallback } from "react";
 const workspace = getCachedWorkspaceSync();
@@ -68,13 +67,17 @@ async function pollBulkJob(jobId, signal, onProgress) {
         }
     }
 }
-function formatErrorSummary(errors) {
+function formatErrorSummary(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+t, errors) {
     if (!(errors === null || errors === void 0 ? void 0 : errors.length))
         return "";
-    const lines = errors.slice(0, 5).map((e) => `Row ${e.row}: ${e.error}`);
+    const lines = errors
+        .slice(0, 5)
+        .map((e) => t("messagesBulkRowError", { row: e.row, error: e.error }));
     const remaining = errors.length - 5;
     if (remaining > 0)
-        lines.push(`...and ${remaining} more`);
+        lines.push(t("messagesBulkMoreRows", { count: remaining }));
     return lines.join("\n");
 }
 export const ClassMoreActions = () => {
@@ -107,7 +110,7 @@ export const ClassMoreActions = () => {
         const text = await file.text();
         const records = converter.csv2json(text);
         if (!Array.isArray(records) || records.length === 0) {
-            showErrorToast("CSV file is empty or invalid");
+            showErrorToast(t("messagesBulkCsvEmpty"));
             return;
         }
         // Client-side validation — basic required field check
@@ -117,55 +120,72 @@ export const ClassMoreActions = () => {
             const msgs = [];
             if (method === "POST") {
                 if (!((_b = row.code) === null || _b === void 0 ? void 0 : _b.trim()))
-                    msgs.push("code is required");
+                    msgs.push(t("validationRequiredCode"));
                 if (!((_c = row.name) === null || _c === void 0 ? void 0 : _c.trim()))
-                    msgs.push("name is required");
+                    msgs.push(t("validationRequiredName"));
             }
             else {
                 if (!((_d = row.id) === null || _d === void 0 ? void 0 : _d.trim()))
-                    msgs.push("id is required for update");
+                    msgs.push(t("validationRequiredIdForUpdate"));
             }
             if (msgs.length > 0) {
                 validationErrors.push({ row: i + 1, messages: msgs });
             }
         }
         if (validationErrors.length > 0) {
-            const summary = validationErrors
+            const errorsList = validationErrors
                 .slice(0, 5)
-                .map((e) => `Row ${e.row}: ${e.messages.join("; ")}`)
+                .map((e) => t("messagesBulkRowError", {
+                row: e.row,
+                error: e.messages.join("; "),
+            }))
                 .join("\n");
             const remaining = validationErrors.length - 5;
-            showErrorToast(`Validation failed for ${validationErrors.length} row(s).\n${summary}${remaining > 0 ? `\n...and ${remaining} more` : ""}`);
+            const errorsStr = remaining > 0
+                ? `${errorsList}\n${t("messagesBulkMoreRows", { count: remaining })}`
+                : errorsList;
+            showErrorToast(t("messagesBulkValidationFailed", {
+                count: validationErrors.length,
+                errors: errorsStr,
+            }));
             return;
         }
         try {
-            showInfoToast(`Bulk ${label} job queued (${records.length} records). Processing...`);
+            showInfoToast(t("messagesBulkJobQueued", { action: label, count: records.length }));
             let jobId;
             try {
                 jobId = await submitBulkJob(text, method, signal);
             }
             catch (submitError) {
-                showErrorToast(`Failed to submit ${label} job: ${submitError instanceof Error ? submitError.message : "Unknown error"}`);
+                showErrorToast(t("messagesBulkJobSubmitFailed", {
+                    action: label,
+                    error: submitError instanceof Error
+                        ? submitError.message
+                        : t("unknownError"),
+                }));
                 return;
             }
             const status = await pollBulkJob(jobId, signal, (processed, total) => {
-                showInfoToast(`Processing ${processed}/${total} classes...`);
+                showInfoToast(t("messagesBulkProgress", { processed, total }));
             });
             if (signal.aborted)
                 return;
             if (status.status === "completed") {
                 const r = status.results;
                 if (r && ((_e = r.errors) === null || _e === void 0 ? void 0 : _e.length) > 0) {
-                    const summary = formatErrorSummary(r.errors);
-                    showSuccessToast(`Created ${r.created} | Updated ${r.updated} | Skipped ${r.skipped}\n${summary}`);
+                    const summary = formatErrorSummary(t, r.errors);
+                    showSuccessToast(`${t("messagesBulkResults", { created: r.created, updated: r.updated, skipped: r.skipped })}\n${summary}`);
                 }
                 else if (r) {
-                    showSuccessToast(`Created ${r.created} | Updated ${r.updated} | Skipped ${r.skipped}`);
+                    showSuccessToast(t("messagesBulkResults", {
+                        created: r.created,
+                        updated: r.updated,
+                        skipped: r.skipped,
+                    }));
                 }
                 else {
-                    showSuccessToast("Bulk operation completed successfully");
+                    showSuccessToast(t("messagesBulkSuccess"));
                 }
-                invalidateClassesCache();
                 const schoolId = ((_f = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _f === void 0 ? void 0 : _f.id) || "";
                 fetch(`${CLASS_API_ROUTES.LIST}?currentPage=1&pageLimit=${pageLimit}&schoolId=${schoolId}`, {
                     headers: {
@@ -191,17 +211,20 @@ export const ClassMoreActions = () => {
             else {
                 const r = status.results;
                 const detail = ((_g = r === null || r === void 0 ? void 0 : r.errors) === null || _g === void 0 ? void 0 : _g.length)
-                    ? formatErrorSummary(r.errors)
-                    : "Unknown error";
-                showErrorToast(`Bulk ${label} failed.\n${detail}`);
+                    ? formatErrorSummary(t, r.errors)
+                    : t("unknownError");
+                showErrorToast(`${t("messagesBulkFailed", { action: label })}\n${detail}`);
             }
         }
         catch (error) {
             if (error.message === "Polling cancelled")
                 return;
-            showErrorToast(`Bulk ${label} failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+            showErrorToast(t("messagesBulkFailedDetail", {
+                action: label,
+                error: error instanceof Error ? error.message : t("unknownError"),
+            }));
         }
-    }, [dispatch]);
+    }, [dispatch, t]);
     const handleBulkCreate = useCallback((files) => handleBulkFlow(files, "POST"), [handleBulkFlow]);
     const handleBulkUpdate = useCallback((files) => handleBulkFlow(files, "PUT"), [handleBulkFlow]);
     const create = [

package/base-modules/course/context.js

@@ -25,7 +25,6 @@ import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
 import { createGenericModule } from "@react-pakistan/util-functions/factory/generic-module-factory";
 import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-component-factory";
 import { COURSE_API_ROUTES, pageLimit } from "./constants";
-import { getCachedCourses, invalidateCoursesCache } from "./cache";
 import { courseFormValidation } from "./validate";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { getCachedWorkspaceSync } from "../workspace/cache";
@@ -167,7 +166,6 @@ export const useCourseModule = () => {
             showToast(isCreatedOrUpdated(data)
                 ? t("messagesCourseCreated")
                 : t("messagesCourseUpdated"), TOAST_VARIANT.SUCCESS);
-            invalidateCoursesCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
             resetFormAndCloseDrawer();
         }
@@ -247,7 +245,6 @@ export const useCourseModule = () => {
         }
         if (data) {
             showToast(t("messagesCourseDeleted"), TOAST_VARIANT.SUCCESS);
-            invalidateCoursesCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
     }, [showToast, t]);
@@ -456,44 +453,13 @@ export const useCourseModule = () => {
     // ==========================================================================
     // 1.4.9 EFFECTS
     // ==========================================================================
-    // Keep the latest fetch function in a ref so the fetch effect can call it
-    // without depending on listFetchNow's unstable identity.
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
-    // Initial load via cache; re-fetch directly from API on page/pageLimit/filter/search changes.
+    }, [listFetchNow]);
     useEffect(() => {
         var _a;
-        if (!schoolId)
-            return;
-        const currentPage = Number(listParams.currentPage) || 1;
-        const currentPageLimit = Number(listParams.pageLimit) || pageLimit;
-        const isDefaultLoad = currentPage === 1 &&
-            currentPageLimit === pageLimit &&
-            !listParams.searchQuery &&
-            listParams.filterEnabled === undefined;
-        if (isDefaultLoad) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedCourses({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: COURSE_ACTION_TYPES.SET_ITEMS,
-                        payload: { items: items || [], count: count || 0 },
-                    });
-                }
-                catch (_a) {
-                    showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-                }
-            })();
-        }
-        else {
-            // Bypass cache for pagination, pageLimit, filter and search changes.
-            // Use ref to avoid the infinite-loop caused by listFetchNow's unstable identity.
-            (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-        }
-    }, [listParams, dispatch, showToast, schoolId, t]);
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [listParams]);
     // ==========================================================================
     // 1.4.10 RETURN
     // ==========================================================================