Merge pull request #280 from R-Sourabh/#278-security-group-remove

Fixed: Fulfillment section updated after removing securityGroup from the ellipse button (#278)
hotwax · Oct 22, 2024 · b16ec26 · b16ec26
2 parents 071eae0 + b0d7002
commit b16ec26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/components/SecurityGroupActionsPopover.vue b/src/components/SecurityGroupActionsPopover.vue
@@ -51,8 +51,8 @@
       })
     },
     methods: {
-      closePopover() {
-        popoverController.dismiss();
+      closePopover(userSecurityGroups: any) {
+        popoverController.dismiss(userSecurityGroups);
       },
       getDateTime(time: any) {
         return DateTime.fromMillis(time).toLocaleString(DateTime.DATETIME_MED);
@@ -73,7 +73,7 @@
         // refetching security groups
         const userSecurityGroups = await UserService.getUserSecurityGroups(this.selectedUser.userLoginId)
         this.store.dispatch('user/updateSelectedUser', { ...this.selectedUser, securityGroups: userSecurityGroups })
-        this.closePopover()
+        this.closePopover(userSecurityGroups)
       },
       async confirmRemove() {
         const message = 'Are you sure you want to perform this action?'

diff --git a/src/views/UserDetails.vue b/src/views/UserDetails.vue
@@ -857,7 +857,10 @@ export default defineComponent({
         event,
         showBackdrop: false,
       });
-      return securityGroupActionsPopover.present();
+      securityGroupActionsPopover.present();
+
+      const result = await securityGroupActionsPopover.onDidDismiss();
+      this.isUserFulfillmentAdmin = result.data.length ? await UserService.isUserFulfillmentAdmin(result.data.map((group: any) => group.groupId)) : false
     },
     async openProductStoreActionsPopover(event: Event, store: any) {
       const productStoreActionsPopover = await popoverController.create({