Improved: logic for adding and removing groups from association with …

…facilityGroupTypes
hotwax · Dec 19, 2023 · a625bd0 · a625bd0
1 parent 3984007
commit a625bd0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/components/CreateFacilityGroupModal.vue b/src/components/CreateFacilityGroupModal.vue
@@ -149,7 +149,6 @@ export default defineComponent({
           }
           const updatedFacilityGroups = [...this.groups, createdGroup]
           await this.store.dispatch('facility/updateFacilityGroups', updatedFacilityGroups)
-          await this.store.dispatch('util/fetchFacilityGroupTypes')
         } else {
           throw resp.data;
         }

diff --git a/src/store/modules/util/getters.ts b/src/store/modules/util/getters.ts
@@ -16,7 +16,7 @@ const getters: GetterTree<UtilState, RootState> = {
     return state.facilityTypes
   },
   getFacilityGroupTypes(state) {
-    return state.facilityGroupTypes ? JSON.parse(JSON.stringify(state.facilityGroupTypes)) : {}
+    return state.facilityGroupTypes
   },
   getLocationTypes(state) {
     return state.locationTypes

diff --git a/src/views/FindGroups.vue b/src/views/FindGroups.vue
@@ -237,7 +237,7 @@ export default defineComponent({
       const groupsToAdd = selectedGroups.filter((selectedGroupId: string) => !prevAssociatedGroups.includes(selectedGroupId))
       const groupsToRemove = prevAssociatedGroups.filter((prevGroupId: string) => !selectedGroups.includes(prevGroupId))
 
-      if(!groupsToAdd.length && !groupsToAdd.length) {
+      if(!(groupsToAdd.length || groupsToRemove.length)) {
         return;
       }