From 81ccf499df6f7b16fa3bc4b1ba95c425423bc340 Mon Sep 17 00:00:00 2001
From: Oreille <33065839+Oreilles@users.noreply.github.com>
Date: Thu, 2 Dec 2021 21:08:27 +0100
Subject: [PATCH] Fix updatePreset behavior (#10212)

* Use `merge` for `layout_query` and `layout_options`

* Fixed typo

* Don't use merge for layout_query and layout_options

* Removed unused import

* Fixed copypaste typo

* Make sure we don't accidentally break nested referenced objects

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
---
 app/src/composables/use-preset/use-preset.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/composables/use-preset/use-preset.ts b/app/src/composables/use-preset/use-preset.ts
index 3cf1d48bd1..248b17147c 100644
--- a/app/src/composables/use-preset/use-preset.ts
+++ b/app/src/composables/use-preset/use-preset.ts
@@ -96,8 +96,9 @@ export function usePreset(
 			return localPreset.value.layout_options?.[localPreset.value.layout] || null;
 		},
 		set(options) {
-			if (localPreset.value.layout) {
-				updatePreset({ layout_options: { [localPreset.value.layout]: options } });
+			const { layout, layout_options } = localPreset.value;
+			if (layout) {
+				updatePreset({ layout_options: assign({}, layout_options, { [layout]: options }) });
 			}
 		},
 	});
@@ -108,8 +109,9 @@ export function usePreset(
 			return localPreset.value.layout_query?.[localPreset.value.layout] || null;
 		},
 		set(query) {
-			if (localPreset.value.layout) {
-				updatePreset({ layout_query: { [localPreset.value.layout]: query } });
+			const { layout, layout_query } = localPreset.value;
+			if (layout) {
+				updatePreset({ layout_query: assign({}, layout_query, { [layout]: query }) });
 			}
 		},
 	});