diff --git a/package-lock.json b/package-lock.json index b7e201a6f..452c01bc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "vue-router": "^4.2.5", "vue2-dropzone": "^3.6.0", "vuex": "^4.1.0", - "webitel-sdk": "^24.4.7" + "webitel-sdk": "^24.4.13" }, "devDependencies": { "@biomejs/biome": "^1.8.3", @@ -9180,9 +9180,9 @@ } }, "node_modules/webitel-sdk": { - "version": "24.4.7", - "resolved": "https://registry.npmjs.org/webitel-sdk/-/webitel-sdk-24.4.7.tgz", - "integrity": "sha512-VR4yyN2kMgwv22dW2qnXaoDZV7hKdOUn73rg8FqJy5fKd9BmJz63d68USbq58COyWlgdoXFRWsiSWeu+Drm5NQ==", + "version": "24.4.13", + "resolved": "https://registry.npmjs.org/webitel-sdk/-/webitel-sdk-24.4.13.tgz", + "integrity": "sha512-8jMs/gjf3gBvHIkVU4k0/iwUz66T1NFfS0GGG37COPwTSqtYd3Cei8zKcm2HiYFpFZ2fVjKZYfW6BBuEUevJdg==", "dependencies": { "@types/webrtc": "~0.0.41", "deep-copy": "1.4.2", diff --git a/package.json b/package.json index 86e7ba585..2ac17e75f 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "vue-router": "^4.2.5", "vue2-dropzone": "^3.6.0", "vuex": "^4.1.0", - "webitel-sdk": "^24.4.7" + "webitel-sdk": "^24.4.13" }, "devDependencies": { "@biomejs/biome": "^1.8.3", diff --git a/src/modules/directory/modules/users/components/opened-user-general.vue b/src/modules/directory/modules/users/components/opened-user-general.vue index 2563d0c1c..fd5a33d97 100644 --- a/src/modules/directory/modules/users/components/opened-user-general.vue +++ b/src/modules/directory/modules/users/components/opened-user-general.vue @@ -55,8 +55,10 @@ diff --git a/src/modules/system/modules/configuration/api/configuration.js b/src/modules/system/modules/configuration/api/configuration.js index 815497a43..ae670a9d3 100644 --- a/src/modules/system/modules/configuration/api/configuration.js +++ b/src/modules/system/modules/configuration/api/configuration.js @@ -14,13 +14,13 @@ import configuration from '../../../../../app/api/openAPIConfig'; const service = new SystemSettingServiceApiFactory(configuration, '', instance); const getList = async (params) => { - const { page, size, search, sort, fields } = applyTransform(params, [ + const { page, size, search, sort, fields, name } = applyTransform(params, [ merge(getDefaultGetParams()), starToSearch('search'), ]); try { - const response = await service.searchSystemSetting(page, size, search, sort, fields); + const response = await service.searchSystemSetting(page, size, search, sort, fields, name); const { items, next } = applyTransform(response.data, [ snakeToCamel(), merge(getDefaultGetListResponse()), diff --git a/src/modules/system/modules/configuration/components/configuration-popup.vue b/src/modules/system/modules/configuration/components/configuration-popup.vue index 56e75f4b3..d69694823 100644 --- a/src/modules/system/modules/configuration/components/configuration-popup.vue +++ b/src/modules/system/modules/configuration/components/configuration-popup.vue @@ -61,6 +61,14 @@ @input="inputHandler" /> + @@ -145,6 +153,14 @@ export default { }; } + const defaultStringConfig = { + itemInstance: { + value: { + required, + }, + }, + }; + switch (this.itemInstance.name) { case EngineSystemSettingName.EnableOmnichannel: return deepmerge(defaults, defaultBooleanConfig); @@ -160,6 +176,10 @@ export default { return deepmerge(defaults, defaultNumberConfig); case EngineSystemSettingName.ExportSettings: return deepmerge(defaults, defaultSelectConfig); + case EngineSystemSettingName.PasswordRegExp: + return deepmerge(defaults, defaultStringConfig); + case EngineSystemSettingName.PasswordValidationText: + return deepmerge(defaults, defaultStringConfig); default: return defaults; } diff --git a/src/modules/system/modules/configuration/utils/configurationValueTypes.js b/src/modules/system/modules/configuration/utils/configurationValueTypes.js index c4b35f3cc..28d40e1e1 100644 --- a/src/modules/system/modules/configuration/utils/configurationValueTypes.js +++ b/src/modules/system/modules/configuration/utils/configurationValueTypes.js @@ -8,6 +8,8 @@ const ConfigurationValueTypes = Object.freeze({ [EngineSystemSettingName.SchemeVersionLimit]: 'number', [EngineSystemSettingName.SearchNumberLength]: 'number', [EngineSystemSettingName.ExportSettings]: 'select', + [EngineSystemSettingName.PasswordRegExp]: 'string', + [EngineSystemSettingName.PasswordValidationText]: 'string', }, );