Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dropdown popup fixes #1943

Merged
merged 2 commits into from
Nov 29, 2024
Merged

Dropdown popup fixes #1943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebbe496
removed custom loader, updated dropdown styles inside popup,fixed act…
Swathi-eGov Nov 29, 2024
a941173
updated css version
Swathi-eGov Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion health/micro-ui/web/micro-ui-internals/example/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<title>DIGIT</title>
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.3/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.42/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.53/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.54/dist/index.css" />
Swathi-eGov marked this conversation as resolved.
Show resolved Hide resolved

<!-- added below css for hcm-workbench module inclusion-->
<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.41/dist/index.css" /> -->
Expand Down
24 changes: 13 additions & 11 deletions health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,17 +844,19 @@ export const UICustomizations = {
</div>
) : (
<div className={"action-button-open-microplan"}>
<ButtonNew
type="actionButton"
variation="secondary"
label={t("MP_ACTIONS_FOR_MICROPLAN_SEARCH")}
options={options}
style={{ width: "20rem" }}
optionsKey="name"
showBottom={true}
isSearchable={false}
onOptionSelect={(item) => onActionSelect(item)}
/>
<div style={{ position: "relative" }}>
Swathi-eGov marked this conversation as resolved.
Show resolved Hide resolved
<ButtonNew
type="actionButton"
variation="secondary"
label={t("MP_ACTIONS_FOR_MICROPLAN_SEARCH")}
options={options}
style={{ width: "20rem" }}
Swathi-eGov marked this conversation as resolved.
Show resolved Hide resolved
optionsKey="name"
showBottom={true}
isSearchable={false}
onOptionSelect={(item) => onActionSelect(item)}
Swathi-eGov marked this conversation as resolved.
Show resolved Hide resolved
/>
</div>
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion health/micro-ui/web/micro-ui-internals/packages/css/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <jagan.kumar@egov.org.in>",
Expand Down
6 changes: 5 additions & 1 deletion health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
1 change: 0 additions & 1 deletion .../web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}
/>
</LabelFieldPair>,
selectedDeletedFormula?.code === "NEW_FORMULA" && (
Expand Down
2 changes: 0 additions & 2 deletions ...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}
/>
</LabelFieldPair>,
]
Expand All @@ -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" }}
/>
</LabelFieldPair>,
selectedDeletedAssumption?.code === "NEW_ASSUMPTION" && (
Expand Down
3 changes: 1 addition & 2 deletions ...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ function UserAccess({ category, setData, nationalRoles }) {
columns={columns}
data={planEmployee?.data}
progressPending={isLoading || isPlanEmpSearchLoading}
progressComponent={<CustomLoader />}
progressComponent={<Loader />}
Swathi-eGov marked this conversation as resolved.
Show resolved Hide resolved
pagination
paginationServer
customStyles={tableCustomStyle}
Expand Down Expand Up @@ -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",
Expand Down
24 changes: 13 additions & 11 deletions ...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,17 +127,19 @@ export const UICustomizations = {
</div>
) : (
<div className={"action-button-open-microplan"}>
<ButtonNew
type="actionButton"
variation="secondary"
label={t("MP_ACTIONS_FOR_MICROPLAN_SEARCH")}
options={options}
style={{ width: "20rem" }}
optionsKey="name"
showBottom={true}
isSearchable={false}
onOptionSelect={(item) => onActionSelect(item)}
/>
<div style={{ position: "relative" }}>
<ButtonNew
type="actionButton"
variation="secondary"
label={t("MP_ACTIONS_FOR_MICROPLAN_SEARCH")}
options={options}
style={{ width: "20rem" }}
Swathi-eGov marked this conversation as resolved.
Show resolved Hide resolved
optionsKey="name"
showBottom={true}
isSearchable={false}
onOptionSelect={(item) => onActionSelect(item)}
/>
</div>
Swathi-eGov marked this conversation as resolved.
Show resolved Hide resolved
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion health/micro-ui/web/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.3/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.42/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.53/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.54/dist/index.css" />
Swathi-eGov marked this conversation as resolved.
Show resolved Hide resolved
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#00bcd1" />
<title>DIGIT HCM</title>
Expand Down