From 2b98437f151a5b9a7e45f5ba1b992cbe45b448a2 Mon Sep 17 00:00:00 2001
From: Mazdak Gibran <141390141+mazdakgibran@users.noreply.github.com>
Date: Mon, 29 Dec 2025 16:33:44 +0500
Subject: [PATCH] change password for first login fixed

change password for first login fixed
---
 .../side-nav/side-nav.component.html          |  2 +-
 .../components/side-nav/side-nav.component.ts |  6 +++++
 .../change-password.component.ts              | 26 ++++++++++++++-----
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/app/shared/components/side-nav/side-nav.component.html b/src/app/shared/components/side-nav/side-nav.component.html
index b8f4024..a4d7e2b 100644
--- a/src/app/shared/components/side-nav/side-nav.component.html
+++ b/src/app/shared/components/side-nav/side-nav.component.html
@@ -30,7 +30,7 @@
                         </a>
                     </li>
                     <li>
-                        <a  routerLink="/home/changePassword" routerLinkActive="mm-active" style="cursor: pointer">
+                        <a  routerLink="/home/changePassword" routerLinkActive="mm-active" (click)="navigateToChangePassword()" style="cursor: pointer">
                             <span> {{ 'changePassword' | translate }}</span>
                         </a>
                     </li>
diff --git a/src/app/shared/components/side-nav/side-nav.component.ts b/src/app/shared/components/side-nav/side-nav.component.ts
index 975a608..269b107 100644
--- a/src/app/shared/components/side-nav/side-nav.component.ts
+++ b/src/app/shared/components/side-nav/side-nav.component.ts
@@ -40,6 +40,12 @@ export class SideNavComponent {
     this.sidebarService.currentSubModule = this.storageService.getItem('currentSubModule') ?? 'dashboard';
     this.closeSidebarMenu();
   }
+
+   navigateToChangePassword() {
+  this.router.navigate(['/home/changePassword'], { 
+    state: { fromMenu: true } 
+  });
+}
   closeSidebarMenu(): void {
     if (isPlatformBrowser(this.platformId)) {
       const subMenus = document.querySelectorAll('#sidebar-menu .sub-menu');
diff --git a/src/app/user-management/change-password/change-password.component.ts b/src/app/user-management/change-password/change-password.component.ts
index 4eae8cc..fb7f0bd 100644
--- a/src/app/user-management/change-password/change-password.component.ts
+++ b/src/app/user-management/change-password/change-password.component.ts
@@ -41,18 +41,30 @@ passwordType2: string = 'password';
   }
 
    ngOnInit(): void {
+    // Call the method to check if first-time login
     this.checkIfFirstTimeChangePasswordOrNot();
   }
 
-  checkIfFirstTimeChangePasswordOrNot(){
-    let currentUser: any = JSON.parse(this.storageService.getItem('user')!)
-    if(currentUser.user.isFirstLogin){
-      this.isFirstLogin = true;
-    }
-    else{
+  checkIfFirstTimeChangePasswordOrNot() {
+    const fromMenu = history.state?.['fromMenu'];
+    
+    if (fromMenu) {
       this.isFirstLogin = false;
+    } else {
+      try {
+        const currentUser: any = JSON.parse(this.storageService.getItem('user') || '{}');
+        
+        // Check if user exists and has isFirstLogin flag
+        if (currentUser?.user?.isFirstLogin) {
+          this.isFirstLogin = true;
+        } else {
+          this.isFirstLogin = false;
+        }
+      } catch (error) {
+        console.error('Error parsing user data:', error);
+        this.isFirstLogin = false;
+      }
     }
   }
 
-
 }