bfg-common 1.4.320 → 1.4.322

package/components/common/layout/theHeader/userMenu/modals/changePassword/ChangePassword.vue

@@ -13,7 +13,7 @@
     v-model="form"
     :hostname="props.hostname"
     :project="props.project"
-    @apply="onChangePassword"
+    @change-password="onChangePassword"
     @hide="onHideModal"
   />
 </template>
@@ -44,13 +44,13 @@ const form = ref<UI_I_ChangePasswordForm>({
   confirm_password: '',
 })
 const onChangePassword = async (): Promise<void> => {
-  const { new_password, password } = form.value
+  const { current_password, new_password } = form.value
 
   onHideModal()
 
   const sendData: UI_I_ChangePasswordBodyRequest = {
-    current_password: password,
-    new_password: new_password,
+    current_password,
+    new_password,
   }
 
   let url = ''
@@ -69,13 +69,15 @@ const onChangePassword = async (): Promise<void> => {
   })
 
   if (error.value?.data && error.value.data.error_code !== 0) {
+    const errorText = error.value.data?.error_message || error.value.data
+
     $store.dispatch('main/A_SHOW_NOTIFICATION', {
       status: 'error',
       headline: localization.value.common.operationFailed,
       messages: [
         {
-          title: 'Error',
-          descriptions: [error.value.data.error_message],
+          title: localization.value.common.error,
+          descriptions: [errorText],
         },
       ],
     })

package/components/common/layout/theHeader/userMenu/modals/changePassword/ChangePasswordNew.vue

@@ -1,7 +1,8 @@
 <template>
   <ui-modal
-    test-id="change-password-modal"
+    show
     width="560px"
+    test-id="change-password-modal"
     :title="localization.common.changePassword"
     :subtitle="props.subtitle"
     class="change-password"
@@ -78,7 +79,6 @@ const modelLocal = defineModel<UI_I_ChangePasswordForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-
 const alertErrorText = ref<string>('')
 const initValidationFields = ref<UI_I_InitialValidationFields>({
   currentPassword: false,
@@ -142,11 +142,7 @@ const onSubmit = (): void => {
     )
   }
 
-  const notReady = true
-  if (notReady) {
-    return
-  }
-  emits('change-password')
+  !isFieldValid && !alertErrorText.value && emits('change-password')
 }
 const onHideModal = (): void => {
   emits('hide')

package/components/common/layout/theHeader/userMenu/modals/changePassword/ChangePasswordOld.vue

@@ -87,10 +87,9 @@
 
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import type {
-  UI_I_ChangePasswordBodyRequest,
   UI_I_FormChangePassword,
+  UI_I_ChangePasswordForm,
 } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import { defaultFormFunc } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/config/form'
@@ -101,10 +100,12 @@ const props = defineProps<{
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
+  (event: 'change-password'): void
 }>()
+const modelLocal = defineModel<UI_I_ChangePasswordForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store, $validation }: any = useNuxtApp()
+const { $validation }: any = useNuxtApp()
 const validation = $validation.call({})
 
 const isValid = ref<boolean>(false)
@@ -141,40 +142,9 @@ const onChangePassword = async (): Promise<void> => {
     return
   }
 
-  onHideModal()
-
-  const sendData: UI_I_ChangePasswordBodyRequest = {
-    current_password: password.value,
-    new_password: newPassword.value,
-  }
-
-  let url = ''
-  if (props.project === 'sphere') {
-    const { id } = useLocalStorage('userData')
-
-    url = `ui/users/${id}/passwd`
-  } else if (props.project === 'procurator') {
-    url = '/ui/passwd'
-  }
-
-  const { error } = await useMyFetch<never, API_UI_I_Error>(url, {
-    method: 'POST',
-    body: sendData,
-    key: Date.now().toString(),
-  })
-
-  if (error.value?.data && error.value.data.error_code !== 0) {
-    $store.dispatch('main/A_SHOW_NOTIFICATION', {
-      status: 'error',
-      headline: localization.value.common.operationFailed,
-      messages: [
-        {
-          title: 'Error',
-          descriptions: [error.value.data.error_message],
-        },
-      ],
-    })
-  }
+  modelLocal.value.current_password = password.value
+  modelLocal.value.new_password = newPassword.value
+  emits('change-password')
 }
 
 const showValidationErrors = (text: string): void => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.320",
+  "version": "1.4.322",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",