Merge branch 'master' of github.com:elastic/kibana into tsify/plugin-…

…helpers
elastic · May 14, 2020 · 41f72bb · 41f72bb
2 parents 362b0bf + 41d16f4
commit 41f72bb
Show file tree

Hide file tree

Showing 7 changed files with 1,983 additions and 134 deletions.
diff --git a/test/functional/services/apps_menu.ts b/test/functional/services/apps_menu.ts
@@ -58,7 +58,7 @@ export function AppsMenuProvider({ getService, getPageObjects }: FtrProviderCont
     public async closeCollapsibleNav() {
       const CLOSE_BUTTON = '[data-test-subj=collapsibleNav] > button';
       if (await find.existsByCssSelector(CLOSE_BUTTON)) {
-        (await find.byCssSelector(CLOSE_BUTTON)).click();
+        await find.clickByCssSelector(CLOSE_BUTTON);
       }
     }
 

diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipeline_form.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipeline_form.helpers.ts
@@ -47,7 +47,7 @@ export type PipelineFormTestSubjects =
   | 'versionField'
   | 'nameField.input'
   | 'descriptionField.input'
-  | 'processorsField'
+  | 'processorsEditor'
   | 'onFailureToggle'
   | 'onFailureEditor'
   | 'testPipelineButton'

diff --git a/...ins/ingest_pipelines/public/application/components/pipeline_form/pipeline_form_fields.tsx b/...ins/ingest_pipelines/public/application/components/pipeline_form/pipeline_form_fields.tsx
@@ -159,7 +159,7 @@ export const PipelineFormFields: React.FunctionComponent<Props> = ({
           component={JsonEditorField}
           componentProps={{
             euiCodeEditorProps: {
-              ['data-test-subj']: 'processorsField',
+              'data-test-subj': 'processorsEditor',
               height: '300px',
               'aria-label': i18n.translate('xpack.ingestPipelines.form.processorsFieldAriaLabel', {
                 defaultMessage: 'Processors JSON editor',
@@ -217,7 +217,7 @@ export const PipelineFormFields: React.FunctionComponent<Props> = ({
             component={JsonEditorField}
             componentProps={{
               euiCodeEditorProps: {
-                ['data-test-subj']: 'onFailureEditor',
+                'data-test-subj': 'onFailureEditor',
                 height: '300px',
                 'aria-label': i18n.translate('xpack.ingestPipelines.form.onFailureFieldAriaLabel', {
                   defaultMessage: 'Failure processors JSON editor',

diff --git a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/table.tsx b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/table.tsx
@@ -6,7 +6,13 @@
 import React, { FunctionComponent, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiInMemoryTable, EuiLink, EuiButton, EuiInMemoryTableProps } from '@elastic/eui';
+import {
+  EuiInMemoryTable,
+  EuiLink,
+  EuiButton,
+  EuiInMemoryTableProps,
+  EuiTableFieldDataColumnType,
+} from '@elastic/eui';
 
 import { BASE_PATH } from '../../../../common/constants';
 import { Pipeline } from '../../../../common/types';
@@ -36,6 +42,16 @@ export const PipelineTable: FunctionComponent<Props> = ({
     selection: {
       onSelectionChange: setSelection,
     },
+    rowProps: () => ({
+      'data-test-subj': 'pipelineTableRow',
+    }),
+    cellProps: (pipeline, column) => {
+      const { field } = column as EuiTableFieldDataColumnType<Pipeline>;
+
+      return {
+        'data-test-subj': `pipelineTableRow-${field}`,
+      };
+    },
     search: {
       toolsLeft:
         selection.length > 0 ? (