From b721b7395495210c65a6bec793d75704b0bc7d6f Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Thu, 26 May 2022 12:28:27 +0530 Subject: [PATCH 1/2] Fixed: issue of temp expr not being set when scheduling a new job(#2dmgzqb) --- src/components/SaveThresholdModal.vue | 3 ++- src/store/modules/job/actions.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/SaveThresholdModal.vue b/src/components/SaveThresholdModal.vue index b3713bc3..a43f7bb6 100644 --- a/src/components/SaveThresholdModal.vue +++ b/src/components/SaveThresholdModal.vue @@ -181,10 +181,11 @@ export default defineComponent({ 'JOB_NAME': this.jobName ? this.jobName : this.userProfile.partyName, 'SERVICE_NAME': job.serviceName, 'SERVICE_COUNT': '0', + 'SERVICE_TEMP_EXPR': 'EVERYDAY', 'jobFields': { 'productStoreId': productStoreId, 'systemJobEnumId': job.systemJobEnumId, - 'tempExprId': 'EVERYDAY', + 'tempExprId': 'EVERYDAY', // Need to remove this as we are passing frequency in SERVICE_TEMP_EXPR, Kept it for now for backward compatibility 'maxRecurrenceCount': '-1', 'parentJobId': job.parentJobId, 'runAsUser': 'system', // default system, but empty in run now diff --git a/src/store/modules/job/actions.ts b/src/store/modules/job/actions.ts index dea5fe0a..91ef4bfd 100644 --- a/src/store/modules/job/actions.ts +++ b/src/store/modules/job/actions.ts @@ -308,10 +308,11 @@ const actions: ActionTree = { 'JOB_NAME': job.jobName, 'SERVICE_NAME': job.serviceName, 'SERVICE_COUNT': '0', + 'SERVICE_TEMP_EXPR': job.jobStatus, 'jobFields': { 'productStoreId': this.state.user.currentEComStore.productStoreId, 'systemJobEnumId': job.systemJobEnumId, - 'tempExprId': job.jobStatus, + 'tempExprId': job.jobStatus, // Need to remove this as we are passing frequency in SERVICE_TEMP_EXPR, Kept it for now for backward compatibility 'maxRecurrenceCount': '-1', 'parentJobId': job.parentJobId, 'runAsUser': 'system', // default system, but empty in run now From c0e5810e561abcfb39e04b3414a629787d145d1c Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Thu, 26 May 2022 12:38:28 +0530 Subject: [PATCH 2/2] Improved: the comment message(#2dmgzqb) --- src/components/SaveThresholdModal.vue | 2 +- src/store/modules/job/actions.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/SaveThresholdModal.vue b/src/components/SaveThresholdModal.vue index a43f7bb6..06e66940 100644 --- a/src/components/SaveThresholdModal.vue +++ b/src/components/SaveThresholdModal.vue @@ -185,7 +185,7 @@ export default defineComponent({ 'jobFields': { 'productStoreId': productStoreId, 'systemJobEnumId': job.systemJobEnumId, - 'tempExprId': 'EVERYDAY', // Need to remove this as we are passing frequency in SERVICE_TEMP_EXPR, Kept it for now for backward compatibility + 'tempExprId': 'EVERYDAY', // Need to remove this as we are passing frequency in SERVICE_TEMP_EXPR, currently kept it for backward compatibility 'maxRecurrenceCount': '-1', 'parentJobId': job.parentJobId, 'runAsUser': 'system', // default system, but empty in run now diff --git a/src/store/modules/job/actions.ts b/src/store/modules/job/actions.ts index 91ef4bfd..e3d8a719 100644 --- a/src/store/modules/job/actions.ts +++ b/src/store/modules/job/actions.ts @@ -312,7 +312,7 @@ const actions: ActionTree = { 'jobFields': { 'productStoreId': this.state.user.currentEComStore.productStoreId, 'systemJobEnumId': job.systemJobEnumId, - 'tempExprId': job.jobStatus, // Need to remove this as we are passing frequency in SERVICE_TEMP_EXPR, Kept it for now for backward compatibility + 'tempExprId': job.jobStatus, // Need to remove this as we are passing frequency in SERVICE_TEMP_EXPR, currently kept it for backward compatibility 'maxRecurrenceCount': '-1', 'parentJobId': job.parentJobId, 'runAsUser': 'system', // default system, but empty in run now