diff --git a/web/app/components/plugins/marketplace/hooks.ts b/web/app/components/plugins/marketplace/hooks.ts index 10aead17c4..5bc9263aaa 100644 --- a/web/app/components/plugins/marketplace/hooks.ts +++ b/web/app/components/plugins/marketplace/hooks.ts @@ -65,10 +65,12 @@ export const useMarketplacePlugins = () => { } = useMutationPluginsFromMarketplace() const [prevPlugins, setPrevPlugins] = useState() + const resetPlugins = useCallback(() => { reset() setPrevPlugins(undefined) }, [reset]) + const handleUpdatePlugins = useCallback((pluginsSearchParams: PluginsSearchParams) => { mutateAsync(pluginsSearchParams).then((res) => { const currentPage = pluginsSearchParams.page || 1 @@ -85,9 +87,6 @@ export const useMarketplacePlugins = () => { } }) }, [mutateAsync]) - const queryPlugins = useCallback((pluginsSearchParams: PluginsSearchParams) => { - handleUpdatePlugins(pluginsSearchParams) - }, [handleUpdatePlugins]) const { run: queryPluginsWithDebounced, cancel: cancelQueryPluginsWithDebounced } = useDebounceFn((pluginsSearchParams: PluginsSearchParams) => { handleUpdatePlugins(pluginsSearchParams) @@ -99,7 +98,7 @@ export const useMarketplacePlugins = () => { plugins: prevPlugins, total: data?.data?.total, resetPlugins, - queryPlugins, + queryPlugins: handleUpdatePlugins, queryPluginsWithDebounced, cancelQueryPluginsWithDebounced, isLoading: isPending, diff --git a/web/app/components/plugins/marketplace/utils.ts b/web/app/components/plugins/marketplace/utils.ts index df943b79b8..06cad62ba7 100644 --- a/web/app/components/plugins/marketplace/utils.ts +++ b/web/app/components/plugins/marketplace/utils.ts @@ -113,21 +113,12 @@ export const getMarketplaceCollectionsAndPlugins = async (query?: CollectionsAnd } export const getMarketplaceListCondition = (pluginType: string) => { - if (pluginType === PluginCategoryEnum.tool) - return 'category=tool' - - if (pluginType === PluginCategoryEnum.agent) - return 'category=agent-strategy' - - if (pluginType === PluginCategoryEnum.model) - return 'category=model' + if ([PluginCategoryEnum.tool, PluginCategoryEnum.agent, PluginCategoryEnum.model, PluginCategoryEnum.datasource, PluginCategoryEnum.trigger].includes(pluginType as PluginCategoryEnum)) + return `category=${pluginType}` if (pluginType === PluginCategoryEnum.extension) return 'category=endpoint' - if (pluginType === PluginCategoryEnum.datasource) - return 'category=datasource' - if (pluginType === 'bundle') return 'type=bundle'