FEATURE/HCMPRE-1852 : POC for single landing ui for users

egovernments · Feb 3, 2025 · c679afd · c679afd
1 parent d1f8ecd
commit c679afd
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json
@@ -13,7 +13,7 @@
     "@egovernments/digit-ui-module-workbench": "1.0.14",
     "@egovernments/digit-ui-module-pgr": "1.8.10",
     "@egovernments/digit-ui-module-dss": "1.8.10",
-    "@egovernments/digit-ui-module-core": "1.8.22",
+    "@egovernments/digit-ui-module-core": "1.8.23",
     "@egovernments/digit-ui-module-common": "1.8.10",
     "@egovernments/digit-ui-module-hrms": "1.8.10",
     "@egovernments/digit-ui-module-utilities": "1.0.10",

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/CHANGELOG.md b/micro-ui/web/micro-ui-internals/packages/modules/core/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog 
 
+## [1.8.23]  [3-Feb-2025]
+- FEATURE/HCMPRE-1852 : POC for single landing ui for users added extra route for no-top-bar/employee
+
 ## [1.8.22]  [3-Feb-2025]
 - FEATURE/HCMPRE-2208  : Fixed some loader component issue 
 - added new prop called allowedUserTypes to restrict any user type if needed

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/package.json b/micro-ui/web/micro-ui-internals/packages/modules/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-core",
-  "version": "1.8.22",
+  "version": "1.8.23",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js
@@ -70,7 +70,6 @@ export const DigitApp = ({ stateCode, modules, appTenants, logoUrl, logoUrlWhite
     pathname,
     initData,
   };
-
   return (
     <Switch>
      {allowedUserTypes?.some(userType=>userType=="employee")&& <Route path={`/${window?.contextPath}/employee`}>
@@ -79,6 +78,9 @@ export const DigitApp = ({ stateCode, modules, appTenants, logoUrl, logoUrlWhite
       {allowedUserTypes?.some(userType=>userType=="citizen")&& <Route path={`/${window?.contextPath}/citizen`}>
         <CitizenApp {...commonProps} />
       </Route>}
+      {allowedUserTypes?.some(userType=>userType=="employee")&& <Route path={`/${window?.contextPath}/no-top-bar/employee`}>
+        <EmployeeApp  {...commonProps} noTopBar={true} />
+      </Route>}
       <Route>
         <Redirect to={`/${window?.contextPath}/${defaultLanding}`} />
       </Route>

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/index.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/index.js
@@ -36,7 +36,10 @@ const EmployeeApp = ({
   sourceUrl,
   pathname,
   initData,
+  noTopBar=false
 }) => {
+
+
   const history = useHistory();
   const { t } = useTranslation();
   const { path } = useRouteMatch();
@@ -119,9 +122,9 @@ const EmployeeApp = ({
               </Route>
             </Switch>
           </div>
-        </Route>
-        <Route>
-          <TopBarSideBar
+        </Route> 
+       <Route>
+          {!noTopBar&&<TopBarSideBar
             t={t}
             stateInfo={stateInfo}
             userDetails={userDetails}
@@ -132,8 +135,8 @@ const EmployeeApp = ({
             logoUrl={logoUrl}
             logoUrlWhite={logoUrlWhite}
             modules={modules}
-          />
-          <div className={`main ${DSO ? "m-auto" : ""} digit-home-main`}>
+          />}
+          <div className={!noTopBar?`main ${DSO ? "m-auto" : ""} digit-home-main`:""}>
             <div className="employee-app-wrapper digit-home-app-wrapper">
               <ErrorBoundary initData={initData}>
                 <AppModules

diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json
@@ -18,7 +18,7 @@
     "@egovernments/digit-ui-module-workbench": "1.0.14",
     "@egovernments/digit-ui-module-pgr": "1.8.10",
     "@egovernments/digit-ui-module-dss": "1.8.10",
-    "@egovernments/digit-ui-module-core": "1.8.22",
+    "@egovernments/digit-ui-module-core": "1.8.23",
     "@egovernments/digit-ui-module-common": "1.8.10",
     "@egovernments/digit-ui-module-hrms": "1.8.10",
     "@egovernments/digit-ui-module-utilities": "1.0.10",

diff --git a/micro-ui/web/sandbox/package.json b/micro-ui/web/sandbox/package.json
@@ -23,7 +23,7 @@
     "@egovernments/digit-ui-module-workbench": "1.0.14",
     "@egovernments/digit-ui-module-pgr": "1.8.10",
     "@egovernments/digit-ui-module-dss": "1.8.10",
-    "@egovernments/digit-ui-module-core": "1.8.22",
+    "@egovernments/digit-ui-module-core": "1.8.23",
     "@egovernments/digit-ui-module-common": "1.8.10",
     "@egovernments/digit-ui-module-hrms": "1.8.10",
     "@egovernments/digit-ui-module-utilities": "1.0.10",

diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json
@@ -17,7 +17,7 @@
     "@egovernments/digit-ui-libraries": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.10",
     "@egovernments/digit-ui-components":"0.0.2-beta.65",
-    "@egovernments/digit-ui-module-core": "1.8.22",
+    "@egovernments/digit-ui-module-core": "1.8.23",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.41",
     "@egovernments/digit-ui-react-components": "1.8.16",
     "babel-loader": "8.1.0",