From 3a35f3fa627fc0b30909a62a0df1dbffb4800d2e Mon Sep 17 00:00:00 2001 From: Lera24 Date: Wed, 11 Dec 2024 15:46:25 +0200 Subject: [PATCH 01/28] fix: route in slas and sources pages[WTEL-5699](https://webitel.atlassian.net/browse/WTEL-5699) --- .../modules/lookups/modules/slas/components/the-slas.vue | 2 +- .../modules/lookups/modules/sources/components/the-sources.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/configuration/modules/lookups/modules/slas/components/the-slas.vue b/src/modules/configuration/modules/lookups/modules/slas/components/the-slas.vue index e66a1f3b..676e5d80 100644 --- a/src/modules/configuration/modules/lookups/modules/slas/components/the-slas.vue +++ b/src/modules/configuration/modules/lookups/modules/slas/components/the-slas.vue @@ -185,7 +185,7 @@ const path = computed(() => [ { name: t('crm') }, { name: t('startPage.configuration.name'), route: '/configuration' }, { name: t('lookups.lookups'), route: '/configuration' }, - { name: t('lookups.slas.slas', 2), route: '/slas' }, + { name: t('lookups.slas.slas', 2), route: 'slas' }, ]); const { close } = useClose('configuration'); diff --git a/src/modules/configuration/modules/lookups/modules/sources/components/the-sources.vue b/src/modules/configuration/modules/lookups/modules/sources/components/the-sources.vue index d1a62846..6f16c043 100644 --- a/src/modules/configuration/modules/lookups/modules/sources/components/the-sources.vue +++ b/src/modules/configuration/modules/lookups/modules/sources/components/the-sources.vue @@ -185,7 +185,7 @@ const path = computed(() => [ { name: t('crm') }, { name: t('startPage.configuration.name'), route: '/configuration' }, { name: t('lookups.lookups'), route: '/configuration' }, - { name: t('lookups.sources.sources', 2), route: '/sources' }, + { name: t('lookups.sources.sources', 2), route: 'sources' }, ]); const { close } = useClose('configuration'); From b59452316d63b29332ae441c0198336f3475cbc7 Mon Sep 17 00:00:00 2001 From: Lera24 Date: Wed, 11 Dec 2024 17:13:43 +0200 Subject: [PATCH 02/28] fix: display locale in navigation menu[WTEL-5697](https://webitel.atlassian.net/browse/WTEL-5697) --- package-lock.json | 12 ++++++------ package.json | 2 +- .../configuration/components/the-configuration.vue | 14 ++++++++------ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 86b5f683..3ca3b4d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@vuelidate/core": "^2.0.3", "@vuelidate/validators": "^2.0.4", "@vueuse/core": "^11.0.3", - "@webitel/ui-sdk": "^24.12.13", + "@webitel/ui-sdk": "^24.12.18", "axios": "^1.7.7", "deep-equal": "^2.2.1", "dompurify": "^3.1.2", @@ -2073,9 +2073,9 @@ } }, "node_modules/@webitel/ui-sdk": { - "version": "24.12.13", - "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.12.13.tgz", - "integrity": "sha512-+sCrne9hD/76WDYGcgxxCXimWejfiGtClhGZy52uGWurDfnZGq6LmiqJrZr1zH6DBeLUAMiivI2lRFcc4Z8K3w==", + "version": "24.12.18", + "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.12.18.tgz", + "integrity": "sha512-SzOHvj2VZqxcfbGgRYcHWxvHvHcYptxf0AfQvIWxKQgLjx3F8ac31jcarji+veW6BREwTWeu9M2of7BKxbzMJw==", "dependencies": { "@floating-ui/vue": "^1.1.5", "@morev/vue-transitions": "^3.0.5", @@ -2105,11 +2105,11 @@ "vue-multiselect": "^3.1.0", "vue-observe-visibility": "^2.0.0-alpha.1", "vue-router": "^4.4.5", - "webitel-sdk": "^24.8.8", + "webitel-sdk": "^24.10.2", "xlsx": "^0.18.5" }, "engines": { - "node": "v22.11.0", + "node": "v22.12.0", "npm": "10.9.0" }, "optionalDependencies": { diff --git a/package.json b/package.json index 7304d469..f40bf9ba 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@vuelidate/core": "^2.0.3", "@vuelidate/validators": "^2.0.4", "@vueuse/core": "^11.0.3", - "@webitel/ui-sdk": "^24.12.13", + "@webitel/ui-sdk": "^24.12.18", "axios": "^1.7.7", "deep-equal": "^2.2.1", "dompurify": "^3.1.2", diff --git a/src/modules/configuration/components/the-configuration.vue b/src/modules/configuration/components/the-configuration.vue index 06902861..9b640ec5 100644 --- a/src/modules/configuration/components/the-configuration.vue +++ b/src/modules/configuration/components/the-configuration.vue @@ -1,11 +1,13 @@ From 756c71bb535f7b92d3ae74571e5ade21c7a76e99 Mon Sep 17 00:00:00 2001 From: Lera24 Date: Fri, 20 Dec 2024 11:08:16 +0200 Subject: [PATCH 27/28] fix:reset condition[WTEL-5770](https://webitel.atlassian.net/browse/WTEL-5770) --- .../conditions/components/opened-sla-conditions.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/configuration/modules/lookups/modules/slas/modules/conditions/components/opened-sla-conditions.vue b/src/modules/configuration/modules/lookups/modules/slas/modules/conditions/components/opened-sla-conditions.vue index a41647ab..faa357da 100644 --- a/src/modules/configuration/modules/lookups/modules/slas/modules/conditions/components/opened-sla-conditions.vue +++ b/src/modules/configuration/modules/lookups/modules/slas/modules/conditions/components/opened-sla-conditions.vue @@ -134,6 +134,7 @@ import ConditionPopup from './opened-sla-condition-popup.vue'; import convertDurationWithMinutes from '@webitel/ui-sdk/src/scripts/convertDurationWithMinutes.js'; import { useTableEmpty } from '@webitel/ui-sdk/src/modules/TableComponentModule/composables/useTableEmpty.js'; import filters from '../modules/filters/store/filters.js'; +import deepEqual from 'deep-equal'; const props = defineProps({ namespace: { @@ -215,11 +216,13 @@ const refresh = () => { loadData(); }; -watch(() => filtersValue.value, () => { +watch(() => filtersValue.value, (newValue, oldValue) => { // https://webitel.atlassian.net/browse/WTEL-5744 // because 'selected' value needs cleaned when changing filters - resetState(); + if(!deepEqual(newValue, oldValue)) { + resetState(); + } }); From c2b82ef9ada61dcc4094f0e1f77ba230bc29e827 Mon Sep 17 00:00:00 2001 From: Lera24 Date: Fri, 20 Dec 2024 11:14:42 +0200 Subject: [PATCH 28/28] fix: style in sla condition popup[WTEL-5776](https://webitel.atlassian.net/browse/WTEL-5776) --- .../components/opened-sla-condition-popup.vue | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/modules/configuration/modules/lookups/modules/slas/modules/conditions/components/opened-sla-condition-popup.vue b/src/modules/configuration/modules/lookups/modules/slas/modules/conditions/components/opened-sla-condition-popup.vue index 3459bb77..d03fde4b 100644 --- a/src/modules/configuration/modules/lookups/modules/slas/modules/conditions/components/opened-sla-condition-popup.vue +++ b/src/modules/configuration/modules/lookups/modules/slas/modules/conditions/components/opened-sla-condition-popup.vue @@ -1,5 +1,6 @@