Merging in master

package.json

@@ -96,6 +96,8 @@
     "**/minimist": "^1.2.5",
     "**/node-jose/node-forge": "^0.10.0",
     "**/prismjs": "1.22.0",
+    "**/react-syntax-highlighter": "^15.3.1",
+    "**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
     "**/request": "^2.88.2",
     "**/trim": "0.0.3",
     "**/typescript": "4.1.2"
@@ -680,7 +682,7 @@
     "has-ansi": "^3.0.0",
     "hdr-histogram-js": "^1.2.0",
     "he": "^1.2.0",
-    "highlight.js": "9.15.10",
+    "highlight.js": "^9.18.5",
     "history-extra": "^5.0.1",
     "hoist-non-react-statics": "^3.3.2",
     "html": "1.0.0",
@@ -784,7 +786,7 @@
     "react-router-redux": "^4.0.8",
     "react-shortcuts": "^2.0.0",
     "react-sizeme": "^2.3.6",
-    "react-syntax-highlighter": "^5.7.0",
+    "react-syntax-highlighter": "^15.3.1",
     "react-test-renderer": "^16.12.0",
     "react-tiny-virtual-list": "^2.2.0",
     "react-virtualized": "^9.21.2",

src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.ts

@@ -19,10 +19,10 @@
 
 import Chance from 'chance';
 
+import { getUpgradeableConfigMock } from './get_upgradeable_config.test.mock';
 import { SavedObjectsErrorHelpers } from '../../saved_objects';
 import { savedObjectsClientMock } from '../../saved_objects/service/saved_objects_client.mock';
 import { loggingSystemMock } from '../../logging/logging_system.mock';
-import { getUpgradeableConfigMock } from './get_upgradeable_config.test.mock';
 
 import { createOrUpgradeSavedConfig } from './create_or_upgrade_saved_config';
 

src/plugins/dashboard/public/application/listing/dashboard_listing.test.js

@@ -62,6 +62,7 @@ test('renders empty page in before initial fetch to avoid flickering', () => {
       getViewUrl={() => {}}
       listingLimit={1000}
       hideWriteControls={false}
+      initialPageSize={10}
       core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
     />
   );

src/plugins/data/common/search/search_source/search_source.test.ts

@@ -341,6 +341,21 @@ describe('SearchSource', () => {
         const request = await searchSource.getSearchRequestBody();
         expect(request.script_fields).toEqual({ hello: {} });
       });
+
+      test('returns all scripted fields when one fields entry is *', async () => {
+        searchSource.setField('index', ({
+          ...indexPattern,
+          getComputedFields: () => ({
+            storedFields: [],
+            scriptFields: { hello: {}, world: {} },
+            docvalueFields: [],
+          }),
+        } as unknown) as IndexPattern);
+        searchSource.setField('fields', ['timestamp', '*']);
+
+        const request = await searchSource.getSearchRequestBody();
+        expect(request.script_fields).toEqual({ hello: {}, world: {} });
+      });
     });
 
     describe('handling for when specific fields are provided', () => {

src/plugins/data/common/search/search_source/search_source.ts

@@ -408,7 +408,12 @@ export class SearchSource {
       case 'query':
         return addToRoot(key, (data[key] || []).concat(val));
       case 'fields':
-        // uses new Fields API
+        // This will pass the passed in parameters to the new fields API.
+        // Also if will only return scripted fields that are part of the specified
+        // array of fields. If you specify the wildcard `*` as an array element
+        // the fields API will return all fields, and all scripted fields will be returned.
+        // NOTE: While the fields API supports wildcards within names, e.g. `user.*`
+        //       scripted fields won't be considered for this.
         return addToBody('fields', val);
       case 'fieldsFromSource':
         // preserves legacy behavior
@@ -518,11 +523,13 @@ export class SearchSource {
       );
       const uniqFieldNames = [...new Set([...bodyFieldNames, ...fieldsFromSource])];
 
-      // filter down script_fields to only include items specified
-      body.script_fields = pick(
-        body.script_fields,
-        Object.keys(body.script_fields).filter((f) => uniqFieldNames.includes(f))
-      );
+      if (!uniqFieldNames.includes('*')) {
+        // filter down script_fields to only include items specified
+        body.script_fields = pick(
+          body.script_fields,
+          Object.keys(body.script_fields).filter((f) => uniqFieldNames.includes(f))
+        );
+      }
 
       // request the remaining fields from stored_fields just in case, since the
       // fields API does not handle stored fields

src/plugins/data/server/search/search_service.ts

@@ -106,13 +106,15 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
   private readonly searchSourceService = new SearchSourceService();
   private defaultSearchStrategyName: string = ES_SEARCH_STRATEGY;
   private searchStrategies: StrategyMap = {};
+  private sessionService: ISessionService;
   private coreStart?: CoreStart;
-  private sessionService: ISessionService = new SessionService();
 
   constructor(
     private initializerContext: PluginInitializerContext<ConfigSchema>,
     private readonly logger: Logger
-  ) {}
+  ) {
+    this.sessionService = new SessionService();
+  }
 
   public setup(
     core: CoreSetup<{}, DataPluginStart>,

src/plugins/embeddable/public/lib/embeddables/embeddable_renderer.test.tsx

@@ -18,7 +18,7 @@
  */
 
 import React from 'react';
-import { wait } from '@testing-library/dom';
+import { waitFor } from '@testing-library/dom';
 import { render } from '@testing-library/react';
 import {
   HelloWorldEmbeddable,
@@ -47,7 +47,7 @@ describe('<EmbeddableRenderer/>', () => {
       <EmbeddableRenderer factory={getFactory()} input={{ id: 'hello' }} />
     );
     expect(getByTestId('embedSpinner')).toBeInTheDocument();
-    await wait(() => !queryByTestId('embedSpinner')); // wait until spinner disappears
+    await waitFor(() => !queryByTestId('embedSpinner')); // wait until spinner disappears
     expect(getByTestId('helloWorldEmbeddable')).toBeInTheDocument();
   });
 });

src/plugins/embeddable/public/lib/embeddables/error_embeddable.test.tsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 import React from 'react';
-import { wait, render } from '@testing-library/react';
+import { waitFor, render } from '@testing-library/react';
 import { ErrorEmbeddable } from './error_embeddable';
 import { EmbeddableRoot } from './embeddable_root';
 
@@ -26,7 +26,7 @@ test('ErrorEmbeddable renders an embeddable', async () => {
   const { getByTestId, getByText } = render(<EmbeddableRoot embeddable={embeddable} />);
 
   expect(getByTestId('embeddableStackError')).toBeVisible();
-  await wait(() => getByTestId('errorMessageMarkdown')); // wait for lazy markdown component
+  await waitFor(() => getByTestId('errorMessageMarkdown')); // wait for lazy markdown component
   expect(getByText(/some error occurred/i)).toBeVisible();
 });
 
@@ -36,7 +36,7 @@ test('ErrorEmbeddable renders an embeddable with markdown message', async () =>
   const { getByTestId, getByText } = render(<EmbeddableRoot embeddable={embeddable} />);
 
   expect(getByTestId('embeddableStackError')).toBeVisible();
-  await wait(() => getByTestId('errorMessageMarkdown')); // wait for lazy markdown component
+  await waitFor(() => getByTestId('errorMessageMarkdown')); // wait for lazy markdown component
   expect(getByText(/some link/i)).toMatchInlineSnapshot(`
     <a
       href="http://localhost:5601/takeMeThere"

src/plugins/es_ui_shared/public/request/use_request.test.ts

@@ -101,8 +101,9 @@ describe('useRequest hook', () => {
         const { setupSuccessRequest, completeRequest, hookResult } = helpers;
         setupSuccessRequest();
         expect(hookResult.isInitialRequest).toBe(true);
-
-        hookResult.resendRequest();
+        act(() => {
+          hookResult.resendRequest();
+        });
         await completeRequest();
         expect(hookResult.isInitialRequest).toBe(false);
       });

src/plugins/saved_objects_tagging_oss/public/api.mock.ts

@@ -18,10 +18,10 @@
  */
 
 import { ITagsClient } from '../common';
-import { SavedObjectsTaggingApiUi, SavedObjectsTaggingApiUiComponent } from './api';
+import { SavedObjectsTaggingApiUi, SavedObjectsTaggingApiUiComponent, ITagsCache } from './api';
 
-const createClientMock = (): jest.Mocked<ITagsClient> => {
-  const mock = {
+const createClientMock = () => {
+  const mock: jest.Mocked<ITagsClient> = {
     create: jest.fn(),
     get: jest.fn(),
     getAll: jest.fn(),
@@ -32,14 +32,25 @@ const createClientMock = (): jest.Mocked<ITagsClient> => {
   return mock;
 };
 
+const createCacheMock = () => {
+  const mock: jest.Mocked<ITagsCache> = {
+    getState: jest.fn(),
+    getState$: jest.fn(),
+  };
+
+  return mock;
+};
+
 interface SavedObjectsTaggingApiMock {
   client: jest.Mocked<ITagsClient>;
+  cache: jest.Mocked<ITagsCache>;
   ui: SavedObjectsTaggingApiUiMock;
 }
 
 const createApiMock = (): SavedObjectsTaggingApiMock => {
-  const mock = {
+  const mock: SavedObjectsTaggingApiMock = {
     client: createClientMock(),
+    cache: createCacheMock(),
     ui: createApiUiMock(),
   };
 
@@ -50,8 +61,8 @@ type SavedObjectsTaggingApiUiMock = Omit<jest.Mocked<SavedObjectsTaggingApiUi>,
   components: SavedObjectsTaggingApiUiComponentMock;
 };
 
-const createApiUiMock = (): SavedObjectsTaggingApiUiMock => {
-  const mock = {
+const createApiUiMock = () => {
+  const mock: SavedObjectsTaggingApiUiMock = {
     components: createApiUiComponentsMock(),
     // TS is very picky with type guards
     hasTagDecoration: jest.fn() as any,
@@ -69,8 +80,8 @@ const createApiUiMock = (): SavedObjectsTaggingApiUiMock => {
 
 type SavedObjectsTaggingApiUiComponentMock = jest.Mocked<SavedObjectsTaggingApiUiComponent>;
 
-const createApiUiComponentsMock = (): SavedObjectsTaggingApiUiComponentMock => {
-  const mock = {
+const createApiUiComponentsMock = () => {
+  const mock: SavedObjectsTaggingApiUiComponentMock = {
     TagList: jest.fn(),
     TagSelector: jest.fn(),
     SavedObjectSaveModalTagSelector: jest.fn(),
@@ -82,6 +93,7 @@ const createApiUiComponentsMock = (): SavedObjectsTaggingApiUiComponentMock => {
 export const taggingApiMock = {
   create: createApiMock,
   createClient: createClientMock,
+  createCache: createCacheMock,
   createUi: createApiUiMock,
   createComponents: createApiUiComponentsMock,
 };

src/plugins/saved_objects_tagging_oss/public/api.ts

@@ -17,22 +17,49 @@
  * under the License.
  */
 
+import { Observable } from 'rxjs';
 import { SearchFilterConfig, EuiTableFieldDataColumnType } from '@elastic/eui';
 import type { FunctionComponent } from 'react';
 import { SavedObject, SavedObjectReference } from '../../../core/types';
 import { SavedObjectsFindOptionsReference } from '../../../core/public';
 import { SavedObject as SavedObjectClass } from '../../saved_objects/public';
 import { TagDecoratedSavedObject } from './decorator';
-import { ITagsClient } from '../common';
+import { ITagsClient, Tag } from '../common';
 
 /**
  * @public
  */
 export interface SavedObjectsTaggingApi {
+  /**
+   * The client to perform tag-related operations on the server-side
+   */
   client: ITagsClient;
+  /**
+   * A client-side auto-refreshing cache of the existing tags. Can be used
+   * to synchronously access the list of tags.
+   */
+  cache: ITagsCache;
+  /**
+   * UI API to use to add tagging capabilities to an application
+   */
   ui: SavedObjectsTaggingApiUi;
 }
 
+/**
+ * @public
+ */
+export interface ITagsCache {
+  /**
+   * Return the current state of the cache
+   */
+  getState(): Tag[];
+
+  /**
+   * Return an observable that will emit everytime the cache's state mutates.
+   */
+  getState$(): Observable<Tag[]>;
+}
+
 /**
  * @public
  */

src/plugins/saved_objects_tagging_oss/public/index.ts

@@ -26,6 +26,7 @@ export {
   SavedObjectsTaggingApi,
   SavedObjectsTaggingApiUi,
   SavedObjectsTaggingApiUiComponent,
+  ITagsCache,
   TagListComponentProps,
   TagSelectorComponentProps,
   GetSearchBarFilterOptions,

src/plugins/telemetry_management_section/public/components/opt_in_example_flyout.tsx

@@ -49,21 +49,27 @@ interface State {
  * React component for displaying the example data associated with the Telemetry opt-in banner.
  */
 export class OptInExampleFlyout extends React.PureComponent<Props, State> {
+  _isMounted = false;
+
   public readonly state: State = {
     data: null,
     isLoading: true,
     hasPrivilegeToRead: false,
   };
 
   async componentDidMount() {
+    this._isMounted = true;
+
     try {
       const { fetchExample } = this.props;
       const clusters = await fetchExample();
-      this.setState({
-        data: Array.isArray(clusters) ? clusters : null,
-        isLoading: false,
-        hasPrivilegeToRead: true,
-      });
+      if (this._isMounted) {
+        this.setState({
+          data: Array.isArray(clusters) ? clusters : null,
+          isLoading: false,
+          hasPrivilegeToRead: true,
+        });
+      }
     } catch (err) {
       this.setState({
         isLoading: false,
@@ -72,6 +78,10 @@ export class OptInExampleFlyout extends React.PureComponent<Props, State> {
     }
   }
 
+  componentWillUnmount() {
+    this._isMounted = false;
+  }
+
   renderBody({ data, isLoading, hasPrivilegeToRead }: State) {
     if (isLoading) {
       return loadingSpinner;

src/plugins/vis_default_editor/public/components/agg_select.tsx

@@ -77,15 +77,15 @@ function DefaultEditorAggSelect({
   }
 
   const helpLink = value && aggHelpLink && (
-    <EuiLink href={aggHelpLink} target="_blank" rel="noopener">
-      <EuiText size="xs">
+    <EuiText size="xs">
+      <EuiLink href={aggHelpLink} target="_blank" rel="noopener">
         <FormattedMessage
           id="visDefaultEditor.aggSelect.helpLinkLabel"
           defaultMessage="{aggTitle} help"
           values={{ aggTitle: value ? value.title : '' }}
         />
-      </EuiText>
-    </EuiLink>
+      </EuiLink>
+    </EuiText>
   );
 
   const errors = aggError ? [aggError] : [];