From 4ea520ed7546bfc3cda44e9705ef01192f5dabf0 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Mon, 13 Jan 2025 15:17:36 +0530 Subject: [PATCH] Fixed: additional parameter updating issue and id showing instead of job description once updating job (#734) --- src/components/MaargJobConfiguration.vue | 14 +++++++++++--- src/store/modules/maargJob/actions.ts | 12 +++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/components/MaargJobConfiguration.vue b/src/components/MaargJobConfiguration.vue index cd8d24bb..cd947a26 100644 --- a/src/components/MaargJobConfiguration.vue +++ b/src/components/MaargJobConfiguration.vue @@ -294,9 +294,17 @@ export default defineComponent({ const paramValues = generateJobCustomParameters(this.customRequiredParameters, this.customOptionalParameters, {}); - job.serviceJobParameters.map((parameter: any) => { - if(paramValues[parameter.parameterName]) { - parameter.parameterValue = paramValues[parameter.parameterName] + Object.keys(paramValues).map((paramName: any) => { + const existingParameter = job.serviceJobParameters.find((parameter: any) => parameter.parameterName === paramName); + + if(existingParameter) { + existingParameter.parameterValue = paramValues[paramName] + } else { + job.serviceJobParameters.push({ + parameterName: paramName, + parameterValue: paramValues[paramName], + jobName: job.jobName + }) } }) diff --git a/src/store/modules/maargJob/actions.ts b/src/store/modules/maargJob/actions.ts index a63c1f80..01703ea9 100644 --- a/src/store/modules/maargJob/actions.ts +++ b/src/store/modules/maargJob/actions.ts @@ -62,6 +62,7 @@ const actions: ActionTree = { let resp = {} as any; let jobs = JSON.parse(JSON.stringify(state.maargJobs)); let currentJob = jobs[jobEnumId] + const maargJobEnums = store.getters["maargJob/getMaargJobEnums"] try { if(!currentJob?.jobName) { @@ -74,17 +75,18 @@ const actions: ActionTree = { resp = await MaargJobService.fetchMaargJobInfo(currentJob.jobName); if(!hasError(resp)) { - const currentJob = resp.data?.jobDetail + const updatedJob = resp.data?.jobDetail const paramValue = {} as any; - currentJob.serviceJobParameters.map((parameter: any) => { + updatedJob.serviceJobParameters.map((parameter: any) => { paramValue[parameter.parameterName] = parameter.parameterValue }) - currentJob["parameterValues"] = paramValue + updatedJob["parameterValues"] = paramValue + updatedJob["enumDescription"] = maargJobEnums[updatedJob.jobTypeEnumId]?.description - jobs[jobEnumId] = currentJob + jobs[jobEnumId] = updatedJob commit(types.MAARGJOB_UPDATED, jobs); - commit(types.MAARGJOB_CURRENT_UPDATED, currentJob); + commit(types.MAARGJOB_CURRENT_UPDATED, updatedJob); } else { throw resp; }