Fixed: Merge conflit in JobHistory modal and job actions(#364trwn)

hotwax · Aug 2, 2022 · 4ae2d2b · 4ae2d2b
1 parent afb8cfd
commit 4ae2d2b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/src/components/JobHistoryModal.vue b/src/components/JobHistoryModal.vue
@@ -101,7 +101,6 @@ export default defineComponent({
             "systemJobEnumId": this.currentJob?.systemJobEnumId
           },
           "fieldList": [ "runTime", "statusId" ],
-          "entityName": "JobSandbox",
           "noConditionFind": "Y",
           "viewSize": process.env.VUE_APP_VIEW_SIZE,
           "orderBy": "runTime DESC"

diff --git a/src/store/modules/job/actions.ts b/src/store/modules/job/actions.ts
@@ -46,7 +46,6 @@ const actions: ActionTree<JobState, RootState> = {
         "systemJobEnumId_op": "not-empty"
       } as any,
       "fieldList": [ "systemJobEnumId", "runTime", "tempExprId", "parentJobId", "serviceName", "jobId", "jobName", "statusId", "cancelDateTime", "finishDateTime", "startDateTime" ],
-      "entityName": "JobSandbox",
       "noConditionFind": "Y",
       "viewSize": payload.viewSize,
       "viewIndex": payload.viewIndex,
@@ -121,7 +120,6 @@ const actions: ActionTree<JobState, RootState> = {
         "statusId_fld1_grp": "2",
       } as any,
       "fieldList": [ "systemJobEnumId", "runTime", "tempExprId", "parentJobId", "serviceName", "jobId", "jobName", "statusId" ],
-      "entityName": "JobSandbox",
       "noConditionFind": "Y",
       "viewSize": payload.viewSize,
       "viewIndex": payload.viewIndex,
@@ -190,7 +188,6 @@ const actions: ActionTree<JobState, RootState> = {
         "systemJobEnumId_op": "not-empty"
       } as any,
       "fieldList": [ "systemJobEnumId", "runTime", "tempExprId", "parentJobId", "serviceName", "jobId", "jobName", "currentRetryCount", "statusId" ],
-      "entityName": "JobSandbox",
       "noConditionFind": "Y",
       "viewSize": payload.viewSize,
       "viewIndex": payload.viewIndex,
@@ -290,7 +287,6 @@ const actions: ActionTree<JobState, RootState> = {
         "productStoreId_fld0_grp": "2",
         ...payload.inputFields
       },
-      "entityName": "JobSandbox",
       "noConditionFind": "Y",
       "viewSize": (payload.inputFields?.systemJobEnumId?.length * 3)
     } as any