Merge pull request #267 from AkshataKatwal16/prod-fix-issue

Issue feat: fix prod refresh issue on center page
tekdi · Oct 15, 2024 · 7529efd · 7529efd
2 parents f8eba85 + 41c04a4
commit 7529efd
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 5 deletions.
diff --git a/.env b/.env
@@ -4,4 +4,4 @@ NEXT_PUBLIC_TELEMETRY_URL=https://qa.prathamteacherapp.tekdinext.com
 NEXT_PUBLIC_NOTIFICATION_BASE_URL=https://notification.prathamdigital.org
 # NEXT_PUBLIC_NOTIFICATION_BASE_URL=https://qa.prathamteacherapp.tekdinext.com/notification-service
 NEXT_PUBLIC_COURSE_PLANNER_API_URL=https://courseplan.tekdinext.com/project/v1
-NEXT_PUBLIC_SUNBIRDSAAS_API_URL=https://sunbirdsaas.com
+NEXT_PUBLIC_SUNBIRDSAAS_API_URL=https://sunbirdsaas.com
diff --git a/src/components/AddNewCenters.tsx b/src/components/AddNewCenters.tsx
@@ -86,7 +86,12 @@ const AddNewCenters: React.FC<AddLearnerModalProps> = ({
   );
   const [stateDefaultValueForCenter, setStateDefaultValueForCenter] =
     useState<string>("");
-
+    const createCenterStatus = useSubmittedButtonStore(
+      (state: any) => state.createCenterStatus
+    );
+    const setCreateCenterStatus = useSubmittedButtonStore(
+      (state: any) => state.setCreateCenterStatus
+    );
   function removeHiddenFields(formResponse: any) {
     return {
       ...formResponse,
@@ -204,6 +209,7 @@ const AddNewCenters: React.FC<AddLearnerModalProps> = ({
         const cohortData = await createCohort(cohortDetails);
         if (cohortData) {
           showToastMessage(t("CENTERS.CENTER_CREATED_SUCCESSFULLY"), "success");
+          createCenterStatus? setCreateCenterStatus(false):setCreateCenterStatus(true)
           setOpenAddNewCohort(false);
           onClose();
           localStorage.removeItem("BMGSData");

diff --git a/src/pages/centers.tsx b/src/pages/centers.tsx
@@ -19,6 +19,7 @@ import {
   Status,
   Storage,
 } from "@/utils/app.constant";
+
 import EditIcon from "@mui/icons-material/Edit";
 import DeleteIcon from "@mui/icons-material/Delete";
 import ConfirmationModal from "@/components/ConfirmationModal";
@@ -34,7 +35,7 @@ import { showToastMessage } from "@/components/Toastify";
 import AddNewCenters from "@/components/AddNewCenters";
 import { getCenterTableData } from "@/data/tableColumns";
 import { Theme } from "@mui/system";
-import { firstLetterInUpperCase, mapFields } from "@/utils/Helper";
+import { firstLetterInUpperCase, mapFields , transformLabel} from "@/utils/Helper";
 import SimpleModal from "@/components/SimpleModal";
 import { IChangeEvent } from "@rjsf/core";
 import { RJSFSchema } from "@rjsf/utils";
@@ -139,6 +140,13 @@ const Center: React.FC = () => {
   const setSubmittedButtonStatus = useSubmittedButtonStore(
     (state: any) => state.setSubmittedButtonStatus
   );
+
+  const createCenterStatus = useSubmittedButtonStore(
+    (state: any) => state.createCenterStatus
+  );
+  const setCreateCenterStatus = useSubmittedButtonStore(
+    (state: any) => state.setCreateCenterStatus
+  );
   const setAdminInformation = useSubmittedButtonStore(
     (state: any) => state.setAdminInformation
   );
@@ -259,7 +267,7 @@ finalResult?.forEach((item: any, index: number) => {
             createdAt: item?.createdAt,
             updatedAt: item?.updatedAt,
             cohortId: item?.cohortId,
-            customFieldValues: cohortType[0] ? cohortType : "-",
+            customFieldValues: cohortType[0] ? transformLabel(cohortType) : "-",
             totalActiveMembers: counts?.totalActiveMembers,
             totalArchivedMembers: counts?.totalArchivedMembers,
           };
@@ -374,7 +382,7 @@ const response=  await fetchCohortMemberList(data);
   useEffect(() => {
     fetchUserList();
     getFormData();
-  }, [pageOffset, pageLimit, sortBy, filters, filters.states, filters.status]);
+  }, [pageOffset, pageLimit, sortBy, filters, filters.states, filters.status, createCenterStatus]);
 
   // handle functions
   const handleChange = (event: SelectChangeEvent<typeof pageSize>) => {

diff --git a/src/utils/Helper.ts b/src/utils/Helper.ts
@@ -178,6 +178,13 @@ export const mapFields = (formFields: any, Details: any) => {
           return field?.value?.toLowerCase();
         }
       } else if (item?.type === InputTypes.RADIO) {
+        if(field?.value===FormValues?.REGULAR|| field?.value===FormValues?.REMOTE)
+        {
+
+          return field?.code;
+        }
+
+
         return field?.value || null;
       } else if (item?.type === InputTypes.NUMERIC) {
         return parseInt(String(field?.value));

diff --git a/src/utils/app.constant.ts b/src/utils/app.constant.ts
@@ -79,6 +79,10 @@ export enum CohortTypes {
 export enum FormValues {
   FEMALE = "FEMALE",
   MALE = "MALE",
+  REGULAR="REGULAR",
+  REMOTE="REMOTE"
+
+
 }
 
 export enum InputTypes {

diff --git a/src/utils/useSharedState.ts b/src/utils/useSharedState.ts
@@ -4,6 +4,11 @@ const useSubmittedButtonStore = create((set) => ({
   submittedButtonStatus: false,
   setSubmittedButtonStatus: (status: boolean) =>
     set({ submittedButtonStatus: status }),
+
+    createCenterStatus: false,
+    setCreateCenterStatus: (status: boolean) =>
+      set({ createCenterStatus: status }),
+
     reassignButtonStatus: false,
     setReassignButtonStatus: (status: boolean) =>
       set({ reassignButtonStatus: status }),