Merge branch 'master' into unskip-tsvb-tests

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/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/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/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] : [];

x-pack/plugins/data_enhanced/server/plugin.ts

@@ -28,6 +28,7 @@ interface SetupDependencies {
 
 export class EnhancedDataServerPlugin implements Plugin<void, void, SetupDependencies> {
   private readonly logger: Logger;
+  private sessionService!: BackgroundSessionService;
 
   constructor(private initializerContext: PluginInitializerContext) {
     this.logger = initializerContext.logger.get('data_enhanced');
@@ -53,20 +54,26 @@ export class EnhancedDataServerPlugin implements Plugin<void, void, SetupDepende
       eqlSearchStrategyProvider(this.logger)
     );
 
+    this.sessionService = new BackgroundSessionService(this.logger);
+
     deps.data.__enhance({
       search: {
         defaultStrategy: ENHANCED_ES_SEARCH_STRATEGY,
-        sessionService: new BackgroundSessionService(),
+        sessionService: this.sessionService,
       },
     });
 
     const router = core.http.createRouter();
     registerSessionRoutes(router);
   }
 
-  public start(core: CoreStart) {}
+  public start(core: CoreStart) {
+    this.sessionService.start(core, this.initializerContext.config.create());
+  }
 
-  public stop() {}
+  public stop() {
+    this.sessionService.stop();
+  }
 }
 
 export { EnhancedDataServerPlugin as Plugin };

x-pack/plugins/data_enhanced/server/saved_objects/background_session.ts

@@ -14,6 +14,9 @@ export const backgroundSessionMapping: SavedObjectsType = {
   hidden: true,
   mappings: {
     properties: {
+      sessionId: {
+        type: 'keyword',
+      },
       name: {
         type: 'keyword',
       },