fix: add hint and fix validation for password input[WTEL-4344]

webitel · May 1, 2024 · b93885a · b93885a
1 parent 40039ca
commit b93885a
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 6 deletions.
diff --git a/src/app/components/utils/generate-password-input.vue b/src/app/components/utils/generate-password-input.vue
@@ -3,7 +3,7 @@
     <wt-input
       :disabled="disabled"
       :label="$t('objects.password')"
-      :label-props="{ hint: $t('objects.directory.passwordInfo'), hintPosition: 'right' }"
+      :label-props="{ hint: (hint || $t('objects.directory.passwordInfo')), hintPosition: 'right' }"
       :placeholder="$t('objects.password')"
       :required="required"
       :v="v"
@@ -55,6 +55,9 @@ export default {
       type: Boolean,
       default: false,
     },
+    hint: {
+      type: String,
+    },
   },
   data() {
     return {

diff --git a/src/app/locale/en/en.js b/src/app/locale/en/en.js
@@ -997,6 +997,7 @@ export default {
         listen: 'Listen',
         authType: 'Auth type',
         authenticatedAs: 'Authenticated as',
+        passwordInfo: 'The empty value will leave the password unchanged',
       },
       singleSignOn: {
         allTypes: 'All types',

diff --git a/src/app/locale/ru/ru.js b/src/app/locale/ru/ru.js
@@ -995,6 +995,7 @@ export default {
         listen: 'Прослушивать ',
         authType: 'Тип аутентификации',
         authenticatedAs: 'Аутентифицировано как',
+        passwordInfo: 'Пустое значение оставит пароль тем же',
       },
 
       singleSignOn: {

diff --git a/src/app/locale/ua/ua.js b/src/app/locale/ua/ua.js
@@ -996,6 +996,7 @@ export default {
         listen: 'Прослуховувати',
         authType: 'Тип аутентифікації',
         authenticatedAs: 'Аутентифіковано як',
+        passwordInfo: 'Порожнє значення залишить пароль незмінним',
       },
       singleSignOn: {
         allTypes: 'Всі типи',

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.integrations.emailProfiles.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.integrations.emailProfiles.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/email-profiles/components/opened-email-profile-general.vue b/src/modules/integrations/modules/email-profiles/components/opened-email-profile-general.vue
@@ -152,6 +152,7 @@
           v-if="isPlainAuthType"
           :value="itemInstance.password"
           :disabled="disableUserInput"
+          :hint="$t('objects.integrations.emailProfiles.passwordInfo')"
           @input="setItemProp({ prop: 'password', value: $event })"
         />
       </div>

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.integrations.emailProfiles.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-register-sip-gateway-general.vue b/src/modules/routing/modules/gateways/components/opened-register-sip-gateway-general.vue
@@ -36,6 +36,7 @@
       <wt-select
         :disabled="disableUserInput"
         :label="$t('objects.routing.schema')"
+        :hint="$t('objects.integrations.emailProfiles.passwordInfo')"
         :search-method="loadDropdownOptionsList"
         :value="itemInstance.schema"
         @input="setItemProp({ prop: 'schema', value: $event })"

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),