Merge pull request #973 from hpcc-systems/yadhap/unapprove-JM-after-u…

…pdate Updating ApprovalStatus to Pending and activeStatus to false when job…
hpcc-systems · Dec 10, 2024 · e375d21 · e375d21
2 parents a29b51c + 900dd0d
commit e375d21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Tombolo/client-reactjs/src/components/application/jobMonitoring/BulkUpdateModal.jsx b/Tombolo/client-reactjs/src/components/application/jobMonitoring/BulkUpdateModal.jsx
@@ -106,7 +106,7 @@ const BulkUpdateModal = ({
       selectedRows.forEach((row) => {
         const { metaData } = row || {};
         const { notificationMetaData } = metaData || {};
-        const { primaryContacts, secondaryContacts, notifyContacts } = notificationMetaData || {};
+        const { primaryContacts = [], secondaryContacts = [], notifyContacts = [] } = notificationMetaData || {};
 
         let meta = {};
 
@@ -169,7 +169,7 @@ const BulkUpdateModal = ({
       const newJobMonitoringData = jobMonitorings.map((job) => {
         if (allUpdatedIds.includes(job.id)) {
           const updatedJob = updatedMetaData.find((data) => data.id === job.id);
-          return { ...job, metaData: updatedJob.metaData };
+          return { ...job, metaData: updatedJob.metaData, isActive: false, approvalStatus: 'Pending' };
         }
         return job;
       });
@@ -178,7 +178,7 @@ const BulkUpdateModal = ({
       setSelectedRows((prev) =>
         prev.map((row) => {
           const updatedRow = updatedMetaData.find((data) => data.id === row.id);
-          return { ...row, metaData: updatedRow.metaData };
+          return { ...row, metaData: updatedRow.metaData, isActive: false, approvalStatus: 'Pending' };
         })
       );
 

diff --git a/Tombolo/server/routes/jobmonitoring/read.js b/Tombolo/server/routes/jobmonitoring/read.js
@@ -364,12 +364,13 @@ router.patch(
     }
 
     try {
-
       const {metaData: payload} = req.body;
 
       for(const data of payload){
         await JobMonitoring.update({
           metaData: data.metaData,
+          isActive: false,
+          approvalStatus: "Pending",
         },{
           where: {id: data.id}
         });