From 154a215760f4d042378f1af056c3da3305798ef7 Mon Sep 17 00:00:00 2001
From: chinmoy-eGov <115543497+chinmoy-eGov@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:20:28 +0530
Subject: [PATCH 1/2] ISTE-9 Addded Division user and state user type

---
 .../modules/core/src/components/TopBarSideBar/TopBar.js    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js
index 43adc8100..4a2d07439 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js
@@ -97,6 +97,7 @@ const TopBar = ({
     );
   }
   const loggedin = userDetails?.access_token ? true : false;
+  console.log(userDetails,"userDetails")
   return (
     <div className="topbar">
       {mobileView ? <Hamburger handleClick={toggleSidebar} color="#9E9E9E" /> : null}
@@ -107,9 +108,13 @@ const TopBar = ({
             <p className="ulb" style={mobileView ? { fontSize: "14px", display: "inline-block" } : {}}>
               {t(cityDetails?.i18nKey).toUpperCase()}{" "}
               {t(`ULBGRADE_${cityDetails?.city?.ulbGrade.toUpperCase().replace(" ", "_").replace(".", "_")}`).toUpperCase()}
+              {` ${userDetails?.info?.roles.some(obj => obj.name === "STATE ADMIN")?` (${userDetails?.info?.name} | State User)`:` (${userDetails?.info?.name} | Division User)`}`}  
             </p>
           ) : (
-            <img className="state" src={logoUrl} />
+            <div style={{display:"flex"}}>
+              <img className="state" src={logoUrl} />
+              <p style={{marginLeft:"5px", fontWeight: "bold"}}>{` ${userDetails?.info?.roles.some(obj => obj.name === "STATE ADMIN")?`(${userDetails?.info?.name} | State User)`:`(${userDetails?.info?.name} | Division User)`}`}  </p>
+            </div>
           ))}
         {!loggedin && (
           <p className="ulb" style={mobileView ? { fontSize: "14px", display: "inline-block" } : {}}>

From 75bb0ce9cfbd5ceb05f4e2eb73567ac160a2d06b Mon Sep 17 00:00:00 2001
From: chinmoy-eGov <115543497+chinmoy-eGov@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:21:43 +0530
Subject: [PATCH 2/2] ISTE-9 Addded Division user and state user type

---
 .../packages/modules/core/src/components/TopBarSideBar/TopBar.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js
index 4a2d07439..589292b7f 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js
@@ -97,7 +97,6 @@ const TopBar = ({
     );
   }
   const loggedin = userDetails?.access_token ? true : false;
-  console.log(userDetails,"userDetails")
   return (
     <div className="topbar">
       {mobileView ? <Hamburger handleClick={toggleSidebar} color="#9E9E9E" /> : null}