Merge pull request #812 from odisha-muktasoft/UCEM-1052-1

UCEM-1052 : updated few fixes for the wageseeker and organisation
odisha-muktasoft · Dec 4, 2024 · c461cc4 · c461cc4
2 parents 76f7031 + 4ec5ff6
commit c461cc4
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 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
@@ -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
@@ -1545,7 +1545,7 @@ export const UICustomizations = {
         case "MASTERS_ADDRESS":
           return value ? (
             <span style={{ whiteSpace: "break-spaces" }}>
-              {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))}`)}
             </span>
           ) : (
             t("ES_COMMON_NA")

diff --git a/...end/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearchComposer.scss b/...end/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
@@ -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/.../web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js b/.../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/...ui-internals/packages/modules/Masters/src/pages/employee/Organisation/ViewOrganisation.js b/...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 = () => {
               )}
             </Tab>
           )}
-          <ActionBar
+          {loggedInUserRoles?.includes("VIEW_ORG_UNMASKED") && loggedInUserRoles?.includes("VIEW_DED_UNMASKED") && <ActionBar
             actionFields={[<Button type={"submit"} label={t("ES_COMMON_MODIFY")} variation={"primary"} onClick={handleModify}></Button>]}
             setactionFieldsToRight={true}
             className={"new-actionbar"}
-          />
+          />}
         </React.Fragment>
       )}
       {showDataError && (

diff --git a/...cro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js b/...cro-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}
           />
-           <ActionBar
+          {loggedInUserRoles?.includes("VIEW_WS_UNMASKED") && loggedInUserRoles?.includes("VIEW_DED_UNMASKED") && <ActionBar
             actionFields={[<Button type={"submit"} label={t("ES_COMMON_MODIFY")} variation={"primary"} onClick={handleModify}></Button>]}
             setactionFieldsToRight={true}
             className={"new-actionbar"}
-          />
+          />}
           </React.Fragment>
       }
       {

diff --git 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",