Merge branch 'main' into 133515-bug-fix-new-created-connectors-rule-d…

…etails
elastic · Jun 7, 2022 · 2928ce6 · 2928ce6
2 parents 51463a9 + 795a305
commit 2928ce6
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 25 deletions.
diff --git a/...rc/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap b/...rc/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap
diff --git a/...ents/src/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap b/...ents/src/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap
diff --git a/...ges/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/no_data_card.tsx b/...ges/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/no_data_card.tsx
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React, { FunctionComponent } from 'react';
-import { EuiButton, EuiCard } from '@elastic/eui';
+import { EuiButton, EuiCard, EuiScreenReaderOnly } from '@elastic/eui';
 
 import type { NoDataCardProps } from './types';
 import { NoDataCardStyles } from './no_data_card.styles';
@@ -21,7 +21,7 @@ const defaultDescription = i18n.translate(
 );
 
 export const NoDataCard: FunctionComponent<NoDataCardProps> = ({
-  title,
+  title: titleProp,
   button,
   description,
   isDisabled,
@@ -39,10 +39,18 @@ export const NoDataCard: FunctionComponent<NoDataCardProps> = ({
       return button;
     }
     // Default footer action is a button with the provided or default string
-    return <EuiButton fill>{button || title}</EuiButton>;
+    return <EuiButton fill>{button || titleProp}</EuiButton>;
   };
+
   const cardDescription = description || defaultDescription;
 
+  // Fix the need for an a11y title even though the button exists by setting to screen reader only
+  const title = titleProp ? (
+    <EuiScreenReaderOnly>
+      <span>{titleProp}</span>
+    </EuiScreenReaderOnly>
+  ) : null;
+
   return (
     <EuiCard
       css={styles}

diff --git a/test/functional/apps/discover/_doc_table_newline.ts b/test/functional/apps/discover/_doc_table_newline.ts
@@ -21,15 +21,20 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     before(async function () {
       await security.testUser.setRoles(['kibana_admin', 'kibana_message_with_newline']);
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/message_with_newline');
+      await kibanaServer.importExport.load(
+        'test/functional/fixtures/kbn_archiver/message_with_newline.json'
+      );
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'newline-test',
         'doc_table:legacy': true,
       });
       await PageObjects.common.navigateToApp('discover');
     });
+
     after(async () => {
       await security.testUser.restoreDefaults();
       await esArchiver.unload('test/functional/fixtures/es_archiver/message_with_newline');
+      await kibanaServer.savedObjects.cleanStandardList();
       await kibanaServer.uiSettings.unset('defaultIndex');
       await kibanaServer.uiSettings.unset('doc_table:legacy');
     });

diff --git a/test/functional/fixtures/es_archiver/message_with_newline/data.json b/test/functional/fixtures/es_archiver/message_with_newline/data.json
@@ -1,18 +1,3 @@
-{
-  "type": "doc",
-  "value": {
-    "id": "index-pattern:newline-test",
-    "index": ".kibana",
-    "source": {
-      "index-pattern": {
-        "fields": "[]",
-        "title": "newline-test"
-      },
-      "type": "index-pattern"
-    }
-  }
-}
-
 {
   "type": "doc",
   "value": {

diff --git a/test/functional/fixtures/kbn_archiver/message_with_newline.json b/test/functional/fixtures/kbn_archiver/message_with_newline.json
@@ -0,0 +1,14 @@
+{
+  "attributes": {
+    "fields": "[]",
+    "title": "newline-test"
+  },
+  "coreMigrationVersion": "8.4.0",
+  "id": "newline-test",
+  "migrationVersion": {
+    "index-pattern": "8.0.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "version": "WzEzLDJd"
+}