@appcorp/fusion-storybook 0.2.32 → 0.2.34

package/base-modules/subject/context.js

@@ -353,10 +353,10 @@ export const useSubjectModule = () => {
     // ============================================================================
     const headerActions = useMemo(() => [
         {
-            enabled: false,
+            enabled: true,
             handleOnClick: handleMoreActions,
             label: t("actionHeaderMoreActions"),
-            order: 1,
+            order: 0,
             icon: MoreHorizontal,
         },
         {

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

@@ -1,40 +1,222 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/**
- * Subject More Actions Component
- *
- * Provides bulk CSV import/export actions for the subject module.
- */
-import { API_METHODS, downloadFromUrl } from "@react-pakistan/util-functions";
+import { downloadFromUrl } from "@react-pakistan/util-functions";
+import { showErrorToast, showSuccessToast, showInfoToast, } from "@appcorp/shadcn/lib/toast-utils";
 import { getCachedWorkspaceSync } from "../workspace/cache";
 import converter from "json-2-csv";
 import { Timeline } from "../../components/timeline";
 import { useTranslations } from "next-intl";
+import { SUBJECT_API_ROUTES, pageLimit } from "./constants";
+import { invalidateSubjectsCache } from "./cache";
+import { SUBJECT_ACTION_TYPES, useSubjectContext } from "./context";
+import { useRef, useEffect, useCallback } from "react";
+const workspace = getCachedWorkspaceSync();
+const POLL_INTERVAL_MS = 2000;
+const POLL_TIMEOUT_MS = 300000;
+const handleGetAllRecords = async (schoolId, pageLimit) => {
+    const response = await fetch(`${SUBJECT_API_ROUTES.UNIT}?pageLimit=${pageLimit}&currentPage=1&schoolId=${schoolId}`);
+    const result = await response.json();
+    const csv = await converter.json2csv(result.items || [], {});
+    const blob = new Blob([csv], { type: "text/csv;charset=utf-8;" });
+    await downloadFromUrl(blob, "subject.csv");
+};
+async function submitBulkJob(csvData, method, signal) {
+    var _a;
+    const schoolId = ((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "";
+    if (!schoolId)
+        throw new Error("School ID not found");
+    const res = await fetch(SUBJECT_API_ROUTES.BULK, {
+        method,
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ schoolId, csvData }),
+        signal,
+    });
+    if (!res.ok) {
+        const errorData = (await res.json().catch(() => ({})));
+        throw new Error(errorData.error || `Bulk operation failed with status ${res.status}`);
+    }
+    const data = (await res.json());
+    return data.jobId;
+}
+async function pollBulkJob(jobId, signal, onProgress) {
+    const startTime = Date.now();
+    let lastProgressToast = 0;
+    while (true) {
+        if (signal.aborted)
+            throw new Error("Polling cancelled");
+        if (Date.now() - startTime > POLL_TIMEOUT_MS) {
+            throw new Error("Bulk operation timed out");
+        }
+        await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
+        if (signal.aborted)
+            throw new Error("Polling cancelled");
+        const res = await fetch(SUBJECT_API_ROUTES.BULK_STATUS(jobId), {
+            signal,
+        });
+        if (!res.ok)
+            continue;
+        const data = (await res.json());
+        if (data.status === "completed" || data.status === "failed") {
+            return data;
+        }
+        // Show progress toast every 10 seconds while running
+        if (data.status === "running" && Date.now() - lastProgressToast > 10000) {
+            lastProgressToast = Date.now();
+            onProgress === null || onProgress === void 0 ? void 0 : onProgress(data.processed, data.total);
+        }
+    }
+}
+function formatErrorSummary(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 remaining = errors.length - 5;
+    if (remaining > 0)
+        lines.push(`...and ${remaining} more`);
+    return lines.join("\n");
+}
 export const SubjectMoreActions = () => {
     const t = useTranslations("subject");
-    const workspace = getCachedWorkspaceSync();
-    const handleGetAllRecords = async (schoolId) => {
-        const response = await fetch(`/api/v1/subject?pageLimit=1000&currentPage=1&schoolId=${schoolId}`, { method: API_METHODS.GET });
-        const result = await response.json();
-        const csv = await converter.json2csv(result.items || [], {});
-        const blob = new Blob([csv], { type: "text/csv;charset=utf-8;" });
-        await downloadFromUrl(blob, "subject.csv");
-    };
+    const { dispatch } = useSubjectContext();
+    const abortRef = useRef(null);
+    // Abort any in-flight polling on unmount
+    useEffect(() => {
+        return () => {
+            var _a;
+            (_a = abortRef.current) === null || _a === void 0 ? void 0 : _a.abort();
+        };
+    }, []);
+    const handleBulkFlow = useCallback(async (files, method) => {
+        var _a, _b, _c, _d, _e, _f, _g;
+        const closeDrawer = () => {
+            dispatch({
+                type: SUBJECT_ACTION_TYPES.SET_DRAWER,
+                payload: { drawer: null },
+            });
+        };
+        // Cancel previous in-flight request
+        (_a = abortRef.current) === null || _a === void 0 ? void 0 : _a.abort();
+        const controller = new AbortController();
+        abortRef.current = controller;
+        const { signal } = controller;
+        const label = method === "POST" ? "create" : "update";
+        // Read + parse CSV
+        const file = files[0];
+        const text = await file.text();
+        const records = converter.csv2json(text);
+        if (!Array.isArray(records) || records.length === 0) {
+            showErrorToast("CSV file is empty or invalid");
+            return;
+        }
+        // Client-side validation — basic required field check
+        const validationErrors = [];
+        for (let i = 0; i < records.length; i++) {
+            const row = records[i];
+            const msgs = [];
+            if (method === "POST") {
+                if (!((_b = row.code) === null || _b === void 0 ? void 0 : _b.trim()))
+                    msgs.push("code is required");
+                if (!((_c = row.name) === null || _c === void 0 ? void 0 : _c.trim()))
+                    msgs.push("name is required");
+            }
+            else {
+                if (!((_d = row.id) === null || _d === void 0 ? void 0 : _d.trim()))
+                    msgs.push("id is required for update");
+            }
+            if (msgs.length > 0) {
+                validationErrors.push({ row: i + 1, messages: msgs });
+            }
+        }
+        if (validationErrors.length > 0) {
+            const summary = validationErrors
+                .slice(0, 5)
+                .map((e) => `Row ${e.row}: ${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` : ""}`);
+            return;
+        }
+        try {
+            showInfoToast(`Bulk ${label} job queued (${records.length} records). Processing...`);
+            let jobId;
+            try {
+                jobId = await submitBulkJob(text, method, signal);
+            }
+            catch (submitError) {
+                showErrorToast(`Failed to submit ${label} job: ${submitError instanceof Error ? submitError.message : "Unknown error"}`);
+                return;
+            }
+            const status = await pollBulkJob(jobId, signal, (processed, total) => {
+                showInfoToast(`Processing ${processed}/${total} subjects...`);
+            });
+            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}`);
+                }
+                else if (r) {
+                    showSuccessToast(`Created ${r.created} | Updated ${r.updated} | Skipped ${r.skipped}`);
+                }
+                else {
+                    showSuccessToast("Bulk operation completed successfully");
+                }
+                invalidateSubjectsCache();
+                const schoolId = ((_f = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _f === void 0 ? void 0 : _f.id) || "";
+                fetch(`${SUBJECT_API_ROUTES.LIST}?currentPage=1&pageLimit=${pageLimit}&schoolId=${schoolId}`, {
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                })
+                    .then(async (res) => {
+                    var _a, _b;
+                    if (!res.ok)
+                        return;
+                    const data = await res.json();
+                    dispatch({
+                        type: SUBJECT_ACTION_TYPES.SET_ITEMS,
+                        payload: {
+                            items: (_a = data.items) !== null && _a !== void 0 ? _a : [],
+                            count: (_b = data.count) !== null && _b !== void 0 ? _b : 0,
+                        },
+                    });
+                })
+                    .catch(() => { });
+                closeDrawer();
+            }
+            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}`);
+            }
+        }
+        catch (error) {
+            if (error.message === "Polling cancelled")
+                return;
+            showErrorToast(`Bulk ${label} failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+        }
+    }, [dispatch]);
+    const handleBulkCreate = useCallback((files) => handleBulkFlow(files, "POST"), [handleBulkFlow]);
+    const handleBulkUpdate = useCallback((files) => handleBulkFlow(files, "PUT"), [handleBulkFlow]);
     const create = [
         {
             id: "1",
             title: t("downloadEmptyCsvTemplate"),
             handleOnClick: async () => {
-                await downloadFromUrl("https://nwolvgylwmjuqxsngjxt.supabase.co/storage/v1/object/public/public-blob/common-assets/subject.csv", "subject-template.csv");
+                var _a;
+                await handleGetAllRecords(((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "", 1);
             },
         },
         { id: "2", title: t("addYourDataToTheCsv") },
         {
             id: "3",
             title: t("uploadTheCompletedCsvToTheSystem"),
-            handleOnClick: () => {
-                // bulk create csv upload — implementation pending
-            },
         },
     ];
     const update = [
@@ -43,17 +225,14 @@ export const SubjectMoreActions = () => {
             title: t("downloadPopulatedCsvTemplate"),
             handleOnClick: async () => {
                 var _a;
-                await handleGetAllRecords(((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "");
+                await handleGetAllRecords(((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "", 1000);
             },
         },
         { id: "2", title: t("updateYourDataInTheCsv") },
         {
             id: "3",
             title: t("uploadTheCompletedCsvToTheSystem"),
-            handleOnClick: () => {
-                // bulk update csv upload — implementation pending
-            },
         },
     ];
-    return (_jsxs("div", { className: "space-y-4", children: [_jsx(Timeline, { events: create, heading: t("bulkCreate") }), _jsx(Timeline, { events: update, heading: t("bulkUpdate") })] }));
+    return (_jsxs("div", { className: "space-y-4", children: [_jsx(Timeline, { events: create, heading: t("bulkCreate"), handleOnBulkCreate: handleBulkCreate }), _jsx(Timeline, { events: update, heading: t("bulkUpdate"), handleOnBulkCreate: handleBulkUpdate })] }));
 };

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

@@ -6,7 +6,6 @@ import { getCachedWorkspaceSync } from "../workspace/cache";
 import converter from "json-2-csv";
 import { Timeline } from "../../components/timeline";
 import { useTranslations } from "next-intl";
-import { CSVS } from "../../constants";
 import { teacherFormValidation } from "./validate";
 import { TEACHER_API_ROUTES, pageLimit } from "./constants";
 import { invalidateTeachersCache } from "./cache";
@@ -15,12 +14,8 @@ import { useRef, useEffect, useCallback } from "react";
 const workspace = getCachedWorkspaceSync();
 const POLL_INTERVAL_MS = 2000;
 const POLL_TIMEOUT_MS = 300000;
-const handleGetAllRecords = async (schoolId) => {
-    const response = await fetch(`${TEACHER_API_ROUTES.UNIT}?pageLimit=1000&currentPage=1&schoolId=${schoolId}`, {
-    // headers: {
-    //   "x-api-token": process.env.NEXT_PUBLIC_API_KEY!,
-    // },
-    });
+const handleGetAllRecords = async (schoolId, pageLimit) => {
+    const response = await fetch(`${TEACHER_API_ROUTES.UNIT}?pageLimit=${pageLimit}&currentPage=1&schoolId=${schoolId}`);
     const result = await response.json();
     const csv = await converter.json2csv(result.items || [], {});
     const blob = new Blob([csv], { type: "text/csv;charset=utf-8;" });
@@ -224,7 +219,8 @@ export const TeacherMoreActions = () => {
             id: "1",
             title: t("moreActionsDownloadEmptyCsvTemplate"),
             handleOnClick: async () => {
-                await downloadFromUrl(CSVS.Teacher, "teacher-template.csv");
+                var _a;
+                await handleGetAllRecords(((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "", 1);
             },
         },
         { id: "2", title: t("moreActionsAddYourDataToTheCsv") },
@@ -239,7 +235,7 @@ export const TeacherMoreActions = () => {
             title: t("moreActionsDownloadPopulatedCsvTemplate"),
             handleOnClick: async () => {
                 var _a;
-                await handleGetAllRecords(((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "");
+                await handleGetAllRecords(((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "", 1000);
             },
         },
         { id: "2", title: t("moreActionsUpdateYourDataToTheCsv") },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/fusion-storybook",
-  "version": "0.2.32",
+  "version": "0.2.34",
   "scripts": {
     "build-storybook": "storybook build",
     "build:next": "next build",