From dfbf66408a4f5dd2be92c46f7fbf6548a684e47b Mon Sep 17 00:00:00 2001 From: Anton Nikolaev Date: Tue, 22 Sep 2020 10:33:52 -0700 Subject: [PATCH] Fix search by query in Plugin Manager Summary: I accidently broke search by query in a previous diff, so fixing it here Reviewed By: passy Differential Revision: D23842187 fbshipit-source-id: 9fcc7a46048ff99e1bf26c8a70ef0240b38018cb --- .../src/chrome/plugin-manager/PluginInstaller.tsx | 2 +- desktop/plugin-lib/src/getUpdatablePlugins.ts | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/desktop/app/src/chrome/plugin-manager/PluginInstaller.tsx b/desktop/app/src/chrome/plugin-manager/PluginInstaller.tsx index 9344f960a..dff791411 100644 --- a/desktop/app/src/chrome/plugin-manager/PluginInstaller.tsx +++ b/desktop/app/src/chrome/plugin-manager/PluginInstaller.tsx @@ -345,7 +345,7 @@ function useNPMSearch( (async () => { let cancelled = false; const updatablePlugins = await reportPlatformFailures( - getUpdatablePlugins(), + getUpdatablePlugins(query), `${TAG}:queryIndex`, ); if (cancelled) { diff --git a/desktop/plugin-lib/src/getUpdatablePlugins.ts b/desktop/plugin-lib/src/getUpdatablePlugins.ts index c7e2feecc..b9dc0b5ec 100644 --- a/desktop/plugin-lib/src/getUpdatablePlugins.ts +++ b/desktop/plugin-lib/src/getUpdatablePlugins.ts @@ -16,6 +16,7 @@ import getPluginDetails from './getPluginDetails'; import {getPluginInstallationDir} from './pluginInstaller'; import pmap from 'p-map'; import {notNull} from './typeUtils'; +const npmApi = new NpmApi(); export type UpdateResult = | {kind: 'not-installed'; version: string} @@ -30,8 +31,9 @@ export type UpdatablePlugin = { export type UpdatablePluginDetails = PluginDetails & UpdatablePlugin; -export async function getUpdatablePlugins(): Promise { - const npmApi = new NpmApi(); +export async function getUpdatablePlugins( + query?: string, +): Promise { const installedPlugins = await getInstalledPlugins(); const npmHostedPlugins = new Map( (await getNpmHostedPlugins()).map((p) => [p.name, p]), @@ -119,5 +121,12 @@ export async function getUpdatablePlugins(): Promise { ...annotatedNotInstalledPlugins .filter(notNull) .sort((p1, p2) => p1.name.localeCompare(p2.name)), - ]; + ].filter( + (p) => + !query || + p.name.includes(query) || + p.id.includes(query) || + p.description?.includes(query) || + p.title?.includes(query), + ); }