addressing paul's comments

Author: parkiino

x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_datasource_page/index.tsx

@@ -242,7 +242,7 @@ export const EditDatasourcePage: React.FunctionComponent = () => {
   };
 
   return (
-    <CreateDatasourcePageLayout {...layoutProps}>
+    <CreateDatasourcePageLayout {...layoutProps} data-test-subj="editDataSource">
       {isLoadingData ? (
         <Loading />
       ) : loadingError || !agentConfig || !packageInfo ? (

x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx

@@ -38,6 +38,7 @@ export const ConfigureEndpointDatasource = memo<CustomConfigureDatasourceContent
                   data-test-subj="editLinkToPolicyDetails"
                   appId="securitySolution:management"
                   appPath={policyUrl}
+                  // Cannot use formalUrl here since the code is called in Ingest, which does not use redux
                   href={`${services.application.getUrlForApp(
                     'securitySolution:management'
                   )}${policyUrl}`}

x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts

@@ -14,7 +14,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     'endpoint',
     'policy',
     'endpointPageUtils',
-    'header',
+    'ingestManagerCreateDatasource',
   ]);
   const testSubjects = getService('testSubjects');
   const policyTestResources = getService('policyTestResources');
@@ -197,13 +197,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       beforeEach(async () => {
         // Create a policy and navigate to Ingest app
         policyInfo = await policyTestResources.createPolicy();
-        const agentId = policyInfo.agentConfig.id;
-        const datasourceId = policyInfo.datasource.id;
-
-        await pageObjects.common.navigateToApp('ingestManager', {
-          hash: `/configs/${agentId}/edit-datasource/${datasourceId}`,
-        });
-        await pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.ingestManagerCreateDatasource.navigateToAgentConfigEditDatasource(
+          policyInfo.agentConfig.id,
+          policyInfo.datasource.id
+        );
       });
       afterEach(async () => {
         if (policyInfo) {

x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_datasource_page.ts

@@ -6,13 +6,14 @@
 
 import { FtrProviderContext } from '../ftr_provider_context';
 
-export function IngestManagerCreateDatasource({ getService }: FtrProviderContext) {
+export function IngestManagerCreateDatasource({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const find = getService('find');
+  const pageObjects = getPageObjects(['common']);
 
   return {
     /**
-     * Validates that the page shown is the Datasource Craete Page
+     * Validates that the page shown is the Datasource Create Page
      */
     async ensureOnCreatePageOrFail() {
       await testSubjects.existOrFail('createDataSource_header');
@@ -75,5 +76,22 @@ export function IngestManagerCreateDatasource({ getService }: FtrProviderContext
     async waitForSaveSuccessNotification() {
       await testSubjects.existOrFail('datasourceCreateSuccessToast');
     },
+
+    /**
+     * Validates that the page shown is the Datasource Edit Page
+     */
+    async ensureOnEditPageOrFail() {
+      await testSubjects.existOrFail('editDataSource_header');
+    },
+
+    /**
+     * Navigates to the Ingest Agent configuration Edit Datasource page
+     */
+    async navigateToAgentConfigEditDatasource(agentConfigId: string, datasourceId: string) {
+      await pageObjects.common.navigateToApp('ingestManager', {
+        hash: `/configs/${agentConfigId}/edit-datasource/${datasourceId}`,
+      });
+      await this.ensureOnEditPageOrFail();
+    },
   };
 }