bfg-common 1.4.316 → 1.4.317

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

@@ -38,7 +38,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const { $store }: any = useNuxtApp()
 
 const form = ref<UI_I_FormChangePassword>({
-  password: '',
+  current_password: '',
   new_password: '',
   confirm_password: '',
 })

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

@@ -59,6 +59,8 @@
 import type { UI_I_Localization } from '~//lib/models/interfaces'
 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 type { UI_I_InitialValidationFields } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
+import { getPasswordMismatchError } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/utils'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -72,19 +74,49 @@ const modelLocal = defineModel<UI_I_FormChangePassword>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-// const isValid = ref<boolean>(false)
-const errorText = ref<string>('')
+const initValidationFields = ref<UI_I_InitialValidationFields>({
+  currentPassword: false,
+  newPassword: false,
+  confirmPassword: false,
+})
+const initValidation = (types: string[]): void => {
+  types.forEach((type) => (initValidationFields.value[type] = true))
+}
 
 const passwordErrorText = computed<string>(() => {
-  return ''
+  if (!initValidationFields.value.currentPassword) return ''
+
+  return !modelLocal.value.current_password
+    ? localization.value.common.fieldRequired
+    : ''
 })
 const newPasswordErrorText = computed<string>(() => {
-  return ''
+  if (!initValidationFields.value.new_password) return ''
+
+  const { new_password, confirm_password } = modelLocal.value
+  return !new_password
+    ? localization.value.common.fieldRequired
+    : getPasswordMismatchError(
+        localization.value,
+        new_password,
+        confirm_password
+      )
 })
 const confirmPasswordErrorText = computed<string>(() => {
-  return ''
+  if (!initValidationFields.value.confirm_password) return ''
+  const { new_password, confirm_password } = modelLocal.value
+  return !confirm_password
+    ? localization.value.common.fieldRequired
+    : getPasswordMismatchError(
+        localization.value,
+        new_password,
+        confirm_password
+      )
 })
 
+// const isValid = ref<boolean>(false)
+const errorText = ref<string>('')
+
 // const showValidationErrors = (text: string): void => {
 //   isValid.value = true
 //   errorText.value = text
@@ -97,6 +129,7 @@ const confirmPasswordErrorText = computed<string>(() => {
 // }
 
 const onSubmit = (): void => {
+  initValidation(['currentPassword', 'newPassword', 'confirmPassword'])
   // const {  } = modelLocal.value
   errorText.value = 'asdaldjlkdjkadj'
 

package/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces.ts

@@ -1,5 +1,11 @@
 import type { UI_I_Validation } from '~/lib/models/plugins/validation/interfaces'
 
+
+export interface UI_I_InitialValidationFields {
+  currentPassword: boolean
+  newPassword: boolean
+  confirmPassword: boolean
+}
 export interface UI_I_FormChangePassword {
   password: UI_I_Validation
   newPassword: UI_I_Validation

package/components/common/layout/theHeader/userMenu/modals/changePassword/lib/utils.ts

@@ -0,0 +1,11 @@
+import type { UI_I_Localization } from '~//lib/models/interfaces'
+
+export const getPasswordMismatchError = (
+  localization: UI_I_Localization,
+  password: string,
+  confirmPassword: string
+): string => {
+  return password === confirmPassword
+    ? ''
+    : localization.common.thePasswordsDoNotMatch
+}

package/package.json

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