diff --git a/package-lock.json b/package-lock.json index 7bcc6f3e..d0e7ae5a 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.21", + "@webitel/ui-sdk": "^24.12.28", "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.21", - "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.12.21.tgz", - "integrity": "sha512-NLvYrK1clg98pXtpyuwWQYuXQ4BH3pldC+EDd97viITiPwRFz1cOQ4vcmsUgc59TEGq/x1q5xgIYIXVwouEqQA==", + "version": "24.12.28", + "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.12.28.tgz", + "integrity": "sha512-al2PT2gg6dpaNLgIK/nrD98tWybHZk/QJRjz6lUQWGYS12NTDvneFY4TfhG8ZtvpanROCkQKbvQFmkPOOX+j0Q==", "dependencies": { "@floating-ui/vue": "^1.1.5", "@morev/vue-transitions": "^3.0.5", @@ -2105,7 +2105,7 @@ "vue-multiselect": "^3.1.0", "vue-observe-visibility": "^2.0.0-alpha.1", "vue-router": "^4.4.5", - "webitel-sdk": "^24.10.2", + "webitel-sdk": "^24.10.4", "xlsx": "^0.18.5" }, "engines": { @@ -10451,9 +10451,9 @@ } }, "node_modules/webitel-sdk": { - "version": "24.10.2", - "resolved": "https://registry.npmjs.org/webitel-sdk/-/webitel-sdk-24.10.2.tgz", - "integrity": "sha512-gkyMawfT5EDQwq44RlXP5MkeE2Cx8SqV7JXsQ/HCQSMIEQQWoSTVvX/6UMVOWgyZocxiHAK/wHU8QFGe+GTs+w==", + "version": "24.10.4", + "resolved": "https://registry.npmjs.org/webitel-sdk/-/webitel-sdk-24.10.4.tgz", + "integrity": "sha512-90wMSqqxwBsJ/wazDSQe2YzryWaPrMl+DaU+SS73lEZsKhZrzuhmI4vFfZlsOKd8X40oAJZZjocp00vGI4GPJw==", "license": "MIT", "dependencies": { "@types/webrtc": "~0.0.41", diff --git a/package.json b/package.json index 8f823eeb..f4f3e4af 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.21", + "@webitel/ui-sdk": "^24.12.28", "axios": "^1.7.7", "deep-equal": "^2.2.1", "dompurify": "^3.1.2", diff --git a/src/app/locale/en/en.js b/src/app/locale/en/en.js index d9832ba8..45247b69 100644 --- a/src/app/locale/en/en.js +++ b/src/app/locale/en/en.js @@ -106,6 +106,8 @@ export default { slas: { slas: 'SLA | SLAs', conditions: 'Condition | Conditions', + editCondition: 'Edit condition', + addCondition: 'Add condition', reactionTime: 'Reaction time', resolutionTime: 'Resolution time', validFrom: 'Valid from', diff --git a/src/app/locale/ru/ru.js b/src/app/locale/ru/ru.js index 0488b22b..fe24d697 100644 --- a/src/app/locale/ru/ru.js +++ b/src/app/locale/ru/ru.js @@ -105,6 +105,8 @@ export default { slas: { slas: 'SLA | SLAs', conditions: 'Условие | Условия', + editCondition: 'Редактировать условие', + addCondition: 'Добавить условие', reactionTime: 'Плановое время реакции', resolutionTime: 'Плановое время решения', validFrom: 'Действителен с', diff --git a/src/app/locale/ua/ua.js b/src/app/locale/ua/ua.js index 276339cf..95e53013 100644 --- a/src/app/locale/ua/ua.js +++ b/src/app/locale/ua/ua.js @@ -105,6 +105,8 @@ export default { slas: { slas: 'SLA | SLAs', conditions: 'Умова | Умови', + editCondition: 'Редагувати умову', + addCondition: 'Додати умову', reactionTime: 'Плановий час реакції', resolutionTime: 'Плановий час вирішення', validFrom: 'Дійсний з', diff --git a/src/modules/configuration/components/the-configuration.vue b/src/modules/configuration/components/the-configuration.vue index daf4a994..8ab821e7 100644 --- a/src/modules/configuration/components/the-configuration.vue +++ b/src/modules/configuration/components/the-configuration.vue @@ -1,11 +1,13 @@ 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..7a682081 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 @@ -20,9 +20,9 @@ - - + + +
- +
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 499b1c6f..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 @@ -17,8 +17,13 @@ -
+ { flushSubscribers(); + resetState(); }); const { @@ -199,6 +208,22 @@ const { text: textEmpty, } = useTableEmpty({ dataList, filters, error, isLoading }); +const refresh = () => { + // https://webitel.atlassian.net/browse/WTEL-5711 + // because 'selected' value needs cleaned + + resetState(); + loadData(); +}; + +watch(() => filtersValue.value, (newValue, oldValue) => { + // https://webitel.atlassian.net/browse/WTEL-5744 + // because 'selected' value needs cleaned when changing filters + + if(!deepEqual(newValue, oldValue)) { + resetState(); + } +});