From c2fda4713eb89786cf07dba596f6d45136858fd5 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Mon, 25 Dec 2023 02:31:02 -0500
Subject: [PATCH] [8.12] [Enterprise Search] Fix polling causing a rewrite on
 form (#173621) (#173634)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Backport

This will backport the following commits from `main` to `8.12`:
- [[Enterprise Search] Fix polling causing a rewrite on form
(#173621)](https://github.com/elastic/kibana/pull/173621)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Efe Gürkan
YALAMAN","email":"efeguerkan.yalaman@elastic.co"},"sourceCommit":{"committedDate":"2023-12-19T14:13:30Z","message":"[Enterprise
Search] Fix polling causing a rewrite on form (#173621)\n\n##
Summary\r\n\r\nThis fixes polling rewriting user input when
configuration is
changed.","sha":"59cb36efe37e2c9e88eb922db7e9126d340da943","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:EnterpriseSearch","v8.12.0","v8.13.0"],"number":173621,"url":"https://github.com/elastic/kibana/pull/173621","mergeCommit":{"message":"[Enterprise
Search] Fix polling causing a rewrite on form (#173621)\n\n##
Summary\r\n\r\nThis fixes polling rewriting user input when
configuration is
changed.","sha":"59cb36efe37e2c9e88eb922db7e9126d340da943"}},"sourceBranch":"main","suggestedTargetBranches":["8.12"],"targetPullRequestStates":[{"branch":"8.12","label":"v8.12.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/173621","number":173621,"mergeCommit":{"message":"[Enterprise
Search] Fix polling causing a rewrite on form (#173621)\n\n##
Summary\r\n\r\nThis fixes polling rewriting user input when
configuration is
changed.","sha":"59cb36efe37e2c9e88eb922db7e9126d340da943"}}]}]
BACKPORT-->

Co-authored-by: Efe Gürkan YALAMAN <efeguerkan.yalaman@elastic.co>
---
 .../configuration/connector_configuration_form.tsx        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/kbn-search-connectors/components/configuration/connector_configuration_form.tsx b/packages/kbn-search-connectors/components/configuration/connector_configuration_form.tsx
index 8205c7be46902e..ca1a2c4e01b93b 100644
--- a/packages/kbn-search-connectors/components/configuration/connector_configuration_form.tsx
+++ b/packages/kbn-search-connectors/components/configuration/connector_configuration_form.tsx
@@ -66,12 +66,12 @@ export const ConnectorConfigurationForm: React.FC<ConnectorConfigurationForm> =
   );
 
   useEffect(() => {
-    setConfigView(sortAndFilterConnectorConfiguration(localConfig, isNative));
-  }, [localConfig, isNative]);
+    setLocalConfig((localConf) => ({ ...configuration, ...localConf }));
+  }, [configuration]);
 
   useEffect(() => {
-    setLocalConfig(configuration);
-  }, [configuration]);
+    setConfigView(sortAndFilterConnectorConfiguration(localConfig, isNative));
+  }, [localConfig, isNative]);
 
   return (
     <EuiForm