merge

web/app/components/plugins/plugin-item/action.tsx

@@ -14,6 +14,7 @@ import { useGitHubReleases } from '../install-plugin/hooks'
 import Toast from '@/app/components/base/toast'
 import { useModalContext } from '@/context/modal-context'
 import { useInvalidateInstalledPluginList } from '@/service/use-plugins'
+import type { PluginType } from '@/app/components/plugins/types'
 
 const i18nPrefix = 'plugin.action'
 
@@ -22,6 +23,7 @@ type Props = {
   installationId: string
   pluginUniqueIdentifier: string
   pluginName: string
+  category: PluginType
   usedInApps: number
   isShowFetchNewVersion: boolean
   isShowInfo: boolean
@@ -34,6 +36,7 @@ const Action: FC<Props> = ({
   installationId,
   pluginUniqueIdentifier,
   pluginName,
+  category,
   isShowFetchNewVersion,
   isShowInfo,
   isShowDelete,
@@ -67,6 +70,7 @@ const Action: FC<Props> = ({
         },
         payload: {
           type: PluginSource.github,
+          category,
           github: {
             originalPackageInfo: {
               id: pluginUniqueIdentifier,
@@ -94,7 +98,7 @@ const Action: FC<Props> = ({
       hideDeleteConfirm()
       onDelete()
     }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [installationId, onDelete])
   return (
     <div className='flex space-x-1'>

web/app/components/plugins/plugin-item/index.tsx

@@ -20,11 +20,9 @@ import Title from '../card/base/title'
 import Action from './action'
 import cn from '@/utils/classnames'
 import { API_PREFIX, MARKETPLACE_URL_PREFIX } from '@/config'
-import { useInvalidateInstalledPluginList } from '@/service/use-plugins'
-import { useInvalidateAllBuiltInTools, useInvalidateAllToolProviders } from '@/service/use-tools'
 import { useSingleCategories } from '../hooks'
-import { useProviderContext } from '@/context/provider-context'
 import { useRenderI18nObject } from '@/hooks/use-i18n'
+import useRefreshPluginList from '@/app/components/plugins/install-plugin/hooks/use-refresh-plugin-list'
 
 type Props = {
   className?: string
@@ -39,10 +37,7 @@ const PluginItem: FC<Props> = ({
   const { categoriesMap } = useSingleCategories()
   const currentPluginID = usePluginPageContext(v => v.currentPluginID)
   const setCurrentPluginID = usePluginPageContext(v => v.setCurrentPluginID)
-  const invalidateInstalledPluginList = useInvalidateInstalledPluginList()
-  const invalidateAllToolProviders = useInvalidateAllToolProviders()
-  const invalidateAllBuiltinTools = useInvalidateAllBuiltInTools()
-  const { refreshModelProviders } = useProviderContext()
+  const { refreshPluginList } = useRefreshPluginList()
 
   const {
     source,
@@ -60,13 +55,7 @@ const PluginItem: FC<Props> = ({
   }, [source, author])
 
   const handleDelete = () => {
-    invalidateInstalledPluginList()
-    if (PluginType.model.includes(category))
-      refreshModelProviders()
-    if (PluginType.tool.includes(category)) {
-      invalidateAllToolProviders()
-      invalidateAllBuiltinTools()
-    }
+    refreshPluginList({ category } as any)
   }
   const getValueFromI18nObject = useRenderI18nObject()
   const title = getValueFromI18nObject(label)
@@ -116,6 +105,7 @@ const PluginItem: FC<Props> = ({
                   isShowDelete
                   meta={meta}
                   onDelete={handleDelete}
+                  category={category}
                 />
               </div>
             </div>