From 9d3cf5cf8ab092f05797acf2e5abdceb86b25f69 Mon Sep 17 00:00:00 2001 From: Jakub Szpila Date: Wed, 27 Jul 2022 10:13:55 +0200 Subject: [PATCH 1/2] change merge to assign --- src/api.v2/helpers/pipeline/pipelineConstruct/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api.v2/helpers/pipeline/pipelineConstruct/index.js b/src/api.v2/helpers/pipeline/pipelineConstruct/index.js index 8c82c2800..c84c7d5a0 100644 --- a/src/api.v2/helpers/pipeline/pipelineConstruct/index.js +++ b/src/api.v2/helpers/pipeline/pipelineConstruct/index.js @@ -198,7 +198,7 @@ const createQCPipeline = async (experimentId, processingConfigUpdates, authJWT) return; } - _.merge(processingConfig[name], body); + _.assign(processingConfig[name], body); }); } From d6f1778bafc2726d9ac3fb4476cc02a60f32a8f6 Mon Sep 17 00:00:00 2001 From: Jakub Szpila Date: Wed, 27 Jul 2022 12:03:11 +0200 Subject: [PATCH 2/2] fix-config-change-in-test --- tests/api.v2/helpers/pipeline/pipelineConstruct.test.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/api.v2/helpers/pipeline/pipelineConstruct.test.js b/tests/api.v2/helpers/pipeline/pipelineConstruct.test.js index d8d8794be..440572d43 100644 --- a/tests/api.v2/helpers/pipeline/pipelineConstruct.test.js +++ b/tests/api.v2/helpers/pipeline/pipelineConstruct.test.js @@ -68,6 +68,9 @@ describe('test for pipeline services', () => { name: 'doubletScores', body: { oneSample: { + defaultFilterSettings: { + oneSetting: 1, + }, filterSettings: { oneSetting: 7, },