From ebbe49627d05f98a074d4126576e3666a149c2a4 Mon Sep 17 00:00:00 2001 From: Swathi-eGov Date: Fri, 29 Nov 2024 17:47:03 +0530 Subject: [PATCH 1/2] removed custom loader, updated dropdown styles inside popup,fixed action drodpown css --- .../example/src/UICustomizations.js | 24 ++++++++++--------- .../css/src/components/microplanning.scss | 6 ++++- .../src/components/FormulaConfiguration.js | 1 - .../microplan/src/components/Hypothesis.js | 2 -- .../microplan/src/components/UserAccess.js | 3 +-- .../microplan/src/configs/UICustomizations.js | 24 ++++++++++--------- 6 files changed, 32 insertions(+), 28 deletions(-) diff --git a/health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js b/health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js index 953614274ed..43f4d71d407 100644 --- a/health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js +++ b/health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js @@ -844,17 +844,19 @@ export const UICustomizations = { ) : (
- onActionSelect(item)} - /> +
+ onActionSelect(item)} + /> +
)} diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss index 78a77b5757e..2d00a0dec44 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss +++ b/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss @@ -2804,8 +2804,12 @@ $border-color: rgba(214, 213, 212, 1); }*/ } .popUpClass.new-assumption-pop{ + .digit-popup-children-wrap { + overflow: visible; + position: relative; + } .digit-popup-footer{ - width: 30rem; + width: 100%; margin-left: auto; } } diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js index 2337446e8ae..5a8cfb88bf7 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js @@ -474,7 +474,6 @@ const FormulaConfiguration = ({ onSelect, category, customProps, formulas: initi showToolTip={true} placeholder={t("SELECT_OPTION")} onChange={(e) => setSelectedDeletedFormula(e.target.value)} - optionCardStyles={{ position: "relative" }} /> , selectedDeletedFormula?.code === "NEW_FORMULA" && ( diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js index 7b6ebcb976d..3502c4bbb9c 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js @@ -283,7 +283,6 @@ const Hypothesis = ({ category, assumptions: initialAssumptions, setShowToast, a style={{ maxWidth: "100%" }} placeholder={t("SELECT_OPTION")} onChange={(e) => setSelectedDeletedAssumption(e.target.value)} - optionCardStyles={{ position: "relative" }} /> , ] @@ -307,7 +306,6 @@ const Hypothesis = ({ category, assumptions: initialAssumptions, setShowToast, a style={{ maxWidth: "100%" }} placeholder={t("SELECT_OPTION")} onChange={(e) => setSelectedDeletedAssumption(e.target.value)} - optionCardStyles={{ position: "relative" }} /> , selectedDeletedAssumption?.code === "NEW_ASSUMPTION" && ( diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js index 0cd3c714cb4..5797120b338 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js @@ -316,7 +316,7 @@ function UserAccess({ category, setData, nationalRoles }) { columns={columns} data={planEmployee?.data} progressPending={isLoading || isPlanEmpSearchLoading} - progressComponent={} + progressComponent={} pagination paginationServer customStyles={tableCustomStyle} @@ -404,7 +404,6 @@ const styles = { justifyContent: "space-between", // Ensures space between search and button alignItems: "center", width: "100%", - padding: "8px", // Optional padding for layout }, buttonContainer: { display: "flex", diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js index 84d51079f0e..7f3965bc2bd 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js @@ -127,17 +127,19 @@ export const UICustomizations = { ) : (
- onActionSelect(item)} - /> +
+ onActionSelect(item)} + /> +
)} From a9411734c34a542dcd29e2e682a349344f227a12 Mon Sep 17 00:00:00 2001 From: Swathi-eGov Date: Fri, 29 Nov 2024 17:48:38 +0530 Subject: [PATCH 2/2] updated css version --- .../micro-ui/web/micro-ui-internals/example/public/index.html | 2 +- .../micro-ui/web/micro-ui-internals/packages/css/package.json | 2 +- health/micro-ui/web/public/index.html | 2 +- 3 files changed, 3 insertions(+), 3 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 index 9c68011184e..e7f0495f857 100644 --- 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 @@ DIGIT - + 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 index 96a94cbde92..ad781a1b359 100644 --- 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.53", + "version": "0.1.54", "license": "MIT", "main": "dist/index.css", "author": "Jagankumar ", diff --git a/health/micro-ui/web/public/index.html b/health/micro-ui/web/public/index.html index 5fe57a555b0..e8fdf9d31f5 100644 --- a/health/micro-ui/web/public/index.html +++ b/health/micro-ui/web/public/index.html @@ -10,7 +10,7 @@ - + DIGIT HCM