Merge pull request hotwax#227 from amansinghbais/224-disable-modal-fav

Improved: added validation on fav button in modal to associate facilites, groupType and product to a facility group (hotwax#224)
Ritika-Patel08 · Mar 22, 2024 · 6e521a7 · 6e521a7
2 parents 83c4aa6 + 3f19c12
commit 6e521a7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/components/AddFacilityToGroupModal.vue b/src/components/AddFacilityToGroupModal.vue
@@ -31,7 +31,7 @@
       </div>
     </ion-list>
     <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-      <ion-fab-button @click="confirmSave()">
+      <ion-fab-button :disabled="!areFacilitiesUpdated()" @click="confirmSave()">
         <ion-icon :icon="saveOutline" />
       </ion-fab-button>
     </ion-fab>
@@ -216,6 +216,11 @@ export default defineComponent({
       };
       await this.store.dispatch('facility/fetchFacilityGroups', payload)
     },
+    areFacilitiesUpdated() {
+      if(this.selectedFacilities.length !== this.selectedFacilityValues.length) return true;
+
+      return this.selectedFacilityValues.some((selectedFacility: any) => !this.selectedFacilities.find((facility: any) => facility.facilityId === selectedFacility.facilityId))
+    }
   },
   setup() {
     const store = useStore();

diff --git a/src/components/AddProductStoreToGroupModal.vue b/src/components/AddProductStoreToGroupModal.vue
@@ -164,7 +164,9 @@ export default defineComponent({
       await this.store.dispatch('facility/updateFacilityGroups', this.groups)
     },
     areProductStoresUpdated() {
-      return JSON.stringify(this.selectedProductStoreValues) !== JSON.stringify(this.selectedProductStores)
+      if(this.selectedProductStores.length !== this.selectedProductStoreValues.length) return true;
+
+      return this.selectedProductStoreValues.some((selectedProductStore: any) => !this.selectedProductStores.find((productStore: any) => productStore.productStoreId === selectedProductStore.productStoreId))
     }
   },
   setup() {

diff --git a/src/components/GroupTypeModal.vue b/src/components/GroupTypeModal.vue
@@ -31,7 +31,7 @@
     </form>
 
     <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-      <ion-fab-button @click="saveGroupType()">
+      <ion-fab-button :disabled="!isGroupTypeUpdated()" @click="saveGroupType()">
         <ion-icon :icon="saveOutline" />
       </ion-fab-button>
     </ion-fab>
@@ -118,6 +118,9 @@ export default defineComponent({
         showToast(translate("Failed to update facility group type."))
         logger.error(err)
       }
+    },
+    isGroupTypeUpdated() {
+      return this.facilityGroup.facilityGroupTypeId !== this.facilityGroupValue.facilityGroupTypeId
     }
   },
   setup() {