Merge pull request #522 from k2maan/#517

Fixed: 'now' option for run time not working (#517)
hotwax · Jun 16, 2023 · 8e217ae · 8e217ae
2 parents d225c0a + 09ddad0
commit 8e217ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/components/InitialJobConfiguration.vue b/src/components/InitialJobConfiguration.vue
@@ -216,7 +216,7 @@ export default defineComponent({
 
       // Handling the case for 'Now'. Sending the now value will fail the API as by the time
       // the job is ran, the given 'now' time would have passed. Hence, passing empty 'run time'
-      !isCustomRunTime(this.runTime) && this.runTime == 0 ? job.runTime = '' : job.runTime += DateTime.now().toMillis()
+      job.runTime = !isCustomRunTime(this.runTime) ? DateTime.now().toMillis() + this.runTime : this.runTime
 
       // if job runTime is not a valid date then making runTime as empty
       if (job?.runTime && !isFutureDate(job?.runTime)) {

diff --git a/src/components/JobConfiguration.vue b/src/components/JobConfiguration.vue
@@ -292,11 +292,9 @@ export default defineComponent({
       const job = this.currentJob;
       job['jobStatus'] = this.jobStatus !== 'SERVICE_DRAFT' ? this.jobStatus : 'HOURLY';
 
-      job.runTime = this.runTime
-
       // Handling the case for 'Now'. Sending the now value will fail the API as by the time
       // the job is ran, the given 'now' time would have passed. Hence, passing empty 'run time'
-      !isCustomRunTime(this.runTime) && this.runTime == 0 ? job.runTime = '' : job.runTime += DateTime.now().toMillis()
+      job.runTime = !isCustomRunTime(this.runTime) ? DateTime.now().toMillis() + this.runTime : this.runTime
 
       if (job?.statusId === 'SERVICE_DRAFT') {
         this.store.dispatch('job/scheduleService', job).then((job: any) => {

diff --git a/src/store/modules/job/actions.ts b/src/store/modules/job/actions.ts
@@ -737,7 +737,7 @@ const actions: ActionTree<JobState, RootState> = {
     }
     return resp;
   },
-  async updateCurrentJob({ commit, state, dispatch }, payload) {
+  async updateCurrentJob({ commit, state }, payload) {
     const cachedJobs = state.cached;
     const pendingJobs = state.pending.list;
 
@@ -837,7 +837,10 @@ const actions: ActionTree<JobState, RootState> = {
       return payload.jobs.reduce((jobParams: any, job: any) => {
         // Handling the case for 'Now'. Sending the now value will fail the API as by the time
         // the job is ran, the given 'now' time would have passed. Hence, passing empty 'run time'
-        !isCustomRunTime(job.runTime) && job.runTime == 0 ? job.runTime = '' : job.runTime += DateTime.now().toMillis()
+        if (!isCustomRunTime(job.runTime)) {
+          // scheduleJob service takes empty runTime for scheduling the job now
+          job.runTime === 0 ? job.runTime = '' : job.runTime += DateTime.now().toMillis()
+        }
 
         const params = {
           'JOB_NAME': job.jobName,