Updated sidebar for microplan

egovernments · Nov 12, 2024 · 1d43315 · 1d43315
1 parent 4bf3640
commit 1d43315
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 28 deletions.
diff --git a/health/micro-ui/web/micro-ui-internals/example/package.json b/health/micro-ui/web/micro-ui-internals/example/package.json
@@ -9,15 +9,15 @@
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.2-beta.7",
+    "@egovernments/digit-ui-libraries": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.7",
     "@egovernments/digit-ui-components": "0.0.2-beta.49",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.13",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.30",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.18",
-    "@egovernments/digit-ui-module-hcmworkbench":"0.0.49",
+    "@egovernments/digit-ui-module-hcmworkbench": "0.0.49",
     "@egovernments/digit-ui-module-campaign-manager": "0.2.1",
-    "@egovernments/digit-ui-module-microplan":"0.0.1",
+    "@egovernments/digit-ui-module-microplan": "0.0.1",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",
@@ -37,4 +37,4 @@
       "last 1 safari version"
     ]
   }
-}
+}
diff --git a/health/micro-ui/web/micro-ui-internals/example/public/index.html b/health/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -12,7 +12,7 @@
   <title>DIGIT</title>
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].30/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].31/dist/index.css" />
 
   <!-- added below css for hcm-workbench module inclusion-->
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/package.json b/health/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-health-css",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <[email protected]>",
@@ -66,4 +66,4 @@
     "digit-ui",
     "css"
   ]
-}
+}
diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -17,6 +17,15 @@
   margin: 0;
 }
 
+.digit-sidebar {
+  top: 4.5rem;
+}
+
+.user-profile {
+  margin-top: 6rem;
+  margin-left: 3.5rem
+}
+
 
 .main.digit-home-main {
   margin-left: 72px;
@@ -128,7 +137,7 @@
   color: theme(digitv2.lightTheme.primary-2) !important;
   margin-bottom: 0rem;
 
-  &.subBoundary{
+  &.subBoundary {
     @extend .typography.heading-s;
   }
 }
@@ -803,4 +812,4 @@ tbody {
   font-weight: 700;
   font-family: theme(digitv2.fontFamily.sans);
   padding-bottom: 1rem;
-}
+}
diff --git a/...ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js b/...ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js
@@ -129,7 +129,7 @@ const SetupMicroplan = ({ hierarchyType, hierarchyData }) => {
   useEffect(() => {
     const handleAssumptionsSubmitEvent = () => {
       const newKey = parseInt(new URLSearchParams(window.location.search).get("key")) || 1;
-      setCurrentKey(newKey+1);
+      setCurrentKey(newKey + 1);
     };
 
     window.addEventListener("AssumptionsLastPage", handleAssumptionsSubmitEvent);
@@ -198,15 +198,15 @@ const SetupMicroplan = ({ hierarchyType, hierarchyData }) => {
             HYPOTHESIS: null,
             FORMULA_CONFIGURATION: null,
           });
-          
+
           setCurrentKey((prev) => prev + 1);
           setCurrentStep((prev) => prev + 1);
 
           //since we are invalidating we need to update this global state
           dispatch({
             type: "MASTER_DATA",
             state: {
-                allAssumptions:[],
+              allAssumptions: [],
             },
           });
         }
@@ -234,7 +234,7 @@ const SetupMicroplan = ({ hierarchyType, hierarchyData }) => {
 
     //Run sync validations on formData based on the screen(key)
 
-    const toastObject = Digit.Utils.microplanv1.formValidator(formData?.[currentConfBody?.key], currentConfBody?.key, state,t);
+    const toastObject = Digit.Utils.microplanv1.formValidator(formData?.[currentConfBody?.key], currentConfBody?.key, state, t);
     if (toastObject) {
       setShowToast(toastObject);
       return;
@@ -378,9 +378,11 @@ const SetupMicroplan = ({ hierarchyType, hierarchyData }) => {
         label={getNextActionLabel()}
       />
       {setupCompleted ? (
-        <ActionBar style={{ zIndex: "19" }}>
-          <SubmitBar label={t("GO_BACK_TO_MY_MICROPLAN")} onSubmit={() => history.goBack()} />
-        </ActionBar>
+        <ActionBar style={{ zIndex: "19" }} setactionFieldsToRight
+          actionFields={[
+            <Button label={t("GO_BACK_TO_MY_MICROPLAN")} onClick={() => history.goBack()} />
+          ]}
+        />
       ) : null}
       {showToast && (
         <Toast

diff --git a/health/micro-ui/web/microplan/package.json b/health/micro-ui/web/microplan/package.json
@@ -13,12 +13,12 @@
   ],
   "homepage": "/microplan-ui",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.2-beta.7",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.13",
+    "@egovernments/digit-ui-libraries": "1.8.2-beta.8",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.23",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.18",
-    "@egovernments/digit-ui-module-hcmmicroplanning":"0.0.2",
-    "@egovernments/digit-ui-module-microplan":"0.0.1",
+    "@egovernments/digit-ui-module-hcmmicroplanning": "0.0.2",
+    "@egovernments/digit-ui-module-microplan": "0.0.1",
     "@egovernments/digit-ui-components": "0.0.2-beta.39",
     "@egovernments/digit-ui-module-campaign-manager": "0.2.1",
     "babel-loader": "8.1.0",
@@ -63,14 +63,14 @@
     "build:webpack": "yarn build:libraries &&cd .. && ls && cd ./web && ls && yarn build:prod",
     "clean": "rm -rf node_modules"
   },
-  "resolutions":  {
+  "resolutions": {
     "**/babel-loader": "8.2.2",
     "**/@babel/core": "7.14.0",
     "**/@babel/preset-env": "7.14.0",
     "**/styled-components": "5.0.0",
     "**/@babel/plugin-transform-modules-commonjs": "7.14.0",
-    "**/polished":"4.2.2",
-    "fast-uri":"2.1.0"
+    "**/polished": "4.2.2",
+    "fast-uri": "2.1.0"
   },
   "eslintConfig": {
     "extends": [

diff --git a/health/micro-ui/web/package.json b/health/micro-ui/web/package.json
@@ -14,9 +14,9 @@
   ],
   "homepage": "/digit-ui",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.2-beta.7",
+    "@egovernments/digit-ui-libraries": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.7",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.13",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@egovernments/digit-ui-module-hrms": "1.8.0-beta.2",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.18",
     "@egovernments/digit-ui-components": "0.0.2-beta.49",
@@ -82,4 +82,4 @@
       "last 1 safari version"
     ]
   }
-}
+}
diff --git a/health/micro-ui/web/public/index.html b/health/micro-ui/web/public/index.html
@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].30/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].31/dist/index.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT HCM</title>