From 3e3c7e3763ede6223d896ee0083224071aea08f9 Mon Sep 17 00:00:00 2001
From: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com>
Date: Mon, 29 Jul 2024 17:00:17 +0530
Subject: [PATCH 01/11] Core ui version fix (#1176)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>
---
 micro-ui/web/micro-ui-internals/example/package.json         | 2 +-
 micro-ui/web/micro-ui-internals/example/public/index.html    | 2 +-
 micro-ui/web/micro-ui-internals/packages/css/package.json    | 2 +-
 .../packages/css/src/pages/employee/index.scss               | 5 +++++
 micro-ui/web/package.json                                    | 2 +-
 micro-ui/web/public/index.html                               | 2 +-
 micro-ui/web/workbench/package.json                          | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json
index 0ebce643710..1f903f2bde4 100644
--- a/micro-ui/web/micro-ui-internals/example/package.json
+++ b/micro-ui/web/micro-ui-internals/example/package.json
@@ -12,7 +12,7 @@
     "@egovernments/digit-ui-libraries": "1.8.2-beta.5",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.3",
     "@egovernments/digit-ui-components": "0.0.2-beta.18",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.7",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.30",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.11",
     "@egovernments/digit-ui-module-hcmworkbench":"0.0.38",
diff --git a/micro-ui/web/micro-ui-internals/example/public/index.html b/micro-ui/web/micro-ui-internals/example/public/index.html
index cb302969a6c..5ace6d5947a 100644
--- a/micro-ui/web/micro-ui-internals/example/public/index.html
+++ b/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -17,7 +17,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.6/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-alpha.6/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.13/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.62-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.63-campaign/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.41/dist/index.css" /> -->
 
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 387687e08d7..a105cd9f97c 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.0.62-campaign",
+  "version": "1.0.63-campaign",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",
diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
index 0a830f434e3..db6f6a1d271 100644
--- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
+++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -545,3 +545,8 @@ tbody {
     bottom: 2.25rem;
   }
 }
+.table.campaign-table {
+  .header-dropdown-menu.showBottom {
+    min-width: 8.6rem;
+  }
+}
diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json
index f7cb38d3626..870a830d91b 100644
--- a/micro-ui/web/package.json
+++ b/micro-ui/web/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.2-beta.5",
     "@egovernments/digit-ui-module-workbench": "1.0.1-beta.16",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.7",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-hrms": "1.8.0-beta.2",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.11",
     "@egovernments/digit-ui-components": "0.0.2-beta.18",
diff --git a/micro-ui/web/public/index.html b/micro-ui/web/public/index.html
index f4499a408a4..24a43e2bba3 100644
--- a/micro-ui/web/public/index.html
+++ b/micro-ui/web/public/index.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.6/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.11/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.62-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.63-campaign/dist/index.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT</title>
diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json
index 81c5dcd1dd1..ff581e92e58 100644
--- a/micro-ui/web/workbench/package.json
+++ b/micro-ui/web/workbench/package.json
@@ -15,7 +15,7 @@
     "@egovernments/digit-ui-libraries": "1.8.2-beta.5",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.3",
     "@egovernments/digit-ui-components": "0.0.2-beta.18",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.7",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.30",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.11",
     "@egovernments/digit-ui-module-hcmworkbench":"0.0.38",

From e86a4dcb10dda9210ce4be75977502af7df366f6 Mon Sep 17 00:00:00 2001
From: ashish-egov <137176738+ashish-egov@users.noreply.github.com>
Date: Mon, 29 Jul 2024 17:59:25 +0530
Subject: [PATCH 02/11] Ashish egov patch 2 (#1178)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Update publishProjectFactory.yml
---
 .../src/server/kafka/Producer.ts              | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/utilities/project-factory/src/server/kafka/Producer.ts b/utilities/project-factory/src/server/kafka/Producer.ts
index 10938d880fd..bba3e19ae8b 100644
--- a/utilities/project-factory/src/server/kafka/Producer.ts
+++ b/utilities/project-factory/src/server/kafka/Producer.ts
@@ -12,33 +12,39 @@ const kafkaClient = new KafkaClient({
 // Creating a new Kafka producer instance using the Kafka client
 const producer = new Producer(kafkaClient, { partitionerType: 2 }); // Using partitioner type 2
 
-// Function to send a test message to check broker availability
+// Function to check broker availability
 const checkBrokerAvailability = () => {
-    const payloads = [
-        {
-            topic: config.kafka.KAFKA_TEST_TOPIC,
-            messages: JSON.stringify({ message: 'Test message to check broker availability' }),
-        },
-    ];
-
-    producer.send(payloads, (err, data) => {
+    kafkaClient.loadMetadataForTopics([], (err, data) => {
         if (err) {
             if (err.message && err.message.toLowerCase().includes('broker not available')) {
                 logger.error('Broker not available. Shutting down the service.');
                 shutdownGracefully();
             } else {
-                logger.error('Error sending test message:', err);
+                logger.error('Error checking broker availability:', err);
             }
         } else {
-            logger.info('Test message sent successfully:', data);
+            logger.info('Broker is available:', data);
         }
     });
 };
 
+// Event listener for 'ready' event, indicating that the client is ready to check broker availability
+kafkaClient.on('ready', () => {
+    logger.info('Kafka client is ready'); // Log message indicating client is ready
+    checkBrokerAvailability(); // Check broker availability
+});
+
 // Event listener for 'ready' event, indicating that the producer is ready to send messages
 producer.on('ready', () => {
     logger.info('Producer is ready'); // Log message indicating producer is ready
-    checkBrokerAvailability(); // Check broker availability by sending a test message
+    checkBrokerAvailability();
+});
+
+// Event listener for 'error' event, indicating that the client encountered an error
+kafkaClient.on('error', (err) => {
+    logger.error('Kafka client is in error state'); // Log message indicating client is in error state
+    console.error(err.stack || err); // Log the error stack or message
+    shutdownGracefully();
 });
 
 // Event listener for 'error' event, indicating that the producer encountered an error
@@ -48,4 +54,4 @@ producer.on('error', (err) => {
     shutdownGracefully();
 });
 
-export { producer }; // Exporting the producer instance for external use
+export { producer }; // Exporting the producer instance for external use
\ No newline at end of file

From 96772cbb1c962a8bd5923079149d52b8cf8e8386 Mon Sep 17 00:00:00 2001
From: ashish-egov <137176738+ashish-egov@users.noreply.github.com>
Date: Tue, 30 Jul 2024 11:20:04 +0530
Subject: [PATCH 03/11] Update Producer.ts (#1182)

---
 .../src/server/kafka/Producer.ts              | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/utilities/project-factory/src/server/kafka/Producer.ts b/utilities/project-factory/src/server/kafka/Producer.ts
index bba3e19ae8b..10938d880fd 100644
--- a/utilities/project-factory/src/server/kafka/Producer.ts
+++ b/utilities/project-factory/src/server/kafka/Producer.ts
@@ -12,39 +12,33 @@ const kafkaClient = new KafkaClient({
 // Creating a new Kafka producer instance using the Kafka client
 const producer = new Producer(kafkaClient, { partitionerType: 2 }); // Using partitioner type 2
 
-// Function to check broker availability
+// Function to send a test message to check broker availability
 const checkBrokerAvailability = () => {
-    kafkaClient.loadMetadataForTopics([], (err, data) => {
+    const payloads = [
+        {
+            topic: config.kafka.KAFKA_TEST_TOPIC,
+            messages: JSON.stringify({ message: 'Test message to check broker availability' }),
+        },
+    ];
+
+    producer.send(payloads, (err, data) => {
         if (err) {
             if (err.message && err.message.toLowerCase().includes('broker not available')) {
                 logger.error('Broker not available. Shutting down the service.');
                 shutdownGracefully();
             } else {
-                logger.error('Error checking broker availability:', err);
+                logger.error('Error sending test message:', err);
             }
         } else {
-            logger.info('Broker is available:', data);
+            logger.info('Test message sent successfully:', data);
         }
     });
 };
 
-// Event listener for 'ready' event, indicating that the client is ready to check broker availability
-kafkaClient.on('ready', () => {
-    logger.info('Kafka client is ready'); // Log message indicating client is ready
-    checkBrokerAvailability(); // Check broker availability
-});
-
 // Event listener for 'ready' event, indicating that the producer is ready to send messages
 producer.on('ready', () => {
     logger.info('Producer is ready'); // Log message indicating producer is ready
-    checkBrokerAvailability();
-});
-
-// Event listener for 'error' event, indicating that the client encountered an error
-kafkaClient.on('error', (err) => {
-    logger.error('Kafka client is in error state'); // Log message indicating client is in error state
-    console.error(err.stack || err); // Log the error stack or message
-    shutdownGracefully();
+    checkBrokerAvailability(); // Check broker availability by sending a test message
 });
 
 // Event listener for 'error' event, indicating that the producer encountered an error
@@ -54,4 +48,4 @@ producer.on('error', (err) => {
     shutdownGracefully();
 });
 
-export { producer }; // Exporting the producer instance for external use
\ No newline at end of file
+export { producer }; // Exporting the producer instance for external use

From c69f8b45b446aa6de57a4f52b109dee1ad7cd91c Mon Sep 17 00:00:00 2001
From: Bhavya-egov <137176879+Bhavya-egov@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:11:16 +0530
Subject: [PATCH 04/11] fixed timeline issues (#1185)

---
 .../micro-ui-internals/example/package.json   |  2 +-
 .../example/public/index.html                 |  2 +-
 micro-ui/web/micro-ui-internals/package.json  |  2 +-
 .../packages/css/package.json                 |  2 +-
 .../css/src/pages/employee/campaign.scss      |  5 +++++
 .../modules/campaign-manager/package.json     |  2 +-
 .../src/components/CampaignSummary.js         |  2 +-
 .../src/components/TimelineComponent.js       | 19 +++++++++++--------
 micro-ui/web/package.json                     |  2 +-
 micro-ui/web/public/index.html                |  2 +-
 micro-ui/web/workbench/package.json           |  2 +-
 11 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json
index 1f903f2bde4..50ad45ff778 100644
--- a/micro-ui/web/micro-ui-internals/example/package.json
+++ b/micro-ui/web/micro-ui-internals/example/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@egovernments/digit-ui-libraries": "1.8.2-beta.5",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.3",
-    "@egovernments/digit-ui-components": "0.0.2-beta.18",
+    "@egovernments/digit-ui-components": "0.0.2-beta.19",
     "@egovernments/digit-ui-module-core": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.30",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.11",
diff --git a/micro-ui/web/micro-ui-internals/example/public/index.html b/micro-ui/web/micro-ui-internals/example/public/index.html
index 5ace6d5947a..a69003b67f2 100644
--- a/micro-ui/web/micro-ui-internals/example/public/index.html
+++ b/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -17,7 +17,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.6/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-alpha.6/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.13/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.63-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.64-campaign/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.41/dist/index.css" /> -->
 
diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json
index dec069e5b22..e11402fb30b 100644
--- a/micro-ui/web/micro-ui-internals/package.json
+++ b/micro-ui/web/micro-ui-internals/package.json
@@ -46,7 +46,7 @@
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.11",
-    "@egovernments/digit-ui-components": "0.0.2-beta.18",
+    "@egovernments/digit-ui-components": "0.0.2-beta.19",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",
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 a105cd9f97c..43066db29bc 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.0.63-campaign",
+  "version": "1.0.64-campaign",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",
diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss
index 4cc371900f3..4c10120e551 100644
--- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss
+++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss
@@ -121,3 +121,8 @@
   display: flex;
   justify-content: space-between;
 }
+.upcoming-timeline{
+  .timeline-label{
+    color: #b1b4b6;
+  }
+}
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json
index 505fdeb2edf..d66e1f825f0 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-react-components": "1.8.2-beta.11",
-    "@egovernments/digit-ui-components": "0.0.2-beta.18",
+    "@egovernments/digit-ui-components": "0.0.2-beta.19",
     "@rjsf/core": "5.10.0",
     "@rjsf/utils": "5.10.0",
     "@rjsf/validator-ajv8": "5.10.0",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js
index c17e2fed55a..6d84785a754 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js
@@ -221,7 +221,7 @@ const CampaignSummary = (props) => {
         const cycleData = reverseDeliveryRemap(target, t);
         return {
           cards: [
-            isPreview
+            isPreview === "true"
               ? {
                   name: "timeline",
                   sections: [
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/TimelineComponent.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/TimelineComponent.js
index f6ca3957669..741cf1852b5 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/TimelineComponent.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/TimelineComponent.js
@@ -40,6 +40,7 @@ const TimelineComponent = ({campaignId, resourceId}) => {
   const { data: baseTimeOut } = Digit.Hooks.useCustomMDMS(tenantId, "HCM-ADMIN-CONSOLE", [{ name: "baseTimeOut" }]);
 
   const formatLabel = (label) => {
+    if(!label) return null;
     return `HCM_${label.replace(/-/g, "_").toUpperCase()}`;
   };
 
@@ -83,7 +84,7 @@ const TimelineComponent = ({campaignId, resourceId}) => {
   const { data: progessTrack , refetch} = Digit.Hooks.useCustomAPIHook(reqCriteria);
 
   const lastCompletedProcess = progessTrack?.processTrack
-    .filter((process) => process.status === "completed")
+    .filter((process) => process.status === "completed" && process.showInUi === true)
     .reduce((latestProcess, currentProcess) => {
       if (!latestProcess || currentProcess.lastModifiedTime > latestProcess.lastModifiedTime) {
         return currentProcess;
@@ -109,29 +110,29 @@ const TimelineComponent = ({campaignId, resourceId}) => {
 
 
     const completedProcesses = progessTrack?.processTrack
-    .filter(process => process.status === 'completed')
+    .filter(process => process.status === 'completed'  && process.showInUi === true)
     .sort((a, b) => b.lastModifiedTime - a.lastModifiedTime)
     .map(process => ({ type: process.type, lastModifiedTime: process.lastModifiedTime }));
 
     const completedTimelines = completedProcesses?.map(process => ({
-      label:  t(formatLabel(process.type)),
+      label:  t(formatLabel(process?.type)),
       subElements: [epochToDateTime(process.lastModifiedTime)],
     }));
 
   const inprogressProcesses = progessTrack?.processTrack
-    .filter(process => process.status === 'inprogress')
+    .filter(process => process.status === 'inprogress' && process.showInUi === true)
     .map(process => ({ type: process.type, lastModifiedTime: process.lastModifiedTime }));
 
   const subElements = inprogressProcesses?.length > 0 
-  ? inprogressProcesses.map(process => `${t(formatLabel(process.type))} , ${epochToDateTime(process.lastModifiedTime)}`)
+  ? inprogressProcesses.map(process => `${t(formatLabel(process?.type))} , ${epochToDateTime(process.lastModifiedTime)}`)
   : [];
 
   const upcomingProcesses = progessTrack?.processTrack
-    .filter(process => process.status === "toBeCompleted")
+    .filter(process => process.status === "toBeCompleted" && process.showInUi === true)
     .map(process => ({ type: process.type, lastModifiedTime: process.lastModifiedTime }));
 
   const subElements2 = upcomingProcesses?.length > 0 
-  ? upcomingProcesses.map(process => `${t(formatLabel(process.type))} , ${epochToDateTime(process.lastModifiedTime)}`)
+  ? upcomingProcesses.map(process => `${t(formatLabel(process?.type))} , ${epochToDateTime(process.lastModifiedTime)}`)
   : [];
 
   // useEffect(()=>{
@@ -183,7 +184,9 @@ const TimelineComponent = ({campaignId, resourceId}) => {
             <Timeline label={t("HCM_UPCOMING")}
               variant="upcoming" 
               subElements={subElements2}
+              className = {"upcoming-timeline"}
               showConnector={true} />
+              
             <Timeline
               label={t("HCM_CURRENT")}
               subElements={subElements}
@@ -211,7 +214,7 @@ const TimelineComponent = ({campaignId, resourceId}) => {
           </TimelineMolecule>
         )
       }
-       {userCredential && (
+       {userCredential && lastCompletedProcess?.type === "campaign-creation" && (
           <Button
             label={t("CAMPAIGN_DOWNLOAD_USER_CRED")}
             variation="primary"
diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json
index 870a830d91b..5575c91b0d4 100644
--- a/micro-ui/web/package.json
+++ b/micro-ui/web/package.json
@@ -19,7 +19,7 @@
     "@egovernments/digit-ui-module-core": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-hrms": "1.8.0-beta.2",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.11",
-    "@egovernments/digit-ui-components": "0.0.2-beta.18",
+    "@egovernments/digit-ui-components": "0.0.2-beta.19",
     "@egovernments/digit-ui-module-dss": "1.8.0-beta",
     "@egovernments/digit-ui-module-common": "1.8.0-beta",
     "@egovernments/digit-ui-module-utilities": "1.0.0-beta",
diff --git a/micro-ui/web/public/index.html b/micro-ui/web/public/index.html
index 24a43e2bba3..507bad88398 100644
--- a/micro-ui/web/public/index.html
+++ b/micro-ui/web/public/index.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.6/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.11/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.63-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.64-campaign/dist/index.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT</title>
diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json
index ff581e92e58..9c97bbcdd33 100644
--- a/micro-ui/web/workbench/package.json
+++ b/micro-ui/web/workbench/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.2-beta.5",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.3",
-    "@egovernments/digit-ui-components": "0.0.2-beta.18",
+    "@egovernments/digit-ui-components": "0.0.2-beta.19",
     "@egovernments/digit-ui-module-core": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.30",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.11",

From de0987661d911e81139e5cc67385b12b57933736 Mon Sep 17 00:00:00 2001
From: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:09:13 +0530
Subject: [PATCH 05/11] HCMPRE 154 (#1186)

* date validation fix

* Update date logic

* FIX

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>
---
 .../micro-ui-internals/example/package.json   |   2 +-
 .../example/public/index.html                 |   2 +-
 .../css/src/pages/employee/index.scss         |   3 +
 .../src/components/BoundaryWithDate.js        |  53 ++++----
 .../src/components/DateWithBoundary.js        |   2 +-
 .../src/pages/employee/DateAndCycleUpdate.js  | 122 +++++++++---------
 .../employee/UpdateDatesWithBoundaries.js     |  55 +++++++-
 micro-ui/web/package.json                     |   2 +-
 micro-ui/web/public/index.html                |   2 +-
 micro-ui/web/workbench/package.json           |   2 +-
 10 files changed, 150 insertions(+), 95 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json
index 50ad45ff778..e706f047a47 100644
--- a/micro-ui/web/micro-ui-internals/example/package.json
+++ b/micro-ui/web/micro-ui-internals/example/package.json
@@ -12,7 +12,7 @@
     "@egovernments/digit-ui-libraries": "1.8.2-beta.5",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.3",
     "@egovernments/digit-ui-components": "0.0.2-beta.19",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.8",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.9",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.30",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.11",
     "@egovernments/digit-ui-module-hcmworkbench":"0.0.38",
diff --git a/micro-ui/web/micro-ui-internals/example/public/index.html b/micro-ui/web/micro-ui-internals/example/public/index.html
index a69003b67f2..49e6287a4ab 100644
--- a/micro-ui/web/micro-ui-internals/example/public/index.html
+++ b/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -14,7 +14,7 @@
     rel="stylesheet"
     href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-alpha.6/dist/index.css"
   /> -->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.6/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.7/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-alpha.6/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.13/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.64-campaign/dist/index.css" />
diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
index db6f6a1d271..9e9cf52f732 100644
--- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
+++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -550,3 +550,6 @@ tbody {
     min-width: 8.6rem;
   }
 }
+.digit-card-component.bannerCard.removeBottomMargin.languageSelection{
+  width: unset;
+}
\ No newline at end of file
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js
index ed0dc797b8f..9191c5c352b 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js
@@ -28,6 +28,9 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
   }, [project]);
 
   const handleDateChange = ({ date, endDate = false, cycleDate = false, cycleIndex }) => {
+    if (typeof date === "undefined") {
+      return null;
+    }
     if (!endDate) {
       dateReducerDispatch({
         type: "START_DATE",
@@ -44,6 +47,9 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
   };
 
   const handleCycleDateChange = ({ date, endDate = false, cycleIndex }) => {
+    if (typeof date === "undefined") {
+      return null;
+    }
     if (!endDate) {
       dateReducerDispatch({
         type: "CYCLE_START_DATE",
@@ -54,7 +60,7 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
       });
     } else {
       dateReducerDispatch({
-        type: "CYCYLE_END_DATE",
+        type: "CYCLE_END_DATE",
         date: date,
         item: project,
         cycleIndex: cycleIndex,
@@ -96,7 +102,7 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
             }
             onChange={(d) => {
               handleDateChange({
-                date: d,
+                date: d?.target?.value,
               });
             }}
           />
@@ -116,7 +122,7 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
             }}
             onChange={(d) => {
               handleDateChange({
-                date: d,
+                date: d?.target?.value,
                 endDate: true,
               });
             }}
@@ -138,26 +144,23 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
                   nonEditable={item?.startDate?.length > 0 && today > item?.startDate ? true : false}
                   value={item?.startDate}
                   placeholder={t("HCM_START_DATE")}
-                  populators={
-                    today >= item?.startDate
-                      ? {}
-                      : {
-                          validation: {
-                            min:
-                              index > 0
-                                ? cycleDates?.find((j) => j.cycleIndex == index)?.endDate &&
-                                  new Date(new Date(cycleDates?.find((j) => j.cycleIndex == index)?.endDate)?.getTime() + 86400000)
-                                    ?.toISOString()
-                                    ?.split("T")?.[0]
-                                : startDate,
-                            max: endDate,
-                          },
-                        }
-                  }
+                  populators={{
+                    validation: {
+                      min:
+                        index > 0 && !isNaN(new Date(cycleDates?.find((j) => j.cycleIndex == index)?.endDate)?.getTime())
+                          ? new Date(new Date(cycleDates?.find((j) => j.cycleIndex == index)?.endDate)?.getTime() + ONE_DAY_IN_MS)
+                              ?.toISOString()
+                              ?.split("T")?.[0]
+                          : today >= startDate
+                          ? today
+                          : startDate,
+                      max: endDate,
+                    },
+                  }}
                   onChange={(d) => {
                     // setStartValidation(true);
                     handleCycleDateChange({
-                      date: d,
+                      date: d?.target?.value,
                       cycleIndex: item?.cycleIndex,
                     });
                   }}
@@ -170,17 +173,19 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
                   placeholder={t("HCM_END_DATE")}
                   populators={{
                     validation: {
-                      min: cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate
-                        ? new Date(new Date(cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate)?.getTime() + 86400000)
+                      min: !isNaN(new Date(cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate)?.getTime())
+                        ? new Date(new Date(cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate)?.getTime() + ONE_DAY_IN_MS)
                             ?.toISOString()
                             ?.split("T")?.[0]
-                        : null,
+                        : today >= startDate
+                        ? today
+                        : startDate,
                       max: endDate,
                     },
                   }}
                   onChange={(d) => {
                     handleCycleDateChange({
-                      date: d,
+                      date: d?.target?.value,
                       endDate: true,
                       cycleIndex: item?.cycleIndex,
                     });
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js
index 5c2ba3d6379..49bd71a2e76 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js
@@ -62,7 +62,7 @@ const reducer = (state, action) => {
         return item;
       });
       break;
-    case "CYCYLE_END_DATE":
+    case "CYCLE_END_DATE":
       const cycleEndRemap = action?.cycles?.map((item, index) => {
         if (item?.id === action?.cycleIndex) {
           return {
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/DateAndCycleUpdate.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/DateAndCycleUpdate.js
index 61245b4f406..093e201d774 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/DateAndCycleUpdate.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/DateAndCycleUpdate.js
@@ -30,7 +30,7 @@ const reducer = (state, action) => {
         if (item?.id === action?.cycleIndex) {
           return {
             ...item,
-            startDate: Digit.Utils.pt.convertDateToEpoch(action?.date, "dayStart"),
+            startDate: Digit.Utils.pt.convertDateToEpoch(typeof action?.date === "string" ? action?.date : null, "dayStart"),
           };
         }
         return item;
@@ -46,7 +46,7 @@ const reducer = (state, action) => {
         },
       };
       break;
-    case "CYCYLE_END_DATE":
+    case "CYCLE_END_DATE":
       const cycleEndRemap = action?.cycles?.map((item, index) => {
         if (item?.id === action?.cycleIndex) {
           return {
@@ -116,14 +116,16 @@ const DateAndCycleUpdate = ({ onSelect, formData, ...props }) => {
 
   useEffect(() => {
     if (dateReducer) {
-      setStartDate(Digit.Utils.date.getDate(dateReducer?.startDate));
-      setEndDate(Digit.Utils.date.getDate(dateReducer?.endDate));
+      setStartDate(dateReducer?.startDate ? Digit.Utils.date.getDate(dateReducer?.startDate) : "");
+      setEndDate(dateReducer?.endDate ? Digit.Utils.date.getDate(dateReducer?.endDate) : "");
       if (dateReducer?.additionalDetails?.projectType?.cycles?.length > 0) {
-        const cycleDateData = dateReducer?.additionalDetails?.projectType?.cycles?.map((cycle) => ({
-          cycleIndex: cycle.id,
-          startDate: Digit.Utils.date.getDate(cycle.startDate),
-          endDate: Digit.Utils.date.getDate(cycle.endDate),
-        }));
+        const cycleDateData = dateReducer?.additionalDetails?.projectType?.cycles?.map((cycle) => {
+          return {
+            cycleIndex: cycle.id,
+            startDate: cycle.startDate ? Digit.Utils.date.getDate(cycle.startDate) : "",
+            endDate: cycle.endDate ? Digit.Utils.date.getDate(cycle.endDate) : "",
+          };
+        });
         setCycleDates(cycleDateData);
       }
     }
@@ -139,7 +141,7 @@ const DateAndCycleUpdate = ({ onSelect, formData, ...props }) => {
   }, [isLoading, projectData]);
 
   const handleDateChange = ({ date, endDate = false, cycleDate = false, cycleIndex }) => {
-    if (!date || date <= today) {
+    if (typeof date === "undefined") {
       return null;
     }
     if (!endDate) {
@@ -158,7 +160,7 @@ const DateAndCycleUpdate = ({ onSelect, formData, ...props }) => {
   };
 
   const handleCycleDateChange = ({ date, endDate = false, cycleIndex }) => {
-    if (!date || date <= today) {
+    if (typeof date === "undefined") {
       return null;
     }
     if (!endDate) {
@@ -171,7 +173,7 @@ const DateAndCycleUpdate = ({ onSelect, formData, ...props }) => {
       });
     } else {
       dateReducerDispatch({
-        type: "CYCYLE_END_DATE",
+        type: "CYCLE_END_DATE",
         date: date,
         item: dateReducer,
         cycleIndex: cycleIndex,
@@ -182,17 +184,18 @@ const DateAndCycleUpdate = ({ onSelect, formData, ...props }) => {
   return (
     <Card className={"boundary-with-container"}>
       <Header className="header">{t(`UPDATE_DATE_AND_CYCLE_HEADER`)}</Header>
-      <LabelFieldPair style={{ display: "grid", gridTemplateColumns: "13rem 2fr", alignItems: "start" }}>
+      <LabelFieldPair style={{ display: "grid", gridTemplateColumns: "13rem 2fr", alignItems: "start", gap: "1rem" }}>
         <div className="campaign-dates">
           <p>{t(`HCM_CAMPAIGN_DATES`)}</p>
           <span className="mandatory-date">*</span>
         </div>
         <div className="date-field-container">
           <FieldV1
+            required={true}
             withoutLabel={true}
             type="date"
             value={startDate}
-            nonEditable={today >= startDate ? true : false}
+            nonEditable={startDate && startDate?.length > 0 && today >= startDate ? true : false}
             placeholder={t("HCM_START_DATE")}
             populators={
               today >= startDate
@@ -205,31 +208,28 @@ const DateAndCycleUpdate = ({ onSelect, formData, ...props }) => {
             }
             onChange={(d) => {
               handleDateChange({
-                date: d,
+                date: d?.target?.value,
               });
             }}
           />
           <FieldV1
+            required={true}
             withoutLabel={true}
             type="date"
             value={endDate}
-            nonEditable={today >= endDate ? true : false}
+            nonEditable={endDate && endDate?.length > 0 && today >= endDate ? true : false}
             placeholder={t("HCM_END_DATE")}
-            populators={
-              today >= endDate
-                ? {}
-                : {
-                    validation: {
-                      min:
-                        startDate && startDate > today
-                          ? Digit.Utils.date.getDate(new Date(startDate).getTime() + 2 * ONE_DAY_IN_MS)
-                          : Digit.Utils.date.getDate(Date.now() + 2 * ONE_DAY_IN_MS),
-                    },
-                  }
-            }
+            populators={{
+              validation: {
+                min:
+                  startDate && startDate > today
+                    ? Digit.Utils.date.getDate(new Date(startDate).getTime() + 2 * ONE_DAY_IN_MS)
+                    : Digit.Utils.date.getDate(Date.now() + 2 * ONE_DAY_IN_MS),
+              },
+            }}
             onChange={(d) => {
               handleDateChange({
-                date: d,
+                date: d?.target?.value,
                 endDate: true,
               });
             }}
@@ -246,57 +246,55 @@ const DateAndCycleUpdate = ({ onSelect, formData, ...props }) => {
               </div>
               <div className="date-field-container">
                 <FieldV1
+                  required={true}
                   withoutLabel={true}
                   type="date"
                   value={item?.startDate}
-                  nonEditable={today >= item?.startDate ? true : false}
+                  nonEditable={item?.startDate && item?.startDate?.length > 0 && today >= item?.startDate ? true : false}
                   placeholder={t("HCM_START_DATE")}
-                  populators={
-                    today >= item?.startDate
-                      ? {}
-                      : {
-                          validation: {
-                            min:
-                              index > 0
-                                ? new Date(new Date(cycleDates?.find((j) => j.cycleIndex == index)?.endDate)?.getTime() + 86400000)
-                                    ?.toISOString()
-                                    ?.split("T")?.[0]
-                                : startDate,
-                            max: endDate,
-                          },
-                        }
-                  }
+                  populators={{
+                    validation: {
+                      min:
+                        index > 0 && !isNaN(new Date(cycleDates?.find((j) => j.cycleIndex == index)?.endDate)?.getTime())
+                          ? new Date(new Date(cycleDates?.find((j) => j.cycleIndex == index)?.endDate)?.getTime() + ONE_DAY_IN_MS)
+                              ?.toISOString()
+                              ?.split("T")?.[0]
+                          : today >= startDate
+                          ? today
+                          : startDate,
+                      max: endDate,
+                    },
+                  }}
                   onChange={(d) => {
                     // setStartValidation(true);
                     handleCycleDateChange({
-                      date: d,
+                      date: d?.target?.value,
                       cycleIndex: item?.cycleIndex,
                     });
                   }}
                 />
                 <FieldV1
+                  required={true}
                   withoutLabel={true}
                   type="date"
                   value={item?.endDate}
-                  nonEditable={today >= item?.endDate ? true : false}
+                  nonEditable={item?.endDate && item?.endDate?.length > 0 && today >= item?.endDate ? true : false}
                   placeholder={t("HCM_END_DATE")}
-                  populators={
-                    today >= item?.endDate
-                      ? {}
-                      : {
-                          validation: {
-                            min: cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate
-                              ? new Date(new Date(cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate)?.getTime() + 86400000)
-                                  ?.toISOString()
-                                  ?.split("T")?.[0]
-                              : null,
-                            max: endDate,
-                          },
-                        }
-                  }
+                  populators={{
+                    validation: {
+                      min: !isNaN(new Date(cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate)?.getTime())
+                        ? new Date(new Date(cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate)?.getTime() + ONE_DAY_IN_MS)
+                            ?.toISOString()
+                            ?.split("T")?.[0]
+                        : today >= startDate
+                        ? today
+                        : startDate,
+                      max: endDate,
+                    },
+                  }}
                   onChange={(d) => {
                     handleCycleDateChange({
-                      date: d,
+                      date: d?.target?.value,
                       endDate: true,
                       cycleIndex: item?.cycleIndex,
                     });
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateDatesWithBoundaries.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateDatesWithBoundaries.js
index 07ae457fe7f..07a67e84f4d 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateDatesWithBoundaries.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateDatesWithBoundaries.js
@@ -32,9 +32,41 @@ function UpdateDatesWithBoundaries() {
     }
   }, [showToast]);
 
+  const checkValid = (data) => {
+    if (DateWithBoundary) {
+      const temp = data?.dateWithBoundary;
+      const allCycleDateValid = temp
+        .map((i) => i.additionalDetails.projectType.cycles.every((j) => j.startDate && j.endDate))
+        .every((k) => k === true);
+      const allDateValid = temp.every((i) => i.startDate && i.endDate);
+
+      if (allCycleDateValid && allDateValid) {
+        return true;
+      }
+      return false;
+    } else if (!DateWithBoundary) {
+      const cycleDateValid = data?.dateAndCycle?.additionalDetails?.projectType?.cycles?.every((item) => item?.startDate && item?.endDate);
+      if (data?.dateAndCycle?.startDate && data?.dateAndCycle?.endDate && cycleDateValid) {
+        return true;
+      }
+      return false;
+    }
+  };
   const onSubmit = async (formData) => {
-    if (!formData?.dateWithBoundary || formData?.dateWithBoundary?.length === 0) {
-      setShowToast({ isError: true, label: "SELECT_BOUNDARY_LEVEL_ERROR" });
+    if (DateWithBoundary) {
+      if (!formData?.dateWithBoundary || !Array.isArray(formData?.dateWithBoundary) || formData?.dateWithBoundary?.length === 0) {
+        setShowToast({ isError: true, label: "SELECT_BOUNDARY_LEVEL_ERROR" });
+        return;
+      }
+    } else if (!DateWithBoundary) {
+      if (!formData?.dateAndCycle) {
+        setShowToast({ isError: true, label: "SELECT_DATE_CHANGE_MANDATORY_ERROR" });
+        return;
+      }
+    }
+    let isValid = checkValid(formData);
+    if (!isValid) {
+      setShowToast({ isError: true, label: "UPDATE_DATE_MANDATORY_FIELDS_MISSING" });
       return;
     }
     setShowPopUp(formData);
@@ -44,7 +76,24 @@ function UpdateDatesWithBoundaries() {
     setShowPopUp(null);
     try {
       if (DateWithBoundary) {
-        const temp = await Digit.Hooks.campaign.useProjectUpdateWithBoundary({ formData: formData?.dateWithBoundary });
+        // updating the endDate by +1 sec and -1 sec so that backend logic for ancestor update work
+        const payload = formData?.dateWithBoundary?.map((item) => {
+          let itemEndDate = item?.endDate;
+          let endDate = new Date(item?.endDate);
+          let endSecond = endDate?.getSeconds();
+          if (endSecond < 59) {
+            return {
+              ...item,
+              endDate: itemEndDate + 1000,
+            };
+          } else {
+            return {
+              ...item,
+              endDate: itemEndDate - 1000,
+            };
+          }
+        });
+        const temp = await Digit.Hooks.campaign.useProjectUpdateWithBoundary({ formData: payload });
         // setShowToast({ isError: false, label: "DATE_UPDATED_SUCCESSFULLY" });
         history.push(`/${window.contextPath}/employee/campaign/response?isSuccess=${true}`, {
           message: t("ES_CAMPAIGN_DATE_CHANGE_WITH_BOUNDARY_SUCCESS"),
diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json
index 5575c91b0d4..8e13578379b 100644
--- a/micro-ui/web/package.json
+++ b/micro-ui/web/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.2-beta.5",
     "@egovernments/digit-ui-module-workbench": "1.0.1-beta.16",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.8",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.9",
     "@egovernments/digit-ui-module-hrms": "1.8.0-beta.2",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.11",
     "@egovernments/digit-ui-components": "0.0.2-beta.19",
diff --git a/micro-ui/web/public/index.html b/micro-ui/web/public/index.html
index 507bad88398..d7ae529c30f 100644
--- a/micro-ui/web/public/index.html
+++ b/micro-ui/web/public/index.html
@@ -8,7 +8,7 @@
     href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;500;700&family=Roboto:wght@400;500;700&display=swap"
     rel="stylesheet" type="text/css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-alpha.6/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.6/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.9/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.11/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.64-campaign/dist/index.css" />
diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json
index 9c97bbcdd33..dde9d61650c 100644
--- a/micro-ui/web/workbench/package.json
+++ b/micro-ui/web/workbench/package.json
@@ -15,7 +15,7 @@
     "@egovernments/digit-ui-libraries": "1.8.2-beta.5",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.3",
     "@egovernments/digit-ui-components": "0.0.2-beta.19",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.8",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.9",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.30",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.11",
     "@egovernments/digit-ui-module-hcmworkbench":"0.0.38",

From 87b3e9c20ab34d38b400b8556395f8773ac80d57 Mon Sep 17 00:00:00 2001
From: Bhavya-egov <137176879+Bhavya-egov@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:09:31 +0530
Subject: [PATCH 06/11] changes in timeline (#1187)

---
 .../src/components/TimelineComponent.js             | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/TimelineComponent.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/TimelineComponent.js
index 741cf1852b5..171bd63835a 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/TimelineComponent.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/TimelineComponent.js
@@ -193,12 +193,21 @@ const TimelineComponent = ({campaignId, resourceId}) => {
               variant="inprogress"
               showConnector={true}
             />
-            <Timeline
+            {/* <Timeline
               label={ t(formatLabel(lastCompletedProcess?.type))}  
               subElements={[epochToDateTime(lastCompletedProcess?.lastModifiedTime)]}
               variant="completed"
               showConnector={true}
-            />
+            /> */}
+            {completedTimelines?.map((timeline, index) => (
+              <Timeline
+                key={index}
+                label={timeline?.label}
+                subElements={timeline?.subElements}
+                variant="completed"
+                showConnector={true}
+              />
+            ))}
           </TimelineMolecule>
         ) : (
           <TimelineMolecule initialVisibleCount={1} hideFutureLabel ={true}>

From f2bd8a0f366f4e31514a2aaf5e2987b2ca44c131 Mon Sep 17 00:00:00 2001
From: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:37:23 +0530
Subject: [PATCH 07/11] CSS version add (#1188)

* date validation fix

* Update date logic

* FIX

* css add

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>
---
 micro-ui/web/public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micro-ui/web/public/index.html b/micro-ui/web/public/index.html
index d7ae529c30f..07bf896b658 100644
--- a/micro-ui/web/public/index.html
+++ b/micro-ui/web/public/index.html
@@ -8,7 +8,7 @@
     href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;500;700&family=Roboto:wght@400;500;700&display=swap"
     rel="stylesheet" type="text/css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-alpha.6/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.9/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.7/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.11/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.64-campaign/dist/index.css" />

From a7ec4efe78e75ddba8a649780f61c09b24325e49 Mon Sep 17 00:00:00 2001
From: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:25:50 +0530
Subject: [PATCH 08/11] HCMPRE 154 (#1189)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>
---
 .../campaign-manager/src/components/BoundaryWithDate.js   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js
index 9191c5c352b..83a84c4a3ef 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js
@@ -89,7 +89,7 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
             withoutLabel={true}
             type="date"
             value={startDate}
-            nonEditable={startDate?.length > 0 && today > startDate ? true : false}
+            nonEditable={startDate?.length > 0 && today >= startDate ? true : false}
             placeholder={t("HCM_START_DATE")}
             populators={
               today >= startDate
@@ -110,7 +110,7 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
             withoutLabel={true}
             type="date"
             value={endDate}
-            nonEditable={endDate?.length > 0 && today > endDate ? true : false}
+            nonEditable={endDate?.length > 0 && today >= endDate ? true : false}
             placeholder={t("HCM_END_DATE")}
             populators={{
               validation: {
@@ -141,7 +141,7 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
                 <FieldV1
                   withoutLabel={true}
                   type="date"
-                  nonEditable={item?.startDate?.length > 0 && today > item?.startDate ? true : false}
+                  nonEditable={item?.startDate?.length > 0 && today >= item?.startDate ? true : false}
                   value={item?.startDate}
                   placeholder={t("HCM_START_DATE")}
                   populators={{
@@ -169,7 +169,7 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
                   withoutLabel={true}
                   type="date"
                   value={item?.endDate}
-                  nonEditable={item?.endDate?.length > 0 && today > item?.endDate && today > cycleDates?.[index + 1]?.startDate ? true : false}
+                  nonEditable={item?.endDate?.length > 0 && today >= item?.endDate && today >= cycleDates?.[index + 1]?.startDate ? true : false}
                   placeholder={t("HCM_END_DATE")}
                   populators={{
                     validation: {

From aa263d8227743b4ce25a0653092210decdb2c692 Mon Sep 17 00:00:00 2001
From: nitish-egov <137176807+nitish-egov@users.noreply.github.com>
Date: Wed, 31 Jul 2024 10:41:07 +0530
Subject: [PATCH 09/11] limited the number of columns of target for upto only
 18 in number  (#1190)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS
---
 utilities/project-factory/src/server/utils/targetUtils.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/utilities/project-factory/src/server/utils/targetUtils.ts b/utilities/project-factory/src/server/utils/targetUtils.ts
index 160c7a0cf6b..06f9b5f079c 100644
--- a/utilities/project-factory/src/server/utils/targetUtils.ts
+++ b/utilities/project-factory/src/server/utils/targetUtils.ts
@@ -65,13 +65,15 @@ function modifyDeliveryConditions(dataa: any[]): any {
 
 function generateTargetColumnsBasedOnDeliveryConditions(uniqueDeliveryConditions: any, localizationMap?: any) {
     const targetColumnsBasedOnDeliveryConditions: string[] = [];
-
-    uniqueDeliveryConditions.forEach((str: any) => {
+    uniqueDeliveryConditions.forEach((str: any, index: number) => {
         const uniqueDeliveryConditionsObject = JSON.parse(str); // Parse JSON string into object
         const targetColumnString = createTargetString(uniqueDeliveryConditionsObject, localizationMap);
         targetColumnsBasedOnDeliveryConditions.push(targetColumnString);
     });
-
+    if (targetColumnsBasedOnDeliveryConditions.length > 18) {
+        targetColumnsBasedOnDeliveryConditions.splice(18);
+        targetColumnsBasedOnDeliveryConditions.push(getLocalizedName("OTHER_TARGETS", localizationMap));
+    }
     return targetColumnsBasedOnDeliveryConditions;
 }
 

From 59ec9531ebfc7535bacf324723edae975166867c Mon Sep 17 00:00:00 2001
From: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com>
Date: Wed, 31 Jul 2024 13:59:37 +0530
Subject: [PATCH 10/11] HCMPRE 154 (#1191)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>
---
 .../example/public/index.html                 |  2 +-
 .../packages/css/package.json                 |  2 +-
 .../css/src/pages/employee/index.scss         |  2 +-
 .../src/components/BoundaryWithDate.js        | 20 +++++++++++--------
 micro-ui/web/public/index.html                |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/example/public/index.html b/micro-ui/web/micro-ui-internals/example/public/index.html
index 49e6287a4ab..684f5350549 100644
--- a/micro-ui/web/micro-ui-internals/example/public/index.html
+++ b/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -17,7 +17,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.7/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-alpha.6/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.13/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.64-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.65-campaign/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.41/dist/index.css" /> -->
 
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 43066db29bc..899c07d1aa7 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.0.64-campaign",
+  "version": "1.0.65-campaign",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",
diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
index 9e9cf52f732..3959f5eb0b6 100644
--- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
+++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -551,5 +551,5 @@ tbody {
   }
 }
 .digit-card-component.bannerCard.removeBottomMargin.languageSelection{
-  width: unset;
+  width: unset !important;
 }
\ No newline at end of file
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js
index 83a84c4a3ef..e7488096717 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js
@@ -10,6 +10,7 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
   // const { t } = useTranslation();
   const ONE_DAY_IN_MS = 24 * 60 * 60 * 1000;
   const today = Digit.Utils.date.getDate(Date.now());
+  const tomorrow = Digit.Utils.date.getDate(new Date(today).getTime() + ONE_DAY_IN_MS);
   const [startDate, setStartDate] = useState(project?.startDate ? Digit.Utils.date.getDate(project?.startDate) : ""); // Set default start date to today
   const [endDate, setEndDate] = useState(project?.endDate ? Digit.Utils.date.getDate(project?.endDate) : ""); // Default end date
   const [cycleDates, setCycleDates] = useState(null);
@@ -152,7 +153,7 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
                               ?.toISOString()
                               ?.split("T")?.[0]
                           : today >= startDate
-                          ? today
+                          ? tomorrow
                           : startDate,
                       max: endDate,
                     },
@@ -173,13 +174,16 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
                   placeholder={t("HCM_END_DATE")}
                   populators={{
                     validation: {
-                      min: !isNaN(new Date(cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate)?.getTime())
-                        ? new Date(new Date(cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate)?.getTime() + ONE_DAY_IN_MS)
-                            ?.toISOString()
-                            ?.split("T")?.[0]
-                        : today >= startDate
-                        ? today
-                        : startDate,
+                      min:
+                        !isNaN(new Date(cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate)?.getTime()) &&
+                        Digit.Utils.date.getDate(new Date(cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate)?.getTime() + ONE_DAY_IN_MS) >
+                          today
+                          ? new Date(new Date(cycleDates?.find((j) => j.cycleIndex == index + 1)?.startDate)?.getTime() + ONE_DAY_IN_MS)
+                              ?.toISOString()
+                              ?.split("T")?.[0]
+                          : today >= startDate
+                          ? tomorrow
+                          : startDate,
                       max: endDate,
                     },
                   }}
diff --git a/micro-ui/web/public/index.html b/micro-ui/web/public/index.html
index 07bf896b658..a99ea661706 100644
--- a/micro-ui/web/public/index.html
+++ b/micro-ui/web/public/index.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.7/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.11/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.64-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.65-campaign/dist/index.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT</title>

From 72122327b4bde61cd15a5140fabf63b68f7b8424 Mon Sep 17 00:00:00 2001
From: ashish-egov <137176738+ashish-egov@users.noreply.github.com>
Date: Wed, 31 Jul 2024 14:42:52 +0530
Subject: [PATCH 11/11] Produceasync (#1192)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Producer update

* Feat : updated producemodified message

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml
---
 .../src/server/api/campaignApis.ts            |  8 ++---
 .../src/server/kafka/Producer.ts              | 32 +++++++++++--------
 .../src/server/utils/campaignMappingUtils.ts  |  2 +-
 .../src/server/utils/campaignUtils.ts         | 14 ++++----
 .../src/server/utils/genericUtils.ts          | 18 +++++------
 .../src/server/utils/processTrackUtils.ts     | 28 ++++++++--------
 6 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/utilities/project-factory/src/server/api/campaignApis.ts b/utilities/project-factory/src/server/api/campaignApis.ts
index 0edd9b151ce..648498225f1 100644
--- a/utilities/project-factory/src/server/api/campaignApis.ts
+++ b/utilities/project-factory/src/server/api/campaignApis.ts
@@ -535,7 +535,7 @@ async function processValidate(request: any, localizationMap?: { [key: string]:
     logger.info("target sheet format validation started");
     await immediateValidationForTargetSheet(request, dataFromSheet, differentTabsBasedOnLevel, localizationMap);
     logger.info("target sheet format validation completed and starts with data validation");
-    validateTargetSheetData(dataFromSheet, request, createAndSearchConfig?.boundaryValidation, differentTabsBasedOnLevel,localizationMap);
+    validateTargetSheetData(dataFromSheet, request, createAndSearchConfig?.boundaryValidation, differentTabsBasedOnLevel, localizationMap);
   }
 
   else {
@@ -788,12 +788,12 @@ async function handleResouceDetailsError(request: any, error: any) {
     if (request?.body?.ResourceDetails?.action == "create") {
       persistMessage.ResourceDetails.additionalDetails = { error: stringifiedError }
     }
-    produceModifiedMessages(persistMessage, config?.kafka?.KAFKA_UPDATE_RESOURCE_DETAILS_TOPIC);
+    await produceModifiedMessages(persistMessage, config?.kafka?.KAFKA_UPDATE_RESOURCE_DETAILS_TOPIC);
   }
   if (request?.body?.Activities && Array.isArray(request?.body?.Activities) && request?.body?.Activities.length > 0) {
     logger.info("Waiting for 2 seconds");
     await new Promise(resolve => setTimeout(resolve, 2000));
-    produceModifiedMessages(request?.body, config?.kafka?.KAFKA_CREATE_RESOURCE_ACTIVITY_TOPIC);
+    await produceModifiedMessages(request?.body, config?.kafka?.KAFKA_CREATE_RESOURCE_ACTIVITY_TOPIC);
   }
 }
 
@@ -870,7 +870,7 @@ async function processCreate(request: any, localizationMap?: any) {
       const mdmsResponse = await callMdmsTypeSchema(request, tenantId, type);
       schema = mdmsResponse
     }
-    else if(type == "facilityMicroplan") {
+    else if (type == "facilityMicroplan") {
       const mdmsResponse = await callMdmsTypeSchema(request, tenantId, "facility", "microplan");
       schema = mdmsResponse
       logger.info("Appending project type to capacity for microplan " + campaignType);
diff --git a/utilities/project-factory/src/server/kafka/Producer.ts b/utilities/project-factory/src/server/kafka/Producer.ts
index 10938d880fd..bba3e19ae8b 100644
--- a/utilities/project-factory/src/server/kafka/Producer.ts
+++ b/utilities/project-factory/src/server/kafka/Producer.ts
@@ -12,33 +12,39 @@ const kafkaClient = new KafkaClient({
 // Creating a new Kafka producer instance using the Kafka client
 const producer = new Producer(kafkaClient, { partitionerType: 2 }); // Using partitioner type 2
 
-// Function to send a test message to check broker availability
+// Function to check broker availability
 const checkBrokerAvailability = () => {
-    const payloads = [
-        {
-            topic: config.kafka.KAFKA_TEST_TOPIC,
-            messages: JSON.stringify({ message: 'Test message to check broker availability' }),
-        },
-    ];
-
-    producer.send(payloads, (err, data) => {
+    kafkaClient.loadMetadataForTopics([], (err, data) => {
         if (err) {
             if (err.message && err.message.toLowerCase().includes('broker not available')) {
                 logger.error('Broker not available. Shutting down the service.');
                 shutdownGracefully();
             } else {
-                logger.error('Error sending test message:', err);
+                logger.error('Error checking broker availability:', err);
             }
         } else {
-            logger.info('Test message sent successfully:', data);
+            logger.info('Broker is available:', data);
         }
     });
 };
 
+// Event listener for 'ready' event, indicating that the client is ready to check broker availability
+kafkaClient.on('ready', () => {
+    logger.info('Kafka client is ready'); // Log message indicating client is ready
+    checkBrokerAvailability(); // Check broker availability
+});
+
 // Event listener for 'ready' event, indicating that the producer is ready to send messages
 producer.on('ready', () => {
     logger.info('Producer is ready'); // Log message indicating producer is ready
-    checkBrokerAvailability(); // Check broker availability by sending a test message
+    checkBrokerAvailability();
+});
+
+// Event listener for 'error' event, indicating that the client encountered an error
+kafkaClient.on('error', (err) => {
+    logger.error('Kafka client is in error state'); // Log message indicating client is in error state
+    console.error(err.stack || err); // Log the error stack or message
+    shutdownGracefully();
 });
 
 // Event listener for 'error' event, indicating that the producer encountered an error
@@ -48,4 +54,4 @@ producer.on('error', (err) => {
     shutdownGracefully();
 });
 
-export { producer }; // Exporting the producer instance for external use
+export { producer }; // Exporting the producer instance for external use
\ No newline at end of file
diff --git a/utilities/project-factory/src/server/utils/campaignMappingUtils.ts b/utilities/project-factory/src/server/utils/campaignMappingUtils.ts
index 5219ad4fcb2..36a5584291a 100644
--- a/utilities/project-factory/src/server/utils/campaignMappingUtils.ts
+++ b/utilities/project-factory/src/server/utils/campaignMappingUtils.ts
@@ -430,7 +430,7 @@ export async function processMapping(mappingObject: any) {
         const produceMessage: any = {
             CampaignDetails: mappingObject?.CampaignDetails
         }
-        produceModifiedMessages(produceMessage, config?.kafka?.KAFKA_UPDATE_PROJECT_CAMPAIGN_DETAILS_TOPIC)
+        await produceModifiedMessages(produceMessage, config?.kafka?.KAFKA_UPDATE_PROJECT_CAMPAIGN_DETAILS_TOPIC)
         await persistTrack(mappingObject?.CampaignDetails?.id, processTrackTypes.campaignCreation, processTrackStatuses.completed)
     } catch (error) {
         logger.error("Error in campaign mapping: " + error);
diff --git a/utilities/project-factory/src/server/utils/campaignUtils.ts b/utilities/project-factory/src/server/utils/campaignUtils.ts
index 2a329538a0e..fbf3d20d9e5 100644
--- a/utilities/project-factory/src/server/utils/campaignUtils.ts
+++ b/utilities/project-factory/src/server/utils/campaignUtils.ts
@@ -478,14 +478,14 @@ async function generateProcessedFileAndPersist(request: any, localizationMap?: {
     if (request?.body?.ResourceDetails?.action == "create") {
         persistMessage.ResourceDetails.additionalDetails = {}
     }
-    produceModifiedMessages(persistMessage, config?.kafka?.KAFKA_UPDATE_RESOURCE_DETAILS_TOPIC);
+    await produceModifiedMessages(persistMessage, config?.kafka?.KAFKA_UPDATE_RESOURCE_DETAILS_TOPIC);
     logger.info(`ResourceDetails to persist : ${request.body.ResourceDetails.type}`);
     if (request?.body?.Activities && Array.isArray(request?.body?.Activities) && request?.body?.Activities.length > 0) {
         logger.info("Activities to persist : ")
         logger.debug(getFormattedStringForDebug(request?.body?.Activities));
         logger.info(`Waiting for 2 seconds`);
         await new Promise(resolve => setTimeout(resolve, 2000));
-        produceModifiedMessages(request?.body, config.kafka.KAFKA_CREATE_RESOURCE_ACTIVITY_TOPIC);
+        await produceModifiedMessages(request?.body, config.kafka.KAFKA_CREATE_RESOURCE_ACTIVITY_TOPIC);
     }
 }
 
@@ -544,7 +544,7 @@ async function enrichAndPersistCampaignWithError(requestBody: any, error: any) {
     // wait for 2 seconds
     logger.info(`Waiting for 2 seconds to persist errors`);
     await new Promise(resolve => setTimeout(resolve, 2000));
-    produceModifiedMessages(requestBody, topic);
+    await produceModifiedMessages(requestBody, topic);
     await persistTrack(requestBody?.CampaignDetails?.id, processTrackTypes.error, processTrackStatuses.failed, { error: String((error?.message + (error?.description ? ` : ${error?.description}` : '')) || error) });
     delete requestBody.CampaignDetails.campaignDetails
 }
@@ -576,7 +576,7 @@ async function enrichAndPersistCampaignForCreate(request: any, firstPersist: boo
     }
     const topic = firstPersist ? config?.kafka?.KAFKA_SAVE_PROJECT_CAMPAIGN_DETAILS_TOPIC : config?.kafka?.KAFKA_UPDATE_PROJECT_CAMPAIGN_DETAILS_TOPIC
     delete request.body.CampaignDetails.codesTargetMapping
-    produceModifiedMessages(request?.body, topic);
+    await produceModifiedMessages(request?.body, topic);
     delete request.body.CampaignDetails.campaignDetails
 }
 
@@ -622,7 +622,7 @@ async function enrichAndPersistCampaignForUpdate(request: any, firstPersist: boo
         request.body.CampaignDetails.projectId = request?.body?.CampaignDetails?.projectId || ExistingCampaignDetails?.projectId || null
     }
     delete request.body.CampaignDetails.codesTargetMapping
-    produceModifiedMessages(request?.body, config?.kafka?.KAFKA_UPDATE_PROJECT_CAMPAIGN_DETAILS_TOPIC);
+    await produceModifiedMessages(request?.body, config?.kafka?.KAFKA_UPDATE_PROJECT_CAMPAIGN_DETAILS_TOPIC);
     delete request.body.ExistingCampaignDetails
     delete request.body.CampaignDetails.campaignDetails
 }
@@ -662,7 +662,7 @@ async function persistForCampaignProjectMapping(request: any, createResourceDeta
         requestBody.localizationMap = localizationMap
         logger.info("Persisting CampaignProjectMapping...");
         logger.debug(`CampaignProjectMapping: ${getFormattedStringForDebug(requestBody)}`);
-        produceModifiedMessages(requestBody, config?.kafka?.KAFKA_START_CAMPAIGN_MAPPING_TOPIC);
+        await produceModifiedMessages(requestBody, config?.kafka?.KAFKA_START_CAMPAIGN_MAPPING_TOPIC);
     }
 }
 
@@ -681,7 +681,7 @@ async function enrichAndPersistProjectCampaignForFirst(request: any, actionInUrl
         await enrichAndPersistCampaignForUpdate(request, firstPersist)
     }
     if (request?.body?.CampaignDetails?.action == "create") {
-        createProcessTracks(request.body.CampaignDetails.id)
+        await createProcessTracks(request.body.CampaignDetails.id)
     }
 }
 
diff --git a/utilities/project-factory/src/server/utils/genericUtils.ts b/utilities/project-factory/src/server/utils/genericUtils.ts
index ce3709a0774..390adb4fe83 100644
--- a/utilities/project-factory/src/server/utils/genericUtils.ts
+++ b/utilities/project-factory/src/server/utils/genericUtils.ts
@@ -367,14 +367,14 @@ async function fullProcessFlowForNewEntry(newEntryResponse: any, generatedResour
     generatedResource = { generatedResource: newEntryResponse }
     // send message to create toppic
     logger.info(`processing the generate request for type ${type}`)
-    produceModifiedMessages(generatedResource, createGeneratedResourceTopic);
+    await produceModifiedMessages(generatedResource, createGeneratedResourceTopic);
     const localizationMapHierarchy = hierarchyType && await getLocalizedMessagesHandler(request, request?.query?.tenantId, getLocalisationModuleName(hierarchyType));
     const localizationMapModule = await getLocalizedMessagesHandler(request, request?.query?.tenantId);
     const localizationMap = { ...localizationMapHierarchy, ...localizationMapModule };
     if (type === 'boundary') {
       // get boundary data from boundary relationship search api
       logger.info("Generating Boundary Data")
-      const boundaryDataSheetGeneratedBeforeDifferentTabSeparation = await getBoundaryDataService(request,enableCaching);
+      const boundaryDataSheetGeneratedBeforeDifferentTabSeparation = await getBoundaryDataService(request, enableCaching);
       logger.info(`Boundary data generated successfully: ${JSON.stringify(boundaryDataSheetGeneratedBeforeDifferentTabSeparation)}`);
       // get boundary sheet data after being generated
       logger.info("generating different tabs logic ")
@@ -383,19 +383,19 @@ async function fullProcessFlowForNewEntry(newEntryResponse: any, generatedResour
       const finalResponse = await getFinalUpdatedResponse(boundaryDataSheetGeneratedAfterDifferentTabSeparation, newEntryResponse, request);
       const generatedResourceNew: any = { generatedResource: finalResponse }
       // send to update topic
-      produceModifiedMessages(generatedResourceNew, updateGeneratedResourceTopic);
+      await produceModifiedMessages(generatedResourceNew, updateGeneratedResourceTopic);
       request.body.generatedResource = finalResponse;
     }
     else if (type == "facilityWithBoundary" || type == 'userWithBoundary') {
       await processGenerateRequest(request, localizationMap, filteredBoundary);
       const finalResponse = await getFinalUpdatedResponse(request?.body?.fileDetails, newEntryResponse, request);
       const generatedResourceNew: any = { generatedResource: finalResponse }
-      produceModifiedMessages(generatedResourceNew, updateGeneratedResourceTopic);
+      await produceModifiedMessages(generatedResourceNew, updateGeneratedResourceTopic);
       request.body.generatedResource = finalResponse;
     }
   } catch (error: any) {
     console.log(error)
-    handleGenerateError(newEntryResponse, generatedResource, error);
+    await handleGenerateError(newEntryResponse, generatedResource, error);
   }
 }
 
@@ -791,7 +791,7 @@ async function processGenerateForNew(request: any, generatedResource: any, newEn
   return request.body.generatedResource;
 }
 
-function handleGenerateError(newEntryResponse: any, generatedResource: any, error: any) {
+async function handleGenerateError(newEntryResponse: any, generatedResource: any, error: any) {
   newEntryResponse.map((item: any) => {
     item.status = generatedResourceStatuses.failed, item.additionalDetails = {
       ...item.additionalDetails, error: {
@@ -804,7 +804,7 @@ function handleGenerateError(newEntryResponse: any, generatedResource: any, erro
   })
   generatedResource = { generatedResource: newEntryResponse };
   logger.error(String(error));
-  produceModifiedMessages(generatedResource, updateGeneratedResourceTopic);
+  await produceModifiedMessages(generatedResource, updateGeneratedResourceTopic);
 }
 
 async function updateAndPersistGenerateRequest(newEntryResponse: any, oldEntryResponse: any, responseData: any, request: any, enableCaching = false, filteredBoundary?: any) {
@@ -814,7 +814,7 @@ async function updateAndPersistGenerateRequest(newEntryResponse: any, oldEntryRe
   if (forceUpdateBool && responseData.length > 0) {
     generatedResource = { generatedResource: oldEntryResponse };
     // send message to update topic 
-    produceModifiedMessages(generatedResource, updateGeneratedResourceTopic);
+    await produceModifiedMessages(generatedResource, updateGeneratedResourceTopic);
     request.body.generatedResource = oldEntryResponse;
   }
   if (responseData.length === 0 || forceUpdateBool) {
@@ -862,7 +862,7 @@ async function enrichResourceDetails(request: any) {
     request.body.ResourceDetails.campaignId = null;
   }
   const persistMessage: any = { ResourceDetails: request.body.ResourceDetails };
-  produceModifiedMessages(persistMessage, config?.kafka?.KAFKA_CREATE_RESOURCE_DETAILS_TOPIC);
+  await produceModifiedMessages(persistMessage, config?.kafka?.KAFKA_CREATE_RESOURCE_DETAILS_TOPIC);
 }
 
 function getFacilityIds(data: any) {
diff --git a/utilities/project-factory/src/server/utils/processTrackUtils.ts b/utilities/project-factory/src/server/utils/processTrackUtils.ts
index 3451e632fb9..7cf57958b4d 100644
--- a/utilities/project-factory/src/server/utils/processTrackUtils.ts
+++ b/utilities/project-factory/src/server/utils/processTrackUtils.ts
@@ -81,20 +81,20 @@ async function handleFailedStatus(
     const failedStatusArray = processDetailsArray.filter((processDetail: any) => processDetail.status === processTrackStatuses.failed);
     if (failedStatusArray.length > 0) {
         logger.info('Process already failed, nothing to persist');
-        updateToBeCompletedProcess(toBeCompletedProcessDetails, status, details, additionalDetails, config?.kafka?.KAFKA_UPDATE_PROCESS_TRACK_TOPIC);
+        await updateToBeCompletedProcess(toBeCompletedProcessDetails, status, details, additionalDetails, config?.kafka?.KAFKA_UPDATE_PROCESS_TRACK_TOPIC);
         return;
     }
     if (inProgressProcessDetails.length > 0) {
         logger.info('Generic fail occured so changing the lastest inprogress status to failed');
-        updateAndProduceMessage(inProgressProcessDetails[inProgressProcessDetails.length - 1], status, details, additionalDetails, config?.kafka?.KAFKA_UPDATE_PROCESS_TRACK_TOPIC);
+        await updateAndProduceMessage(inProgressProcessDetails[inProgressProcessDetails.length - 1], status, details, additionalDetails, config?.kafka?.KAFKA_UPDATE_PROCESS_TRACK_TOPIC);
     } else {
         logger.info('No inprogress process found, creating a new processDetail to failed');
-        createAndProduceNewProcessDetail(campaignId, type, status, details, additionalDetails, config?.kafka?.KAFKA_SAVE_PROCESS_TRACK_TOPIC);
+        await createAndProduceNewProcessDetail(campaignId, type, status, details, additionalDetails, config?.kafka?.KAFKA_SAVE_PROCESS_TRACK_TOPIC);
     }
-    updateToBeCompletedProcess(toBeCompletedProcessDetails, status, details, additionalDetails, config?.kafka?.KAFKA_UPDATE_PROCESS_TRACK_TOPIC);
+    await updateToBeCompletedProcess(toBeCompletedProcessDetails, status, details, additionalDetails, config?.kafka?.KAFKA_UPDATE_PROCESS_TRACK_TOPIC);
 }
 
-function updateToBeCompletedProcess(
+async function updateToBeCompletedProcess(
     processDetailsArray: any[],
     status: string,
     details?: Record<string, any>,
@@ -104,7 +104,7 @@ function updateToBeCompletedProcess(
         details.error = "HCM_PROCESS_TRACK_PREVIOUS_PROCESS_FAILED"
     if (processDetailsArray.length > 0) {
         for (let i = 0; i < processDetailsArray.length; i++) {
-            updateAndProduceMessage(processDetailsArray[i], status, details, additionalDetails, kafkaTopic);
+            await updateAndProduceMessage(processDetailsArray[i], status, details, additionalDetails, kafkaTopic);
         }
     }
 }
@@ -128,27 +128,27 @@ async function handleNonFailedStatus(
 }
 
 // Updates an existing process detail and produces the message
-function updateAndProduceMessage(
+async function updateAndProduceMessage(
     processDetails: any,
     status: string,
     details?: Record<string, any>,
     additionalDetails?: Record<string, any>,
     kafkaTopic?: string
-): void {
+) {
     updateProcessDetails(processDetails, processDetails.type, status, details, additionalDetails);
     const produceMessage: any = { processDetails };
-    produceModifiedMessages(produceMessage, kafkaTopic);
+    await produceModifiedMessages(produceMessage, kafkaTopic);
 }
 
 // Creates a new process detail and produces the message
-function createAndProduceNewProcessDetail(
+async function createAndProduceNewProcessDetail(
     campaignId: string,
     type: string,
     status: string,
     details?: Record<string, any>,
     additionalDetails?: Record<string, any>,
     kafkaTopic?: string
-): void {
+) {
     const currentTime = Date.now();
     const processDetail: any = {
         id: uuidv4(),
@@ -163,7 +163,7 @@ function createAndProduceNewProcessDetail(
 
     updateProcessDetails(processDetail, type, status, details, additionalDetails);
     const produceMessage: any = { processDetails: [processDetail] };
-    produceModifiedMessages(produceMessage, kafkaTopic);
+    await produceModifiedMessages(produceMessage, kafkaTopic);
 }
 
 
@@ -181,7 +181,7 @@ function updateProcessDetails(
     processDetails.status = status;
 }
 
-function createProcessTracks(campaignId: string) {
+async function createProcessTracks(campaignId: string) {
     logger.info(`Creating process tracks for campaignId: ${campaignId}`);
 
     const processDetailsArray: any[] = [];
@@ -206,7 +206,7 @@ function createProcessTracks(campaignId: string) {
 
     logger.info(`Created ${processDetailsArray.length} process tracks`);
     const produceMessage: any = { processDetails: processDetailsArray }
-    produceModifiedMessages(produceMessage, config?.kafka?.KAFKA_SAVE_PROCESS_TRACK_TOPIC);
+    await produceModifiedMessages(produceMessage, config?.kafka?.KAFKA_SAVE_PROCESS_TRACK_TOPIC);
 }
 
 function getOrderedDetailsArray(toBeCompletedArray: any[]) {