Merge pull request #338 from shashwatbangar/#85zrh3hjv

Implemented: Added cancelScheduledJob service to cancel job(#85zrh3hjv)
hotwax · Jan 17, 2023 · f7e2bac · f7e2bac
2 parents 8a9662b + b7eea5d
commit f7e2bac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/services/JobService.ts b/src/services/JobService.ts
@@ -54,12 +54,22 @@ const getAutoCancelDays = async (payload: any): Promise <any> => {
     params: payload
   });
 }
+
+const cancelJob = async (payload: any): Promise <any> => {
+  return api({
+    url: "service/cancelScheduledJob",
+    method: "post",
+    data: payload
+  });
+}
+
 export const JobService = {
   fetchJobDescription,
   fetchJobInformation,
   fetchTemporalExpression,
   updateJob,
   scheduleJob,
   updateAutoCancelDays,
-  getAutoCancelDays
+  getAutoCancelDays,
+  cancelJob
 }
diff --git a/src/store/modules/job/actions.ts b/src/store/modules/job/actions.ts
@@ -660,12 +660,8 @@ const actions: ActionTree<JobState, RootState> = {
     let resp;
 
     try {
-      resp = await JobService.updateJob({
-        jobId: job.jobId,
-        systemJobEnumId: job.systemJobEnumId,
-        statusId: "SERVICE_CANCELLED",
-        recurrenceTimeZone: this.state.user.current.userTimeZone,
-        cancelDateTime: DateTime.now().toMillis()
+      resp = await JobService.cancelJob({
+        jobId: job.jobId
       });
       if (resp.status == 200 && !hasError(resp)) {
         // TODO: When we are trying to cancel the job from pipeline page those jobs are not in the cached state, so we need to