use type filter in providers

x-pack/plugins/global_search/common/search_syntax/index.ts

@@ -5,4 +5,4 @@
  */
 
 export { parseSearchParams } from './parse_search_params';
-export { SearchParams, FilterValues, FilterValueType } from './types';
+export { GlobalSearchProviderFindParams, FilterValues, FilterValueType } from './types';

x-pack/plugins/global_search/common/search_syntax/parse_search_params.ts

@@ -4,9 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Query } from '@elastic/eui';
+// @ts-expect-error need nested import, as this is also used on the server-side.
+//                  importing from eui entrypoint causes errors.
+import { Query } from '@elastic/eui/lib/components/search_bar/query';
 import { getSearchTerm, getFieldValueMap, applyAliases } from './query_utils';
-import { FilterValues, SearchParams } from './types';
+import { FilterValues, GlobalSearchProviderFindParams } from './types';
 
 const knownFilters = ['tag', 'type'];
 
@@ -15,7 +17,7 @@ const aliasMap = {
   type: ['types'],
 };
 
-export const parseSearchParams = (term: string): SearchParams => {
+export const parseSearchParams = (term: string): GlobalSearchProviderFindParams => {
   let query: Query;
 
   try {

x-pack/plugins/global_search/common/search_syntax/types.ts

@@ -8,7 +8,7 @@ export type FilterValueType = string | boolean | number;
 
 export type FilterValues<ValueType extends FilterValueType = FilterValueType> = ValueType[];
 
-export interface SearchParams {
+export interface GlobalSearchProviderFindParams {
   /**
    * The parsed search term.
    * Can be undefined if the query was only composed of field terms.

x-pack/plugins/global_search/common/types.ts

@@ -7,6 +7,12 @@
 import { Observable } from 'rxjs';
 import { Serializable } from 'src/core/types';
 
+export {
+  FilterValues,
+  GlobalSearchProviderFindParams,
+  FilterValueType,
+} from './search_syntax/types';
+
 /**
  * Options provided to {@link GlobalSearchResultProvider | a result provider}'s `find` method.
  */

x-pack/plugins/global_search/public/services/search_service.ts

@@ -15,6 +15,7 @@ import { takeInArray } from '../../common/operators';
 import { defaultMaxProviderResults } from '../../common/constants';
 import { processProviderResult } from '../../common/process_result';
 import { ILicenseChecker } from '../../common/license_checker';
+import { parseSearchParams } from '../../common/search_syntax';
 import { GlobalSearchResultProvider } from '../types';
 import { GlobalSearchClientConfigType } from '../config';
 import { GlobalSearchFindOptions } from './types';
@@ -147,8 +148,10 @@ export class SearchService {
       aborted$,
     });
 
+    const searchParams = parseSearchParams(term);
+
     const providersResults$ = [...this.providers.values()].map((provider) =>
-      provider.find(term, providerOptions).pipe(
+      provider.find(searchParams, providerOptions).pipe(
         takeInArray(this.maxProviderResults),
         takeUntil(aborted$),
         map((results) => results.map((r) => processResult(r)))

x-pack/plugins/global_search/public/types.ts

@@ -5,7 +5,11 @@
  */
 
 import { Observable } from 'rxjs';
-import { GlobalSearchProviderFindOptions, GlobalSearchProviderResult } from '../common/types';
+import {
+  GlobalSearchProviderFindOptions,
+  GlobalSearchProviderResult,
+  GlobalSearchProviderFindParams,
+} from '../common/types';
 import { SearchServiceSetup, SearchServiceStart } from './services';
 
 export type GlobalSearchPluginSetup = Pick<SearchServiceSetup, 'registerResultProvider'>;
@@ -29,15 +33,15 @@ export interface GlobalSearchResultProvider {
    * // returning all results in a single batch
    * setupDeps.globalSearch.registerResultProvider({
    *   id: 'my_provider',
-   *   find: (term, { aborted$, preference, maxResults }, context) => {
+   *   find: ({ term, filters }, { aborted$, preference, maxResults }, context) => {
    *     const resultPromise = myService.search(term, { preference, maxResults }, context.core.savedObjects.client);
    *     return from(resultPromise).pipe(takeUntil(aborted$));
    *   },
    * });
    * ```
    */
   find(
-    term: string,
+    search: GlobalSearchProviderFindParams,
     options: GlobalSearchProviderFindOptions
   ): Observable<GlobalSearchProviderResult[]>;
 }

x-pack/plugins/global_search/server/services/search_service.ts

@@ -13,7 +13,7 @@ import { GlobalSearchFindError } from '../../common/errors';
 import { takeInArray } from '../../common/operators';
 import { defaultMaxProviderResults } from '../../common/constants';
 import { ILicenseChecker } from '../../common/license_checker';
-
+import { parseSearchParams } from '../../common/search_syntax';
 import { processProviderResult } from '../../common/process_result';
 import { GlobalSearchConfigType } from '../config';
 import { getContextFactory, GlobalSearchContextFactory } from './context';
@@ -137,7 +137,8 @@ export class SearchService {
 
     const timeout$ = timer(this.config!.search_timeout.asMilliseconds()).pipe(map(mapToUndefined));
     const aborted$ = options.aborted$ ? merge(options.aborted$, timeout$) : timeout$;
-    const providerOptions = {
+    const findParams = parseSearchParams(term);
+    const findOptions = {
       ...options,
       preference: options.preference ?? 'default',
       maxResults: this.maxProviderResults,
@@ -148,7 +149,7 @@ export class SearchService {
       processProviderResult(result, basePath);
 
     const providersResults$ = [...this.providers.values()].map((provider) =>
-      provider.find(term, providerOptions, context).pipe(
+      provider.find(findParams, findOptions, context).pipe(
         takeInArray(this.maxProviderResults),
         takeUntil(aborted$),
         map((results) => results.map((r) => processResult(r)))

x-pack/plugins/global_search/server/types.ts

@@ -16,6 +16,7 @@ import {
   GlobalSearchBatchedResults,
   GlobalSearchProviderFindOptions,
   GlobalSearchProviderResult,
+  GlobalSearchProviderFindParams,
 } from '../common/types';
 import { SearchServiceSetup, SearchServiceStart } from './services';
 
@@ -97,15 +98,15 @@ export interface GlobalSearchResultProvider {
    * // returning all results in a single batch
    * setupDeps.globalSearch.registerResultProvider({
    *   id: 'my_provider',
-   *   find: (term, { aborted$, preference, maxResults }, context) => {
+   *   find: ({term, filters }, { aborted$, preference, maxResults }, context) => {
    *     const resultPromise = myService.search(term, { preference, maxResults }, context.core.savedObjects.client);
    *     return from(resultPromise).pipe(takeUntil(aborted$));
    *   },
    * });
    * ```
    */
   find(
-    term: string,
+    search: GlobalSearchProviderFindParams,
     options: GlobalSearchProviderFindOptions,
     context: GlobalSearchProviderContext
   ): Observable<GlobalSearchProviderResult[]>;

x-pack/plugins/global_search_bar/public/components/search_bar.tsx

@@ -119,7 +119,9 @@ export function SearchBar({
       }
 
       let arr: GlobalSearchResult[] = [];
-      if (searchValue.length !== 0) trackUiMetric(METRIC_TYPE.COUNT, 'search_request');
+      if (searchValue.length !== 0) {
+        trackUiMetric(METRIC_TYPE.COUNT, 'search_request');
+      }
       searchSubscription.current = globalSearch(searchValue, {}).subscribe({
         next: ({ results }) => {
           if (searchValue.length > 0) {

x-pack/plugins/global_search_providers/public/providers/application.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { from } from 'rxjs';
+import { from, of } from 'rxjs';
 import { take, map, takeUntil, mergeMap, shareReplay } from 'rxjs/operators';
 import { ApplicationStart } from 'src/core/public';
 import { GlobalSearchResultProvider } from '../../../global_search/public';
@@ -26,12 +26,15 @@ export const createApplicationResultProvider = (
 
   return {
     id: 'application',
-    find: (term, { aborted$, maxResults }) => {
+    find: ({ term, filters }, { aborted$, maxResults }) => {
+      if (filters.types && !filters.types.includes('application')) {
+        return of([]);
+      }
       return searchableApps$.pipe(
         takeUntil(aborted$),
         take(1),
         map((apps) => {
-          const results = getAppResults(term, [...apps.values()]);
+          const results = getAppResults(term ?? '', [...apps.values()]);
           return results.sort((a, b) => b.score - a.score).slice(0, maxResults);
         })
       );

x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts

@@ -12,7 +12,7 @@ import { mapToResults } from './map_object_to_result';
 export const createSavedObjectsResultProvider = (): GlobalSearchResultProvider => {
   return {
     id: 'savedObjects',
-    find: (term, { aborted$, maxResults, preference }, { core }) => {
+    find: ({ term, filters }, { aborted$, maxResults, preference }, { core }) => {
       if (!term) {
         return of([]);
       }
@@ -24,7 +24,9 @@ export const createSavedObjectsResultProvider = (): GlobalSearchResultProvider =
 
       const searchableTypes = typeRegistry
         .getVisibleTypes()
+        .filter(filters.types ? (type) => filters.types!.includes(type.name) : () => true)
         .filter((type) => type.management?.defaultSearchField && type.management?.getInAppUrl);
+
       const searchFields = uniq(
         searchableTypes.map((type) => type.management!.defaultSearchField!)
       );

x-pack/plugins/lens/public/search_provider.ts

@@ -6,7 +6,7 @@
 
 import levenshtein from 'js-levenshtein';
 import { ApplicationStart } from 'kibana/public';
-import { from } from 'rxjs';
+import { from, of } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
 import { GlobalSearchResultProvider } from '../../global_search/public';
@@ -26,7 +26,10 @@ export const getSearchProvider: (
   uiCapabilities: Promise<ApplicationStart['capabilities']>
 ) => GlobalSearchResultProvider = (uiCapabilities) => ({
   id: 'lens',
-  find: (term) => {
+  find: ({ term = '', filters }) => {
+    if (filters.types && !filters.types.includes('application')) {
+      return of([]);
+    }
     return from(
       uiCapabilities.then(({ navLinks: { visualize: visualizeNavLink } }) => {
         if (!visualizeNavLink) {