From 175d0948709892a5ceb7561c4f62fdb87a1c6986 Mon Sep 17 00:00:00 2001 From: Lera24 Date: Thu, 4 Jan 2024 14:46:28 +0200 Subject: [PATCH 1/3] hotfix: route in devices[WTEL-2374] --- .../directory/modules/devices/components/opened-device.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/directory/modules/devices/components/opened-device.vue b/src/modules/directory/modules/devices/components/opened-device.vue index e80c56076..214fc72fc 100644 --- a/src/modules/directory/modules/devices/components/opened-device.vue +++ b/src/modules/directory/modules/devices/components/opened-device.vue @@ -116,7 +116,7 @@ export default { path() { const baseUrl = '/directory/devices'; - const url = baseUrl + this.isHotdesk ? '/hotdesk' : ''; + const url = baseUrl + (this.isHotdesk ? '/hotdesk' : ''); return [ { name: this.$t('objects.directory.directory') }, { name: this.$tc('objects.directory.devices.devices', 2), route: baseUrl }, From 60ee738c3a6339c831466ec60b53ddcf98d387e1 Mon Sep 17 00:00:00 2001 From: Lera24 Date: Thu, 4 Jan 2024 17:22:29 +0200 Subject: [PATCH 2/3] hotfix: color default img in dummy in dark mode[WTEL-4111] --- .../objectTableMixin/tableComponentMixin.js | 5 ++++- .../openedObjectTableTabMixin/openedObjectTableTabMixin.js | 5 ++++- .../contact-center/modules/agents/components/the-agents.vue | 1 + .../agents/modules/skills/components/opened-agent-skills.vue | 1 + .../subordinates/components/opened-agent-subordinates.vue | 1 + .../contact-center/modules/queues/components/the-queues.vue | 1 + .../queues/modules/agents/components/opened-queue-agents.vue | 1 + .../modules/buckets/components/opened-queue-buckets.vue | 1 + .../queues/modules/logs/components/opened-queue-logs.vue | 1 + .../queues/modules/members/components/the-queue-members.vue | 1 + .../modules/res-groups/components/opened-queue-resources.vue | 1 + .../queues/modules/skills/components/opened-queue-skills.vue | 1 + .../resource-groups/components/the-resource-groups.vue | 1 + .../resources/components/opened-resource-group-resources.vue | 1 + .../modules/resources/components/the-resources.vue | 1 + .../modules/display/components/opened-resource-numbers.vue | 1 + .../contact-center/modules/teams/components/the-teams.vue | 1 + .../teams/modules/agents/components/opened-team-agents.vue | 1 + .../supervisors/components/opened-team-supervisors.vue | 1 + .../directory/modules/devices/components/the-devices.vue | 1 + .../modules/license/components/all-licenses/all-licenses.vue | 1 + .../license/modules/users/components/licenses-by-user.vue | 1 + src/modules/directory/modules/users/components/the-users.vue | 1 + .../users/modules/logs/components/opened-user-logs.vue | 1 + .../cognitive-profiles/components/the-cognitive-profiles.vue | 1 + .../modules/email-profiles/components/the-email-profiles.vue | 1 + .../modules/import-csv/components/the-import-csv.vue | 1 + .../integrations/modules/storage/components/the-storage.vue | 1 + .../modules/triggers/components/the-triggers.vue | 1 + .../agent-pause-cause/components/the-agent-pause-cause.vue | 1 + .../modules/agent-skills/components/the-agent-skills.vue | 1 + .../lookups/modules/blacklists/components/the-blacklists.vue | 1 + .../modules/numbers/components/opened-blacklist-numbers.vue | 1 + .../lookups/modules/buckets/components/the-buckets.vue | 1 + .../calendars/components/opened-calendar-holidays.vue | 1 + .../lookups/modules/calendars/components/the-calendars.vue | 1 + .../communications/components/the-communication-types.vue | 1 + src/modules/lookups/modules/media/components/the-media.vue | 1 + .../lookups/modules/regions/components/the-regions.vue | 1 + .../modules/objects/components/the-objects-permissions.vue | 1 + .../obac/components/opened-object-permissions-obac.vue | 1 + .../rbac/components/opened-object-permissions-rbac.vue | 1 + .../permissions/modules/roles/components/the-roles.vue | 1 + .../modules/chat-gateways/components/the-chat-gateways.vue | 1 + .../routing/modules/chatplan/components/the-chatplan.vue | 1 + .../routing/modules/dialplan/components/the-dialplan.vue | 1 + src/modules/routing/modules/flow/components/the-flow.vue | 1 + .../routing/modules/gateways/components/the-sip-gateways.vue | 1 + .../system/modules/changelogs/components/the-changelogs.vue | 1 + .../modules/logs/components/opened-changelog-logs.vue | 1 + .../modules/configuration/components/the-configuration.vue | 1 + 51 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/app/mixins/objectPagesMixins/objectTableMixin/tableComponentMixin.js b/src/app/mixins/objectPagesMixins/objectTableMixin/tableComponentMixin.js index db97b6375..bdd7b100d 100644 --- a/src/app/mixins/objectPagesMixins/objectTableMixin/tableComponentMixin.js +++ b/src/app/mixins/objectPagesMixins/objectTableMixin/tableComponentMixin.js @@ -1,6 +1,6 @@ import getNamespacedState from '@webitel/ui-sdk/src/store/helpers/getNamespacedState'; -import { mapActions, mapState } from 'vuex'; +import { mapActions, mapGetters, mapState } from 'vuex'; import baseTableMixin from '../../baseMixins/baseTableMixin/baseTableMixin'; import objectTableAccessControlMixin from './_internals/objectTableAccessControlMixin'; @@ -37,6 +37,9 @@ export default { return getNamespacedState(state, this.namespace).isNextPage; }, }), + ...mapGetters('appearance', { + darkMode: 'DARK_MODE', + }), headers() { if (!this.headersValue) return []; return this.headersValue.map((header) => { diff --git a/src/app/mixins/objectPagesMixins/openedObjectTableTabMixin/openedObjectTableTabMixin.js b/src/app/mixins/objectPagesMixins/openedObjectTableTabMixin/openedObjectTableTabMixin.js index db40f8c1e..f1a283279 100644 --- a/src/app/mixins/objectPagesMixins/openedObjectTableTabMixin/openedObjectTableTabMixin.js +++ b/src/app/mixins/objectPagesMixins/openedObjectTableTabMixin/openedObjectTableTabMixin.js @@ -1,6 +1,6 @@ import getNamespacedState from '@webitel/ui-sdk/src/store/helpers/getNamespacedState'; -import { mapActions, mapState } from 'vuex'; +import { mapActions, mapGetters, mapState } from 'vuex'; import ObjectListPopup from '../../../components/utils/object-list-popup/object-list-popup.vue'; import OnePlusMany @@ -54,6 +54,9 @@ export default { return getNamespacedState(state, `${this.namespace}/${this.subNamespace}`).aggs; }, }), + ...mapGetters('appearance', { + darkMode: 'DARK_MODE', + }), headers() { if (!this.headersValue) return []; return this.headersValue.map((header) => ({ diff --git a/src/modules/contact-center/modules/agents/components/the-agents.vue b/src/modules/contact-center/modules/agents/components/the-agents.vue index b16a544dd..bedf55a94 100644 --- a/src/modules/contact-center/modules/agents/components/the-agents.vue +++ b/src/modules/contact-center/modules/agents/components/the-agents.vue @@ -58,6 +58,7 @@ :show-action="dummy.showAction" :src="dummy.src" :text="dummy.text && $t(dummy.text)" + :dark-mode="darkMode" class="dummy-wrapper" @create="create" /> diff --git a/src/modules/contact-center/modules/agents/modules/skills/components/opened-agent-skills.vue b/src/modules/contact-center/modules/agents/modules/skills/components/opened-agent-skills.vue index 5f908040d..e14f76e38 100644 --- a/src/modules/contact-center/modules/agents/modules/skills/components/opened-agent-skills.vue +++ b/src/modules/contact-center/modules/agents/modules/skills/components/opened-agent-skills.vue @@ -41,6 +41,7 @@ diff --git a/src/modules/contact-center/modules/agents/modules/subordinates/components/opened-agent-subordinates.vue b/src/modules/contact-center/modules/agents/modules/subordinates/components/opened-agent-subordinates.vue index 5fbc2b1d3..17b7c4779 100644 --- a/src/modules/contact-center/modules/agents/modules/subordinates/components/opened-agent-subordinates.vue +++ b/src/modules/contact-center/modules/agents/modules/subordinates/components/opened-agent-subordinates.vue @@ -55,6 +55,7 @@ diff --git a/src/modules/contact-center/modules/queues/components/the-queues.vue b/src/modules/contact-center/modules/queues/components/the-queues.vue index 971f84009..5efb0d6ee 100644 --- a/src/modules/contact-center/modules/queues/components/the-queues.vue +++ b/src/modules/contact-center/modules/queues/components/the-queues.vue @@ -58,6 +58,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/contact-center/modules/queues/modules/agents/components/opened-queue-agents.vue b/src/modules/contact-center/modules/queues/modules/agents/components/opened-queue-agents.vue index 967f5f64e..b1c426768 100644 --- a/src/modules/contact-center/modules/queues/modules/agents/components/opened-queue-agents.vue +++ b/src/modules/contact-center/modules/queues/modules/agents/components/opened-queue-agents.vue @@ -38,6 +38,7 @@ diff --git a/src/modules/contact-center/modules/queues/modules/buckets/components/opened-queue-buckets.vue b/src/modules/contact-center/modules/queues/modules/buckets/components/opened-queue-buckets.vue index d5c1a9084..dd2228614 100644 --- a/src/modules/contact-center/modules/queues/modules/buckets/components/opened-queue-buckets.vue +++ b/src/modules/contact-center/modules/queues/modules/buckets/components/opened-queue-buckets.vue @@ -41,6 +41,7 @@ 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 index 5116392c0..057b8370c 100644 --- 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 @@ -19,6 +19,7 @@ + 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 index 91608331b..463c7699c 100644 --- 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 @@ -99,6 +99,7 @@ + diff --git a/src/modules/contact-center/modules/queues/modules/res-groups/components/opened-queue-resources.vue b/src/modules/contact-center/modules/queues/modules/res-groups/components/opened-queue-resources.vue index 15233ffd8..a4caccee0 100644 --- a/src/modules/contact-center/modules/queues/modules/res-groups/components/opened-queue-resources.vue +++ b/src/modules/contact-center/modules/queues/modules/res-groups/components/opened-queue-resources.vue @@ -41,6 +41,7 @@ diff --git a/src/modules/contact-center/modules/queues/modules/skills/components/opened-queue-skills.vue b/src/modules/contact-center/modules/queues/modules/skills/components/opened-queue-skills.vue index 115d44e87..6bae95c3a 100644 --- a/src/modules/contact-center/modules/queues/modules/skills/components/opened-queue-skills.vue +++ b/src/modules/contact-center/modules/queues/modules/skills/components/opened-queue-skills.vue @@ -47,6 +47,7 @@ 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 index e2ecb2b81..7b3baceed 100644 --- 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 @@ -52,6 +52,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/contact-center/modules/resource-groups/modules/resources/components/opened-resource-group-resources.vue b/src/modules/contact-center/modules/resource-groups/modules/resources/components/opened-resource-group-resources.vue index 20d716f8a..93e8fe7c3 100644 --- a/src/modules/contact-center/modules/resource-groups/modules/resources/components/opened-resource-group-resources.vue +++ b/src/modules/contact-center/modules/resource-groups/modules/resources/components/opened-resource-group-resources.vue @@ -50,6 +50,7 @@ diff --git a/src/modules/contact-center/modules/resources/components/the-resources.vue b/src/modules/contact-center/modules/resources/components/the-resources.vue index a56fdf387..aa0c31aa6 100644 --- a/src/modules/contact-center/modules/resources/components/the-resources.vue +++ b/src/modules/contact-center/modules/resources/components/the-resources.vue @@ -52,6 +52,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/contact-center/modules/resources/modules/display/components/opened-resource-numbers.vue b/src/modules/contact-center/modules/resources/modules/display/components/opened-resource-numbers.vue index b0e108d90..418708e9f 100644 --- a/src/modules/contact-center/modules/resources/modules/display/components/opened-resource-numbers.vue +++ b/src/modules/contact-center/modules/resources/modules/display/components/opened-resource-numbers.vue @@ -50,6 +50,7 @@ diff --git a/src/modules/contact-center/modules/teams/components/the-teams.vue b/src/modules/contact-center/modules/teams/components/the-teams.vue index 6b1b0c6b9..799f6ca5d 100644 --- a/src/modules/contact-center/modules/teams/components/the-teams.vue +++ b/src/modules/contact-center/modules/teams/components/the-teams.vue @@ -52,6 +52,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" 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 index c10a73482..9d02472a3 100644 --- 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 @@ -64,6 +64,7 @@ diff --git a/src/modules/contact-center/modules/teams/modules/supervisors/components/opened-team-supervisors.vue b/src/modules/contact-center/modules/teams/modules/supervisors/components/opened-team-supervisors.vue index 00678577d..f4371ca1a 100644 --- a/src/modules/contact-center/modules/teams/modules/supervisors/components/opened-team-supervisors.vue +++ b/src/modules/contact-center/modules/teams/modules/supervisors/components/opened-team-supervisors.vue @@ -55,6 +55,7 @@ diff --git a/src/modules/directory/modules/devices/components/the-devices.vue b/src/modules/directory/modules/devices/components/the-devices.vue index 55c35289a..afe60471c 100644 --- a/src/modules/directory/modules/devices/components/the-devices.vue +++ b/src/modules/directory/modules/devices/components/the-devices.vue @@ -77,6 +77,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/directory/modules/license/components/all-licenses/all-licenses.vue b/src/modules/directory/modules/license/components/all-licenses/all-licenses.vue index c19eb5d3f..9144c7076 100644 --- a/src/modules/directory/modules/license/components/all-licenses/all-licenses.vue +++ b/src/modules/directory/modules/license/components/all-licenses/all-licenses.vue @@ -38,6 +38,7 @@ diff --git a/src/modules/directory/modules/license/modules/users/components/licenses-by-user.vue b/src/modules/directory/modules/license/modules/users/components/licenses-by-user.vue index cfe9dab6e..e337d5c3c 100644 --- a/src/modules/directory/modules/license/modules/users/components/licenses-by-user.vue +++ b/src/modules/directory/modules/license/modules/users/components/licenses-by-user.vue @@ -29,6 +29,7 @@ diff --git a/src/modules/directory/modules/users/components/the-users.vue b/src/modules/directory/modules/users/components/the-users.vue index d36045b91..78b6208c6 100644 --- a/src/modules/directory/modules/users/components/the-users.vue +++ b/src/modules/directory/modules/users/components/the-users.vue @@ -64,6 +64,7 @@ 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 index f51b660f8..e09e0c4db 100644 --- 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 @@ -20,6 +20,7 @@ + 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 index 5f00b45a8..ba50a538a 100644 --- a/src/modules/integrations/modules/cognitive-profiles/components/the-cognitive-profiles.vue +++ b/src/modules/integrations/modules/cognitive-profiles/components/the-cognitive-profiles.vue @@ -61,6 +61,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" 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 index 9a3d6435b..fd0e7c484 100644 --- a/src/modules/integrations/modules/email-profiles/components/the-email-profiles.vue +++ b/src/modules/integrations/modules/email-profiles/components/the-email-profiles.vue @@ -57,6 +57,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" 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 index 759ceae6e..c3f548387 100644 --- a/src/modules/integrations/modules/import-csv/components/the-import-csv.vue +++ b/src/modules/integrations/modules/import-csv/components/the-import-csv.vue @@ -52,6 +52,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/integrations/modules/storage/components/the-storage.vue b/src/modules/integrations/modules/storage/components/the-storage.vue index 2c6427169..7ba1cda73 100644 --- a/src/modules/integrations/modules/storage/components/the-storage.vue +++ b/src/modules/integrations/modules/storage/components/the-storage.vue @@ -56,6 +56,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/integrations/modules/triggers/components/the-triggers.vue b/src/modules/integrations/modules/triggers/components/the-triggers.vue index 42c6b5449..7543ed4d8 100644 --- a/src/modules/integrations/modules/triggers/components/the-triggers.vue +++ b/src/modules/integrations/modules/triggers/components/the-triggers.vue @@ -57,6 +57,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" 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 index 98dde4bcd..a82525000 100644 --- 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 @@ -52,6 +52,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" 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 index b5cba3849..2f50da7ad 100644 --- a/src/modules/lookups/modules/agent-skills/components/the-agent-skills.vue +++ b/src/modules/lookups/modules/agent-skills/components/the-agent-skills.vue @@ -68,6 +68,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/lookups/modules/blacklists/components/the-blacklists.vue b/src/modules/lookups/modules/blacklists/components/the-blacklists.vue index 946fb08a6..7e725d99b 100644 --- a/src/modules/lookups/modules/blacklists/components/the-blacklists.vue +++ b/src/modules/lookups/modules/blacklists/components/the-blacklists.vue @@ -52,6 +52,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/lookups/modules/blacklists/modules/numbers/components/opened-blacklist-numbers.vue b/src/modules/lookups/modules/blacklists/modules/numbers/components/opened-blacklist-numbers.vue index 4e864804a..574808439 100644 --- a/src/modules/lookups/modules/blacklists/modules/numbers/components/opened-blacklist-numbers.vue +++ b/src/modules/lookups/modules/blacklists/modules/numbers/components/opened-blacklist-numbers.vue @@ -62,6 +62,7 @@ diff --git a/src/modules/lookups/modules/buckets/components/the-buckets.vue b/src/modules/lookups/modules/buckets/components/the-buckets.vue index 9ef40aaa4..b0845d9b1 100644 --- a/src/modules/lookups/modules/buckets/components/the-buckets.vue +++ b/src/modules/lookups/modules/buckets/components/the-buckets.vue @@ -51,6 +51,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/lookups/modules/calendars/components/opened-calendar-holidays.vue b/src/modules/lookups/modules/calendars/components/opened-calendar-holidays.vue index 7e7fa001e..bd4de6f8c 100644 --- a/src/modules/lookups/modules/calendars/components/opened-calendar-holidays.vue +++ b/src/modules/lookups/modules/calendars/components/opened-calendar-holidays.vue @@ -44,6 +44,7 @@ diff --git a/src/modules/lookups/modules/calendars/components/the-calendars.vue b/src/modules/lookups/modules/calendars/components/the-calendars.vue index bde0e81fa..8c364be17 100644 --- a/src/modules/lookups/modules/calendars/components/the-calendars.vue +++ b/src/modules/lookups/modules/calendars/components/the-calendars.vue @@ -52,6 +52,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/lookups/modules/communications/components/the-communication-types.vue b/src/modules/lookups/modules/communications/components/the-communication-types.vue index 3b79e0f69..1f224f73f 100644 --- a/src/modules/lookups/modules/communications/components/the-communication-types.vue +++ b/src/modules/lookups/modules/communications/components/the-communication-types.vue @@ -52,6 +52,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/lookups/modules/media/components/the-media.vue b/src/modules/lookups/modules/media/components/the-media.vue index 350de37b2..1c0573a57 100644 --- a/src/modules/lookups/modules/media/components/the-media.vue +++ b/src/modules/lookups/modules/media/components/the-media.vue @@ -94,6 +94,7 @@ diff --git a/src/modules/lookups/modules/regions/components/the-regions.vue b/src/modules/lookups/modules/regions/components/the-regions.vue index 0ed770d63..094795cc7 100644 --- a/src/modules/lookups/modules/regions/components/the-regions.vue +++ b/src/modules/lookups/modules/regions/components/the-regions.vue @@ -52,6 +52,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/permissions/modules/objects/components/the-objects-permissions.vue b/src/modules/permissions/modules/objects/components/the-objects-permissions.vue index ceb42a5d1..3c4b21f7a 100644 --- a/src/modules/permissions/modules/objects/components/the-objects-permissions.vue +++ b/src/modules/permissions/modules/objects/components/the-objects-permissions.vue @@ -31,6 +31,7 @@ diff --git a/src/modules/permissions/modules/objects/modules/obac/components/opened-object-permissions-obac.vue b/src/modules/permissions/modules/objects/modules/obac/components/opened-object-permissions-obac.vue index dc43f46f0..6cb9c3788 100644 --- a/src/modules/permissions/modules/objects/modules/obac/components/opened-object-permissions-obac.vue +++ b/src/modules/permissions/modules/objects/modules/obac/components/opened-object-permissions-obac.vue @@ -40,6 +40,7 @@ diff --git a/src/modules/permissions/modules/objects/modules/rbac/components/opened-object-permissions-rbac.vue b/src/modules/permissions/modules/objects/modules/rbac/components/opened-object-permissions-rbac.vue index 909ca14d3..6dcb82bea 100644 --- a/src/modules/permissions/modules/objects/modules/rbac/components/opened-object-permissions-rbac.vue +++ b/src/modules/permissions/modules/objects/modules/rbac/components/opened-object-permissions-rbac.vue @@ -40,6 +40,7 @@ diff --git a/src/modules/permissions/modules/roles/components/the-roles.vue b/src/modules/permissions/modules/roles/components/the-roles.vue index 3bd210339..6bfb08d14 100644 --- a/src/modules/permissions/modules/roles/components/the-roles.vue +++ b/src/modules/permissions/modules/roles/components/the-roles.vue @@ -51,6 +51,7 @@ diff --git a/src/modules/routing/modules/chat-gateways/components/the-chat-gateways.vue b/src/modules/routing/modules/chat-gateways/components/the-chat-gateways.vue index d42217754..d4039257a 100644 --- a/src/modules/routing/modules/chat-gateways/components/the-chat-gateways.vue +++ b/src/modules/routing/modules/chat-gateways/components/the-chat-gateways.vue @@ -59,6 +59,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/routing/modules/chatplan/components/the-chatplan.vue b/src/modules/routing/modules/chatplan/components/the-chatplan.vue index 9a760bc55..8a9c27e7b 100644 --- a/src/modules/routing/modules/chatplan/components/the-chatplan.vue +++ b/src/modules/routing/modules/chatplan/components/the-chatplan.vue @@ -55,6 +55,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/routing/modules/dialplan/components/the-dialplan.vue b/src/modules/routing/modules/dialplan/components/the-dialplan.vue index 281f117c6..7eb381f61 100644 --- a/src/modules/routing/modules/dialplan/components/the-dialplan.vue +++ b/src/modules/routing/modules/dialplan/components/the-dialplan.vue @@ -55,6 +55,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/routing/modules/flow/components/the-flow.vue b/src/modules/routing/modules/flow/components/the-flow.vue index f09a7feca..ca9a73c00 100644 --- a/src/modules/routing/modules/flow/components/the-flow.vue +++ b/src/modules/routing/modules/flow/components/the-flow.vue @@ -68,6 +68,7 @@ + diff --git a/src/modules/routing/modules/gateways/components/the-sip-gateways.vue b/src/modules/routing/modules/gateways/components/the-sip-gateways.vue index aa305bd6e..1461903a5 100644 --- a/src/modules/routing/modules/gateways/components/the-sip-gateways.vue +++ b/src/modules/routing/modules/gateways/components/the-sip-gateways.vue @@ -58,6 +58,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" diff --git a/src/modules/system/modules/changelogs/components/the-changelogs.vue b/src/modules/system/modules/changelogs/components/the-changelogs.vue index 53e9462fd..783525064 100644 --- a/src/modules/system/modules/changelogs/components/the-changelogs.vue +++ b/src/modules/system/modules/changelogs/components/the-changelogs.vue @@ -56,6 +56,7 @@ v-if="dummy && isLoaded" :show-action="dummy.showAction" :src="dummy.src" + :dark-mode="darkMode" :text="dummy.text && $t(dummy.text)" class="dummy-wrapper" @create="create" 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 index 0753e63c7..e2a5d5eff 100644 --- 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 @@ -20,6 +20,7 @@ + diff --git a/src/modules/system/modules/configuration/components/the-configuration.vue b/src/modules/system/modules/configuration/components/the-configuration.vue index d329cf451..fc339c394 100644 --- a/src/modules/system/modules/configuration/components/the-configuration.vue +++ b/src/modules/system/modules/configuration/components/the-configuration.vue @@ -62,6 +62,7 @@
Date: Tue, 9 Jan 2024 19:23:08 +0200 Subject: [PATCH 3/3] fix: throw error on csv members upload empty required fields [WTEL-4132] --- .../upload-csv-popup/mixins/uploadCSVMixin.js | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/modules/_shared/upload-csv-popup/mixins/uploadCSVMixin.js b/src/modules/_shared/upload-csv-popup/mixins/uploadCSVMixin.js index cf07e5081..7613675e0 100644 --- a/src/modules/_shared/upload-csv-popup/mixins/uploadCSVMixin.js +++ b/src/modules/_shared/upload-csv-popup/mixins/uploadCSVMixin.js @@ -141,13 +141,25 @@ export default { }, normalizeCSVData(data) { const nonEmptyMappingFields = this.mappingFields.filter((field) => !isEmpty(field.csv)); - return data.map((dataItem) => ( - nonEmptyMappingFields.reduce((normalizedItem, { name, csv }) => ({ - ...normalizedItem, - [name]: Array.isArray(csv) - ? csv.map((csv) => dataItem[csv]) - : dataItem[csv], - }), {}) + return data.map((dataItem, index) => ( + nonEmptyMappingFields.reduce(( + normalizedItem, + { name, csv, required }, + ) => { + // if one of required fields on any row is empty, throw an error + if (required && + isEmpty(dataItem[csv])) { + // +1 because of indexing starts from 0, but rows counting from 1 + throw new Error(`Required field is empty: ${name} on row ${index + + 1}`); + } + return { + ...normalizedItem, + [name]: Array.isArray(csv) + ? csv.map((csv) => dataItem[csv]) + : dataItem[csv], + }; + }, {}) )); }, async readFile() {