Merge pull request #63 from ymaheshwari1/fix/regenerate-latLng

Fixed: logic to not make api call for checking postalCode when closing the modal without changing latLng
hotwax · Dec 4, 2023 · f225250 · f225250
2 parents c3e5507 + eaa7a89
commit f225250
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/src/components/FacilityGeoPointModal.vue b/src/components/FacilityGeoPointModal.vue
@@ -114,7 +114,7 @@ export default defineComponent({
       try {
         const resp = await UtilService.generateLatLong(payload)
 
-        if(!hasError(resp)) {
+        if(!hasError(resp) && resp.data.response.docs.length > 0) {
           const result = resp.data.response.docs[0]
           this.geoPoint.latitude = result.latitude
           this.geoPoint.longitude = result.longitude
@@ -133,12 +133,15 @@ export default defineComponent({
         return;
       }
 
-      let resp;
+      let resp, geoPoints = '';
 
       try {
+        // passing old postalCode from here, as we don't allow user to update postalCode from this modal,
+        // and the user can only update the latLon from here
         resp = await FacilityService.updateFacilityPostalAddress({...this.geoPoint, postalCode: this.postalAddress.postalCode, facilityId: this.facilityId})
 
         if(!hasError(resp)) {
+          geoPoints = this.geoPoint
           showToast(translate("Facility latitude and longitude updated successfully."))
           await this.store.dispatch('facility/fetchFacilityContactDetails', { facilityId: this.facilityId })
         } else {
@@ -148,7 +151,7 @@ export default defineComponent({
         showToast(translate("Failed to update facility latitude and longitude."))
         logger.error(err)
       }
-      modalController.dismiss()
+      modalController.dismiss({ geoPoints })
     }
   },
   setup() {

diff --git a/src/components/GeoPointPopover.vue b/src/components/GeoPointPopover.vue
@@ -42,7 +42,7 @@ export default defineComponent({
   props: ['facilityId', 'isRegenerationRequired'],
   methods: {
     async regenerateLatitudeAndLongitude() {
-      let resp;
+      let resp, generatedLatLong;
 
       try {
         resp = await UtilService.generateLatLong({
@@ -53,8 +53,8 @@ export default defineComponent({
           }
         })
 
-        if(!hasError(resp)) {
-          const generatedLatLong = resp.data.response.docs[0]
+        if(!hasError(resp) && resp.data.response.docs.length > 0) {
+          generatedLatLong = resp.data.response.docs[0]
 
           if(generatedLatLong.latitude && generatedLatLong.longitude) {
             resp = await FacilityService.updateFacilityPostalAddress({
@@ -79,7 +79,7 @@ export default defineComponent({
         logger.error(err);
       }
 
-      popoverController.dismiss()
+      popoverController.dismiss({ generatedLatLong })
     },
     async removeLatitudeAndLongitude() {
       let resp;

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -227,6 +227,7 @@
   "Store unlink failed.": "Store unlink failed.",
   "Store unlinked successfully.": "Store unlinked successfully.",
   "Successfully associated calendar to the facility.": "Successfully associated calendar to the facility.",
+  "Successfully created and associated calendar to the facility.": "Successfully created and associated calendar to the facility.",
   "Successfully regenerated latitude and longitude for the facility.": "Successfully regenerated latitude and longitude for the facility.",
   "Sunday": "Sunday",
   "The timezone you select is used to ensure automations you schedule are always accurate to the time you select.": "The timezone you select is used to ensure automations you schedule are always accurate to the time you select.",

diff --git a/src/views/FacilityDetails.vue b/src/views/FacilityDetails.vue
@@ -528,8 +528,12 @@ export default defineComponent({
         showBackdrop: false
       });
 
-      popover.onDidDismiss().then(async() => {
-        await this.fetchPostalCodeByGeoPoints()
+      popover.onDidDismiss().then(async(result) => {
+        if(result?.data?.generatedLatLong) {
+          // changing the value for the variable, as if the popover has returned some value, it simply
+          // means that the latLng are correct for current zipCode
+          this.isRegenerationRequired = false
+        }
       })
 
       return popover.present()
@@ -578,9 +582,11 @@ export default defineComponent({
         componentProps: { facilityId: this.facilityId }
       })
 
-      geoPointModal.onDidDismiss().then(async() => {
-        await this.fetchPostalCodeByGeoPoints()
-      } )
+      geoPointModal.onDidDismiss().then(async(result) => {
+        if(result.data?.geoPoints) {
+          await this.fetchPostalCodeByGeoPoints()
+        }
+      })
 
       geoPointModal.present()
     },