Merge pull request #657 from webitel/fix/display-password

fix: add hint and fix validation for password input[WTEL-4344]
webitel · May 8, 2024 · cedce30 · cedce30
2 parents 984a6d8 + d35dcf0
commit cedce30
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 9 deletions.
diff --git a/src/app/locale/en/en.js b/src/app/locale/en/en.js
@@ -178,7 +178,7 @@ export default {
     objectHeader: {},
     directory: {
       directory: 'Directory',
-      passwordInfo: 'Enter value only if you want to edit (or create new) App Secret',
+      passwordInfo: 'Enter value only if you want to edit it (or create a new one). The empty field will leave the value unchanged',
       users: {
         users: 'User | Users',
         allUsers: 'All users',

diff --git a/src/app/locale/kz/kz.js b/src/app/locale/kz/kz.js
@@ -145,7 +145,6 @@ export default {
     generalInfo: 'жалпы ақпарат',
     directory: {
       directory: 'Каталог',
-      passwordInfo: 'Құпиясөзді қайта жазу (немесе жаңасын жасау) қажет болса, мәнді енгізіңіз',
       users: {
         users: 'Пайдаланушы | Пайдаланушылар',
         allUsers: 'Барлық пайдаланушылар',

diff --git a/src/app/locale/ru/ru.js b/src/app/locale/ru/ru.js
@@ -178,7 +178,7 @@ export default {
     objectHeader: {},
     directory: {
       directory: 'Каталог',
-      passwordInfo: 'Введите значение, если хотите перезаписать (или создать новый) пароль',
+      passwordInfo: 'Введите значение только если хотите его перезаписать (или задать новое). Пустое поле оставит значение тем же.',
       users: {
         users: 'Пользователь | Пользователи',
         allUsers: 'Все пользователи',

diff --git a/src/app/locale/ua/ua.js b/src/app/locale/ua/ua.js
@@ -178,7 +178,7 @@ export default {
     objectHeader: {},
     directory: {
       directory: 'Каталог',
-      passwordInfo: 'Введіть значення, якщо хочете перезаписати (або створити новий) пароль',
+      passwordInfo: 'Введіть значення лише якщо хочете його перезаписати (або задати нове). Порожнє значення залишить пароль незмінним',
       users: {
         users: 'Користувач | Користувачі',
         allUsers: 'Всі користувачі',

diff --git a/...odules/cognitive-profiles/components/eleven-labs/opened-cognitive-profile-eleven-labs.vue b/...odules/cognitive-profiles/components/eleven-labs/opened-cognitive-profile-eleven-labs.vue
@@ -40,6 +40,7 @@
         :label="$t('objects.key')"
         :v="v.itemInstance.properties.key"
         :value="itemInstance.properties.key"
+        :label-props="{ hint: $t('objects.directory.passwordInfo'), hintPosition: 'right' }"
         required
         @input="setItemProp({ path: 'properties.key', value: $event })"
       />

diff --git a/...ns/modules/cognitive-profiles/components/microsoft/opened-cognitive-profile-microsoft.vue b/...ns/modules/cognitive-profiles/components/microsoft/opened-cognitive-profile-microsoft.vue
@@ -37,6 +37,7 @@
       <wt-input
         :disabled="disableUserInput"
         :label="$t('objects.key')"
+        :label-props="{ hint: $t('objects.directory.passwordInfo'), hintPosition: 'right' }"
         :v="v.itemInstance.properties.key"
         :value="itemInstance.properties.key"
         required

diff --git a/src/modules/integrations/modules/cognitive-profiles/components/opened-cognitive-profile.vue b/src/modules/integrations/modules/cognitive-profiles/components/opened-cognitive-profile.vue
@@ -76,7 +76,7 @@ export default {
         return deepmerge(defaults, {
           itemInstance: {
             properties: {
-              key: { required },
+              key: { required: requiredUnless(() => !!this.id) },
               region: { required },
             },
           },

diff --git a/src/modules/integrations/modules/storage/components/opened-storage-s3.vue b/src/modules/integrations/modules/storage/components/opened-storage-s3.vue
@@ -17,6 +17,7 @@
       <wt-input
         :disabled="disableUserInput"
         :label="$t('objects.integrations.storage.s3Access')"
+        :label-props="{ hint: $t('objects.directory.passwordInfo'), hintPosition: 'right' }"
         :v="v.itemInstance.properties.accessKey"
         :value="itemInstance.properties.accessKey"
         required

diff --git a/src/modules/integrations/modules/storage/components/opened-storage.vue b/src/modules/integrations/modules/storage/components/opened-storage.vue
@@ -37,7 +37,7 @@
 
 <script>
 import { useVuelidate } from '@vuelidate/core';
-import { minValue, required } from '@vuelidate/validators';
+import { minValue, required, requiredUnless } from '@vuelidate/validators';
 import openedObjectMixin from '../../../../../app/mixins/objectPagesMixins/openedObjectMixin/openedObjectMixin';
 import storageMixin from '../mixins/storageMixin';
 import Storage from '../store/_internals/enums/Storage.enum';
@@ -84,7 +84,7 @@ export default {
           itemInstance: {
             properties: {
               keyId: { required },
-              accessKey: { required },
+              accessKey: { required: requiredUnless(() => !!this.id) },
               bucketName: { required },
               region: { required },
               endpoint: { required },

diff --git a/src/modules/routing/modules/gateways/components/opened-sip-gateway.vue b/src/modules/routing/modules/gateways/components/opened-sip-gateway.vue
@@ -38,7 +38,7 @@
 <script>
 
 import { useVuelidate } from '@vuelidate/core';
-import { helpers, maxValue, minValue, numeric, required } from '@vuelidate/validators';
+import { helpers, maxValue, minValue, numeric, required, requiredUnless } from '@vuelidate/validators';
 import { mapActions } from 'vuex';
 import openedObjectMixin from '../../../../../app/mixins/objectPagesMixins/openedObjectMixin/openedObjectMixin';
 import { gatewayHostValidator, ipValidator, sipAccountValidator } from '../../../../../app/utils/validators';
@@ -67,7 +67,7 @@ export default {
         itemInstance: {
           account: { sipAccountValidator, required },
           proxy: { gatewayHostValidator, required },
-          password: { required },
+          password: { required: requiredUnless(() => !!this.id) },
           expires: {
             numeric,
             minValue: minValue(32),