From 609a77187464b5e4f93f38429976121b723cc9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Thu, 30 Mar 2023 11:30:05 +0200
Subject: [PATCH] Revert "elastic: remove most of xpack" (#65596)

Revert "elastic: remove most of xpack (#63460)"

This reverts commit 6cee0cdbad3008737461916c8024aa97936d0422.
---
 .../configuration/ElasticDetails.tsx          | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
index cc51279915b..0f0639f9238 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
@@ -86,13 +86,23 @@ export const ElasticDetails = ({ value, onChange }: Props) => {
           />
         </InlineField>
 
-        <InlineField label="Include Frozen Indices" labelWidth={26}>
+        <InlineField label="X-Pack enabled" labelWidth={26}>
           <InlineSwitch
-            id="es_config_frozenIndices"
-            value={(value.jsonData.xpack ?? false) && (value.jsonData.includeFrozen ?? false)}
-            onChange={(event) => includeFrozenIndicesOnChange(event.currentTarget.checked, value, onChange)}
+            id="es_config_xpackEnabled"
+            value={value.jsonData.xpack || false}
+            onChange={jsonDataSwitchChangeHandler('xpack', value, onChange)}
           />
         </InlineField>
+
+        {value.jsonData.xpack && (
+          <InlineField label="Include Frozen Indices" labelWidth={26}>
+            <InlineSwitch
+              id="es_config_frozenIndices"
+              value={value.jsonData.includeFrozen ?? false}
+              onChange={jsonDataSwitchChangeHandler('includeFrozen', value, onChange)}
+            />
+          </InlineField>
+        )}
       </FieldSet>
     </>
   );
@@ -121,20 +131,17 @@ const jsonDataChangeHandler =
     });
   };
 
-const includeFrozenIndicesOnChange = (newValue: boolean, formValue: Props['value'], onChange: Props['onChange']) => {
-  const newJsonData = { ...formValue.jsonData };
-  if (newValue) {
-    newJsonData.xpack = true;
-    newJsonData.includeFrozen = true;
-  } else {
-    delete newJsonData.xpack;
-    delete newJsonData.includeFrozen;
-  }
-  onChange({
-    ...formValue,
-    jsonData: newJsonData,
-  });
-};
+const jsonDataSwitchChangeHandler =
+  (key: keyof ElasticsearchOptions, value: Props['value'], onChange: Props['onChange']) =>
+  (event: React.SyntheticEvent<HTMLInputElement>) => {
+    onChange({
+      ...value,
+      jsonData: {
+        ...value.jsonData,
+        [key]: event.currentTarget.checked,
+      },
+    });
+  };
 
 const intervalHandler =
   (value: Props['value'], onChange: Props['onChange']) => (option: SelectableValue<Interval | 'none'>) => {