UCEM-1047 : Added the logic for organisation view

odisha-muktasoft · Nov 27, 2024 · 76f7031 · 76f7031
1 parent 32e4511
commit 76f7031
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 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.23",
+    "@egovernments/digit-ui-module-masters": "0.4.24",
     "@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/css/src/pages/employee/index.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -587,6 +587,10 @@
   }
 }
 
+.loginFormStyleEmployee .loginCardClassName div:nth-child(7) {
+  margin-top: 0 !important;
+}
+
 .topbar .left .employee-select-wrap .options-card {
   right: -3rem !important
 }

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
@@ -257,7 +257,7 @@ const Urls = {
   },
 
   organisation: {
-    search: "/org-services/organisation/v1/_search",
+    search: "/mukta-services/org-services/organisation/v1/_search",
     create: "/org-services/organisation/v1/_create",
     update: "/org-services/organisation/v1/_update",
   },

diff --git a/...-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js b/...-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
@@ -13,6 +13,9 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
   const PAN = organisation?.identifiers?.find(item => item?.isActive && item?.type === 'PAN' )
   const GSTIN = organisation?.identifiers?.find(item => item?.isActive && item?.type === 'GSTIN')
 
+  const getAddressMasked = (value) => {
+    return value.replace(/.(?=.{1,}$)/g, '*');
+  }
   const orgDetails = [
     {
       title: '',
@@ -44,7 +47,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
     values: [
         { title: "CORE_COMMON_PROFILE_CITY", value: organisation?.orgAddress?.[0]?.tenantId ? Digit.Utils.locale.getCityLocale(organisation?.orgAddress?.[0]?.tenantId) : t("NA")},
         { title: "COMMON_WARD", value: organisation?.orgAddress?.[0]?.boundaryCode ? Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId) : t("NA")},
-        { title: "COMMON_LOCALITY", value: organisation?.additionalDetails?.locality ? Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId) : t("NA")},
+        { title: "COMMON_LOCALITY", value: organisation?.additionalDetails?.locality ? ( organisation?.additionalDetails?.isLocalityMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId))) : Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId)) : t("NA")},
         { title: "ES_COMMON_STREET", value: organisation?.orgAddress?.[0]?.street || t("NA")},
         { title: "ES_COMMON_DOOR_NO", value: organisation?.orgAddress?.[0]?.doorNo || t("NA")},
     ]

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.23",
+    "version": "0.4.24",
     "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/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js
@@ -116,7 +116,7 @@ export const getWageSeekerUpdatePayload = ({formData, wageSeekerDataFromAPI, ten
     //DPP update here as well for socialCategory
     if(formData?.basicDetails_socialCategory?.code) {
         Individual.additionalFields = {
-            fields: [{
+            fields: [...Individual.additionalFields.fields.filter((ob) => ob?.key !== "SOCIAL_CATEGORY"),{
                 key: "SOCIAL_CATEGORY",
                 value: formData?.basicDetails_socialCategory?.code
             }]

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.23",
+    "@egovernments/digit-ui-module-masters": "0.4.24",
     "@egovernments/digit-ui-module-project": "0.4.17",
     "@egovernments/digit-ui-module-expenditure": "0.4.28",
     "@egovernments/digit-ui-customisation-mukta": "0.2.14",