diff --git a/package-lock.json b/package-lock.json index 59d87865b..0b1453f4a 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": "^24.6.58", + "@webitel/ui-sdk": "^24.6.59", "axios": "^1.6.8", "clipboard-copy": "^4.0.1", "cron-validator": "^1.3.1", @@ -2250,9 +2250,9 @@ } }, "node_modules/@webitel/ui-sdk": { - "version": "24.6.58", - "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.6.58.tgz", - "integrity": "sha512-66XdIEUYF2tYyVOSJIM+aU+Li0exZA5sob9DqZemfILzmvoFNEQwxSanduGuz2UFbi+lWFzrngDH+hC5tku03w==", + "version": "24.6.59", + "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.6.59.tgz", + "integrity": "sha512-taisUQNZxhUp8/JpzV1PFJhOCfNC0J6BQcxhcS1zjyUlmQcXI7kk7WOzGivSDBs9SnwTXdRNmJkSsiF7okR/sw==", "dependencies": { "@floating-ui/vue": "^1.0.1", "@morev/vue-transitions": "^3.0.2", diff --git a/package.json b/package.json index 6f4737acb..f06aa4332 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@vuelidate/validators": "^2.0.0", "@vueuse/core": "^10.3.0", "@webitel/flow-ui-sdk": "^0.1.14", - "@webitel/ui-sdk": "^24.6.58", + "@webitel/ui-sdk": "^24.6.59", "axios": "^1.6.8", "clipboard-copy": "^4.0.1", "cron-validator": "^1.3.1", diff --git a/src/app/components/utils/generate-password-input.vue b/src/app/components/utils/generate-password-input.vue index be1c00ec5..f2eeb10e8 100644 --- a/src/app/components/utils/generate-password-input.vue +++ b/src/app/components/utils/generate-password-input.vue @@ -1,6 +1,7 @@ + + + + diff --git a/src/app/mixins/baseMixins/openedObjectValidationMixin/openedObjectValidationMixin.js b/src/app/mixins/baseMixins/openedObjectValidationMixin/openedObjectValidationMixin.js index 88b11b0c1..66dcc333e 100644 --- a/src/app/mixins/baseMixins/openedObjectValidationMixin/openedObjectValidationMixin.js +++ b/src/app/mixins/baseMixins/openedObjectValidationMixin/openedObjectValidationMixin.js @@ -9,11 +9,11 @@ export default { }, methods: { - checkValidations(validatedInstance = 'itemInstance') { + checkValidations() { const v = this.v$ ? this.v$ : this.v; - v[validatedInstance].$touch(); + v.$touch(); // if its still pending or an error is returned do not submit - return v[validatedInstance].$pending || v[validatedInstance].$error; + return v.$pending || v.$error; }, }, }; 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..1e5f9083f 100644 --- a/src/modules/directory/modules/users/components/opened-user-general.vue +++ b/src/modules/directory/modules/users/components/opened-user-general.vue @@ -36,12 +36,11 @@ @input="setItemProp({ prop: 'email', value: $event })" /> - import { mapGetters } from 'vuex'; -import PasswordInput from '../../../../../app/components/utils/generate-password-input.vue'; +import UserPasswordInput from '../../../../../app/components/utils/user-password-input.vue'; import openedTabComponentMixin from '../../../../../app/mixins/objectPagesMixins/openedObjectTabMixin/openedTabComponentMixin'; import Qrcode from './_internals/qrcode-two-factor-auth.vue'; export default { name: 'OpenedUserGeneral', - components: { PasswordInput, Qrcode }, + components: { UserPasswordInput, Qrcode }, mixins: [openedTabComponentMixin], computed: { ...mapGetters('directory/users', { diff --git a/src/modules/directory/modules/users/components/opened-user.vue b/src/modules/directory/modules/users/components/opened-user.vue index 879c0dcdc..71a9ebfc1 100644 --- a/src/modules/directory/modules/users/components/opened-user.vue +++ b/src/modules/directory/modules/users/components/opened-user.vue @@ -46,9 +46,11 @@ diff --git a/src/modules/settings/components/change-password.vue b/src/modules/settings/components/change-password.vue new file mode 100644 index 000000000..85f68e785 --- /dev/null +++ b/src/modules/settings/components/change-password.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/src/modules/settings/components/the-settings.vue b/src/modules/settings/components/the-settings.vue index f67cf98b6..874222065 100644 --- a/src/modules/settings/components/the-settings.vue +++ b/src/modules/settings/components/the-settings.vue @@ -10,35 +10,7 @@ in a column and give them half the width of the screen-->
-
-

- {{ $t('settings.changePassword') }} -

-
-
- - - - {{ $t('objects.save') }} - - +
@@ -106,21 +78,20 @@