update pr

src/components/AddLeanerModal.tsx

@@ -146,7 +146,7 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
       );
       const apiBody: any = {
         username: username,
-        password: password,
+        password: username,
         tenantCohortRoleMapping: [
           {
             tenantId: tenantId,

src/pages/login.tsx

@@ -116,9 +116,12 @@ const LoginPage = () => {
       const token = localStorage.getItem('token');
       const tenant = localStorage.getItem('tenantName');
       if (token && (tenant?.toLocaleLowerCase() === TENANT_DATA?.SECOND_CHANCE_PROGRAM?.toLowerCase() || tenant?.toLocaleLowerCase() === TENANT_DATA?.PRATHAM_SCP?.toLowerCase())) {
+        localStorage.setItem("previousPage", "login");
         router.push('/dashboard');
       } else if (token && tenant?.toLowerCase() == TENANT_DATA?.YOUTHNET?.toLowerCase()) {
         router.push('/youthboard');
+        localStorage.setItem("previousPage", "login");
+
       }
     }
   }, []);

src/pages/logout.tsx

@@ -6,6 +6,7 @@ import ReactGA from 'react-ga4';
 import { Telemetry } from '@/utils/app.constant';
 import { useQueryClient } from '@tanstack/react-query';
 import useStore from '@/store/store';
+import { preserveLocalStorage } from '@/utils/Helper';
 
 function Logout() {
   const queryClient = useQueryClient();
@@ -15,31 +16,7 @@ function Logout() {
   const clearLocalStorage = () => {
     if (typeof window !== 'undefined' && window.localStorage) {
       // Specify the keys you want to keep
-      const keysToKeep = [
-        'preferredLanguage',
-        'mui-mode',
-        'mui-color-scheme-dark',
-        'mui-color-scheme-light',
-        'hasSeenTutorial',
-        // 'deviceID',
-      ];
-      // Retrieve the values of the keys to keep
-      const valuesToKeep: { [key: string]: any } = {};
-      keysToKeep.forEach((key: string) => {
-        valuesToKeep[key] = localStorage.getItem(key);
-      });
-
-      // Clear all local storage
-      localStorage.clear();
-      queryClient.clear();
-      setCohorts([]);
-      // Re-add the keys to keep with their values
-      keysToKeep.forEach((key: string) => {
-        if (valuesToKeep[key] !== null) {
-          // Check if the key exists and has a value
-          localStorage.setItem(key, valuesToKeep[key]);
-        }
-      });
+      preserveLocalStorage();
     }
   };
 

src/pages/unauthorized.tsx

@@ -1,3 +1,4 @@
+import { preserveLocalStorage } from '@/utils/Helper';
 import WarningIcon from '@mui/icons-material/Warning';
 import { Link, useTheme } from '@mui/material';
 import Box from '@mui/material/Box';
@@ -13,30 +14,22 @@ const Unauthorized = () => {
   useEffect(() => {
     const handleBackButton = () => {
       console.log("User pressed the browser back button");
-     // localStorage.clear()
-     const keysToKeep = [
-      'preferredLanguage',
-      'mui-mode',
-      'mui-color-scheme-dark',
-      'mui-color-scheme-light',
-      'hasSeenTutorial',
-    ];
-    // Retrieve the values of the keys to keep
-    const valuesToKeep: { [key: string]: any } = {};
-    keysToKeep.forEach((key: string) => {
-      valuesToKeep[key] = localStorage.getItem(key);
-    });
+     const previousPage = localStorage.getItem("previousPage");
 
-    // Clear all local storage
-    localStorage.clear();
+     if (previousPage === "login") {
+      {
+        const handleBackButton = () => {
+          preserveLocalStorage();
+        };
 
-    // Re-add the keys to keep with their values
-    keysToKeep.forEach((key: string) => {
-      if (valuesToKeep[key] !== null) {
-        // Check if the key exists and has a value
-        localStorage.setItem(key, valuesToKeep[key]);
+        window.addEventListener("popstate", handleBackButton);
+
+        return () => {
+          window.removeEventListener("popstate", handleBackButton);
+        };
       }
-    })}
+    }
+  }
 
 
     window.addEventListener("popstate", handleBackButton);

src/utils/Helper.ts

@@ -938,4 +938,30 @@ export const getAssessmentType = (type: string) => {
   } else {
     return AssessmentType.OTHER;
   }
-}
+}
+export const preserveLocalStorage = () => {
+  const keysToKeep = [
+    'preferredLanguage',
+    'mui-mode',
+    'mui-color-scheme-dark',
+    'mui-color-scheme-light',
+    'hasSeenTutorial',
+  ];
+
+  const valuesToKeep: { [key: string]: any } = {};
+
+  keysToKeep.forEach((key: string) => {
+    const value = localStorage.getItem(key);
+    if (value !== null) {
+      valuesToKeep[key] = value;
+    }
+  });
+
+  localStorage.clear();
+
+  keysToKeep.forEach((key: string) => {
+    if (valuesToKeep[key] !== undefined) {
+      localStorage.setItem(key, valuesToKeep[key]);
+    }
+  });
+};