From dae28ceb6d533d17b451eacf79dd5a7e823cebd3 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Wed, 3 Jun 2020 13:10:09 -0700
Subject: [PATCH] [Ingest Manager] Remove default namespace toggle (#66298)
 (#68148)

* Remove default namespace toggle

* Fix i18n

* Add namespace validation

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../agent_config/components/config_form.tsx   | 75 ++++++++-----------
 .../translations/translations/ja-JP.json      |  1 -
 .../translations/translations/zh-CN.json      |  1 -
 3 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx
index 30996931ba67a..73ddd567c515b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx
@@ -50,6 +50,15 @@ export const agentConfigFormValidation = (
     ];
   }
 
+  if (!agentConfig.namespace?.trim()) {
+    errors.namespace = [
+      <FormattedMessage
+        id="xpack.ingestManager.agentConfigForm.namespaceRequiredErrorMessage"
+        defaultMessage="A namespace is required"
+      />,
+    ];
+  }
+
   return errors;
 };
 
@@ -73,7 +82,6 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
   onDelete = () => {},
 }) => {
   const [touchedFields, setTouchedFields] = useState<{ [key: string]: boolean }>({});
-  const [showNamespace, setShowNamespace] = useState<boolean>(!!agentConfig.namespace);
   const fields: Array<{
     name: 'name' | 'description' | 'namespace';
     label: JSX.Element;
@@ -170,49 +178,28 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
           />
         }
       >
-        <EuiSwitch
-          showLabel={true}
-          label={
-            <FormattedMessage
-              id="xpack.ingestManager.agentConfigForm.namespaceUseDefaultsFieldLabel"
-              defaultMessage="Use default namespace"
-            />
-          }
-          checked={showNamespace}
-          onChange={() => {
-            setShowNamespace(!showNamespace);
-            if (showNamespace) {
-              updateAgentConfig({ namespace: '' });
-            }
-          }}
-        />
-        {showNamespace && (
-          <>
-            <EuiSpacer size="m" />
-            <EuiFormRow
-              fullWidth
-              error={touchedFields.namespace && validation.namespace ? validation.namespace : null}
-              isInvalid={Boolean(touchedFields.namespace && validation.namespace)}
-            >
-              <EuiComboBox
-                fullWidth
-                singleSelection
-                noSuggestions
-                selectedOptions={agentConfig.namespace ? [{ label: agentConfig.namespace }] : []}
-                onCreateOption={(value: string) => {
-                  updateAgentConfig({ namespace: value });
-                }}
-                onChange={(selectedOptions) => {
-                  updateAgentConfig({
-                    namespace: (selectedOptions.length ? selectedOptions[0] : '') as string,
-                  });
-                }}
-                isInvalid={Boolean(touchedFields.namespace && validation.namespace)}
-                onBlur={() => setTouchedFields({ ...touchedFields, namespace: true })}
-              />
-            </EuiFormRow>
-          </>
-        )}
+        <EuiFormRow
+          fullWidth
+          error={touchedFields.namespace && validation.namespace ? validation.namespace : null}
+          isInvalid={Boolean(touchedFields.namespace && validation.namespace)}
+        >
+          <EuiComboBox
+            fullWidth
+            singleSelection
+            noSuggestions
+            selectedOptions={agentConfig.namespace ? [{ label: agentConfig.namespace }] : []}
+            onCreateOption={(value: string) => {
+              updateAgentConfig({ namespace: value });
+            }}
+            onChange={(selectedOptions) => {
+              updateAgentConfig({
+                namespace: (selectedOptions.length ? selectedOptions[0] : '') as string,
+              });
+            }}
+            isInvalid={Boolean(touchedFields.namespace && validation.namespace)}
+            onBlur={() => setTouchedFields({ ...touchedFields, namespace: true })}
+          />
+        </EuiFormRow>
       </EuiDescribedFormGroup>
       <EuiDescribedFormGroup
         title={
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index db39013911c3e..9f47c9558486e 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -8118,7 +8118,6 @@
     "xpack.ingestManager.agentConfigForm.nameRequiredErrorMessage": "エージェント構成名が必要です",
     "xpack.ingestManager.agentConfigForm.namespaceFieldDescription": "この構成を使用するデータソースにデフォルトの名前空間を適用します。データソースはその独自の名前空間を指定できます。",
     "xpack.ingestManager.agentConfigForm.namespaceFieldLabel": "デフォルト名前空間",
-    "xpack.ingestManager.agentConfigForm.namespaceUseDefaultsFieldLabel": "デフォルト名前空間を使用する",
     "xpack.ingestManager.agentConfigForm.systemMonitoringFieldLabel": "オプション",
     "xpack.ingestManager.agentConfigForm.systemMonitoringText": "システムメトリックを収集",
     "xpack.ingestManager.agentConfigForm.systemMonitoringTooltipText": "このオプションを有効にすると、システムメトリックと情報を収集するデータソースで構成をブートストラップできます。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index b15ee5380fba8..8711fbc223960 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -8122,7 +8122,6 @@
     "xpack.ingestManager.agentConfigForm.nameRequiredErrorMessage": "“代理配置名称”必填",
     "xpack.ingestManager.agentConfigForm.namespaceFieldDescription": "将默认命名空间应用于使用此配置的数据源。数据源可以指定自己的命名空间。",
     "xpack.ingestManager.agentConfigForm.namespaceFieldLabel": "默认命名空间",
-    "xpack.ingestManager.agentConfigForm.namespaceUseDefaultsFieldLabel": "使用默认命名空间",
     "xpack.ingestManager.agentConfigForm.systemMonitoringFieldLabel": "可选",
     "xpack.ingestManager.agentConfigForm.systemMonitoringText": "收集系统指标",
     "xpack.ingestManager.agentConfigForm.systemMonitoringTooltipText": "启用此选项可使用收集系统指标和信息的数据源启动您的配置。",