New angular update on mentor directorry, profile flow

src/app/pages/edit-profile/edit-profile.page.html

@@ -3,14 +3,16 @@
   <div class="main-wrapper">
     <app-profile-image [profileImageData]='profileImageData' [uploadImage]="true"
       (imageRemoveEvent)="removeCurrentPhoto($event)" (imageUploadEvent)="imageUploadEvent($event)"></app-profile-image>
-    <div *ngIf="showForm" class="mx-10">
+    @if (showFormSignal()) {
+    <div class="mx-10">
       <app-dynamic-form [jsonFormData]="formData" #form1> </app-dynamic-form>
     </div>
+    }
   </div>
 </ion-content>
 
 <ion-footer class="ion-no-border footer-button" submitButton>
   <ion-toolbar>
     <ion-button [disabled]="form1 && !form1.myForm.valid" expand="full" (click)="onSubmit()">{{'SUBMIT' | translate}}</ion-button>
   </ion-toolbar>
-</ion-footer>
+</ion-footer>

src/app/pages/edit-profile/edit-profile.page.spec.ts

@@ -189,6 +189,16 @@ describe('EditProfilePage', () => {
       await component.ngOnInit();
       expect(mockChangeDetectorRef.detectChanges).toHaveBeenCalled();
     });
+
+    it('should expose showForm through signal-backed getter/setter', () => {
+      component.showForm = false;
+      expect(component.showForm).toBeFalse();
+      expect(component.showFormSignal()).toBeFalse();
+
+      component.showForm = true;
+      expect(component.showForm).toBeTrue();
+      expect(component.showFormSignal()).toBeTrue();
+    });
   });
 
   describe('ionViewWillEnter', () => {
@@ -313,6 +323,49 @@ describe('EditProfilePage', () => {
       const result = await component.canPageLeave();
       expect(result).toBe(false);
     });
+
+    it('should return true when form is pristine and image is uploaded with backButton true', async () => {
+      component.form1 = {
+        myForm: { pristine: true },
+        onSubmit: jasmine.createSpy('onSubmit'),
+        reset: jasmine.createSpy('reset')
+      } as any;
+      component.profileImageData.isUploaded = true;
+      component.headerConfig.backButton = true;
+
+      const mockAlert = {
+        present: jasmine.createSpy('present').and.returnValue(Promise.resolve()),
+        onDidDismiss: jasmine.createSpy('onDidDismiss').and.returnValue(Promise.resolve({ role: 'cancel' }))
+      };
+      mockAlertController.create.and.returnValue(Promise.resolve(mockAlert as any));
+
+      const result = await component.canPageLeave();
+
+      expect(mockAlert.present).not.toHaveBeenCalled();
+      expect(result).toBe(true);
+    });
+
+    it('should return false when form is pristine and backButton is false', async () => {
+      component.userDetails = { ...mockUserDetails, profile_mandatory_fields: ['field1'] };
+      component.form1 = {
+        myForm: { pristine: true },
+        onSubmit: jasmine.createSpy('onSubmit'),
+        reset: jasmine.createSpy('reset')
+      } as any;
+      component.profileImageData.isUploaded = true;
+      component.headerConfig.backButton = false;
+
+      const mockAlert = {
+        present: jasmine.createSpy('present').and.returnValue(Promise.resolve()),
+        onDidDismiss: jasmine.createSpy('onDidDismiss').and.returnValue(Promise.resolve({ role: 'cancel' }))
+      };
+      mockAlertController.create.and.returnValue(Promise.resolve(mockAlert as any));
+
+      const result = await component.canPageLeave();
+
+      expect(mockAlert.present).toHaveBeenCalled();
+      expect(result).toBe(false);
+    });
   });
 
   describe('onSubmit', () => {
@@ -416,6 +469,37 @@ describe('EditProfilePage', () => {
 
       expect(mockProfileService.profileUpdate).toHaveBeenCalled();
     });
+
+    it('should send fallback values when optional fields are missing', async () => {
+      component.formData = {
+        controls: [
+          { name: 'about', value: '', multiple: false },
+          { name: 'education_qualification', value: '', multiple: false },
+          { name: 'experience', value: null, multiple: false }
+        ]
+      };
+      component.entityNames = ['about', 'education_qualification', 'experience'];
+      component.userDetails = { ...mockUserDetails, profile_mandatory_fields: ['a'] };
+      component.form1 = {
+        myForm: {
+          valid: true,
+          value: { about: '', education_qualification: '', experience: null },
+          markAsPristine: jasmine.createSpy('markAsPristine')
+        },
+        onSubmit: jasmine.createSpy('onSubmit'),
+        reset: jasmine.createSpy('reset')
+      } as any;
+      component.profileImageData.isUploaded = true;
+      mockProfileService.profileUpdate.and.returnValue(Promise.resolve(true));
+
+      await component.onSubmit();
+
+      const payload = mockProfileService.profileUpdate.calls.mostRecent().args[0];
+      expect(payload.about).toBe('NA');
+      expect(payload.education_qualification).toBe('NA');
+      expect(payload.experience).toBe(0);
+      expect(component.userDetails.profile_mandatory_fields).toEqual([]);
+    });
   });
 
   describe('resetForm', () => {
@@ -529,4 +613,4 @@ describe('EditProfilePage', () => {
       expect(result.length).toBe(2);
     });
   });
-});
+});

src/app/pages/edit-profile/edit-profile.page.ts

@@ -1,5 +1,5 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, OnInit, ViewChild, signal } from '@angular/core';
 import { HttpService } from 'src/app/core/services/http/http.service';
 import {
   DynamicFormComponent,
@@ -34,6 +34,7 @@ import { PlatformLocation, Location } from '@angular/common';
 })
 export class EditProfilePage implements OnInit, isDeactivatable {
   private win: any = window;
+  private readonly showFormState = signal(false);
   updated: boolean;
   @ViewChild('form1') form1: DynamicFormComponent;
   profileImageData: any = {
@@ -46,7 +47,16 @@ export class EditProfilePage implements OnInit, isDeactivatable {
   };
   path;
   localImage;
-  showForm: any = false;
+  get showForm(): boolean {
+    return this.showFormState();
+  }
+
+  set showForm(value: boolean) {
+    this.showFormState.set(!!value);
+  }
+
+  showFormSignal = this.showFormState.asReadonly();
+
   userDetails: any;
   entityNames: any;
   entityList: any;
@@ -91,12 +101,12 @@ export class EditProfilePage implements OnInit, isDeactivatable {
     this.entityNames = await this.updateEntityArray(this.userDetails?.profile_mandatory_fields, entityNames);
     this.entityList = await this.form.getEntities(this.entityNames, 'PROFILE');
     this.formData = await this.form.populateEntity(this.formData, this.entityList)
-    this.changeDetRef.detectChanges();
     if (this.userDetails) {
       this.profileImageData.image = this.userDetails.image;
       this.profileService.prefillData(this.userDetails, this.entityNames, this.formData);
       this.showForm = true;
     }
+    this.changeDetRef.detectChanges();
     if(this.userDetails?.profile_mandatory_fields?.length || !this.userDetails?.about){
     this.headerConfig.backButton = false;
     let msg = {