handled undefined values

Signed-off-by: bhavanakarwade <[email protected]>
credebl · Dec 4, 2024 · 069c2aa · 069c2aa
1 parent 1a14d3b
commit 069c2aa
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 42 deletions.
diff --git a/src/components/Authentication/SignInUserPasskey.tsx b/src/components/Authentication/SignInUserPasskey.tsx
@@ -89,8 +89,7 @@ const SignInUserPasskey = (signInUserProps: signInUserProps) => {
 
 			}
 			await setToLocalStorage(storageKeys.PERMISSIONS, permissionArray);
-			// await setToLocalStorage(storageKeys.USER_PROFILE, userProfile);
-			await setToLocalStorage(storageKeys.USER_PROFILE, JSON.stringify(userProfile));
+			await setToLocalStorage(storageKeys.USER_PROFILE, userProfile);
 			await setToLocalStorage(storageKeys.USER_EMAIL, data?.data?.email);
 			return {
 				role: role?.orgRole || ""

diff --git a/src/components/Authentication/SignInUserPassword.tsx b/src/components/Authentication/SignInUserPassword.tsx
@@ -63,8 +63,7 @@ const SignInUserPassword = (signInUserProps: SignInUser3Props) => {
 				id, profileImg, firstName, email, 
 
 			}
-			// await setToLocalStorage(storageKeys.USER_PROFILE, userProfile);
-			await setToLocalStorage(storageKeys.USER_PROFILE, JSON.stringify(userProfile));
+			await setToLocalStorage(storageKeys.USER_PROFILE, userProfile);
 			await setToLocalStorage(storageKeys.USER_EMAIL, data?.data?.email);
 			return {
 				role: role?.orgRole ?? '',

diff --git a/src/components/Profile/DisplayProfileImg.tsx b/src/components/Profile/DisplayProfileImg.tsx
@@ -7,33 +7,16 @@ import { storageKeys } from "../../config/CommonConstant.ts";
 
 const DisplayProfileImg = () => {
     const [userObj, setUserObj] = useState<IUserProfile | null>(null)
-    // const getUserDetails = async () => {
-    //     const userProfile = await getFromLocalStorage(storageKeys.USER_PROFILE)
-    //     const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES)
-    //     const parsedUser = userProfile ? JSON.parse(userProfile) : null;
-
-    //     if (parsedUser) {
-    //         parsedUser.roles = orgRoles;
-    //         setUserObj(parsedUser);
-    //     }
-    // }
-
     const getUserDetails = async () => {
-        try {
-            const userProfile = await getFromLocalStorage(storageKeys.USER_PROFILE);
-            const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES);
-            const parsedUser = userProfile ? JSON.parse(userProfile) : null;
+        const userProfile = await getFromLocalStorage(storageKeys.USER_PROFILE)
+        const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES)
+        const parsedUser = userProfile ? JSON.parse(userProfile) : null;
 
-            if (parsedUser) {
-                parsedUser.roles = orgRoles || []; // Default to an empty array if orgRoles is null
-                setUserObj(parsedUser);
-            } else {
-                console.warn("User profile is not available in local storage.");
-            }
-        } catch (error) {
-            console.error("Error fetching user details:", error);
+        if (parsedUser) {
+            parsedUser.roles = orgRoles;
+            setUserObj(parsedUser);
         }
-    };
+    }
 
     useEffect(() => {
         getUserDetails()

diff --git a/src/components/Profile/EditUserProfile.tsx b/src/components/Profile/EditUserProfile.tsx
@@ -179,8 +179,7 @@ const EditUserProfile = ({ toggleEditProfile, userProfileInfo, updateProfile }:
     }
 
     updateProfile(userData);
-    // await setToLocalStorage(storageKeys.USER_PROFILE, updatedUserData);
-    await setToLocalStorage(storageKeys.USER_PROFILE, JSON.stringify(updatedUserData));
+    await setToLocalStorage(storageKeys.USER_PROFILE, updatedUserData);
     window.location.reload();
     setLoading(false)
   }

diff --git a/src/components/Profile/UserProfile.tsx b/src/components/Profile/UserProfile.tsx
@@ -27,8 +27,7 @@ const UserProfile = ({ noBreadcrumb }: { noBreadcrumb?: boolean }) => {
         const userProfile = {
           id, profileImg, firstName, email, 
         }
-        // await setToLocalStorage(storageKeys.USER_PROFILE, userProfile)
-        await setToLocalStorage(storageKeys.USER_PROFILE, JSON.stringify(userProfile))
+        await setToLocalStorage(storageKeys.USER_PROFILE, userProfile)
         await setToLocalStorage(storageKeys.USER_EMAIL, data?.data?.email)
       }
     } catch (error) {

diff --git a/src/components/User/UserDashBoard.tsx b/src/components/User/UserDashBoard.tsx
@@ -354,8 +354,7 @@ const UserDashBoard = () => {
 		await setToLocalStorage(storageKeys.ORG_ID, org.id.toString());
 		const roles: string[] = org?.userOrgRoles.map((role) => role.orgRole.name);
 
-		// await setToLocalStorage(storageKeys.ORG_ROLES, roles?.toString());
-		await setToLocalStorage(storageKeys.ORG_ROLES, JSON.stringify(roles));
+		await setToLocalStorage(storageKeys.ORG_ROLES, roles?.toString());
 
 		const { id, name, description, logoUrl } = org || {};
 		const orgInfo = {

diff --git a/src/components/organization/OrgDropDown.tsx b/src/components/organization/OrgDropDown.tsx
@@ -67,9 +67,7 @@ const OrgDropDown = () => {
 			? org?.userOrgRoles.map((role) => role?.orgRole?.name)
 			: [];
 		if (roles.length > 0) { // Added check
-			// await setToLocalStorage(storageKeys.ORG_ROLES, roles?.toString());
-			await setToLocalStorage(storageKeys.ORG_ROLES, JSON.stringify(roles));
-
+			await setToLocalStorage(storageKeys.ORG_ROLES, roles?.toString());
 		}
 	};
 
@@ -93,9 +91,8 @@ const OrgDropDown = () => {
 
 			setActiveOrg(activeOrgDetails);
 
-			await setToLocalStorage(storageKeys.ORG_ROLES, JSON.stringify(roles));
-
-				// await setToLocalStorage(storageKeys.ORG_ROLES, roles?.toString());
+
+				await setToLocalStorage(storageKeys.ORG_ROLES, roles?.toString());
 
 		}
 		if (activeOrgDetails) {

diff --git a/src/components/organization/OrganizationsList.tsx b/src/components/organization/OrganizationsList.tsx
@@ -123,8 +123,7 @@ const OrganizationsList = () => {
 			id, name, description, logoUrl, roles
 		}
 		await setToLocalStorage(storageKeys.ORG_INFO, orgInfo)
-		// await setToLocalStorage(storageKeys.ORG_ROLES, roles?.toString());
-		await setToLocalStorage(storageKeys.ORG_ROLES, JSON.stringify(roles));
+		await setToLocalStorage(storageKeys.ORG_ROLES, roles?.toString());
 		window.location.href = pathRoutes.organizations.dashboard;
 	};
 	let content: React.JSX.Element = <></>;