diff --git a/package-lock.json b/package-lock.json index 80c705bc5..5a385e9c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@vuelidate/validators": "^2.0.0", "@vueuse/core": "^10.3.0", "@webitel/flow-ui-sdk": "^0.1.14", - "@webitel/ui-sdk": "^23.12.21", + "@webitel/ui-sdk": "^23.12.23", "axios": "^0.27.1", "clipboard-copy": "^4.0.1", "cron-validator": "^1.3.1", @@ -1534,9 +1534,9 @@ } }, "node_modules/@webitel/ui-sdk": { - "version": "23.12.21", - "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-23.12.21.tgz", - "integrity": "sha512-sbtO+nG3eYKeMVySerHj+CiWEwUDSU64DtfOZhENhAAc2iOFfg3+1GZO1nIcKSgMSfBj+ea/y0rOYrGQuRmi9w==", + "version": "23.12.23", + "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-23.12.23.tgz", + "integrity": "sha512-fj/P2hDmcRGIfs3475sVovVd9f7WM9X8fLL5HdYKGhM81w96oDQfFCmeyak1wpADjSiu60XFnto4bD2g9zNDCg==", "dependencies": { "@floating-ui/vue": "^1.0.1", "@vue/compat": "^3.2.47", @@ -10008,9 +10008,9 @@ } }, "@webitel/ui-sdk": { - "version": "23.12.21", - "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-23.12.21.tgz", - "integrity": "sha512-sbtO+nG3eYKeMVySerHj+CiWEwUDSU64DtfOZhENhAAc2iOFfg3+1GZO1nIcKSgMSfBj+ea/y0rOYrGQuRmi9w==", + "version": "23.12.23", + "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-23.12.23.tgz", + "integrity": "sha512-fj/P2hDmcRGIfs3475sVovVd9f7WM9X8fLL5HdYKGhM81w96oDQfFCmeyak1wpADjSiu60XFnto4bD2g9zNDCg==", "requires": { "@floating-ui/vue": "^1.0.1", "@vue/compat": "^3.2.47", diff --git a/package.json b/package.json index b2aea7c94..796946e5f 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@vuelidate/validators": "^2.0.0", "@vueuse/core": "^10.3.0", "@webitel/flow-ui-sdk": "^0.1.14", - "@webitel/ui-sdk": "^23.12.21", + "@webitel/ui-sdk": "^23.12.23", "axios": "^0.27.1", "clipboard-copy": "^4.0.1", "cron-validator": "^1.3.1", diff --git a/src/app/locale/en/en.js b/src/app/locale/en/en.js index d6918dfd6..147915dc1 100644 --- a/src/app/locale/en/en.js +++ b/src/app/locale/en/en.js @@ -1037,6 +1037,10 @@ export default { }, }, + configuration: { + configuration: 'Configuration | Configurations', + parameter: 'Parameter', + }, }, pagination: { diff --git a/src/app/locale/ru/ru.js b/src/app/locale/ru/ru.js index 78634b234..6b189286d 100644 --- a/src/app/locale/ru/ru.js +++ b/src/app/locale/ru/ru.js @@ -1034,6 +1034,10 @@ export default { }, }, }, + configuration: { + configuration: 'Конфигурация | Конфигурации', + parameter: 'Параметр', + }, }, pagination: { rowsPerPage: 'Количество строк на странице', diff --git a/src/app/locale/ua/ua.js b/src/app/locale/ua/ua.js index acf1d73ea..52c911e56 100644 --- a/src/app/locale/ua/ua.js +++ b/src/app/locale/ua/ua.js @@ -1035,6 +1035,10 @@ export default { }, }, }, + configuration: { + configuration: 'Конфігурація | Конфігурації', + parameter: 'Параметр', + }, }, pagination: { rowsPerPage: 'Кількість записів', diff --git a/src/app/router/_internals/NavigationPages.lookup.js b/src/app/router/_internals/NavigationPages.lookup.js index ebd69bf0a..44be92e37 100644 --- a/src/app/router/_internals/NavigationPages.lookup.js +++ b/src/app/router/_internals/NavigationPages.lookup.js @@ -170,9 +170,9 @@ const nav = Object.freeze([ route: 'changelogs', }, { - value: AdminSections.SETTINGS, - locale: `WebitelApplications.${WebitelApplications.ADMIN}.sections.${AdminSections.SETTINGS}`, - route: 'settings', + value: AdminSections.CONFIGURATION, + locale: `WebitelApplications.${WebitelApplications.ADMIN}.sections.${AdminSections.CONFIGURATION}`, + route: 'configuration', }, ], }, diff --git a/src/app/router/_internals/RouteNames.enum.js b/src/app/router/_internals/RouteNames.enum.js index 6b67dd35c..226328631 100644 --- a/src/app/router/_internals/RouteNames.enum.js +++ b/src/app/router/_internals/RouteNames.enum.js @@ -47,7 +47,7 @@ export default Object.freeze({ // SYSTEM CHANGELOGS: 'changelogs', - SETTINGS: 'admin-settings', + CONFIGURATION: 'configuration', SETTINGS_PAGE: 'settings', PAGE_403: 'access-denied', diff --git a/src/app/router/router.js b/src/app/router/router.js index 326410ec2..a683438d8 100755 --- a/src/app/router/router.js +++ b/src/app/router/router.js @@ -67,7 +67,7 @@ const OpenedImportCsv = () => import('../../modules/integrations/modules/import- const OpenedTrigger = () => import('../../modules/integrations/modules/triggers/components/opened-trigger.vue'); const Changelogs = () => import('../../modules/system/modules/changelogs/components/the-changelogs.vue'); const OpenedChangelog = () => import('../../modules/system/modules/changelogs/components/opened-changelog.vue'); -const TheSettings = () => import('../../modules/system/modules/settings/components/the-settings.vue'); +const Configuration = () => import('../../modules/system/modules/configuration/components/the-configuration.vue'); const checkAppAccess = (to, from, next) => { const hasReadAccess = store.getters['userinfo/CHECK_APP_ACCESS'](store.getters['userinfo/THIS_APP']); @@ -689,9 +689,9 @@ const router = createRouter({ beforeEnter: checkRouteAccess, }, { - path: '/system/settings', - name: RouteNames.SETTINGS, - component: TheSettings, + path: '/system/configuration', + name: RouteNames.CONFIGURATION, + component: Configuration, beforeEnter: checkRouteAccess, }, ], diff --git a/src/modules/system/modules/settings/api/settings.js b/src/modules/system/modules/configuration/api/configuration.js similarity index 97% rename from src/modules/system/modules/settings/api/settings.js rename to src/modules/system/modules/configuration/api/configuration.js index 2625381bf..428f32b9f 100644 --- a/src/modules/system/modules/settings/api/settings.js +++ b/src/modules/system/modules/configuration/api/configuration.js @@ -116,7 +116,7 @@ const deleteItem = async ({ id }) => { } }; -const SettingsAPI = { +const ConfigurationAPI = { getList, get, add, @@ -125,4 +125,4 @@ const SettingsAPI = { getLookup, }; -export default SettingsAPI; +export default ConfigurationAPI; diff --git a/src/modules/system/modules/settings/components/setting-popup.vue b/src/modules/system/modules/configuration/components/configuration-popup.vue similarity index 81% rename from src/modules/system/modules/settings/components/setting-popup.vue rename to src/modules/system/modules/configuration/components/configuration-popup.vue index e34f072d4..09e316b8a 100644 --- a/src/modules/system/modules/settings/components/setting-popup.vue +++ b/src/modules/system/modules/configuration/components/configuration-popup.vue @@ -6,20 +6,20 @@ >