Update setup-user.component.ts

src/app/user-management/setup-user/setup-user.component.ts

@@ -93,6 +93,16 @@ export class SetupUserComponent implements OnInit {
 
   // Submit for creating new user
 onSubmit() {
+  // For create mode, check if password is required
+  if (this.mode === 'create') {
+    const passwordControl = this.userForm.get('defaultPassword');
+    if (!passwordControl?.value) {
+      passwordControl?.setErrors({ required: true });
+      this.userForm.markAllAsTouched();
+      return;
+    }
+  }
+  
   if (this.userForm.invalid) {
     this.userForm.markAllAsTouched();
     return;
@@ -126,6 +136,12 @@ export class SetupUserComponent implements OnInit {
 
   // Update existing user
 onUpdate() {
+  // Clear any pattern errors if password is empty in edit mode
+  const passwordControl = this.userForm.get('defaultPassword');
+  if (passwordControl && !passwordControl.value && this.mode === 'edit') {
+    passwordControl.setErrors(null); // Clear errors for empty password in edit mode
+  }
+  
   if (this.userForm.invalid) {
     this.userForm.markAllAsTouched();
     return;
@@ -139,9 +155,11 @@ export class SetupUserComponent implements OnInit {
     porOrgacode: this.storageService.getItem('POR_ORGACODE')
   };
 
-    // Only include password if it was provided
-    if (this.userForm.value.defaultPassword && this.userForm.value.defaultPassword.trim()) {
-      updatedUser.password = this.userForm.value.defaultPassword;
+  // Only include password if it was provided AND is valid
+  if (this.userForm.value.defaultPassword && 
+      this.userForm.value.defaultPassword.trim() &&
+      this.userForm.get('defaultPassword')?.valid) {
+    updatedUser.password = this.userForm.value.defaultPassword.trim();
   }
 
   let params = new HttpParams().set('userId', this.selectedUserIdForEdit!);
@@ -162,7 +180,6 @@ export class SetupUserComponent implements OnInit {
     }
   });
 }
-
   // Cancel edit mode
   cancelEdit() {
     this.resetForm();
@@ -247,28 +264,45 @@ export class SetupUserComponent implements OnInit {
       Validators.maxLength(500)
     ]],
     defaultPassword: ['', [
-        // Make password optional for edit mode, required for create
-        (control: AbstractControl) => {
-          if (this.mode === 'create' && !control.value) {
-            return { required: true };
-          }
-          return null;
-        },
-        Validators.pattern(
-          /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,20}$/
-        )
+      // For edit mode, password is optional
+      // For create mode, handle required validation separately
+      this.passwordValidator.bind(this)
     ]],
     email: ['', [Validators.required, Validators.email]],
     userRole: [null, Validators.required]
   });
+}
 
-    // Update password validation when mode changes
-    this.userForm.get('defaultPassword')?.valueChanges.subscribe(() => {
-      const passwordControl = this.userForm.get('defaultPassword');
-      if (passwordControl) {
-        passwordControl.updateValueAndValidity();
+// Custom validator for password
+private passwordValidator(control: AbstractControl): { [key: string]: any } | null {
+  const value = control.value;
+  
+  // If empty and we're in edit mode, it's valid (optional)
+  if (!value || value.trim() === '') {
+    if (this.mode === 'edit') {
+      return null; // Password is optional in edit mode
     }
-    });
+    // For create mode, we'll handle required validation in onSubmit
+    return null; // Don't show pattern error for empty field
+  }
+  
+  // If there's a value, check the pattern
+  const pattern = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,20}$/;
+  if (!pattern.test(value)) {
+    return { pattern: true };
+  }
+  
+  return null;
+}
+
+// Separate validator function
+private createPasswordValidator(mode: 'create' | 'edit'): Validators {
+  return (control: AbstractControl) => {
+    if (mode === 'create' && !control.value) {
+      return { required: true };
+    }
+    return null;
+  };
 }
 
   loadUsersDirect(): void {