-
{
- onInfo()
- handleTrigger()
- }}
- className='px-3 py-1.5 rounded-lg text-text-secondary system-md-regular cursor-pointer hover:bg-state-base-hover'
- >{t('plugin.detailPanel.operation.info')}
-
{
- onCheckVersion()
- handleTrigger()
- }}
- className='px-3 py-1.5 rounded-lg text-text-secondary system-md-regular cursor-pointer hover:bg-state-base-hover'
- >{t('plugin.detailPanel.operation.checkUpdate')}
-
- {t('plugin.detailPanel.operation.viewDetail')}
-
-
-
+ {source === PluginSource.github && (
+
{
+ onInfo()
+ handleTrigger()
+ }}
+ className='px-3 py-1.5 rounded-lg text-text-secondary system-md-regular cursor-pointer hover:bg-state-base-hover'
+ >{t('plugin.detailPanel.operation.info')}
+ )}
+ {source === PluginSource.github && (
+
{
+ onCheckVersion()
+ handleTrigger()
+ }}
+ className='px-3 py-1.5 rounded-lg text-text-secondary system-md-regular cursor-pointer hover:bg-state-base-hover'
+ >{t('plugin.detailPanel.operation.checkUpdate')}
+ )}
+ {source === PluginSource.marketplace && (
+
+ {t('plugin.detailPanel.operation.viewDetail')}
+
+
+ )}
+ {(source === PluginSource.marketplace || source === PluginSource.github) && (
+
+ )}
{
onRemove()
diff --git a/web/app/components/plugins/plugin-detail-panel/utils.ts b/web/app/components/plugins/plugin-detail-panel/utils.ts
new file mode 100644
index 0000000000..fd51142a38
--- /dev/null
+++ b/web/app/components/plugins/plugin-detail-panel/utils.ts
@@ -0,0 +1,21 @@
+import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
+
+export const NAME_FIELD = {
+ type: FormTypeEnum.textInput,
+ name: 'name',
+ label: {
+ en_US: 'Endpoint Name',
+ zh_Hans: '端点名称',
+ ja_JP: 'エンドポイント名',
+ pt_BR: 'Nome do ponto final',
+ },
+ placeholder: {
+ en_US: 'Endpoint Name',
+ zh_Hans: '端点名称',
+ ja_JP: 'エンドポイント名',
+ pt_BR: 'Nome do ponto final',
+ },
+ required: true,
+ default: '',
+ help: null,
+}
diff --git a/web/app/components/plugins/plugin-page/context.tsx b/web/app/components/plugins/plugin-page/context.tsx
index 697d28a022..6554ce344a 100644
--- a/web/app/components/plugins/plugin-page/context.tsx
+++ b/web/app/components/plugins/plugin-page/context.tsx
@@ -11,16 +11,13 @@ import {
useContextSelector,
} from 'use-context-selector'
import { useSelector as useAppContextSelector } from '@/context/app-context'
-import type { Permissions, PluginDetail } from '../types'
+import type { PluginDetail } from '../types'
import type { FilterState } from './filter-management'
-import { PermissionType } from '../types'
import { useTranslation } from 'react-i18next'
import { useTabSearchParams } from '@/hooks/use-tab-searchparams'
export type PluginPageContextValue = {
containerRef: React.RefObject
- permissions: Permissions
- setPermissions: (permissions: PluginPageContextValue['permissions']) => void
currentPluginDetail: PluginDetail | undefined
setCurrentPluginDetail: (plugin: PluginDetail) => void
filters: FilterState
@@ -32,21 +29,16 @@ export type PluginPageContextValue = {
export const PluginPageContext = createContext({
containerRef: { current: null },
- permissions: {
- install_permission: PermissionType.noOne,
- debug_permission: PermissionType.noOne,
- },
- setPermissions: () => {},
currentPluginDetail: undefined,
- setCurrentPluginDetail: () => {},
+ setCurrentPluginDetail: () => { },
filters: {
categories: [],
tags: [],
searchQuery: '',
},
- setFilters: () => {},
+ setFilters: () => { },
activeTab: '',
- setActiveTab: () => {},
+ setActiveTab: () => { },
options: [],
})
@@ -63,10 +55,6 @@ export const PluginPageContextProvider = ({
}: PluginPageContextProviderProps) => {
const { t } = useTranslation()
const containerRef = useRef(null)
- const [permissions, setPermissions] = useState({
- install_permission: PermissionType.noOne,
- debug_permission: PermissionType.noOne,
- })
const [filters, setFilters] = useState({
categories: [],
tags: [],
@@ -93,8 +81,6 @@ export const PluginPageContextProvider = ({
{
const { t } = useTranslation()
- const [info, setInfo] = React.useState(null)
- useEffect(() => {
- fetchDebugKey().then((res) => {
- setInfo(res)
- })
- }, [])
+ const { data: info, isLoading } = useDebugKey()
+
+ if (isLoading) return null
+
return (
{
diff --git a/web/app/components/plugins/plugin-page/plugins-panel.tsx b/web/app/components/plugins/plugin-page/plugins-panel.tsx
index 466df72066..198b418f7c 100644
--- a/web/app/components/plugins/plugin-page/plugins-panel.tsx
+++ b/web/app/components/plugins/plugin-page/plugins-panel.tsx
@@ -48,7 +48,7 @@ const PluginsPanel = () => {
) : (
)}
-
invalidateInstalledPluginList()}/>
+ invalidateInstalledPluginList()}/>
)
}
diff --git a/web/app/components/plugins/plugin-page/use-permission.ts b/web/app/components/plugins/plugin-page/use-permission.ts
index 4a8cdc29c1..c4fc01f2c3 100644
--- a/web/app/components/plugins/plugin-page/use-permission.ts
+++ b/web/app/components/plugins/plugin-page/use-permission.ts
@@ -1,15 +1,12 @@
-import { useEffect } from 'react'
-import type { Permissions } from '../types'
import { PermissionType } from '../types'
-import {
- usePluginPageContext,
-} from './context'
import { useAppContext } from '@/context/app-context'
-import { updatePermission as doUpdatePermission, fetchPermission } from '@/service/plugins'
import Toast from '../../base/toast'
import { useTranslation } from 'react-i18next'
+import { useInvalidatePermissions, useMutationPermissions, usePermissions } from '@/service/use-plugins'
-const hasPermission = (permission: PermissionType, isAdmin: boolean) => {
+const hasPermission = (permission: PermissionType | undefined, isAdmin: boolean) => {
+ if (!permission)
+ return false
if (permission === PermissionType.noOne)
return false
@@ -22,29 +19,26 @@ const hasPermission = (permission: PermissionType, isAdmin: boolean) => {
const usePermission = () => {
const { t } = useTranslation()
const { isCurrentWorkspaceManager, isCurrentWorkspaceOwner } = useAppContext()
- const [permissions, setPermissions] = usePluginPageContext(v => [v.permissions, v.setPermissions])
+ const { data: permissions } = usePermissions()
+ const invalidatePermissions = useInvalidatePermissions()
+ const { mutate: updatePermission, isPending: isUpdatePending } = useMutationPermissions({
+ onSuccess: () => {
+ invalidatePermissions()
+ Toast.notify({
+ type: 'success',
+ message: t('common.api.actionSuccess'),
+ })
+ },
+ })
const isAdmin = isCurrentWorkspaceManager || isCurrentWorkspaceOwner
- const updatePermission = async (permission: Permissions) => {
- await doUpdatePermission(permission)
- setPermissions(permission)
- Toast.notify({
- type: 'success',
- message: t('common.api.actionSuccess'),
- })
- }
- useEffect(() => {
- (async () => {
- const permission = await fetchPermission()
- setPermissions(permission)
- })()
- }, [])
return {
- canManagement: hasPermission(permissions.install_permission, isAdmin),
- canDebugger: hasPermission(permissions.debug_permission, isAdmin),
+ canManagement: hasPermission(permissions?.install_permission, isAdmin),
+ canDebugger: hasPermission(permissions?.debug_permission, isAdmin),
canSetPermissions: isAdmin,
permissions,
setPermissions: updatePermission,
+ isUpdatePending,
}
}
diff --git a/web/app/components/plugins/provider-card.tsx b/web/app/components/plugins/provider-card.tsx
index 5c8ab1891e..e2a45fc24d 100644
--- a/web/app/components/plugins/provider-card.tsx
+++ b/web/app/components/plugins/provider-card.tsx
@@ -19,11 +19,13 @@ import { useBoolean } from 'ahooks'
type Props = {
className?: string
payload: Plugin
+ onSuccess: () => void
}
const ProviderCard: FC = ({
className,
payload,
+ onSuccess,
}) => {
const { t } = useTranslation()
const [isShowInstallFromMarketplace, {
@@ -84,7 +86,10 @@ const ProviderCard: FC = ({
manifest={payload as any}
uniqueIdentifier={payload.latest_package_identifier}
onClose={hideInstallFromMarketplace}
- onSuccess={hideInstallFromMarketplace}
+ onSuccess={() => {
+ onSuccess()
+ hideInstallFromMarketplace()
+ }}
/>
)
}
diff --git a/web/app/components/plugins/types.ts b/web/app/components/plugins/types.ts
index 95b255de62..629b9b7582 100644
--- a/web/app/components/plugins/types.ts
+++ b/web/app/components/plugins/types.ts
@@ -301,3 +301,7 @@ export type InstalledPluginListResponse = {
export type UninstallPluginResponse = {
success: boolean
}
+
+export type PluginsFromMarketplaceResponse = {
+ plugins: Plugin[]
+}
diff --git a/web/app/components/tools/marketplace/hooks.ts b/web/app/components/tools/marketplace/hooks.ts
index 82f019ef14..5d27e10043 100644
--- a/web/app/components/tools/marketplace/hooks.ts
+++ b/web/app/components/tools/marketplace/hooks.ts
@@ -15,7 +15,7 @@ export const useMarketplace = (searchPluginText: string, filterPluginTags: strin
} = useMarketplaceCollectionsAndPlugins()
const {
plugins,
- setPlugins,
+ resetPlugins,
queryPlugins,
queryPluginsWithDebounced,
isLoading: isPluginsLoading,
@@ -37,9 +37,9 @@ export const useMarketplace = (searchPluginText: string, filterPluginTags: strin
}
else {
queryMarketplaceCollectionsAndPlugins()
- setPlugins(undefined)
+ resetPlugins()
}
- }, [searchPluginText, filterPluginTags, queryPlugins, queryMarketplaceCollectionsAndPlugins, queryPluginsWithDebounced, setPlugins])
+ }, [searchPluginText, filterPluginTags, queryPlugins, queryMarketplaceCollectionsAndPlugins, queryPluginsWithDebounced, resetPlugins])
return {
isLoading: isLoading || isPluginsLoading,
diff --git a/web/app/components/tools/marketplace/index.tsx b/web/app/components/tools/marketplace/index.tsx
index f2092227a0..c50b898362 100644
--- a/web/app/components/tools/marketplace/index.tsx
+++ b/web/app/components/tools/marketplace/index.tsx
@@ -31,9 +31,11 @@ const Marketplace = ({
onClick={() => onMarketplaceScroll()}
/>
-
More from Marketplace
+
+ {t('plugin.marketplace.moreFrom')}
+
- Discover
+ {t('plugin.marketplace.discover')}
{t('plugin.category.models')}
@@ -45,11 +47,11 @@ const Marketplace = ({
{t('plugin.category.extensions')}
- and
+ {t('plugin.marketplace.and')}
{t('plugin.category.bundles')}
- in Dify Marketplace
+ {t('plugin.marketplace.inDifyMarketplace')}