Skip to content

Ccsd 530 #2891

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

Closed
wants to merge 4 commits into from
Closed

Ccsd 530 #2891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
637e68a
Hrms pgr 2 (#2870)
Hari-egov Jul 28, 2025
751e657
CCSD-530
Hari-egov Jul 28, 2025
4a1e71f
CCSD-528
Hari-egov Jul 29, 2025
825a564
## [1.0.27] [29-Jul-2025]
Hari-egov Jul 29, 2025
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 micro-ui/web/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@egovernments/digit-ui-components":"0.2.0",
"@egovernments/digit-ui-libraries": "1.8.18",
"@egovernments/digit-ui-module-core": "1.8.42",
"@egovernments/digit-ui-module-workbench": "1.0.26",
"@egovernments/digit-ui-module-workbench": "1.0.27",
"@egovernments/digit-ui-module-utilities": "1.0.15",
"@egovernments/digit-ui-module-open-payment":"0.0.2",
"@egovernments/digit-ui-module-hrms": "1.8.11",
Expand Down
4 changes: 2 additions & 2 deletions micro-ui/web/micro-ui-internals/example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
},
"devDependencies": {
"@egovernments/digit-ui-libraries": "1.8.18",
"@egovernments/digit-ui-module-workbench": "1.0.26",
"@egovernments/digit-ui-module-workbench": "1.0.27",
"@egovernments/digit-ui-module-pgr": "1.8.12",
"@egovernments/digit-ui-module-dss": "1.8.12",
"@egovernments/digit-ui-module-core": "1.8.44",
"@egovernments/digit-ui-module-common": "1.8.10",
"@egovernments/digit-ui-module-hrms": "1.8.15",
"@egovernments/digit-ui-module-hrms": "1.8.16",
"@egovernments/digit-ui-module-utilities": "1.0.15",
"@egovernments/digit-ui-module-open-payment": "0.0.2",
"@egovernments/digit-ui-module-engagement": "1.5.20",
Expand Down
4 changes: 4 additions & 0 deletions micro-ui/web/micro-ui-internals/packages/modules/hrms/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@

## [1.8.16] [25-July-2025]
- DatePicker HRMS - Maxwidth Added for 2 more fields

## [1.8.15] [25-July-2025]
- DatePicker HRMS Maxwidth Added

Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/modules/hrms/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-module-hrms",
"version": "1.8.15",
"version": "1.8.16",
"description": "HRMS",
"license": "MIT",
"main": "dist/index.js",
Expand Down
8 changes: 7 additions & 1 deletion ...i-internals/packages/modules/hrms/src/components/pageComponents/SelectDateofEmployment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ const SelectDateofEmployment = ({ t, config, onSelect, formData = {}, userType,
onSelect(config.key, { ...formData[config.key], [input]: value });
}


const fieldStyle = {
maxWidth: "36.25rem",
paddingRight: "2.5rem",
};

return (
<div>
{inputs?.map((input, index) => (
Expand All @@ -32,7 +38,7 @@ const SelectDateofEmployment = ({ t, config, onSelect, formData = {}, userType,
{t(input.label)}
{input.isMandatory ? " * " : null}
</CardLabel>
<div className="field">
<div className="field" style={fieldStyle}>
<DatePicker
key={input.name}
min={formData?.SelectDateofBirthEmployment?.dob}
Expand Down
10 changes: 8 additions & 2 deletions .../web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,12 @@ function Assignment({
const ValidateDatePickers = (value) => {
assignments;
};
const fieldStyle = {
maxWidth: "36.25rem",
paddingRight: "2.5rem",
};
Comment on lines +209 to +212
Copy link
Contributor

@coderabbitai coderabbitai bot Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Consider extracting shared styles to eliminate duplication.

The fieldStyle object is duplicated across multiple files (SelectDateofEmployment.js and assignment.js). This violates the DRY principle and could lead to maintenance issues.

Consider creating a shared constants file or utility for common form field styles. Would you like me to help create a solution to centralize these shared styles?

🤖 Prompt for AI Agents 
In
micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
around lines 209 to 212, the fieldStyle object is duplicated in multiple files,
violating the DRY principle. To fix this, create a shared constants or styles
file (e.g., formFieldStyles.js) in a common directory and move the fieldStyle
object there. Then, import this shared style object into assignment.js and other
files like SelectDateofEmployment.js to eliminate duplication and centralize
style management.



return (
<div key={index + 1} style={{ marginBottom: "16px" }}>
<div style={{ border: "1px solid #E3E3E3", padding: "16px", marginTop: "8px" }}>
Expand All @@ -224,7 +230,7 @@ function Assignment({

<LabelFieldPair>
<CardLabel className={assignment?.id ? "card-label-smaller" : "card-label-smaller"}> {`${t("HR_ASMT_FROM_DATE_LABEL")} * `} </CardLabel>
<div className="field">
<div className="field" style={fieldStyle}>
<DatePicker
type="date"
name="fromDate"
Expand All @@ -245,7 +251,7 @@ function Assignment({
{t("HR_ASMT_TO_DATE_LABEL")}
{assignment?.isCurrentAssignment ? "" : " * "}{" "}
</CardLabel>
<div className="field">
<div className="field" style={fieldStyle}>
<DatePicker
type="date"
name="toDate"
Expand Down
2 changes: 2 additions & 0 deletions micro-ui/web/micro-ui-internals/packages/modules/workbench/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## [1.0.27] [29-Jul-2025]
- File Upload Issues Resolved & Edit MDMS view incorrect data fix
Comment on lines +1 to +2
Copy link
Contributor

@coderabbitai coderabbitai bot Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Changelog entry content is good but needs formatting cleanup.

The changelog entry accurately documents the fixes mentioned in the PR objectives. However, please address the formatting issues:

Apply this diff to fix formatting:

-## [1.0.27]  [29-Jul-2025]
-- File Upload Issues Resolved & Edit MDMS view incorrect data fix   
+## [1.0.27] [29-Jul-2025]
+- File Upload Issues Resolved & Edit MDMS view incorrect data fix
+

This removes trailing spaces, fixes bracket spacing, and adds the missing blank line after the entry.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
## [1.0.27] [29-Jul-2025]
- File Upload Issues Resolved & Edit MDMS view incorrect data fix
## [1.0.27] [29-Jul-2025]
- File Upload Issues Resolved & Edit MDMS view incorrect data fix
🧰 Tools
🪛 LanguageTool

[grammar] ~1-~1: Use correct spacing
Context: ## [1.0.27] [29-Jul-2025] - File Upload Issues Resolved & Edit MD...

(QB_NEW_EN_OTHER_ERROR_IDS_5)

[grammar] ~2-~2: Use correct spacing
Context: ...solved & Edit MDMS view incorrect data fix ## [1.0.26] [18-Jun-2025] - Provided schem...

(QB_NEW_EN_OTHER_ERROR_IDS_5)

🪛 markdownlint-cli2 (0.17.2)

2-2: Trailing spaces
Expected: 0 or 2; Actual: 1

(MD009, no-trailing-spaces)

2-2: Headings should be surrounded by blank lines
Expected: 1; Actual: 0; Below

(MD022, blanks-around-headings)

2-2: First line in a file should be a top-level heading

(MD041, first-line-heading, first-line-h1)

🤖 Prompt for AI Agents 
In micro-ui/web/micro-ui-internals/packages/modules/workbench/CHANGELOG.md at
lines 1 to 2, the changelog entry has formatting issues such as trailing spaces,
inconsistent bracket spacing, and missing a blank line after the entry. Remove
any trailing spaces, ensure proper spacing around brackets, and add a blank line
after the changelog entry to improve readability and maintain consistency.


## [1.0.26] [18-Jun-2025]
- Provided schema download & upload
Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/modules/workbench/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-module-workbench",
"version": "1.0.26",
"version": "1.0.27",
"description": "Workbench",
"main": "dist/index.js",
"module": "dist/index.modern.js",
Expand Down
12 changes: 9 additions & 3 deletions micro-ui/web/micro-ui-internals/packages/modules/workbench/src/components/DigitJSONForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ const DigitJSONForm = ({
const [showPopUp, setShowPopUp] = useState(false);
const [showBulkUploadModal, setShowBulkUploadModal] = useState(false);
const { moduleName, masterName } = Digit.Hooks.useQueryParams();
const [updatedData, setUpdatedData] = useState(formData);
const [internalFormData, setInternalFormData] = useState(formData);
const tenantId = Digit.ULBService.getCurrentTenantId();
const enableBulkUpload = window?.globalConfigs?.getConfig?.("ENABLE_MDMS_BULK_UPLOAD")
? window.globalConfigs.getConfig("ENABLE_MDMS_BULK_UPLOAD")
Expand Down Expand Up @@ -394,6 +394,12 @@ const DigitJSONForm = ({
setShowPopUp(false);
};

const onFormChangeInternal = ({ formData }) => {
setInternalFormData(formData);
onFormChange && onFormChange({ formData });
};


return (
<AdditionalPropertiesContext.Provider value={{ additionalProperties, updateAdditionalProperties: () => {} }}>
<React.Fragment>
Expand Down Expand Up @@ -426,9 +432,9 @@ const DigitJSONForm = ({
schema={schema?.definition}
validator={validator}
showErrorList={false}
formData={formData}
noHtml5Validate={true}
onChange={onFormChange}
formData={internalFormData}
onChange={onFormChangeInternal}
formContext={{
schemaCode: schema?.code,
MdmsRes,
Expand Down
9 changes: 9 additions & 0 deletions ...i/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/LocalisationAdd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,15 @@ const LocalisationAdd = () => {
},
});

useEffect(() => {
if (showModuleDropdownModal) {
setIsDownloadDisabled(true);
setChoosendModule(null);
setJsonResult(null);
setJsonResultDefault(null);
}
}, [showModuleDropdownModal]);

useEffect(() => {
if (selectedLang && selectedModule) {
dispatch({
Expand Down
4 changes: 2 additions & 2 deletions micro-ui/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"homepage": "/digit-ui",
"dependencies": {
"@egovernments/digit-ui-libraries": "1.8.18",
"@egovernments/digit-ui-module-workbench": "1.0.26",
"@egovernments/digit-ui-module-workbench": "1.0.27",
"@egovernments/digit-ui-module-pgr": "1.8.12",
"@egovernments/digit-ui-module-dss": "1.8.12",
"@egovernments/digit-ui-module-core": "1.8.44",
"@egovernments/digit-ui-module-common": "1.8.10",
"@egovernments/digit-ui-module-hrms": "1.8.15",
"@egovernments/digit-ui-module-hrms": "1.8.16",
"@egovernments/digit-ui-module-utilities": "1.0.15",
"@egovernments/digit-ui-module-open-payment": "0.0.2",
"@egovernments/digit-ui-module-engagement": "1.5.20",
Expand Down
4 changes: 2 additions & 2 deletions micro-ui/web/sandbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
"homepage": "/sandbox-ui",
"dependencies": {
"@egovernments/digit-ui-libraries": "1.8.14",
"@egovernments/digit-ui-module-workbench": "1.0.26",
"@egovernments/digit-ui-module-workbench": "1.0.27",
"@egovernments/digit-ui-module-pgr": "1.8.12",
"@egovernments/digit-ui-module-dss": "1.8.12",
"@egovernments/digit-ui-module-core": "1.8.44",
"@egovernments/digit-ui-module-common": "1.8.10",
"@egovernments/digit-ui-module-hrms": "1.8.15",
"@egovernments/digit-ui-module-hrms": "1.8.16",
"@egovernments/digit-ui-module-utilities": "1.0.15",
"@egovernments/digit-ui-module-open-payment": "0.0.2",
"@egovernments/digit-ui-module-engagement": "1.5.20",
Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/workbench/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"homepage": "/workbench-ui",
"dependencies": {
"@egovernments/digit-ui-libraries": "1.8.14",
"@egovernments/digit-ui-module-workbench": "1.0.26",
"@egovernments/digit-ui-module-workbench": "1.0.27",
"@egovernments/digit-ui-components":"0.2.0",
"@egovernments/digit-ui-module-core": "1.8.42",
"@egovernments/digit-ui-module-utilities": "1.0.15",
Expand Down
Loading