From 3562a9fe46f3c5a565d367d49f6c5edeb02e90eb Mon Sep 17 00:00:00 2001 From: Remi Planel <rplanel@pasteur.fr> Date: Mon, 4 Oct 2021 11:59:34 +0200 Subject: [PATCH] make the copy analysis work with the RunAnalysis component that needs a workflow id --- .../_id/analysis/_analysisId/copy.vue | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/client-nuxt/pages/projects/_id/analysis/_analysisId/copy.vue b/client-nuxt/pages/projects/_id/analysis/_analysisId/copy.vue index 7bb08161..628e6b33 100644 --- a/client-nuxt/pages/projects/_id/analysis/_analysisId/copy.vue +++ b/client-nuxt/pages/projects/_id/analysis/_analysisId/copy.vue @@ -1,12 +1,14 @@ <template> <v-card class="my-4"> <error-alert v-if="error" :error-message="error"></error-alert> + <v-card-text> <RunAnalysisForm + v-if="workflowId" + :workflow-id="workflowId" :project-id="projectId" :experiments="experiments" - :wf-params="wfJobParams" - :tools-inputs="toolsInputs" + :workflow-parameters="wfJobParams" :analysis="analysisCopy" /> </v-card-text> @@ -38,19 +40,11 @@ export default { creation_date: new Date(exp.creation_date).toDateString(), } }) - const workflowTools = await $axios.$get('/api/workflow-tools') const wfJobParams = await $axios.$get( - `/api/projects/${projectId}/analysis/${analysisId}/workflow_job_params` + `/api/projects/${projectId}/analysis/${analysisId}/workflow_job_parameters/` ) - const toolsInputs = Object.keys(workflowTools) - .filter((stepId) => stepId !== 'null') - .map((stepId) => { - workflowTools[stepId].stepId = stepId - return workflowTools[stepId] - }) return { experiments: await Promise.all(expWithVarTypes), - toolsInputs, wfJobParams: Object.keys(wfJobParams).reduce((acc, stepId) => { if (Object.keys(wfJobParams[stepId]).length > 0) { acc[stepId] = { ...wfJobParams[stepId] } @@ -64,11 +58,20 @@ export default { } }, data() { - return { error: null } + return { error: null, selectedWorkflow: null } }, computed: { analysisCopy() { - return { ...this.analysis, name: `Copy of ${this.analysis.name}` } + return { + ...this.analysis, + name: `Copy of ${this.analysis.name}`, + creation_date: undefined, + galaxy_workflow_invocation_id: undefined, + galaxy_history_id: undefined, + } + }, + workflowId() { + return this?.analysis?.galaxy_workflow_id }, }, } -- GitLab