Merge branch 'main' into cases-files-be

elastic · Feb 27, 2023 · b9cb6a5 · b9cb6a5
2 parents 71e8482 + 340d592
commit b9cb6a5
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 26 deletions.
diff --git a/test/functional/apps/console/_xjson.ts b/test/functional/apps/console/_xjson.ts
@@ -15,7 +15,8 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
   const log = getService('log');
   const PageObjects = getPageObjects(['common', 'console', 'header']);
 
-  describe('XJSON', function testXjson() {
+  // FLAKY: https://github.com/elastic/kibana/issues/145477
+  describe.skip('XJSON', function testXjson() {
     this.tags('includeFirefox');
     before(async () => {
       await PageObjects.common.navigateToApp('console');

diff --git a/...terprise_search_content/components/engine/engine_search_preview/engine_search_preview.tsx b/...terprise_search_content/components/engine/engine_search_preview/engine_search_preview.tsx
@@ -9,7 +9,7 @@ import React, { useState, useMemo } from 'react';
 
 import { useValues } from 'kea';
 
-import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer } from '@elastic/eui';
 import {
   PagingInfo,
   Results,
@@ -25,7 +25,9 @@ import EnginesAPIConnector, {
 } from '@elastic/search-ui-engines-connector';
 import { HttpSetup } from '@kbn/core-http-browser';
 import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
 
+import { docLinks } from '../../../../shared/doc_links';
 import { HttpLogic } from '../../../../shared/http';
 import { EngineViewTabs } from '../../../routes';
 import { EnterpriseSearchEnginesPageTemplate } from '../../layout/engines_page_template';
@@ -138,6 +140,13 @@ export const EngineSearchPreview: React.FC = () => {
           <EuiFlexGroup>
             <EuiFlexItem grow={false} css={{ minWidth: '240px' }}>
               <ResultsPerPage view={ResultsPerPageView} options={RESULTS_PER_PAGE_OPTIONS} />
+              <EuiSpacer size="m" />
+              <EuiLink href={docLinks.enterpriseSearchEngines} target="_blank">
+                <FormattedMessage
+                  id="xpack.enterpriseSearch.content.engine.searchPreview.improveResultsLink"
+                  defaultMessage="Improve these results"
+                />
+              </EuiLink>
             </EuiFlexItem>
             <EuiFlexItem>
               <PagingInfo view={PagingInfoView} />

diff --git a/...nterprise_search_content/components/engine/engine_search_preview/search_ui_components.tsx b/...nterprise_search_content/components/engine/engine_search_preview/search_ui_components.tsx
@@ -194,26 +194,33 @@ export const ResultsPerPageView: React.FC<ResultsPerPageViewProps> = ({
   options,
   value,
 }) => (
-  <EuiFlexGroup direction="column" gutterSize="s">
-    <EuiTitle size="xxxs">
-      <label htmlFor="results-per-page">Show</label>
-    </EuiTitle>
-    <EuiSelect
-      id="results-per-page"
-      options={
-        options?.map((option) => ({
-          text: i18n.translate(
-            'xpack.enterpriseSearch.content.engine.searchPreview.resultsPerPage.label',
-            {
-              defaultMessage: '{value} {value, plural, one {Result} other {Results}}',
-              values: { value: option },
-            }
-          ),
-          value: option,
-        })) ?? []
-      }
-      value={value}
-      onChange={(evt) => onChange(parseInt(evt.target.value, 10))}
-    />
-  </EuiFlexGroup>
+  <EuiFlexItem grow={false}>
+    <EuiFlexGroup direction="column" gutterSize="s">
+      <EuiTitle size="xxxs">
+        <label htmlFor="results-per-page">
+          <FormattedMessage
+            id="xpack.enterpriseSearch.content.engine.searchPreview.resultsPerPage.label"
+            defaultMessage="Show"
+          />
+        </label>
+      </EuiTitle>
+      <EuiSelect
+        id="results-per-page"
+        options={
+          options?.map((option) => ({
+            text: i18n.translate(
+              'xpack.enterpriseSearch.content.engine.searchPreview.resultsPerPage.option.label',
+              {
+                defaultMessage: '{value} {value, plural, one {Result} other {Results}}',
+                values: { value: option },
+              }
+            ),
+            value: option,
+          })) ?? []
+        }
+        value={value}
+        onChange={(evt) => onChange(parseInt(evt.target.value, 10))}
+      />
+    </EuiFlexGroup>
+  </EuiFlexItem>
 );
diff --git a/...rs_actions_ui/public/application/sections/alerts_table/bulk_actions/bulk_actions.test.tsx b/...rs_actions_ui/public/application/sections/alerts_table/bulk_actions/bulk_actions.test.tsx
@@ -584,7 +584,8 @@ describe('AlertsTable.BulkActions', () => {
           });
         });
 
-        describe('and executing a bulk action', () => {
+        // FLAKY: https://github.com/elastic/kibana/issues/152176
+        describe.skip('and executing a bulk action', () => {
           it('should return the are all selected flag set to true', async () => {
             const mockedFn = jest.fn();
             const props = {

diff --git a/...ctions_ui/public/application/sections/rules_list/components/rules_list_bulk_edit.test.tsx b/...ctions_ui/public/application/sections/rules_list/components/rules_list_bulk_edit.test.tsx
@@ -156,7 +156,8 @@ describe('Rules list Bulk Edit', () => {
     queryClient.clear();
   });
 
-  describe('bulk actions', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/152268
+  describe.skip('bulk actions', () => {
     beforeEach(async () => {
       renderWithProviders(<RulesList />);
       await waitForElementToBeRemoved(() => screen.queryByTestId('centerJustifiedSpinner'));