Merge pull request #384 from suvarnakale/release-1.0.0

Issue #PS-1699 bug: Error When Attempting to Create Duplicate Center- fixed
tekdi · Nov 11, 2024 · 7626c6d · 7626c6d
2 parents 209355f + 80a4794
commit 7626c6d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 27 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -137,8 +137,8 @@
     "AND_COUNT_MORE": "and {{count}} more",
     "RETURN_TO_LOGIN": "Return to Login",
     "NO_CENTER_FOUND": "No Center found",
-    "FILTER_BY":"Filter By",
-    "ALL":"All"
+    "FILTER_BY": "Filter By",
+    "ALL": "All"
   },
   "LOGIN_PAGE": {
     "USERNAME": "Username",
@@ -359,6 +359,7 @@
     "UNIT_NAME": "Unit Name",
     "NOTE": "Note: This will be the center name",
     "CENTER_CREATED": "Center created successfully!",
+    "DUPLICATE_CENTER": "Cohort already exists",
     "RENAME_CENTER": "Rename Center",
     "REQUEST_TO_DELETE": "Request to Delete",
     "RENAME": "Rename",
@@ -590,27 +591,24 @@
   },
   "OBSERVATION": {
     "OBSERVATION_START": "Start Observation",
-    "OBSERVATION_DETAILS":"Observation Details",
-    "ADD_ENTITY":"Add {{entityType}} in observation list",
-    "SEARCH_ENTITY":"Search {{entityType}} name",
-    "OBSERVATIONS":"{{name}} Observations",
-    "SEARCH_OBSERVATIONS":"Search Observations",
-    "CONTINUE":"Continue",
-    "SUBMITTED":"Submitted",
-    "FORM_SAVED_SUCCESSFULLY":"Form changes saved successfully",
-    "FORM_SUBMIT_SUCCESSFULLY":"Form submitted successfully",
-    "NOT_STARTED":"Not Started",
-    "COMPLETED":"Completed",
-    "INPROGRESS":"In-Progress",
-    "NO_DATA_FOUND":"No {{entity}} found",
-    "NO_RESULT_FOUND":"No Observations found for {{entity}}",
-    "NO_OBSERVATION_EXPIRED":"No observation expired for {{entity}}",
-    "DAYS_LEFT":"Days left",
-    "THIS_OBSERVATION_EXPIRED":"This observation is expired",
-    "DUE_DATE":"Due date",
-    "SURVEY_FORMS":"Survey forms"
-
-
-}
-
+    "OBSERVATION_DETAILS": "Observation Details",
+    "ADD_ENTITY": "Add {{entityType}} in observation list",
+    "SEARCH_ENTITY": "Search {{entityType}} name",
+    "OBSERVATIONS": "{{name}} Observations",
+    "SEARCH_OBSERVATIONS": "Search Observations",
+    "CONTINUE": "Continue",
+    "SUBMITTED": "Submitted",
+    "FORM_SAVED_SUCCESSFULLY": "Form changes saved successfully",
+    "FORM_SUBMIT_SUCCESSFULLY": "Form submitted successfully",
+    "NOT_STARTED": "Not Started",
+    "COMPLETED": "Completed",
+    "INPROGRESS": "In-Progress",
+    "NO_DATA_FOUND": "No {{entity}} found",
+    "NO_RESULT_FOUND": "No Observations found for {{entity}}",
+    "NO_OBSERVATION_EXPIRED": "No observation expired for {{entity}}",
+    "DAYS_LEFT": "Days left",
+    "THIS_OBSERVATION_EXPIRED": "This observation is expired",
+    "DUE_DATE": "Due date",
+    "SURVEY_FORMS": "Survey Forms"
+  }
 }
diff --git a/src/components/center/CreateCenterModal.tsx b/src/components/center/CreateCenterModal.tsx
@@ -149,15 +149,15 @@ const CreateCenterModal: React.FC<CreateBlockModalProps> = ({
         ).values()
       );
       const cohortData = await createCohort(cohortDetails);
-      if (cohortData) {
+      if (cohortData.hasOwnProperty('cohortId')) {
         showToastMessage(t('CENTERS.CENTER_CREATED'), 'success');
         const telemetryInteract = {
           context: {
             env: 'teaching-center',
             cdata: [],
           },
           edata: {
-            id:'create-center-successfully',
+            id: 'create-center-successfully',
             type: Telemetry.CLICK,
             subtype: '',
             pageid: 'centers',
@@ -168,6 +168,9 @@ const CreateCenterModal: React.FC<CreateBlockModalProps> = ({
         onCenterAdded();
         handleClose();
         localStorage.removeItem('BMGSData');
+      } else {
+        showToastMessage(t('CENTERS.DUPLICATE_CENTER'), 'error');
+        handleClose();
       }
     }
   };