Merge remote-tracking branch 'origin/master' into feature/widget-call…

…-config
webitel · Oct 25, 2023 · e84af33 · e84af33
2 parents 74921cd + c4e92ba
commit e84af33
Show file tree

Hide file tree

Showing 44 changed files with 85 additions and 135 deletions.
diff --git a/src/app/components/utils/delete-confirmation-popup/delete-confirmation-popup.vue b/src/app/components/utils/delete-confirmation-popup/delete-confirmation-popup.vue
diff --git a/src/app/mixins/baseMixins/baseTableMixin/deleteMixin/deleteConfirmationMixin.js b/src/app/mixins/baseMixins/baseTableMixin/deleteMixin/deleteConfirmationMixin.js
@@ -1,5 +1,5 @@
 import DeleteConfirmationPopup
-  from '../../../../components/utils/delete-confirmation-popup/delete-confirmation-popup.vue';
+  from '@webitel/ui-sdk/src/modules/DeleteConfirmationPopup/components/delete-confirmation-popup.vue';
 
 export default {
   components: {

diff --git a/src/modules/contact-center/modules/agents/components/the-agents.vue b/src/modules/contact-center/modules/agents/components/the-agents.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/contact-center/modules/queues/components/the-queues.vue b/src/modules/contact-center/modules/queues/components/the-queues.vue
@@ -18,7 +18,8 @@
       />
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/...es/queues/modules/members/components/communications/opened-queue-member-communication.vue b/...es/queues/modules/members/components/communications/opened-queue-member-communication.vue
@@ -8,7 +8,8 @@
 
     <delete-confirmation-popup
       v-show="deleteConfirmation.isDeleteConfirmationPopup"
-      :payload="deleteConfirmation"
+      :delete-count="deleteConfirmation.deleteCount"
+      :callback="deleteConfirmation.callback"
       @close="closeDelete"
     />
 

diff --git a/src/modules/contact-center/modules/queues/modules/members/components/the-queue-members.vue b/src/modules/contact-center/modules/queues/modules/members/components/the-queue-members.vue
@@ -46,7 +46,8 @@
 
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/contact-center/modules/resource-groups/components/the-resource-groups.vue b/src/modules/contact-center/modules/resource-groups/components/the-resource-groups.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/.../modules/resource-groups/modules/resources/components/opened-resource-group-resources.vue b/.../modules/resource-groups/modules/resources/components/opened-resource-group-resources.vue
@@ -6,7 +6,8 @@
     />
     <delete-confirmation-popup
       v-show="deleteConfirmation.isDeleteConfirmationPopup"
-      :payload="deleteConfirmation"
+      :delete-count="deleteConfirmation.deleteCount"
+      :callback="deleteConfirmation.callback"
       @close="closeDelete"
     />
 

diff --git a/src/modules/contact-center/modules/resources/components/the-resources.vue b/src/modules/contact-center/modules/resources/components/the-resources.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/...s/contact-center/modules/resources/modules/display/components/opened-resource-numbers.vue b/...s/contact-center/modules/resources/modules/display/components/opened-resource-numbers.vue
@@ -6,7 +6,8 @@
     />
     <delete-confirmation-popup
       v-show="deleteConfirmation.isDeleteConfirmationPopup"
-      :payload="deleteConfirmation"
+      :delete-count="deleteConfirmation.deleteCount"
+      :callback="deleteConfirmation.callback"
       @close="closeDelete"
     />
 

diff --git a/src/modules/contact-center/modules/teams/components/the-teams.vue b/src/modules/contact-center/modules/teams/components/the-teams.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/contact-center/modules/teams/modules/agents/components/opened-team-agents.vue b/src/modules/contact-center/modules/teams/modules/agents/components/opened-team-agents.vue
@@ -6,7 +6,8 @@
     />
     <delete-confirmation-popup
       v-show="deleteConfirmation.isDeleteConfirmationPopup"
-      :payload="deleteConfirmation"
+      :delete-count="deleteConfirmation.deleteCount"
+      :callback="deleteConfirmation.callback"
       @close="closeDelete"
     />
     <object-list-popup

diff --git a/...s/contact-center/modules/teams/modules/supervisors/components/opened-team-supervisors.vue b/...s/contact-center/modules/teams/modules/supervisors/components/opened-team-supervisors.vue
@@ -11,7 +11,8 @@
     />
     <delete-confirmation-popup
       v-show="deleteConfirmation.isDeleteConfirmationPopup"
-      :payload="deleteConfirmation"
+      :delete-count="deleteConfirmation.deleteCount"
+      :callback="deleteConfirmation.callback"
       @close="closeDelete"
     />
 

diff --git a/src/modules/directory/modules/devices/components/the-devices.vue b/src/modules/directory/modules/devices/components/the-devices.vue
@@ -31,7 +31,8 @@
 
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/directory/modules/users/components/the-users.vue b/src/modules/directory/modules/users/components/the-users.vue
@@ -19,7 +19,8 @@
       />
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/directory/modules/users/modules/tokens/components/opened-user-token.vue b/src/modules/directory/modules/users/modules/tokens/components/opened-user-token.vue
@@ -11,7 +11,8 @@
     />
     <delete-confirmation-popup
       v-show="deleteConfirmation.isDeleteConfirmationPopup"
-      :payload="deleteConfirmation"
+      :delete-count="deleteConfirmation.deleteCount"
+      :callback="deleteConfirmation.callback"
       @close="closeDelete"
     />
 

diff --git a/src/modules/integrations/modules/cognitive-profiles/components/the-cognitive-profiles.vue b/src/modules/integrations/modules/cognitive-profiles/components/the-cognitive-profiles.vue
@@ -16,7 +16,8 @@
       />
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/integrations/modules/email-profiles/components/the-email-profiles.vue b/src/modules/integrations/modules/email-profiles/components/the-email-profiles.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/integrations/modules/import-csv/components/the-import-csv.vue b/src/modules/integrations/modules/import-csv/components/the-import-csv.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/integrations/modules/single-sign-on/components/the-single-sign-on.vue b/src/modules/integrations/modules/single-sign-on/components/the-single-sign-on.vue
@@ -12,9 +12,10 @@
     <template v-slot:main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
-      ></delete-confirmation-popup>
+      />
 
       <section class="main-section__wrapper">
         <header class="content-header">

diff --git a/src/modules/integrations/modules/storage/components/the-storage.vue b/src/modules/integrations/modules/storage/components/the-storage.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/integrations/modules/triggers/components/the-triggers.vue b/src/modules/integrations/modules/triggers/components/the-triggers.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/lookups/modules/agent-pause-cause/components/the-agent-pause-cause.vue b/src/modules/lookups/modules/agent-pause-cause/components/the-agent-pause-cause.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/lookups/modules/agent-skills/components/the-agent-skills.vue b/src/modules/lookups/modules/agent-skills/components/the-agent-skills.vue
@@ -21,7 +21,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/lookups/modules/agent-skills/modules/agents/components/opened-skill-agents.vue b/src/modules/lookups/modules/agent-skills/modules/agents/components/opened-skill-agents.vue
@@ -14,7 +14,8 @@
     />
     <delete-confirmation-popup
       v-show="deleteConfirmation.isDeleteConfirmationPopup"
-      :payload="deleteConfirmation"
+      :delete-count="deleteConfirmation.deleteCount"
+      :callback="deleteConfirmation.callback"
       @close="closeDelete"
     />
     <header class="content-header">

diff --git a/src/modules/lookups/modules/blacklists/components/the-blacklists.vue b/src/modules/lookups/modules/blacklists/components/the-blacklists.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/...odules/lookups/modules/blacklists/modules/numbers/components/opened-blacklist-numbers.vue b/...odules/lookups/modules/blacklists/modules/numbers/components/opened-blacklist-numbers.vue
@@ -12,7 +12,8 @@
     />
     <delete-confirmation-popup
       v-show="deleteConfirmation.isDeleteConfirmationPopup"
-      :payload="deleteConfirmation"
+      :delete-count="deleteConfirmation.deleteCount"
+      :callback="deleteConfirmation.callback"
       @close="closeDelete"
     />
 

diff --git a/src/modules/lookups/modules/buckets/components/the-buckets.vue b/src/modules/lookups/modules/buckets/components/the-buckets.vue
@@ -11,7 +11,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/lookups/modules/calendars/components/opened-calendar-holidays.vue b/src/modules/lookups/modules/calendars/components/opened-calendar-holidays.vue
@@ -7,7 +7,8 @@
     />
     <delete-confirmation-popup
       v-show="deleteConfirmation.isDeleteConfirmationPopup"
-      :payload="deleteConfirmation"
+      :delete-count="deleteConfirmation.deleteCount"
+      :callback="deleteConfirmation.callback"
       @close="closeDelete"
     />
 

diff --git a/src/modules/lookups/modules/calendars/components/the-calendars.vue b/src/modules/lookups/modules/calendars/components/the-calendars.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />
 

diff --git a/src/modules/lookups/modules/communications/components/the-communication-types.vue b/src/modules/lookups/modules/communications/components/the-communication-types.vue
@@ -12,7 +12,8 @@
     <template #main>
       <delete-confirmation-popup
         v-show="deleteConfirmation.isDeleteConfirmationPopup"
-        :payload="deleteConfirmation"
+        :delete-count="deleteConfirmation.deleteCount"
+        :callback="deleteConfirmation.callback"
         @close="closeDelete"
       />