@appcorp/fusion-storybook 0.2.21 → 0.2.23

package/base-modules/teacher/constants.d.ts

@@ -7,7 +7,13 @@
  * - Gender Options
  */
 export declare const pageLimit: number;
-export declare const TEACHER_API_ROUTES: Record<string, string>;
+export declare const TEACHER_API_ROUTES: {
+    readonly LIST: "/api/v1/teacher";
+    readonly UNIT: "/api/v1/teacher";
+    readonly AVATAR: "/api/v1/teacher-avatar";
+    readonly BULK: "/api/v1/teacher/bulk";
+    readonly BULK_STATUS: (jobId: string) => string;
+};
 export declare const GENDER_OPTIONS: readonly [{
     readonly label: "Select Gender";
     readonly value: "";
@@ -20,6 +26,9 @@ export declare const GENDER_OPTIONS: readonly [{
 }, {
     readonly label: "Other";
     readonly value: "OTHER";
+}, {
+    readonly label: "Prefer not to say";
+    readonly value: "PREFER_NOT_TO_SAY";
 }];
 export declare const AVATAR_MAX_FILE_SIZE: number;
 export declare const AVATAR_ALLOWED_MIME_TYPES: readonly ["image/webp", "image/png", "image/jpeg", "image/jpg", "image/gif", "image/bmp"];

package/base-modules/teacher/constants.js

@@ -14,9 +14,11 @@ export const pageLimit = Number(process.env.NEXT_PUBLIC_PAGE_LIMIT) || 10;
 // API ROUTES
 // ============================================================================
 export const TEACHER_API_ROUTES = {
+    LIST: "/api/v1/teacher",
     UNIT: "/api/v1/teacher",
     AVATAR: "/api/v1/teacher-avatar",
     BULK: "/api/v1/teacher/bulk",
+    BULK_STATUS: (jobId) => `/api/v1/teacher/bulk/${jobId}`,
 };
 // ============================================================================
 // GENDER OPTIONS
@@ -26,6 +28,7 @@ export const GENDER_OPTIONS = [
     { label: "Male", value: "MALE" },
     { label: "Female", value: "FEMALE" },
     { label: "Other", value: "OTHER" },
+    { label: "Prefer not to say", value: "PREFER_NOT_TO_SAY" },
 ];
 // ============================================================================
 // AVATAR UPLOAD CONFIGURATION

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

@@ -1,7 +1,7 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { downloadFromUrl } from "@react-pakistan/util-functions";
-import { showErrorToast, showSuccessToast, } from "@appcorp/shadcn/lib/toast-utils";
+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";
@@ -11,7 +11,10 @@ import { teacherFormValidation } from "./validate";
 import { TEACHER_API_ROUTES } from "./constants";
 import { invalidateTeachersCache } from "./cache";
 import { useTeacherContext, TEACHER_ACTION_TYPES } 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) => {
     const response = await fetch(`${TEACHER_API_ROUTES.UNIT}?pageLimit=1000&currentPage=1&schoolId=${schoolId}`);
     const result = await response.json();
@@ -19,92 +22,151 @@ const handleGetAllRecords = async (schoolId) => {
     const blob = new Blob([csv], { type: "text/csv;charset=utf-8;" });
     await downloadFromUrl(blob, "teacher.csv");
 };
-async function processBulkCsv(files, method) {
+async function submitBulkJob(csvData, method, signal) {
     var _a;
-    if (!files || files.length === 0)
-        return false;
-    const file = files[0];
-    try {
+    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(TEACHER_API_ROUTES.BULK, {
+        method,
+        headers: {
+            "Content-Type": "application/json",
+            "x-api-token": process.env.NEXT_PUBLIC_API_KEY,
+        },
+        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) {
+    const startTime = Date.now();
+    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(TEACHER_API_ROUTES.BULK_STATUS(jobId), {
+            headers: {
+                "x-api-token": process.env.NEXT_PUBLIC_API_KEY,
+            },
+            signal,
+        });
+        if (!res.ok)
+            continue;
+        const data = (await res.json());
+        if (data.status === "completed" || data.status === "failed") {
+            return data;
+        }
+    }
+}
+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 TeacherMoreActions = () => {
+    const t = useTranslations("teacher");
+    const { dispatch } = useTeacherContext();
+    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 closeDrawer = () => {
+        dispatch({
+            type: TEACHER_ACTION_TYPES.SET_DRAWER,
+            payload: { drawer: null },
+        });
+    };
+    const handleBulkFlow = useCallback(async (files, method) => {
+        var _a, _b, _c;
+        // 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 false;
+            return;
         }
-        const errors = [];
+        // Client-side validation — fast feedback, saves worker round-trip
+        const validationErrors = [];
         for (let i = 0; i < records.length; i++) {
             const result = teacherFormValidation.safeParse(records[i]);
             if (!result.success) {
-                errors.push({
+                validationErrors.push({
                     row: i + 1,
                     messages: result.error.issues.map((issue) => `${issue.path.join(".")}: ${issue.message}`),
                 });
             }
         }
-        if (errors.length > 0) {
-            const summary = errors
+        if (validationErrors.length > 0) {
+            const summary = validationErrors
                 .slice(0, 5)
                 .map((e) => `Row ${e.row}: ${e.messages.join("; ")}`)
                 .join("\n");
-            const remaining = errors.length - 5;
-            showErrorToast(`Validation failed for ${errors.length} row(s).\n${summary}${remaining > 0 ? `\n...and ${remaining} more` : ""}`);
-            return false;
+            const remaining = validationErrors.length - 5;
+            showErrorToast(`Validation failed for ${validationErrors.length} row(s).\n${summary}${remaining > 0 ? `\n...and ${remaining} more` : ""}`);
+            return;
         }
-        const schoolId = ((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "";
         try {
-            const response = await fetch(TEACHER_API_ROUTES.BULK, {
-                method,
-                headers: {
-                    "Content-Type": "application/json",
-                    "x-api-token": process.env.NEXT_PUBLIC_API_KEY,
-                },
-                body: JSON.stringify({
-                    schoolId,
-                    csvData: text,
-                }),
-            });
-            if (response.ok) {
-                showSuccessToast(`Successfully processed ${records.length} teacher(s)`);
-                return true;
+            showInfoToast(`Bulk ${label} job queued (${records.length} records). Processing...`);
+            const jobId = await submitBulkJob(text, method, signal);
+            const status = await pollBulkJob(jobId, signal);
+            if (signal.aborted)
+                return;
+            if (status.status === "completed") {
+                const r = status.results;
+                if (r && ((_b = r.errors) === null || _b === void 0 ? void 0 : _b.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");
+                }
+                invalidateTeachersCache();
+                closeDrawer();
+            }
+            else {
+                const r = status.results;
+                const detail = ((_c = r === null || r === void 0 ? void 0 : r.errors) === null || _c === void 0 ? void 0 : _c.length)
+                    ? formatErrorSummary(r.errors)
+                    : "Unknown error";
+                showErrorToast(`Bulk ${label} failed.\n${detail}`);
             }
-            const errorData = await response.json().catch(() => ({}));
-            showErrorToast(errorData.error ||
-                `Bulk operation failed with status ${response.status}`);
-            return false;
-        }
-        catch (_b) {
-            showErrorToast("Network error during bulk operation");
-            return false;
-        }
-    }
-    catch (error) {
-        showErrorToast(`Failed to process CSV: ${error instanceof Error ? error.message : "Unknown error"}`);
-        return false;
-    }
-}
-export const TeacherMoreActions = () => {
-    const t = useTranslations("teacher");
-    const { dispatch } = useTeacherContext();
-    const closeDrawer = () => {
-        dispatch({
-            type: TEACHER_ACTION_TYPES.SET_DRAWER,
-            payload: { drawer: null },
-        });
-    };
-    const handleBulkCreate = async (files) => {
-        const ok = await processBulkCsv(files, "POST");
-        if (ok) {
-            invalidateTeachersCache();
-            closeDrawer();
         }
-    };
-    const handleBulkUpdate = async (files) => {
-        const ok = await processBulkCsv(files, "PUT");
-        if (ok) {
-            invalidateTeachersCache();
-            closeDrawer();
+        catch (error) {
+            if (error.message === "Polling cancelled")
+                return;
+            showErrorToast(`Bulk ${label} failed: ${error instanceof Error ? error.message : "Unknown error"}`);
         }
-    };
+    }, [closeDrawer]);
+    const handleBulkCreate = useCallback((files) => handleBulkFlow(files, "POST"), [handleBulkFlow]);
+    const handleBulkUpdate = useCallback((files) => handleBulkFlow(files, "PUT"), [handleBulkFlow]);
     const create = [
         {
             id: "1",

package/base-modules/teacher/validate.d.ts

@@ -12,10 +12,16 @@ export declare const teacherFormValidation: z.ZodObject<{
     country: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     dateOfBirth: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     emergencyPhone: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    campusId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     experience: z.ZodNullable<z.ZodOptional<z.ZodNumber>>;
     firstName: z.ZodString;
-    gender: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-    joiningDate: z.ZodString;
+    gender: z.ZodPreprocess<z.ZodNullable<z.ZodOptional<z.ZodEnum<{
+        MALE: "MALE";
+        FEMALE: "FEMALE";
+        OTHER: "OTHER";
+        PREFER_NOT_TO_SAY: "PREFER_NOT_TO_SAY";
+    }>>>>;
+    joiningDate: z.ZodOptional<z.ZodString>;
     lastName: z.ZodString;
     phone: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     postalCode: z.ZodNullable<z.ZodOptional<z.ZodString>>;

package/base-modules/teacher/validate.js

@@ -26,10 +26,15 @@ export const teacherFormValidation = z.object({
     //     });
     //   }
     // }),
+    campusId: z.string().optional().nullable(),
     experience: z.number().optional().nullable(),
     firstName: z.string().min(1, "First name is required"),
-    gender: z.string().optional().nullable(),
-    joiningDate: z.string(),
+    gender: z
+        .preprocess((val) => (val === "" ? undefined : val), z
+        .enum(["MALE", "FEMALE", "OTHER", "PREFER_NOT_TO_SAY"])
+        .optional()
+        .nullable()),
+    joiningDate: z.string().optional(),
     lastName: z.string().min(1, "Last name is required"),
     phone: z.string().nullable().optional(),
     // .superRefine((val, ctx) => {

package/package.json

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