BUGFIX/HCMPRE-1818: Height of FilterCard Changed (#2191)

egovernments · Feb 5, 2025 · 2414a37 · 2414a37
1 parent 35fbe07
commit 2414a37
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
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].44/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].45/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.2.44",
+  "version": "0.2.45",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <[email protected]>",

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplan.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplan.scss
@@ -548,3 +548,15 @@ tbody tr:last-child td:last-child .digit-dropdown-employee-select-wrap .digit-dr
   color: #363636;
   font-size: 1.1rem;
 }
+
+.pop-inbox-wrapper-filter-table-wrapper.planInbox-filtercard-table-wrapper {
+    align-items: stretch;
+}
+
+.filter-card{
+  &.plan-inbox-filtercard{
+    .content-container{
+      flex:1;
+    }
+  }
+}
diff --git a/...ui/web/micro-ui-internals/packages/modules/microplan/src/components/InboxFilterWrapper.js b/...ui/web/micro-ui-internals/packages/modules/microplan/src/components/InboxFilterWrapper.js
@@ -13,7 +13,7 @@ const InboxFilterWrapper = (props) => {
   const [filterValues, setFilterValues] = useState(
     { status: null, onRoadCondition: null, terrain: null, securityQ1: null, securityQ2: null, facilityId:null }
   );
-
+  
   // Default selected option
   let defaultSelectedOptions = props.defaultValue
   ? Object.entries(props.defaultValue).reduce((acc, [key, value]) => {
@@ -161,8 +161,9 @@ const InboxFilterWrapper = (props) => {
       primaryActionLabel={resultArray.length > 0 && t(props?.primaryActionLabel)}
       secondaryActionLabel={resultArray.length > 0 && t(props?.secondaryActionLabel)}
       title={t(props?.title)}
+      className={props?.isPlanInbox ? "plan-inbox-filtercard" : ""}
     >
-      <div className="gap-between-dropdowns" style={{ height: "18rem" }}>
+      <div className="gap-between-dropdowns">
         {/* Only render LabelFieldPair if resultArray has items */}
         {resultArray.length > 0 && (
           <LabelFieldPair vertical style={{ marginBottom: "1rem" }} >

diff --git a/...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js b/...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
@@ -64,7 +64,7 @@ const PlanInbox = () => {
   const [defaultBoundaries, setDefaultBoundaries] = useState([]);
   const userRoles = user?.info?.roles?.map((roleData) => roleData?.code);
   const hrms_context_path = window?.globalConfigs?.getConfig("HRMS_CONTEXT_PATH") || 'health-hrms';
-
+ 
   // Check if the user has the 'rootapprover' role
   const isRootApprover = userRoles?.includes("ROOT_PLAN_ESTIMATION_APPROVER");
 
@@ -849,6 +849,7 @@ const PlanInbox = () => {
       userRole = "PLAN_ESTIMATION_APPROVER";
     }
   });
+
 
   return (
     <div className="pop-inbox-wrapper">
@@ -879,7 +880,7 @@ const PlanInbox = () => {
       />
 
       <div
-        className="pop-inbox-wrapper-filter-table-wrapper"
+        className="pop-inbox-wrapper-filter-table-wrapper planInbox-filtercard-table-wrapper"
         style={{
           marginBottom:
             (isRootApprover && isStatusConditionMet(totalStatusCount) && planObject?.status === "RESOURCE_ESTIMATION_IN_PROGRESS") ||

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].44/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].45/dist/index.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT HCM</title>