From 4ec5ff645ebfd3a447de7f0f72ace7508e1dba1e Mon Sep 17 00:00:00 2001 From: Tulika-eGov Date: Wed, 4 Dec 2024 12:30:33 +0530 Subject: [PATCH] UCEM-1052 : updated few fixes for the wageseeker and organisation --- .../micro-ui-internals/example/package.json | 2 +- .../Mukta/src/configs/UICustomizations.js | 2 +- .../src/pages/works/inboxSearchComposer.scss | 5 ++ .../packages/modules/Masters/package.json | 2 +- .../src/configs/searchWMSWageSeekerConfig.js | 57 ++++++------------- .../employee/Organisation/ViewOrganisation.js | 5 +- .../employee/WageSeeker/ViewWageSeeker.js | 5 +- frontend/micro-ui/web/package.json | 2 +- 8 files changed, 31 insertions(+), 49 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json index 18cac11aa3..56c0a25929 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -19,7 +19,7 @@ "@egovernments/digit-ui-module-contracts": "0.4.15", "@egovernments/digit-ui-module-measurement":"0.2.20", "@egovernments/digit-ui-module-estimate": "0.4.22", - "@egovernments/digit-ui-module-masters": "0.4.24", + "@egovernments/digit-ui-module-masters": "0.4.25", "@egovernments/digit-ui-module-project": "0.4.17", "@egovernments/digit-ui-module-expenditure": "0.4.28", "@egovernments/digit-ui-customisation-mukta": "0.2.14", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js index 013e3eed44..4bfb081118 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js @@ -1545,7 +1545,7 @@ export const UICustomizations = { case "MASTERS_ADDRESS": return value ? ( - {String(`${t(Digit.Utils.locale.getCityLocale(row?.tenantId))} ${t(Digit.Utils.locale.getMohallaLocale(value, row?.tenantId))}`)} + {String(`${t(Digit.Utils.locale.getCityLocale(row?.tenantId))}, ${t(Digit.Utils.locale.getMohallaLocale(value, row?.tenantId))}`)} ) : ( t("ES_COMMON_NA") diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearchComposer.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearchComposer.scss index e3a3f09a72..d4b0d71892 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearchComposer.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearchComposer.scss @@ -34,6 +34,11 @@ .search-field-wrapper.search.custom-both-clear-search{ .search-button-wrapper.search { grid-column: initial; + + } + .search-button-wrapper.search.customIndSearchButton { + grid-column: 4; + } .search-button-wrapper{ .link-label{ diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json index 886dc9bbe0..638116d4ca 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-masters", - "version": "0.4.24", + "version": "0.4.25", "description": "Masters Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js index 7b93700c4e..0956cc3f6a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js @@ -27,12 +27,12 @@ const searchWMSWageSeekerConfig = () => { "formClassName": "custom-both-clear-search", "primaryLabel": "ES_COMMON_SEARCH", "secondaryLabel": "ES_COMMON_CLEAR_SEARCH", + "type":"customIndSearchButton", "minReqFields": 1, "defaultValues": { "ward": "", "individualId": "", "name": "", - "socialCategoryValue": "", "mobileNumber": "", "createdFrom": "", "createdTo": "" @@ -44,9 +44,6 @@ const searchWMSWageSeekerConfig = () => { "isMandatory": false, "disable": false, "populators": { - // "optionsCustomStyle": { - // "top": "2.3rem" - // }, "name": "ward", "type": "ward", "optionsKey": "i18nKey", @@ -76,33 +73,21 @@ const searchWMSWageSeekerConfig = () => { "validation": { "minlength": 2 } } }, - { - "label": "CORE_COMMON_PROFILE_MOBILE_NUMBER", - "type": "mobileNumber", - "isMandatory": false, - "disable": false, - "populators": { - "name": "mobileNumber", - "error": "PROJECT_PATTERN_ERR_MSG", - "validation": { "pattern": {}, "minlength": 2 } - } - }, - { - "label": "MASTERS_SOCIAL_CATEGORY", - "type": "dropdown", - "isMandatory": false, - "disable": false, - "populators": { - "name": "socialCategoryValue", - "optionsKey": "code", - // "optionsCustomStyle": { "top": "2.3rem" }, - "mdmsConfig": { - "masterName": "SocialCategory", - "moduleName": "common-masters", - "localePrefix": "MASTERS" - } - } - }, + // { + // "label": "MASTERS_SOCIAL_CATEGORY", + // "type": "dropdown", + // "isMandatory": false, + // "disable": false, + // "populators": { + // "name": "socialCategoryValue", + // "optionsKey": "code", + // "mdmsConfig": { + // "masterName": "SocialCategory", + // "moduleName": "common-masters", + // "localePrefix": "MASTERS" + // } + // } + // }, { "label": "CREATED_FROM_DATE", "type": "date", @@ -152,11 +137,6 @@ const searchWMSWageSeekerConfig = () => { "label": "MASTERS_WAGESEEKER_NAME", "jsonPath": "businessObject.name.givenName" }, - { "label": "MASTERS_FATHER_NAME", "jsonPath": "businessObject.fatherName" }, - { - "label": "MASTERS_SOCIAL_CATEGORY", - "jsonPath": "businessObject.additionalFields.fields[0].value" - }, { "label": "CORE_COMMON_PROFILE_CITY", "jsonPath": "businessObject.address[0].tenantId", @@ -166,11 +146,6 @@ const searchWMSWageSeekerConfig = () => { "label": "MASTERS_WARD", "jsonPath": "businessObject.address[0].ward.code", "additionalCustomization": true - }, - { - "label": "MASTERS_LOCALITY", - "jsonPath": "businessObject.address[0].locality.code", - "additionalCustomization": true } ], "enableGlobalSearch": false, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/ViewOrganisation.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/ViewOrganisation.js index 5950f70bfe..d3478a18cc 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/ViewOrganisation.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/ViewOrganisation.js @@ -16,6 +16,7 @@ const ViewOrganisation = () => { const [activeLink, setActiveLink] = useState("Location_Details"); const orgSession = Digit.Hooks.useSessionStorage("ORG_CREATE", {}); const [sessionFormData, clearSessionFormData] = orgSession; + const loggedInUserRoles = Digit.Utils.getLoggedInUserDetails("roles"); const configNavItems = [ { @@ -121,11 +122,11 @@ const ViewOrganisation = () => { )} )} - ]} setactionFieldsToRight={true} className={"new-actionbar"} - /> + />} )} {showDataError && ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js index 61434c3fc0..fb6228e7af 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js @@ -13,6 +13,7 @@ const ViewWageSeeker = () => { const wageSeekerSession = Digit.Hooks.useSessionStorage("WAGE_SEEKER_CREATE", {}); const [sesionFormData, clearSessionFormData] = wageSeekerSession; + const loggedInUserRoles = Digit.Utils.getLoggedInUserDetails("roles"); // const tenantId = Digit.ULBService.getCurrentTenantId() const {individualId,tenantId } = Digit.Hooks.useQueryParams() @@ -60,11 +61,11 @@ const ViewWageSeeker = () => { mutate={()=>{}} tenantId={tenantId} /> - ]} setactionFieldsToRight={true} className={"new-actionbar"} - /> + />} } { diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index d1f4c7da01..c1e87d77fa 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -26,7 +26,7 @@ "@egovernments/digit-ui-module-contracts": "0.4.15", "@egovernments/digit-ui-module-measurement":"0.2.20", "@egovernments/digit-ui-module-estimate": "0.4.22", - "@egovernments/digit-ui-module-masters": "0.4.24", + "@egovernments/digit-ui-module-masters": "0.4.25", "@egovernments/digit-ui-module-project": "0.4.17", "@egovernments/digit-ui-module-expenditure": "0.4.28", "@egovernments/digit-ui-customisation-mukta": "0.2.14",