Merge pull request #816 from webitel/fix/obac-rbac-popups-reset-state

fix/ add state resetting in obac`s and rbac`s popup [WTEL-5156]
webitel · Dec 20, 2024 · b3bd913 · b3bd913
2 parents cfb0e98 + d58bcdd
commit b3bd913
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 27 deletions.
diff --git a/src/app/mixins/objectPagesMixins/permissionsTabMixin/permissionsTabRolePopupMixin.js b/src/app/mixins/objectPagesMixins/permissionsTabMixin/permissionsTabRolePopupMixin.js
@@ -14,7 +14,7 @@ export default {
     },
   },
   data: () => ({
-    newGrantee: '',
+    newGrantee: null,
   }),
   computed: {
     ...mapState({
@@ -53,8 +53,19 @@ export default {
         fields,
       });
     },
+    resetNewGrantee() {
+      this.newGrantee = null;
+    },
+    resetNewGrantor() {
+      this.newGrantor = null;
+    },
+    resetPopupState() {
+      if (this.newGrantor) this.resetNewGrantor();
+      this.resetNewGrantee();
+    },
     close() {
       this.$emit('close');
+      this.resetPopupState();
     },
   },
 };
diff --git a/...ues/modules/members/components/communications/opened-queue-member-communication-popup.vue b/...ues/modules/members/components/communications/opened-queue-member-communication-popup.vue
@@ -72,12 +72,21 @@ import { required } from '@vuelidate/validators';
 import getNamespacedState from '@webitel/ui-sdk/src/store/helpers/getNamespacedState';
 import deepCopy from 'deep-copy';
 import { mapActions, mapState } from 'vuex';
-import nestedObjectMixin
-  from '../../../../../../../../app/mixins/objectPagesMixins/openedObjectMixin/nestedObjectMixin';
+import nestedObjectMixin from '../../../../../../../../app/mixins/objectPagesMixins/openedObjectMixin/nestedObjectMixin';
 import CommunicationsAPI from '../../../../../../../lookups/modules/communications/api/communications';
 import ResourcesAPI from '../../../../../resources/api/resources';
 import { digitsDtmfOnly } from '../../validation/dtmf';
 
+const getDefaultItemInstance = () => ({
+  destination: '',
+  display: '',
+  priority: 0,
+  type: {},
+  resource: {},
+  description: '',
+  dtmf: '',
+});
+
 export default {
   name: 'OpenedAgentSkillsPopup',
   mixins: [nestedObjectMixin],
@@ -89,15 +98,7 @@ export default {
   }),
   data: () => ({
     namespace: 'ccenter/queues/members',
-    itemInstanceValue: {
-      destination: '',
-      display: '',
-      priority: 0,
-      type: {},
-      resource: {},
-      description: '',
-      dtmf: '',
-    },
+    itemInstanceValue: getDefaultItemInstance(),
   }),
   validations: {
     itemInstance: {
@@ -110,7 +111,8 @@ export default {
   computed: {
     ...mapState({
       commList(state) {
-        return getNamespacedState(state, `${this.namespace}`).itemInstance.communications;
+        return getNamespacedState(state, `${this.namespace}`).itemInstance
+          .communications;
       },
     }),
     // override mixin map state
@@ -127,7 +129,7 @@ export default {
     },
     communicationIndex() {
       return this.$route.params.communicationIndex;
-    }
+    },
   },
 
   methods: {
@@ -136,7 +138,10 @@ export default {
         return dispatch(`${this.namespace}/ADD_MEMBER_COMMUNICATION`, payload);
       },
       updateItem(dispatch, payload) {
-        return dispatch(`${this.namespace}/UPDATE_MEMBER_COMMUNICATION`, payload);
+        return dispatch(
+          `${this.namespace}/UPDATE_MEMBER_COMMUNICATION`,
+          payload,
+        );
       },
     }),
     initEditedValue() {
@@ -162,20 +167,25 @@ export default {
       return ResourcesAPI.getLookup(params);
     },
     loadItem() {},
-    resetState() {},
+    resetItemInstance() {
+      this.itemInstance = getDefaultItemInstance();
+    },
+    resetState() {
+      this.resetItemInstance();
+    },
   },
   watch: {
     communicationIndex: {
-       handler(index) {
+      handler(index) {
         if (index) {
           this.initEditedValue();
         }
-      }, immediate: true,
-    }
+        this.resetState();
+      },
+      immediate: true,
+    },
   },
 };
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/...odules/contact-center/modules/teams/modules/agents/components/create-team-agent-popup.vue b/...odules/contact-center/modules/teams/modules/agents/components/create-team-agent-popup.vue
@@ -52,7 +52,7 @@ export default {
   setup: () => ({
     // Reasons for use $stopPropagation
     // https://webitel.atlassian.net/browse/WTEL-4559?focusedCommentId=621761
-    v$: useVuelidate({$stopPropagation: true}),
+    v$: useVuelidate({ $stopPropagation: true }),
   }),
 
   data: () => ({
@@ -73,8 +73,13 @@ export default {
       return AgentsAPI.getLookup(params);
     },
   },
+
+  watch: {
+    agentId() {
+      this.resetState();
+    },
+  },
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/...ons/modules/objects/modules/rbac/components/opened-object-permissions-rbac-role-popup.vue b/...ons/modules/objects/modules/rbac/components/opened-object-permissions-rbac-role-popup.vue
@@ -46,7 +46,7 @@ export default {
   components: { PermissionsRoleSelect },
   mixins: [permissionsTabRolePopupMixins],
   data: () => ({
-    newGrantor: '',
+    newGrantor: null,
   }),
 
   methods: {
@@ -56,7 +56,7 @@ export default {
           grantee: this.newGrantee,
           grantor: this.newGrantor,
         });
-        this.$emit('close');
+        this.close();
       } catch (err) {
         throw err;
       }