bfg-common 1.4.314 → 1.4.316

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

@@ -5,11 +5,12 @@
     :subtitle="props.hostname"
     :project="props.project"
     @hide="onHideModal"
-    @apply="onChangePassword"
+    @change-password="onChangePassword"
   />
 
   <common-layout-the-header-user-menu-modals-change-password-old
     v-else
+    v-model="form"
     :hostname="props.hostname"
     :project="props.project"
     @hide="onHideModal"
@@ -25,7 +26,6 @@ import type {
   UI_I_FormChangePassword,
 } 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'
 
 const props = defineProps<{
   newView: boolean
@@ -35,39 +35,21 @@ const props = defineProps<{
 const isShowModalLocal = defineModel<boolean>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store, $validation }: any = useNuxtApp()
-const validation = $validation.call({})
-
-const isValid = ref<boolean>(false)
-const errorText = ref<string>('')
-const form = ref<UI_I_FormChangePassword>(
-  useDeepCopy(defaultFormFunc(localization.value))
-)
-
-const setForm = (): void => {
-  form.value = useDeepCopy(defaultFormFunc(localization.value))
-  validation.setForm(form)
-}
-setForm()
+const { $store }: any = useNuxtApp()
 
+const form = ref<UI_I_FormChangePassword>({
+  password: '',
+  new_password: '',
+  confirm_password: '',
+})
 const onChangePassword = async (): Promise<void> => {
-  const valid = validation.touch()
-  const { newPassword, password } = form.value
-
-  if (newPassword.value === password.value) {
-    showValidationErrors(localization.value.common.newPasswordMustDifferentOld)
-    return
-  }
-  if (!valid.isValid) {
-    showValidationErrors(valid.errors.confirmPassword[0])
-    return
-  }
+  const { new_password, password } = form.value
 
   onHideModal()
 
   const sendData: UI_I_ChangePasswordBodyRequest = {
-    current_password: password.value,
-    new_password: newPassword.value,
+    current_password: password,
+    new_password: new_password,
   }
 
   let url = ''
@@ -98,15 +80,7 @@ const onChangePassword = async (): Promise<void> => {
     })
   }
 }
-
-const showValidationErrors = (text: string): void => {
-  isValid.value = true
-  errorText.value = text
-}
-
 const onHideModal = (): void => {
   isShowModalLocal.value = false
-  setForm()
-  isValid.value = false
 }
 </script>

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

@@ -28,7 +28,7 @@
             v-model="modelLocal.current_password"
             test-id="change-password-password-field"
             :label="localization.auth.password"
-            :error="errorText"
+            :error="passwordErrorText"
             type="password"
           ></ui-input>
 
@@ -36,7 +36,7 @@
             v-model="modelLocal.new_password"
             test-id="change-password-new-password-field"
             :label="localization.common.newPassword"
-            :error="errorText"
+            :error="newPasswordErrorText"
             type="password"
           ></ui-input>
 
@@ -44,7 +44,7 @@
             v-model="modelLocal.confirm_password"
             test-id="change-password-confirm-password-field"
             :label="localization.common.confirmPassword"
-            :error="errorText"
+            :error="confirmPasswordErrorText"
             type="password"
           ></ui-input>
         </div>
@@ -66,7 +66,7 @@ const props = defineProps<{
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
-  (event: 'submit'): void
+  (event: 'change-password'): void
 }>()
 const modelLocal = defineModel<UI_I_FormChangePassword>({ required: true })
 
@@ -75,6 +75,16 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 // const isValid = ref<boolean>(false)
 const errorText = ref<string>('')
 
+const passwordErrorText = computed<string>(() => {
+  return ''
+})
+const newPasswordErrorText = computed<string>(() => {
+  return ''
+})
+const confirmPasswordErrorText = computed<string>(() => {
+  return ''
+})
+
 // const showValidationErrors = (text: string): void => {
 //   isValid.value = true
 //   errorText.value = text
@@ -89,6 +99,12 @@ const errorText = ref<string>('')
 const onSubmit = (): void => {
   // const {  } = modelLocal.value
   errorText.value = 'asdaldjlkdjkadj'
+
+  const notReady = true
+  if (notReady) {
+    return
+  }
+  emits('change-password')
 }
 </script>
 
@@ -103,7 +119,12 @@ const onSubmit = (): void => {
     margin-bottom: 20px;
   }
   &__alert {
+    padding: 10px 12px;
     margin-bottom: 12px;
+    :deep(svg) {
+      width: 16px;
+      height: 16px;
+    }
   }
   &__form {
     @include flex($dir: column);

package/package.json

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