From 479ddacddb9508d6ac1a394b72817193b624e213 Mon Sep 17 00:00:00 2001
From: kurilova <kurilova@google.com>
Date: Thu, 15 May 2025 13:46:44 +0000
Subject: [PATCH] Fix settings update

---
 .../general-settings.store.ts                 | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/modules/ui/src/app/pages/general-settings/general-settings.store.ts b/modules/ui/src/app/pages/general-settings/general-settings.store.ts
index ec2b5c99f..11bcfd802 100644
--- a/modules/ui/src/app/pages/general-settings/general-settings.store.ts
+++ b/modules/ui/src/app/pages/general-settings/general-settings.store.ts
@@ -151,17 +151,20 @@ export class GeneralSettingsStore extends ComponentStore<SettingsComponentState>
     config: SystemConfig;
   }>(trigger$ => {
     return trigger$.pipe(
-      exhaustMap(trigger => {
-        return this.testRunService.createSystemConfig(trigger.config).pipe(
-          tap(() => {
-            this.store.dispatch(
-              AppActions.fetchSystemConfigSuccess({
-                systemConfig: trigger.config,
-              })
-            );
-            trigger.onSystemConfigUpdate();
-          })
-        );
+      withLatestFrom(this.systemConfig$),
+      exhaustMap(([trigger, currentConfig]) => {
+        return this.testRunService
+          .createSystemConfig({ ...currentConfig, ...trigger.config })
+          .pipe(
+            tap(() => {
+              this.store.dispatch(
+                AppActions.fetchSystemConfigSuccess({
+                  systemConfig: { ...currentConfig, ...trigger.config },
+                })
+              );
+              trigger.onSystemConfigUpdate();
+            })
+          );
       })
     );
   });