Merge branch 'console' into HCMPRE-1438-payments

egovernments · Jan 22, 2025 · 3adc99e · 3adc99e
2 parents ca049a4 + 89ab055
commit 3adc99e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 14 deletions.
diff --git a/health/micro-ui/web/console/package.json b/health/micro-ui/web/console/package.json
@@ -12,9 +12,9 @@
   ],
   "homepage": "/console",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.6",
+    "@egovernments/digit-ui-libraries": "1.8.8",
     "@egovernments/digit-ui-module-workbench": "1.0.12",
-    "@egovernments/digit-ui-module-core": "1.8.14",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-utilities": "1.0.10",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
     "@egovernments/digit-ui-react-components": "1.8.14",

diff --git a/health/micro-ui/web/core/package.json b/health/micro-ui/web/core/package.json
@@ -12,9 +12,9 @@
   ],
   "homepage": "/core-ui",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.6",
+    "@egovernments/digit-ui-libraries": "1.8.8",
     "@egovernments/digit-ui-module-workbench": "1.0.12",
-    "@egovernments/digit-ui-module-core": "1.8.14",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-utilities": "1.0.10",
     "@egovernments/digit-ui-components":"0.0.2-beta.56",
     "@egovernments/digit-ui-react-components": "1.8.14",

diff --git a/health/micro-ui/web/micro-ui-internals/example/package.json b/health/micro-ui/web/micro-ui-internals/example/package.json
@@ -9,10 +9,10 @@
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.6",
+    "@egovernments/digit-ui-libraries": "1.8.8",
     "@egovernments/digit-ui-module-workbench": "1.0.12",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
-    "@egovernments/digit-ui-module-core": "1.8.14",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-utilities": "1.0.3",
     "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-module-hcmworkbench": "0.1.0",

diff --git a/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js b/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js
@@ -855,10 +855,17 @@ const UploadData = ({ formData, onSelect, ...props }) => {
     }
   };
   useEffect(() =>{
-    if(totalData?.HCM_CAMPAIGN_UPLOAD_FACILITY_DATA?.uploadFacility?.uploadedFile?.[0]?.resourceId == "not-validated"){
+    if(totalData?.HCM_CAMPAIGN_UPLOAD_FACILITY_DATA?.uploadFacility?.uploadedFile?.[0]?.resourceId == "not-validated" ||
+      totalData?.HCM_CAMPAIGN_UPLOAD_USER_DATA?.uploadUser?.uploadedFile?.[0]?.resourceId == "not-validated" || 
+      totalData?.HCM_CAMPAIGN_UPLOAD_BOUNDARY_DATA?.uploadBoundary?.uploadedFile?.[0]?.resourceId == "not-validated"
+    ){
       setNotValid(1);
   }
-  },[totalData?.HCM_CAMPAIGN_UPLOAD_FACILITY_DATA?.uploadFacility?.uploadedFile?.[0]?.resourceId])
+  },[totalData?.HCM_CAMPAIGN_UPLOAD_FACILITY_DATA?.uploadFacility?.uploadedFile?.[0]?.resourceId ,
+  totalData?.HCM_CAMPAIGN_UPLOAD_USER_DATA?.uploadUser?.uploadedFile?.[0]?.resourceId,
+  totalData?.HCM_CAMPAIGN_UPLOAD_BOUNDARY_DATA?.uploadBoundary?.uploadedFile?.[0]?.resourceId
+])
+
   useEffect(() => {
     const fetchData = async () => {
       if ((!errorsType[type] && uploadedFile?.length > 0 && !isSuccess) || notValid==1) {

diff --git a/...o-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useProductList.js b/...o-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useProductList.js
@@ -8,7 +8,7 @@ export const useProductList = (tenantId,projectType) => {
     config: {
       enabled: true,
       select: (data) => {
-        if (projectType === "Co-delivery") {
+        if (projectType === "DEFAULT") {
           return data?.ProductVariant;
         }
         const filteredData = data?.ProductVariant?.filter(item => 

diff --git a/health/micro-ui/web/microplan/package.json b/health/micro-ui/web/microplan/package.json
@@ -13,8 +13,8 @@
   ],
   "homepage": "/microplan-ui",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.6",
-    "@egovernments/digit-ui-module-core": "1.8.14",
+    "@egovernments/digit-ui-libraries": "1.8.8",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.23",
     "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-module-hcmmicroplanning": "0.0.2",

diff --git a/health/micro-ui/web/package.json b/health/micro-ui/web/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.7",
-    "@egovernments/digit-ui-module-core": "1.8.14",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-hrms": "1.8.0-beta.2",
     "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",

diff --git a/health/micro-ui/web/workbench/package.json b/health/micro-ui/web/workbench/package.json
@@ -12,9 +12,9 @@
   ],
   "homepage": "/workbench-ui",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.6",
+    "@egovernments/digit-ui-libraries": "1.8.8",
     "@egovernments/digit-ui-module-workbench": "1.0.12",
-    "@egovernments/digit-ui-module-core": "1.8.14",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-utilities": "1.0.10",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
     "@egovernments/digit-ui-react-components": "1.8.14",