From 71f77186c4a4fbaffc17dde518ab02741c387ba9 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Wed, 19 Mar 2025 14:32:41 +0100
Subject: [PATCH] CB-6369 fixes onFinish during easy config for Server
 Configuration Form (#3328)

---
 .../ConfigurationWizardPagesBootstrapService.ts          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts b/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts
index cb026d60f6..0cf0ad6c0b 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts
@@ -95,7 +95,14 @@ export class ConfigurationWizardPagesBootstrapService extends Bootstrap {
       onLoad: () => {
         this.serverConfigurationFormStateManager.create();
       },
-      onDeActivate: this.serverConfigurationFormStateManager.destroy.bind(this.serverConfigurationFormStateManager),
+      onDeActivate: (configurationWizard, administration, nextAdministrationItem) => {
+        // so onFinish can be called with all required data from the form during easy config mode
+        if (configurationWizard) {
+          return;
+        }
+
+        this.serverConfigurationFormStateManager.destroy();
+      },
       canDeActivate: async configurationWizard => {
         const state = this.serverConfigurationFormStateManager.formState;