From 0d91e2740f628460bf909ffd08d53de9bd9c8251 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Tue, 9 Jun 2020 15:05:50 -0700
Subject: [PATCH] Fix edit datasource not working following changes in #67234
 (#68583)

---
 .../components/custom_configure_datasource.tsx    |  3 ++-
 .../step_configure_datasource.tsx                 |  7 +++++--
 .../agent_config/edit_datasource_page/index.tsx   |  5 +++--
 .../configure_datasource.tsx                      | 15 +++------------
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/custom_configure_datasource.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/custom_configure_datasource.tsx
index aff764cb8ba3e..4263feb7cd8c7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/custom_configure_datasource.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/custom_configure_datasource.tsx
@@ -12,7 +12,8 @@ import { CreateDatasourceFrom } from '../types';
 export interface CustomConfigureDatasourceProps {
   packageName: string;
   from: CreateDatasourceFrom;
-  datasource: NewDatasource | (NewDatasource & { id: string });
+  datasource: NewDatasource;
+  datasourceId?: string;
 }
 
 /**
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_configure_datasource.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_configure_datasource.tsx
index d9cf0fbfb7987..5499ac287ff05 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_configure_datasource.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_configure_datasource.tsx
@@ -16,7 +16,8 @@ import { CreateDatasourceFrom } from './types';
 export const StepConfigureDatasource: React.FunctionComponent<{
   from?: CreateDatasourceFrom;
   packageInfo: PackageInfo;
-  datasource: NewDatasource | (NewDatasource & { id: string });
+  datasource: NewDatasource;
+  datasourceId?: string;
   updateDatasource: (fields: Partial<NewDatasource>) => void;
   validationResults: DatasourceValidationResults;
   submitAttempted: boolean;
@@ -24,6 +25,7 @@ export const StepConfigureDatasource: React.FunctionComponent<{
   from = 'config',
   packageInfo,
   datasource,
+  datasourceId,
   updateDatasource,
   validationResults,
   submitAttempted,
@@ -70,9 +72,10 @@ export const StepConfigureDatasource: React.FunctionComponent<{
     ) : (
       <EuiPanel>
         <CustomConfigureDatasource
+          from={from}
           packageName={packageInfo.name}
           datasource={datasource}
-          from={from}
+          datasourceId={datasourceId}
         />
       </EuiPanel>
     );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_datasource_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_datasource_page/index.tsx
index 4bb42faedf7f6..d47eea80da8b7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_datasource_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_datasource_page/index.tsx
@@ -69,8 +69,7 @@ export const EditDatasourcePage: React.FunctionComponent = () => {
   const [loadingError, setLoadingError] = useState<Error>();
   const [agentConfig, setAgentConfig] = useState<AgentConfig>();
   const [packageInfo, setPackageInfo] = useState<PackageInfo>();
-  const [datasource, setDatasource] = useState<NewDatasource & { id: string }>({
-    id: '',
+  const [datasource, setDatasource] = useState<NewDatasource>({
     name: '',
     description: '',
     config_id: '',
@@ -94,6 +93,7 @@ export const EditDatasourcePage: React.FunctionComponent = () => {
         }
         if (datasourceData?.item) {
           const {
+            id,
             revision,
             inputs,
             created_by,
@@ -302,6 +302,7 @@ export const EditDatasourcePage: React.FunctionComponent = () => {
                     from={'edit'}
                     packageInfo={packageInfo}
                     datasource={datasource}
+                    datasourceId={datasourceId}
                     updateDatasource={updateDatasource}
                     validationResults={validationResults!}
                     submitAttempted={formState === 'INVALID'}
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx
index ebcb46c3fb5b7..db5196bfc4eb4 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx
@@ -12,30 +12,21 @@ import { LinkToApp } from '../../../../../common/components/endpoint/link_to_app
 import {
   CustomConfigureDatasourceContent,
   CustomConfigureDatasourceProps,
-  NewDatasource,
 } from '../../../../../../../ingest_manager/public';
 import { getManagementUrl } from '../../../..';
 
-type DatasourceWithId = NewDatasource & { id: string };
-
 /**
  * Exports Endpoint-specific datasource configuration instructions
  * for use in the Ingest app create / edit datasource config
  */
 export const ConfigureEndpointDatasource = memo<CustomConfigureDatasourceContent>(
-  ({
-    from,
-    datasource,
-  }: {
-    from: string;
-    datasource: CustomConfigureDatasourceProps['datasource'];
-  }) => {
+  ({ from, datasourceId }: CustomConfigureDatasourceProps) => {
     const { services } = useKibana();
     let policyUrl = '';
-    if (from === 'edit') {
+    if (from === 'edit' && datasourceId) {
       policyUrl = getManagementUrl({
         name: 'policyDetails',
-        policyId: (datasource as DatasourceWithId).id,
+        policyId: datasourceId,
       });
     }