From 9c8e3b60066086eb6b209d84cb0058c06593e2ca Mon Sep 17 00:00:00 2001 From: Lera24 Date: Fri, 29 Dec 2023 13:34:31 +0200 Subject: [PATCH 1/2] hotfix: change dummy in dark mode[WTEL-4111] --- package-lock.json | 18 +- package.json | 2 +- .../dummy/adm-dummy-after-search-dark.svg | 19 + .../dummy/adm-dummy-after-search-light.svg | 19 + .../assets/dummy/adm-dummy-after-search.svg | 143 - src/app/composables/useDummy.js | 16 +- .../agents/assets/adm-agent-history-dark.svg | 15 + .../agents/assets/adm-agent-history-light.svg | 15 + .../agents/assets/adm-agent-history.svg | 65 - .../agents/components/agent-history-popup.vue | 9 +- .../members/components/the-queue-members.vue | 7 +- .../assets/adm-dummy-cognitive-profiles.svg | 2670 ----------------- .../adm-dummy-congnitive-profiles-dark.svg | 568 ++++ .../adm-dummy-congnitive-profiles-light.svg | 568 ++++ .../components/the-cognitive-profiles.vue | 8 +- .../assets/adm-dummy-email-profile-dark.svg | 19 + .../assets/adm-dummy-email-profile-light.svg | 19 + .../assets/adm-dummy-email-profile.svg | 75 - .../components/the-email-profiles.vue | 6 +- .../storage/assets/adm-dummy-storage-dark.svg | 461 +++ .../assets/adm-dummy-storage-light.svg | 461 +++ .../storage/assets/adm-dummy-storage.svg | 1961 ------------ .../storage/components/the-storage.vue | 6 +- .../assets/adm-dummy-blacklist-dark.svg | 47 + .../assets/adm-dummy-blacklist-light.svg | 47 + .../blacklists/assets/adm-dummy-blacklist.svg | 263 -- .../blacklists/components/the-blacklists.vue | 8 +- .../components/opened-calendar-holidays.vue | 17 +- 28 files changed, 2329 insertions(+), 5203 deletions(-) create mode 100644 src/app/assets/dummy/adm-dummy-after-search-dark.svg create mode 100644 src/app/assets/dummy/adm-dummy-after-search-light.svg delete mode 100644 src/app/assets/dummy/adm-dummy-after-search.svg create mode 100644 src/modules/contact-center/modules/agents/assets/adm-agent-history-dark.svg create mode 100644 src/modules/contact-center/modules/agents/assets/adm-agent-history-light.svg delete mode 100644 src/modules/contact-center/modules/agents/assets/adm-agent-history.svg delete mode 100644 src/modules/integrations/modules/cognitive-profiles/assets/adm-dummy-cognitive-profiles.svg create mode 100644 src/modules/integrations/modules/cognitive-profiles/assets/adm-dummy-congnitive-profiles-dark.svg create mode 100644 src/modules/integrations/modules/cognitive-profiles/assets/adm-dummy-congnitive-profiles-light.svg create mode 100644 src/modules/integrations/modules/email-profiles/assets/adm-dummy-email-profile-dark.svg create mode 100644 src/modules/integrations/modules/email-profiles/assets/adm-dummy-email-profile-light.svg delete mode 100644 src/modules/integrations/modules/email-profiles/assets/adm-dummy-email-profile.svg create mode 100644 src/modules/integrations/modules/storage/assets/adm-dummy-storage-dark.svg create mode 100644 src/modules/integrations/modules/storage/assets/adm-dummy-storage-light.svg delete mode 100644 src/modules/integrations/modules/storage/assets/adm-dummy-storage.svg create mode 100644 src/modules/lookups/modules/blacklists/assets/adm-dummy-blacklist-dark.svg create mode 100644 src/modules/lookups/modules/blacklists/assets/adm-dummy-blacklist-light.svg delete mode 100644 src/modules/lookups/modules/blacklists/assets/adm-dummy-blacklist.svg diff --git a/package-lock.json b/package-lock.json index 21e756afd..503065e06 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,19 @@ { "name": "web-client", - "version": "23.09.0", + "version": "23.12.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "web-client", - "version": "23.09.0", + "version": "23.12.0", "dependencies": { "@vue/compat": "^3.2.47", "@vuelidate/core": "^2.0.0", "@vuelidate/validators": "^2.0.0", "@vueuse/core": "^10.3.0", "@webitel/flow-ui-sdk": "^0.1.14", - "@webitel/ui-sdk": "^23.12.126", + "@webitel/ui-sdk": "^23.12.129", "axios": "^0.27.1", "clipboard-copy": "^4.0.1", "cron-validator": "^1.3.1", @@ -1372,9 +1372,9 @@ } }, "node_modules/@webitel/ui-sdk": { - "version": "23.12.126", - "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-23.12.126.tgz", - "integrity": "sha512-chugAEXlZsa4cVUimKcmyGYYUPqnjRBYD9BzVJ27A2/hjiXT9nJW440UFaH2WHSBQlO9bfcboW72p5jAtKagEQ==", + "version": "23.12.129", + "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-23.12.129.tgz", + "integrity": "sha512-eQR1Co2g2jB4V6lFSTbYnSGi+eaG/F8O5ZCrHJCpsIcOvsDio2uJK5uMSSn6YXmWjR6XlUMuuPO7K2XmXg1cZA==", "dependencies": { "@floating-ui/vue": "^1.0.1", "@vuelidate/core": "^2.0.3", @@ -9252,9 +9252,9 @@ } }, "@webitel/ui-sdk": { - "version": "23.12.126", - "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-23.12.126.tgz", - "integrity": "sha512-chugAEXlZsa4cVUimKcmyGYYUPqnjRBYD9BzVJ27A2/hjiXT9nJW440UFaH2WHSBQlO9bfcboW72p5jAtKagEQ==", + "version": "23.12.129", + "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-23.12.129.tgz", + "integrity": "sha512-eQR1Co2g2jB4V6lFSTbYnSGi+eaG/F8O5ZCrHJCpsIcOvsDio2uJK5uMSSn6YXmWjR6XlUMuuPO7K2XmXg1cZA==", "requires": { "@floating-ui/vue": "^1.0.1", "@vuelidate/core": "^2.0.3", diff --git a/package.json b/package.json index cf8008d50..41594aa57 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@vuelidate/validators": "^2.0.0", "@vueuse/core": "^10.3.0", "@webitel/flow-ui-sdk": "^0.1.14", - "@webitel/ui-sdk": "^23.12.126", + "@webitel/ui-sdk": "^23.12.129", "axios": "^0.27.1", "clipboard-copy": "^4.0.1", "cron-validator": "^1.3.1", diff --git a/src/app/assets/dummy/adm-dummy-after-search-dark.svg b/src/app/assets/dummy/adm-dummy-after-search-dark.svg new file mode 100644 index 000000000..2f3337219 --- /dev/null +++ b/src/app/assets/dummy/adm-dummy-after-search-dark.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/app/assets/dummy/adm-dummy-after-search-light.svg b/src/app/assets/dummy/adm-dummy-after-search-light.svg new file mode 100644 index 000000000..1c50b9905 --- /dev/null +++ b/src/app/assets/dummy/adm-dummy-after-search-light.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/app/assets/dummy/adm-dummy-after-search.svg b/src/app/assets/dummy/adm-dummy-after-search.svg deleted file mode 100644 index 8da70491a..000000000 --- a/src/app/assets/dummy/adm-dummy-after-search.svg +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/composables/useDummy.js b/src/app/composables/useDummy.js index e6d51e283..3001e4479 100644 --- a/src/app/composables/useDummy.js +++ b/src/app/composables/useDummy.js @@ -4,8 +4,10 @@ import getNamespacedState import { computed, ref, watch } from 'vue'; import { useRoute } from 'vue-router'; import { useStore } from 'vuex'; -import defaultDummyPicAfterSearch - from '../assets/dummy/adm-dummy-after-search.svg'; +import defaultDummyPicAfterSearchLight + from '../assets/dummy/adm-dummy-after-search-light.svg'; +import defaultDummyPicAfterSearchDark + from '../assets/dummy/adm-dummy-after-search-dark.svg'; export function useDummy({ namespace, @@ -13,7 +15,7 @@ export function useDummy({ hiddenText, dummyPic, dummyText, - dummyPicAfterSearch = defaultDummyPicAfterSearch, + dummyPicAfterSearch, dummyTextAfterSearch = 'objects.emptyResultSearch', }) { const store = useStore(); @@ -24,12 +26,18 @@ export function useDummy({ const dataList = computed(() => getNamespacedState(store.state, namespace).dataList); const search = computed(() => getNamespacedState(store.state, namespace).search); + const darkMode = computed(() => store.getters['appearance/DARK_MODE']); + const dummyImgAfterSearch = computed(() => { + if(dummyPicAfterSearch) return dummyPicAfterSearch; + return darkMode.value ? defaultDummyPicAfterSearchDark : defaultDummyPicAfterSearchLight; + }) + watch(() => dataList, () => { if (!dataList.value.length) { if (IsEmpty(route?.query) ? search.value : Object.values(route.query) .some((query) => query.length)) { return dummy.value = { - src: dummyPicAfterSearch, + src: dummyImgAfterSearch, text: dummyTextAfterSearch, }; } else return dummy.value = { diff --git a/src/modules/contact-center/modules/agents/assets/adm-agent-history-dark.svg b/src/modules/contact-center/modules/agents/assets/adm-agent-history-dark.svg new file mode 100644 index 000000000..8158c374a --- /dev/null +++ b/src/modules/contact-center/modules/agents/assets/adm-agent-history-dark.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/modules/contact-center/modules/agents/assets/adm-agent-history-light.svg b/src/modules/contact-center/modules/agents/assets/adm-agent-history-light.svg new file mode 100644 index 000000000..67b91b1f4 --- /dev/null +++ b/src/modules/contact-center/modules/agents/assets/adm-agent-history-light.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/modules/contact-center/modules/agents/assets/adm-agent-history.svg b/src/modules/contact-center/modules/agents/assets/adm-agent-history.svg deleted file mode 100644 index 26e6beded..000000000 --- a/src/modules/contact-center/modules/agents/assets/adm-agent-history.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/modules/contact-center/modules/agents/components/agent-history-popup.vue b/src/modules/contact-center/modules/agents/components/agent-history-popup.vue index 5a4acf4c7..545a9f4bb 100644 --- a/src/modules/contact-center/modules/agents/components/agent-history-popup.vue +++ b/src/modules/contact-center/modules/agents/components/agent-history-popup.vue @@ -86,9 +86,11 @@