From b93885ac4ea92d5326c182a14a7daa17c7351a29 Mon Sep 17 00:00:00 2001
From: Lera24 <bedulinavalera21@gmail.com>
Date: Wed, 1 May 2024 17:50:34 +0300
Subject: [PATCH 1/2] fix: add hint and fix validation for password
 input[WTEL-4344]

---
 src/app/components/utils/generate-password-input.vue         | 5 ++++-
 src/app/locale/en/en.js                                      | 1 +
 src/app/locale/ru/ru.js                                      | 1 +
 src/app/locale/ua/ua.js                                      | 1 +
 .../eleven-labs/opened-cognitive-profile-eleven-labs.vue     | 1 +
 .../microsoft/opened-cognitive-profile-microsoft.vue         | 1 +
 .../components/opened-cognitive-profile.vue                  | 2 +-
 .../components/opened-email-profile-general.vue              | 1 +
 .../modules/storage/components/opened-storage-s3.vue         | 1 +
 .../modules/storage/components/opened-storage.vue            | 4 ++--
 .../components/opened-register-sip-gateway-general.vue       | 1 +
 .../modules/gateways/components/opened-sip-gateway.vue       | 4 ++--
 12 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/app/components/utils/generate-password-input.vue b/src/app/components/utils/generate-password-input.vue
index be1c00ec5..fbb98fe49 100644
--- 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
index 5ab988a99..7ddb47179 100644
--- 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
index ad920c5ad..b4faeba24 100644
--- 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
index 0b4ee3c3e..a5cdd061c 100644
--- 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/src/modules/integrations/modules/cognitive-profiles/components/eleven-labs/opened-cognitive-profile-eleven-labs.vue b/src/modules/integrations/modules/cognitive-profiles/components/eleven-labs/opened-cognitive-profile-eleven-labs.vue
index 28731807e..a80424557 100644
--- a/src/modules/integrations/modules/cognitive-profiles/components/eleven-labs/opened-cognitive-profile-eleven-labs.vue
+++ b/src/modules/integrations/modules/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/src/modules/integrations/modules/cognitive-profiles/components/microsoft/opened-cognitive-profile-microsoft.vue b/src/modules/integrations/modules/cognitive-profiles/components/microsoft/opened-cognitive-profile-microsoft.vue
index f50993d94..c1404776d 100644
--- a/src/modules/integrations/modules/cognitive-profiles/components/microsoft/opened-cognitive-profile-microsoft.vue
+++ b/src/modules/integrations/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
index 6df6061ea..d86f0f9d7 100644
--- 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
index c7fd91301..fcf51a553 100644
--- 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
index 5f97fc426..40632c57e 100644
--- 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
index 48f4e017e..7e98cb676 100644
--- 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
index 92d35a331..64c832a95 100644
--- 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
index 07ca842d6..7fa54f698 100644
--- 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),

From d35dcf058df1b24677fa9caa4342d35df718aaf3 Mon Sep 17 00:00:00 2001
From: Lera24 <bedulinavalera21@gmail.com>
Date: Wed, 8 May 2024 15:12:05 +0300
Subject: [PATCH 2/2] fix: add changed locales[WTEL-4344]

---
 src/app/components/utils/generate-password-input.vue         | 5 +----
 src/app/locale/en/en.js                                      | 3 +--
 src/app/locale/kz/kz.js                                      | 1 -
 src/app/locale/ru/ru.js                                      | 3 +--
 src/app/locale/ua/ua.js                                      | 3 +--
 .../eleven-labs/opened-cognitive-profile-eleven-labs.vue     | 2 +-
 .../microsoft/opened-cognitive-profile-microsoft.vue         | 2 +-
 .../components/opened-email-profile-general.vue              | 1 -
 .../modules/storage/components/opened-storage-s3.vue         | 2 +-
 .../components/opened-register-sip-gateway-general.vue       | 1 -
 10 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/app/components/utils/generate-password-input.vue b/src/app/components/utils/generate-password-input.vue
index fbb98fe49..be1c00ec5 100644
--- 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: (hint || $t('objects.directory.passwordInfo')), hintPosition: 'right' }"
+      :label-props="{ hint: $t('objects.directory.passwordInfo'), hintPosition: 'right' }"
       :placeholder="$t('objects.password')"
       :required="required"
       :v="v"
@@ -55,9 +55,6 @@ 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
index 7ddb47179..319df6647 100644
--- 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',
@@ -997,7 +997,6 @@ 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/kz/kz.js b/src/app/locale/kz/kz.js
index 67421e881..53aa32d2f 100644
--- 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
index b4faeba24..3f95ea5ca 100644
--- 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: 'Все пользователи',
@@ -995,7 +995,6 @@ export default {
         listen: 'Прослушивать ',
         authType: 'Тип аутентификации',
         authenticatedAs: 'Аутентифицировано как',
-        passwordInfo: 'Пустое значение оставит пароль тем же',
       },
 
       singleSignOn: {
diff --git a/src/app/locale/ua/ua.js b/src/app/locale/ua/ua.js
index a5cdd061c..57953279d 100644
--- 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: 'Всі користувачі',
@@ -996,7 +996,6 @@ export default {
         listen: 'Прослуховувати',
         authType: 'Тип аутентифікації',
         authenticatedAs: 'Аутентифіковано як',
-        passwordInfo: 'Порожнє значення залишить пароль незмінним',
       },
       singleSignOn: {
         allTypes: 'Всі типи',
diff --git a/src/modules/integrations/modules/cognitive-profiles/components/eleven-labs/opened-cognitive-profile-eleven-labs.vue b/src/modules/integrations/modules/cognitive-profiles/components/eleven-labs/opened-cognitive-profile-eleven-labs.vue
index a80424557..240d7c725 100644
--- a/src/modules/integrations/modules/cognitive-profiles/components/eleven-labs/opened-cognitive-profile-eleven-labs.vue
+++ b/src/modules/integrations/modules/cognitive-profiles/components/eleven-labs/opened-cognitive-profile-eleven-labs.vue
@@ -40,7 +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' }"
+        :label-props="{ hint: $t('objects.directory.passwordInfo'), hintPosition: 'right' }"
         required
         @input="setItemProp({ path: 'properties.key', value: $event })"
       />
diff --git a/src/modules/integrations/modules/cognitive-profiles/components/microsoft/opened-cognitive-profile-microsoft.vue b/src/modules/integrations/modules/cognitive-profiles/components/microsoft/opened-cognitive-profile-microsoft.vue
index c1404776d..ae0c968b1 100644
--- a/src/modules/integrations/modules/cognitive-profiles/components/microsoft/opened-cognitive-profile-microsoft.vue
+++ b/src/modules/integrations/modules/cognitive-profiles/components/microsoft/opened-cognitive-profile-microsoft.vue
@@ -37,7 +37,7 @@
       <wt-input
         :disabled="disableUserInput"
         :label="$t('objects.key')"
-        :label-props="{ hint: $t('objects.integrations.emailProfiles.passwordInfo'), hintPosition: 'right' }"
+        :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/email-profiles/components/opened-email-profile-general.vue b/src/modules/integrations/modules/email-profiles/components/opened-email-profile-general.vue
index fcf51a553..c7fd91301 100644
--- 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,7 +152,6 @@
           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
index 40632c57e..229d44933 100644
--- a/src/modules/integrations/modules/storage/components/opened-storage-s3.vue
+++ b/src/modules/integrations/modules/storage/components/opened-storage-s3.vue
@@ -17,7 +17,7 @@
       <wt-input
         :disabled="disableUserInput"
         :label="$t('objects.integrations.storage.s3Access')"
-        :label-props="{ hint: $t('objects.integrations.emailProfiles.passwordInfo'), hintPosition: 'right' }"
+        :label-props="{ hint: $t('objects.directory.passwordInfo'), hintPosition: 'right' }"
         :v="v.itemInstance.properties.accessKey"
         :value="itemInstance.properties.accessKey"
         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
index 64c832a95..92d35a331 100644
--- 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,7 +36,6 @@
       <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 })"