From 637e68a11533034d5b72ce223d95935a791b87da Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Mon, 28 Jul 2025 17:47:22 +0530 Subject: [PATCH 1/3] Hrms pgr 2 (#2870) * CCSD-508 * digit-ui-module-hrms": "1.8.15 * removed change log * digit-ui-module-hrms": "1.8.16" --- micro-ui/web/micro-ui-internals/example/package.json | 2 +- .../packages/modules/hrms/CHANGELOG.md | 4 ++++ .../packages/modules/hrms/package.json | 2 +- .../pageComponents/SelectDateofEmployment.js | 8 +++++++- .../hrms/src/components/pageComponents/assignment.js | 10 ++++++++-- micro-ui/web/package.json | 2 +- micro-ui/web/sandbox/package.json | 2 +- 7 files changed, 23 insertions(+), 7 deletions(-) diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json index ba283970795..5ae5730f261 100644 --- a/micro-ui/web/micro-ui-internals/example/package.json +++ b/micro-ui/web/micro-ui-internals/example/package.json @@ -15,7 +15,7 @@ "@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", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/CHANGELOG.md b/micro-ui/web/micro-ui-internals/packages/modules/hrms/CHANGELOG.md index 446484a5463..c50262a5a0b 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/CHANGELOG.md +++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/CHANGELOG.md @@ -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 diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json b/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json index 0ebaf5a4806..6f7ba1b8598 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json +++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json @@ -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", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectDateofEmployment.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectDateofEmployment.js index 1168e2855ef..89dcff1abc2 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectDateofEmployment.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectDateofEmployment.js @@ -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 (
{inputs?.map((input, index) => ( @@ -32,7 +38,7 @@ const SelectDateofEmployment = ({ t, config, onSelect, formData = {}, userType, {t(input.label)} {input.isMandatory ? " * " : null} -
+
{ assignments; }; + const fieldStyle = { + maxWidth: "36.25rem", + paddingRight: "2.5rem", + }; + + return (
@@ -224,7 +230,7 @@ function Assignment({ {`${t("HR_ASMT_FROM_DATE_LABEL")} * `} -
+
-
+
Date: Wed, 30 Jul 2025 17:51:11 +0530 Subject: [PATCH 2/3] CCSD-474 --- micro-ui/web/core/package.json | 2 +- .../micro-ui-internals/example/package.json | 2 +- .../packages/css/package.json | 2 +- .../src/digitv2/pages/employee/workbench.scss | 15 ++++++- .../packages/modules/workbench/CHANGELOG.md | 2 + .../packages/modules/workbench/package.json | 2 +- .../workbench/src/pages/employee/MDMSEdit.js | 44 +++++++++++-------- .../workbench/src/pages/employee/MDMSView.js | 44 ++++++++++++++----- micro-ui/web/package.json | 2 +- micro-ui/web/public/index.html | 2 +- micro-ui/web/sandbox/package.json | 2 +- micro-ui/web/workbench/package.json | 2 +- 12 files changed, 81 insertions(+), 40 deletions(-) diff --git a/micro-ui/web/core/package.json b/micro-ui/web/core/package.json index 2d75a295396..b2fc442c634 100644 --- a/micro-ui/web/core/package.json +++ b/micro-ui/web/core/package.json @@ -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", diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json index 5ae5730f261..d9818ed6b9e 100644 --- a/micro-ui/web/micro-ui-internals/example/package.json +++ b/micro-ui/web/micro-ui-internals/example/package.json @@ -10,7 +10,7 @@ }, "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", diff --git a/micro-ui/web/micro-ui-internals/packages/css/package.json b/micro-ui/web/micro-ui-internals/packages/css/package.json index 4053e7e25f1..e62ec5e406b 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/package.json +++ b/micro-ui/web/micro-ui-internals/packages/css/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-css", - "version": "1.8.34", + "version": "1.8.35", "license": "MIT", "main": "dist/index.css", "author": "Jagankumar ", diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/digitv2/pages/employee/workbench.scss b/micro-ui/web/micro-ui-internals/packages/css/src/digitv2/pages/employee/workbench.scss index 2f7e1de78fd..c8dc9252f16 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/src/digitv2/pages/employee/workbench.scss +++ b/micro-ui/web/micro-ui-internals/packages/css/src/digitv2/pages/employee/workbench.scss @@ -773,7 +773,7 @@ button:hover { width: calc(100% - 32px); background-color: initial; position: relative !important; - z-index: 10; + z-index: 8 !important; width: 100%; height: 100%; outline: 2px solid transparent; @@ -781,6 +781,19 @@ button:hover { padding-left: 8px; } +.digit-dropdown-employee-select-wrap .digit-dropdown-select input[type=text], .digit-dropdown-employee-select-wrap .digit-dropdown-select .digit-checkbox-container .input-emp[type=text], .digit-checkbox-container .digit-dropdown-employee-select-wrap .digit-dropdown-select .input-emp[type=text] { + position: absolute; + z-index: 8 !important; + height: 100%; + outline: 2px solid transparent; + outline-offset: 2px; + width: calc(100% - 1.75rem); + background-color: initial; + padding-top: .5rem; + padding-bottom: .5rem; + padding-left: .75rem; + color: #363636; } + .modal-content .employee-select-wrap .select-active { position: absolute; display: block; diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/CHANGELOG.md b/micro-ui/web/micro-ui-internals/packages/modules/workbench/CHANGELOG.md index 4db182ff562..a7f60489c2a 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/CHANGELOG.md +++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.0.27] [30-July-2025] +- Workbench View and edit state issues ## [1.0.26] [18-Jun-2025] - Provided schema download & upload diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json b/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json index 5ed87e7ef98..29c1924c557 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json +++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json @@ -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", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSEdit.js b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSEdit.js index 13cf6779d22..6d018a558c8 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSEdit.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSEdit.js @@ -20,14 +20,16 @@ const MDMSEdit = ({ ...props }) => { const closeToast = () => { setTimeout(() => setShowToast(null), 5000); }; + const gotoView = () => { setRenderLoader(true); - history.push( - `/${window?.contextPath}/employee/workbench/mdms-view?moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}${ - from ? `&from=${from}` : "" - }` - ); + // history.push( + // `/${window?.contextPath}/employee/workbench/mdms-view?moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}${ + // from ? `&from=${from}` : "" + // }` + // ); + window.location.href = `/${window?.contextPath}/employee/workbench/mdms-view?moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}${from ? `&from=${from}` : ""}`; }; // Fetch MDMS Data @@ -103,18 +105,20 @@ const MDMSEdit = ({ ...props }) => { const { data: localizationMap, isLoading: isLocalizationLoading } = Digit.Hooks.useCustomAPIHook(localizationReqCriteria); - // Replace values with localized messages - let finalData = data; - if (data?.data && localizationMap) { - const updatedData = _.cloneDeep(data); - Object.keys(updatedData.data).forEach((field) => { - const localizationKey = tranformLocModuleName(`${data.schemaCode}_${field}_${updatedData.data[field]}`); - if (localizationMap[localizationKey]) { - updatedData.data[field] = localizationMap[localizationKey]; - } - }); - finalData = updatedData; - } + const [initialFormData, setInitialFormData] = useState(null); + + React.useEffect(() => { + if (data?.data && localizationMap && !initialFormData) { + const updatedData = _.cloneDeep(data); + Object.keys(updatedData.data).forEach((field) => { + const localizationKey = tranformLocModuleName(`${data.schemaCode}_${field}_${updatedData.data[field]}`); + if (localizationMap[localizationKey]) { + updatedData.data[field] = localizationMap[localizationKey]; + } + }); + setInitialFormData(updatedData.data); + } + }, [data, localizationMap, initialFormData]); const localizationUpsertMutation = Digit.Hooks.useCustomAPIMutationHook({ url: `/localization/messages/v1/_upsert`, @@ -178,7 +182,9 @@ const MDMSEdit = ({ ...props }) => { }, onSuccess: () => { setShowToast({ label: t("WBH_SUCCESS_UPD_MDMS_MSG") }); - gotoView(); + setTimeout(() => { + window.location.href = `/${window?.contextPath}/employee/workbench/mdms-view?moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}${from ? `&from=${from}` : ""}`; + }, 1000); }, } ); @@ -190,7 +196,7 @@ const MDMSEdit = ({ ...props }) => { return ( { const history = useHistory() const { t } = useTranslation() @@ -39,7 +38,6 @@ const MDMSView = ({ ...props }) => { const fetchActionItems = (data) => Digit?.Customizations?.["commonUiConfig"]?.["ViewMdmsConfig"]?.fetchActionItems(data, propsToSendButtons); - const reqCriteria = { url: `/${Digit.Hooks.workbench.getMDMSContextPath()}/v2/_search`, params: {}, @@ -85,7 +83,7 @@ const MDMSView = ({ ...props }) => { const onError = (resp) => { setShowToast({ label: `${t("WBH_ERROR_MDMS_DATA")} ${t(resp?.response?.data?.Errors?.[0]?.code)}`, - type:"error" + type: "error" }); closeToast() refetch() @@ -132,8 +130,9 @@ const MDMSView = ({ ...props }) => { const tranformLocModuleName = (localModuleName) => { if (!localModuleName) return null; - return localModuleName.replace(/[^a-zA-Z0-9]/g, "-").toUpperCase(); + return localModuleName.replace(/[^a-zA-Z0-9]/g, "-").toUpperCase(); }; + const localizationModule = tranformLocModuleName(`DIGIT-MDMS-${rawSchemaCode}`).toLowerCase(); const createLocalizationCode = (fieldName, fieldValue) => { @@ -146,12 +145,12 @@ const MDMSView = ({ ...props }) => { if (data?.data && localisableFields?.length > 0) { localizationCodes = localisableFields.map(field => createLocalizationCode(field.fieldPath, data.data[field.fieldPath])); } - const locale=Digit.StoreData.getCurrentLanguage(); + + const locale = Digit.StoreData.getCurrentLanguage(); const localizationReqCriteria = { url: `/localization/messages/v1/_search?locale=${locale}&tenantId=${tenantId}&module=${localizationModule}`, params: {}, - body: { - }, + body: {}, config: { enabled: !!data && !!MdmsRes && !!data?.schemaCode && !!tenantId && localizationCodes.length > 0, select: (respData) => { @@ -168,7 +167,6 @@ const MDMSView = ({ ...props }) => { const { data: localizationMap, isLoading: isLocalizationLoading } = Digit.Hooks.useCustomAPIHook(localizationReqCriteria); - // Transform data if localizationMap is available let finalData = data; if (data && data.data && localizationMap && localisableFields?.length > 0) { const updatedData = _.cloneDeep(data); @@ -181,7 +179,29 @@ const MDMSView = ({ ...props }) => { finalData = updatedData; } - if (isLoading || isFetching || isLocalizationLoading) return ; + if (isLoading || isFetching || isLocalizationLoading) return ; + + // ✅ Function to render toast cleanly + const renderToast = () => { + if (!showToast) return null; + return ( + setShowToast(null)} + style={{ + position: "fixed", + bottom: "5rem", + left: "50%", + transform: "translateX(-50%)", + zIndex: 999999, + width: "max-content", + maxWidth: "90%", + }} + /> + ); + }; return ( @@ -201,9 +221,9 @@ const MDMSView = ({ ...props }) => { history.push(`../utilities/audit-log?id=${finalData?.id}&tenantId=${tenantId}`); }} /> - {showToast && setShowToast(null)}>} + {renderToast()} ) -} +}; -export default MDMSView +export default MDMSView; diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json index 912983a5277..75bbf2e083a 100644 --- a/micro-ui/web/package.json +++ b/micro-ui/web/package.json @@ -15,7 +15,7 @@ "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", diff --git a/micro-ui/web/public/index.html b/micro-ui/web/public/index.html index 7e593b9bbd3..0b626007435 100644 --- a/micro-ui/web/public/index.html +++ b/micro-ui/web/public/index.html @@ -7,7 +7,7 @@ - + diff --git a/micro-ui/web/sandbox/package.json b/micro-ui/web/sandbox/package.json index 1b6f44bdc24..c11a1663d72 100644 --- a/micro-ui/web/sandbox/package.json +++ b/micro-ui/web/sandbox/package.json @@ -20,7 +20,7 @@ "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", diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json index fa801994aeb..41d9adcffa2 100644 --- a/micro-ui/web/workbench/package.json +++ b/micro-ui/web/workbench/package.json @@ -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", From 6fb023628dda35fc45d85f426943ef5801510f9c Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Wed, 30 Jul 2025 17:54:30 +0530 Subject: [PATCH 3/3] 1.0.28 WB --- micro-ui/web/core/package.json | 2 +- micro-ui/web/micro-ui-internals/example/package.json | 2 +- .../micro-ui-internals/packages/modules/workbench/CHANGELOG.md | 2 +- .../micro-ui-internals/packages/modules/workbench/package.json | 2 +- micro-ui/web/package.json | 2 +- micro-ui/web/sandbox/package.json | 2 +- micro-ui/web/workbench/package.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/micro-ui/web/core/package.json b/micro-ui/web/core/package.json index b2fc442c634..fb7fccf5799 100644 --- a/micro-ui/web/core/package.json +++ b/micro-ui/web/core/package.json @@ -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.27", + "@egovernments/digit-ui-module-workbench": "1.0.28", "@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", diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json index d9818ed6b9e..43975f3dbd0 100644 --- a/micro-ui/web/micro-ui-internals/example/package.json +++ b/micro-ui/web/micro-ui-internals/example/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@egovernments/digit-ui-libraries": "1.8.18", - "@egovernments/digit-ui-module-workbench": "1.0.27", + "@egovernments/digit-ui-module-workbench": "1.0.28", "@egovernments/digit-ui-module-pgr": "1.8.12", "@egovernments/digit-ui-module-dss": "1.8.12", "@egovernments/digit-ui-module-core": "1.8.44", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/CHANGELOG.md b/micro-ui/web/micro-ui-internals/packages/modules/workbench/CHANGELOG.md index a7f60489c2a..afc08c2535f 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/CHANGELOG.md +++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/CHANGELOG.md @@ -1,4 +1,4 @@ -## [1.0.27] [30-July-2025] +## [1.0.28] [30-July-2025] - Workbench View and edit state issues ## [1.0.26] [18-Jun-2025] diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json b/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json index 29c1924c557..cb174089e82 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json +++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-workbench", - "version": "1.0.27", + "version": "1.0.28", "description": "Workbench", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json index 75bbf2e083a..0585e3f6260 100644 --- a/micro-ui/web/package.json +++ b/micro-ui/web/package.json @@ -15,7 +15,7 @@ "homepage": "/digit-ui", "dependencies": { "@egovernments/digit-ui-libraries": "1.8.18", - "@egovernments/digit-ui-module-workbench": "1.0.27", + "@egovernments/digit-ui-module-workbench": "1.0.28", "@egovernments/digit-ui-module-pgr": "1.8.12", "@egovernments/digit-ui-module-dss": "1.8.12", "@egovernments/digit-ui-module-core": "1.8.44", diff --git a/micro-ui/web/sandbox/package.json b/micro-ui/web/sandbox/package.json index c11a1663d72..a55cbfcc102 100644 --- a/micro-ui/web/sandbox/package.json +++ b/micro-ui/web/sandbox/package.json @@ -20,7 +20,7 @@ "homepage": "/sandbox-ui", "dependencies": { "@egovernments/digit-ui-libraries": "1.8.14", - "@egovernments/digit-ui-module-workbench": "1.0.27", + "@egovernments/digit-ui-module-workbench": "1.0.28", "@egovernments/digit-ui-module-pgr": "1.8.12", "@egovernments/digit-ui-module-dss": "1.8.12", "@egovernments/digit-ui-module-core": "1.8.44", diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json index 41d9adcffa2..7640b9a73f1 100644 --- a/micro-ui/web/workbench/package.json +++ b/micro-ui/web/workbench/package.json @@ -15,7 +15,7 @@ "homepage": "/workbench-ui", "dependencies": { "@egovernments/digit-ui-libraries": "1.8.14", - "@egovernments/digit-ui-module-workbench": "1.0.27", + "@egovernments/digit-ui-module-workbench": "1.0.28", "@egovernments/digit-ui-components":"0.2.0", "@egovernments/digit-ui-module-core": "1.8.42", "@egovernments/digit-ui-module-utilities": "1.0.15",