remove empty contracts & cache searchable apps

Author: pgayvallet

x-pack/plugins/global_search_providers/public/index.ts

@@ -5,18 +5,9 @@
  */
 
 import { PluginInitializer } from 'src/core/public';
-import {
-  GlobalSearchProvidersPlugin,
-  GlobalSearchProvidersPluginSetupDeps,
-  GlobalSearchProvidersPluginStartDeps,
-} from './plugin';
-import { GlobalSearchProvidersPluginSetup, GlobalSearchProvidersPluginStart } from './types';
+import { GlobalSearchProvidersPlugin, GlobalSearchProvidersPluginSetupDeps } from './plugin';
 
-export const plugin: PluginInitializer<
-  GlobalSearchProvidersPluginSetup,
-  GlobalSearchProvidersPluginStart,
-  GlobalSearchProvidersPluginSetupDeps,
-  GlobalSearchProvidersPluginStartDeps
-> = (context) => new GlobalSearchProvidersPlugin();
+export const plugin: PluginInitializer<{}, {}, GlobalSearchProvidersPluginSetupDeps, {}> = () =>
+  new GlobalSearchProvidersPlugin();
 
 export { GlobalSearchProvidersPluginSetup, GlobalSearchProvidersPluginStart };

x-pack/plugins/global_search_providers/public/plugin.ts

@@ -13,17 +13,8 @@ export interface GlobalSearchProvidersPluginSetupDeps {
   globalSearch: GlobalSearchPluginSetup;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface GlobalSearchProvidersPluginStartDeps {}
-
 export class GlobalSearchProvidersPlugin
-  implements
-    Plugin<
-      GlobalSearchProvidersPluginSetup,
-      GlobalSearchProvidersPluginStart,
-      GlobalSearchProvidersPluginSetupDeps,
-      GlobalSearchProvidersPluginStartDeps
-    > {
+  implements Plugin<{}, {}, GlobalSearchProvidersPluginSetupDeps, {}> {
   setup(
     {
       getStartServices,

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

@@ -87,6 +87,33 @@ describe('applicationResultProvider', () => {
     ]);
   });
 
+  it('ignores inaccessible apps', async () => {
+    application.applications$ = of(
+      createAppMap([
+        createApp({ id: 'app1', title: 'App 1' }),
+        createApp({ id: 'disabled', title: 'disabled', status: AppStatus.inaccessible }),
+      ])
+    );
+    const provider = createApplicationResultProvider(Promise.resolve(application));
+    await provider.find('term', defaultOption).toPromise();
+
+    expect(getAppResultsMock).toHaveBeenCalledWith('term', [expectApp('app1')]);
+  });
+
+  it('ignores chromeless apps', async () => {
+    application.applications$ = of(
+      createAppMap([
+        createApp({ id: 'app1', title: 'App 1' }),
+        createApp({ id: 'chromeless', title: 'chromeless', chromeless: true }),
+      ])
+    );
+
+    const provider = createApplicationResultProvider(Promise.resolve(application));
+    await provider.find('term', defaultOption).toPromise();
+
+    expect(getAppResultsMock).toHaveBeenCalledWith('term', [expectApp('app1')]);
+  });
+
   it('sorts the results returned by `getAppResults`', async () => {
     getAppResultsMock.mockReturnValue([
       createResult({ id: 'r60', score: 60 }),
@@ -96,7 +123,6 @@ describe('applicationResultProvider', () => {
     ]);
 
     const provider = createApplicationResultProvider(Promise.resolve(application));
-
     const results = await provider.find('term', defaultOption).toPromise();
 
     expect(results).toEqual([

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

@@ -5,19 +5,28 @@
  */
 
 import { from } from 'rxjs';
-import { take, map, takeUntil, mergeMap } from 'rxjs/operators';
+import { take, map, takeUntil, mergeMap, shareReplay } from 'rxjs/operators';
 import { ApplicationStart } from 'src/core/public';
 import { GlobalSearchResultProvider } from '../../../global_search/public';
 import { getAppResults } from './get_app_results';
 
 export const createApplicationResultProvider = (
   applicationPromise: Promise<ApplicationStart>
 ): GlobalSearchResultProvider => {
+  const searchableApps$ = from(applicationPromise).pipe(
+    mergeMap((application) => application.applications$),
+    map((apps) =>
+      [...apps.values()].filter(
+        (app) => app.status === 0 && (app.legacy === true || app.chromeless !== true)
+      )
+    ),
+    shareReplay(1)
+  );
+
   return {
     id: 'application',
     find: (term, { aborted$, maxResults }) => {
-      return from(applicationPromise).pipe(
-        mergeMap((application) => application.applications$),
+      return searchableApps$.pipe(
         takeUntil(aborted$),
         take(1),
         map((apps) => {

x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts

@@ -40,24 +40,6 @@ describe('getAppResults', () => {
     expect(results.length).toBe(1);
     expect(results[0]).toEqual(expect.objectContaining({ id: 'dashboard', score: 100 }));
   });
-
-  it('ignores inaccessible apps', () => {
-    const apps = [
-      createApp({ id: 'dashboard', title: 'dashboard', status: AppStatus.inaccessible }),
-    ];
-
-    const results = getAppResults('dashboard', apps);
-
-    expect(results.length).toBe(0);
-  });
-
-  it('ignores chromeless apps', () => {
-    const apps = [createApp({ id: 'dashboard', title: 'dashboard', chromeless: true })];
-
-    const results = getAppResults('dashboard', apps);
-
-    expect(results.length).toBe(0);
-  });
 });
 
 describe('scoreApp', () => {

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

@@ -12,14 +12,10 @@ export const getAppResults = (
   term: string,
   apps: Array<PublicAppInfo | PublicLegacyAppInfo>
 ): GlobalSearchProviderResult[] => {
-  return (
-    apps
-      // remove disabled and chromeless app (to avoid returning the login page for example)
-      .filter((app) => app.status === 0 && (app.legacy === true || app.chromeless !== true))
-      .map((app) => ({ app, score: scoreApp(term, app) }))
-      .filter(({ score }) => score > 0)
-      .map(({ app, score }) => appToResult(app, score))
-  );
+  return apps
+    .map((app) => ({ app, score: scoreApp(term, app) }))
+    .filter(({ score }) => score > 0)
+    .map(({ app, score }) => appToResult(app, score));
 };
 
 export const scoreApp = (term: string, { title }: PublicAppInfo | PublicLegacyAppInfo): number => {