Merge pull request #697 from webitel/fix/required-calendar-contentcen…

…ter-icon Fix/required calendar contentcenter icon
webitel · Jul 3, 2024 · ac44081 · ac44081
2 parents e3269f7 + 2b0c8de
commit ac44081
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 99 deletions.
diff --git a/src/modules/contact-center/modules/queues/components/opened-queue-general.vue b/src/modules/contact-center/modules/queues/components/opened-queue-general.vue
@@ -21,7 +21,7 @@
         :search-method="loadDropdownOptionsCalendarList"
         :v="v.itemInstance.calendar"
         :value="itemInstance.calendar"
-        required
+        :required="v.itemInstance.calendar"
         @input="setItemProp({ prop: 'calendar', value: $event })"
       />
       <wt-select

diff --git a/src/modules/contact-center/modules/queues/modules/logs/components/opened-queue-logs.vue b/src/modules/contact-center/modules/queues/modules/logs/components/opened-queue-logs.vue
@@ -16,15 +16,15 @@
     </header>
 
     <wt-loader v-show="!isLoaded" />
-    <!--    <wt-dummy-->
-    <!--      v-if="dummy && isLoaded"-->
-    <!--      :src="dummy.src"-->
-    <!--      :dark-mode="darkMode"-->
-    <!--      :text="dummy.text && $t(dummy.text)"-->
-    <!--      class="dummy-wrapper"-->
-    <!--    ></wt-dummy>-->
+    <wt-dummy
+      v-if="dummy && isLoaded"
+      :src="dummy.src"
+      :dark-mode="darkMode"
+      :text="dummy.text && $t(dummy.text)"
+      class="dummy-wrapper"
+    ></wt-dummy>
     <div
-      v-show="isLoaded"
+      v-show="dataList.length && isLoaded"
       class="table-wrapper"
     >
       <wt-table
@@ -87,6 +87,7 @@
 import FilterSearch from '@webitel/ui-sdk/src/modules/QueryFilters/components/filter-search.vue';
 import convertDuration from '@webitel/ui-sdk/src/scripts/convertDuration';
 import openedObjectTableTabMixin from '../../../../../../../app/mixins/objectPagesMixins/openedObjectTableTabMixin/openedObjectTableTabMixin';
+import { useDummy } from '../../../../../../../app/composables/useDummy';
 
 const namespace = 'ccenter/queues';
 const subNamespace = 'log';
@@ -100,13 +101,10 @@ export default {
     subNamespace,
   }),
 
-  /* https://my.webitel.com/browse/WTEL-3697 */
-  /* Temporarily disabled functionality due to problems with pagination */
-
-  // setup() {
-  //   const { dummy } = useDummy({ namespace: `${namespace}/${subNamespace}`, hiddenText: true });
-  //   return { dummy };
-  // },
+  setup() {
+    const { dummy } = useDummy({ namespace: `${namespace}/${subNamespace}`, hiddenText: true });
+    return { dummy };
+  },
   computed: {
     filtersNamespace() {
       return `${this.namespace}/${this.subNamespace}/filters`;

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
@@ -96,15 +96,15 @@
         </header>
 
         <wt-loader v-show="!isLoaded" />
-        <!--        <wt-dummy-->
-        <!--          v-if="dummy && isLoaded"-->
-        <!--          :src="dummy.src"-->
-        <!--          :dark-mode="darkMode"-->
-        <!--          :text="dummy.text && $t(dummy.text)"-->
-        <!--          class="dummy-wrapper"-->
-        <!--        ></wt-dummy>-->
+                <wt-dummy
+                  v-if="dummy && isLoaded"
+                  :src="dummy.src"
+                  :dark-mode="darkMode"
+                  :text="dummy.text && $t(dummy.text)"
+                  class="dummy-wrapper"
+                ></wt-dummy>
         <div
-          v-show="isLoaded"
+          v-show="dataList.length && isLoaded"
           class="table-wrapper"
         >
           <wt-table
@@ -209,6 +209,7 @@ import TheQueueMembersFilters from '../modules/filters/components/the-queue-memb
 import destinationsPopup from './communications/opened-queue-member-destinations-popup.vue';
 import ResetPopup from './reset-members-popup.vue';
 import uploadPopup from './upload-members-popup.vue';
+import { useDummy } from '../../../../../../../app/composables/useDummy';
 
 export default {
   name: 'TheQueueMembers',
@@ -223,6 +224,8 @@ export default {
   mixins: [tableComponentMixin],
 
   setup() {
+    const { dummy } = useDummy({ namespace: `${namespace}/${subNamespace}`,
+      text: 'objects.ccenter.members.emptyWorkspace', });
     const {
       isVisible: isDeleteConfirmationPopup,
       deleteCount,
@@ -239,6 +242,7 @@ export default {
 
       askDeleteConfirmation,
       closeDelete,
+      dummy
     };
   },
 
@@ -330,16 +334,6 @@ export default {
       };
       return [importCsv];
     },
-
-    /* https://my.webitel.com/browse/WTEL-3697 */
-    /* Temporarily disabled functionality due to problems with pagination */
-
-    // dummy() {
-    //   return !this.dataList.length && {
-    //     src: this.darkMode ? dummyPicDark : dummyPicLight,
-    //     text: 'objects.ccenter.members.emptyWorkspace',
-    //   };
-    // },
   },
 
   methods: {

diff --git a/src/modules/directory/modules/users/modules/logs/components/opened-user-logs.vue b/src/modules/directory/modules/users/modules/logs/components/opened-user-logs.vue
@@ -17,15 +17,15 @@
     </header>
 
     <wt-loader v-show="!isLoaded" />
-    <!--    <wt-dummy-->
-    <!--      v-if="dummy && isLoaded"-->
-    <!--      :src="dummy.src"-->
-    <!--      :dark-mode="darkMode"-->
-    <!--      :text="dummy.text && $t(dummy.text)"-->
-    <!--      class="dummy-wrapper"-->
-    <!--    ></wt-dummy>-->
+    <wt-dummy
+          v-if="dummy && isLoaded"
+          :src="dummy.src"
+          :dark-mode="darkMode"
+          :text="dummy.text && $t(dummy.text)"
+          class="dummy-wrapper"
+    ></wt-dummy>
     <div
-      v-show="isLoaded"
+      v-show="dataList.length && isLoaded"
       class="table-wrapper"
     >
       <wt-table
@@ -77,7 +77,7 @@ import openedObjectTableTabMixin from '../../../../../../../app/mixins/objectPag
 import RouteNames from '../../../../../../../app/router/_internals/RouteNames.enum';
 import RecordLink from '../../../../../../system/modules/changelogs/modules/logs/components/changelog-logs-record-link.vue';
 import LogsAPI from '../api/logs';
-// import { useDummy } from '.  ./../../../../../../app/composables/useDummy';
+import { useDummy } from '../../../../../../../app/composables/useDummy';
 
 const namespace = 'directory/users';
 const subNamespace = 'logs';
@@ -92,13 +92,10 @@ export default {
     changelogsRouteName: RouteNames.CHANGELOGS,
   }),
 
-  /* https://my.webitel.com/browse/WTEL-3697 */
-  /* Temporarily disabled functionality due to problems with pagination */
-
-  // setup() {
-  //   const { dummy } = useDummy({ namespace: `${namespace}/${subNamespace}`, hiddenText: true });
-  //   return { dummy };
-  // },
+  setup() {
+    const { dummy } = useDummy({ namespace: `${namespace}/${subNamespace}`, hiddenText: true });
+    return { dummy };
+  },
 
   computed: {
     getFilters() {

diff --git a/src/modules/routing/modules/flow/components/the-flow.vue b/src/modules/routing/modules/flow/components/the-flow.vue
@@ -65,17 +65,18 @@
         </header>
 
         <wt-loader v-show="!isLoaded" />
-        <!--        <wt-dummy-->
-        <!--          v-if="dummy && isLoaded"-->
-        <!--          :src="dummy.src"-->
-        <!--          :dark-mode="darkMode"-->
-        <!--          :text="dummy.text && $t(dummy.text)"-->
-        <!--          :show-action="dummy.showAction"-->
-        <!--          @create="create"-->
-        <!--          class="dummy-wrapper"-->
-        <!--        ></wt-dummy>-->
+        <wt-dummy
+          v-if="dummy && isLoaded"
+          :src="dummy.src"
+          :dark-mode="darkMode"
+          :text="dummy.text && $t(dummy.text)"
+          :show-action="dummy.showAction"
+          @create="create"
+          class="dummy-wrapper"
+        ></wt-dummy>
+
         <div
-          v-show="isLoaded"
+          v-show="dataList.length && isLoaded"
           class="table-wrapper"
         >
           <wt-table
@@ -174,6 +175,7 @@ import FlowEditor from '../enums/FlowEditor.enum';
 import TheFlowFilters from '../modules/filters/components/the-flow-filters.vue';
 import CreateFlowPopup from './create-flow-popup.vue';
 import UploadPopup from './upload-flow-popup.vue';
+import { useDummy } from '../../../../../app/composables/useDummy';
 
 const namespace = 'routing/flow';
 
@@ -189,42 +191,34 @@ export default {
   },
   mixins: [tableComponentMixin],
 
+  data: () => ({
+    namespace,
+    routeName: RouteNames.FLOW,
+    isUploadPopup: false,
+    jsonFile: null,
+    isCreateFlowPopup: false,
+  }),
+
   setup() {
     const {
       isVisible: isDeleteConfirmationPopup,
       deleteCount,
       deleteCallback,
-
       askDeleteConfirmation,
       closeDelete,
     } = useDeleteConfirmationPopup();
+    const { dummy } = useDummy({ namespace, showAction: true });
 
     return {
       isDeleteConfirmationPopup,
       deleteCount,
       deleteCallback,
-
       askDeleteConfirmation,
       closeDelete,
+      dummy,
     };
   },
 
-  data: () => ({
-    namespace,
-    routeName: RouteNames.FLOW,
-    isUploadPopup: false,
-    jsonFile: null,
-    isCreateFlowPopup: false,
-  }),
-
-  /* https://my.webitel.com/browse/WTEL-3697 */
-  /* Temporarily disabled functionality due to problems with pagination */
-
-  // setup() {
-  //   const { dummy } = useDummy({ namespace, showAction: true });
-  //   return { dummy };
-  // },
-
   computed: {
     path() {
       return [
@@ -290,9 +284,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.the-flow__tags {
-  display: flex;
-  flex-wrap: wrap;
-  gap: var(--spacing-xs);
-}
+  .the-flow__tags {
+    display: flex;
+    flex-wrap: wrap;
+    gap: var(--spacing-xs);
+  }
 </style>
diff --git a/src/modules/system/modules/changelogs/modules/logs/components/opened-changelog-logs.vue b/src/modules/system/modules/changelogs/modules/logs/components/opened-changelog-logs.vue
@@ -17,15 +17,15 @@
     </header>
 
     <wt-loader v-show="!isLoaded" />
-    <!--    <wt-dummy-->
-    <!--      v-if="dummy && isLoaded"-->
-    <!--      :src="dummy.src"-->
-    <!--      :dark-mode="darkMode"-->
-    <!--      :text="dummy.text && $t(dummy.text)"-->
-    <!--      class="dummy-wrapper"-->
-    <!--    ></wt-dummy>-->
+        <wt-dummy
+          v-if="dummy && isLoaded"
+          :src="dummy.src"
+          :dark-mode="darkMode"
+          :text="dummy.text && $t(dummy.text)"
+          class="dummy-wrapper"
+        ></wt-dummy>
     <div
-      v-show="isLoaded"
+      v-show="dataList.length && isLoaded"
       class="table-wrapper"
     >
       <wt-table
@@ -89,7 +89,7 @@ import openedObjectTableTabMixin from '../../../../../../../app/mixins/objectPag
 import RouteNames from '../../../../../../../app/router/_internals/RouteNames.enum';
 import LogsAPI from '../api/logs';
 import RecordLink from './changelog-logs-record-link.vue';
-// import { useDummy } from '../../../../../../../app/composables/useDummy';
+import { useDummy } from '../../../../../../../app/composables/useDummy';
 
 const namespace = 'system/changelogs';
 const subNamespace = 'logs';
@@ -104,13 +104,10 @@ export default {
     usersRouteName: RouteNames.USERS,
   }),
 
-  /* https://my.webitel.com/browse/WTEL-3697 */
-  /* Temporarily disabled functionality due to problems with pagination */
-
-  // setup() {
-  //   const { dummy } = useDummy({ namespace: `${namespace}/${subNamespace}`, hiddenText: true });
-  //   return { dummy };
-  // },
+  setup() {
+    const { dummy } = useDummy({ namespace: `${namespace}/${subNamespace}`, hiddenText: true });
+    return { dummy };
+  },
   computed: {
     getFilters() {
       return this.$store.getters[`${namespace}/${subNamespace}/filters/GET_FILTERS`];