@appcorp/fusion-storybook 0.2.9 → 0.2.10

package/base-modules/teacher/avatar-upload.js

@@ -43,6 +43,7 @@ export async function convertToWebPFormat(file) {
         return webpBlob;
     }
     catch (error) {
+        console.log("webp conversion error", error);
         const errorMessage = error instanceof Error
             ? error.message
             : "Unknown error during WebP conversion";
@@ -79,10 +80,13 @@ export async function processAvatarFile(file) {
     }
     // Convert to WebP
     const conversionResult = await convertToWebPFormat(file);
-    if ("type" in conversionResult) {
-        // It's an error
-        return conversionResult;
-    }
+    console.log("type" in conversionResult
+        ? `type: ${conversionResult.type}`
+        : "no type field in result");
+    // if ("type" in conversionResult) {
+    //   // It's an error
+    //   return conversionResult as AvatarUploadError;
+    // }
     // Convert blob to base64
     try {
         const fileBase64 = await blobToBase64(conversionResult);

package/base-modules/teacher/context.js

@@ -27,13 +27,12 @@ import { createGenericModule } from "@react-pakistan/util-functions/factory/gene
 import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-component-factory";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { GENDER } from "../../type";
-import { formatNumber } from "@react-pakistan/util-functions/general/format-number";
-import { formatPhoneDisplay } from "@react-pakistan/util-functions/general/format-phone-display";
 import { TEACHER_API_ROUTES, pageLimit } from "./constants";
 import { teacherFormValidation } from "./validate";
 import { getCachedTeachers, invalidateTeachersCache } from "./cache";
 import { getCachedWorkspaceSync } from "../workspace/cache";
 import { processAvatarFile } from "./avatar-upload";
+import { v4 as uuidv4 } from "uuid";
 // ============================================================================
 // 1.1 DRAWER TYPES
 // ============================================================================
@@ -127,7 +126,7 @@ export const useTeacherModule = () => {
         city: state.city,
         country: state.country,
         dateOfBirth: state.dateOfBirth,
-        emergencyPhone: formatNumber(state.emergencyPhone),
+        emergencyPhone: state.emergencyPhone,
         enabled: state.enabled,
         experience: state.experience,
         firstName: state.firstName,
@@ -135,7 +134,7 @@ export const useTeacherModule = () => {
         id: state.id,
         joiningDate: state.joiningDate,
         lastName: state.lastName,
-        phone: formatNumber(state.phone),
+        phone: state.phone,
         postalCode: state.postalCode,
         qualification: state.qualification,
         schoolId,
@@ -216,9 +215,7 @@ export const useTeacherModule = () => {
             dispatch({
                 type: TEACHER_ACTION_TYPES.SET_FORM_DATA,
                 payload: {
-                    form: Object.assign(Object.assign({}, teacher), { phone: (teacher.phone && formatPhoneDisplay(teacher.phone)) || "", emergencyPhone: (teacher.emergencyPhone &&
-                            formatPhoneDisplay(teacher.emergencyPhone)) ||
-                            "", filterEnabled: undefined }),
+                    form: Object.assign(Object.assign({}, teacher), { phone: teacher.phone || "", emergencyPhone: teacher.emergencyPhone || "", filterEnabled: undefined }),
                 },
             });
         }
@@ -359,30 +356,29 @@ export const useTeacherModule = () => {
     const handleAvatarUpload = useCallback(async (file) => {
         try {
             // Set uploading state
-            dispatch({
-                type: TEACHER_ACTION_TYPES.SET_INPUT_FIELD,
-                payload: { key: "avatarUploading", value: true },
-            });
+            // dispatch({
+            //   type: TEACHER_ACTION_TYPES.SET_INPUT_FIELD,
+            //   payload: { key: "avatarUploading", value: true },
+            // });
             // Process avatar file (validate, convert to WebP)
             const result = await processAvatarFile(file);
             if ("type" in result) {
                 // Error result
                 const error = result;
                 showToast(error.message, TOAST_VARIANT.ERROR);
-                dispatch({
-                    type: TEACHER_ACTION_TYPES.SET_INPUT_FIELD,
-                    payload: { key: "avatarUploading", value: false },
-                });
+                // dispatch({
+                //   type: TEACHER_ACTION_TYPES.SET_INPUT_FIELD,
+                //   payload: { key: "avatarUploading", value: false },
+                // });
                 return;
             }
-            // Get teacherId from current state (if creating, id will be empty)
-            const teacherId = state.id;
+            const teacherId = state.firstName + state.lastName + uuidv4().slice(0, 5);
             if (!teacherId) {
                 showToast("Please save the teacher record first before uploading an avatar", TOAST_VARIANT.ERROR);
-                dispatch({
-                    type: TEACHER_ACTION_TYPES.SET_INPUT_FIELD,
-                    payload: { key: "avatarUploading", value: false },
-                });
+                // dispatch({
+                //   type: TEACHER_ACTION_TYPES.SET_INPUT_FIELD,
+                //   payload: { key: "avatarUploading", value: false },
+                // });
                 return;
             }
             // Upload to S3 via teacher-avatar endpoint
@@ -402,10 +398,10 @@ export const useTeacherModule = () => {
                 const errorData = await response.json().catch(() => ({}));
                 const errorMessage = errorData.error || `Upload failed with status ${response.status}`;
                 showToast(errorMessage, TOAST_VARIANT.ERROR);
-                dispatch({
-                    type: TEACHER_ACTION_TYPES.SET_INPUT_FIELD,
-                    payload: { key: "avatarUploading", value: false },
-                });
+                // dispatch({
+                //   type: TEACHER_ACTION_TYPES.SET_INPUT_FIELD,
+                //   payload: { key: "avatarUploading", value: false },
+                // });
                 return;
             }
             const data = await response.json();
@@ -424,12 +420,12 @@ export const useTeacherModule = () => {
             showToast(errorMessage, TOAST_VARIANT.ERROR);
         }
         finally {
-            dispatch({
-                type: TEACHER_ACTION_TYPES.SET_INPUT_FIELD,
-                payload: { key: "avatarUploading", value: false },
-            });
+            // dispatch({
+            //   type: TEACHER_ACTION_TYPES.SET_INPUT_FIELD,
+            //   payload: { key: "avatarUploading", value: false },
+            // });
         }
-    }, [state.id, dispatch, showToast]);
+    }, [dispatch, showToast, state.firstName, state.lastName]);
     const applyFilters = useCallback(() => {
         dispatch({
             type: TEACHER_ACTION_TYPES.SET_CURRENT_PAGE,

package/package.json

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