ngskcloud
/
gcgj-dify-1.7.0
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: install by local bundle change

Browse Source
pull/12372/head
Joel 1 year ago
parent e151c2ee8c
commit 5947e38ea0
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File

4
web/app/(commonLayout)/plugins/test/card/page.tsx
Unescape Escape View File

@ -30,7 +30,7 @@ const PluginList = () => {
type: 'github', type: 'github',
value: { value: {
repo: 'YIXIAO0/test', repo: 'YIXIAO0/test',
version: '1.11.5', release: '1.11.5',
package: 'test.difypkg', package: 'test.difypkg',
github_plugin_unique_identifier: 'yixiao0/test:0.0.1@3592166c87afcf944b4f13f27467a5c8f9e00bd349cb42033a072734a37431b4', github_plugin_unique_identifier: 'yixiao0/test:0.0.1@3592166c87afcf944b4f13f27467a5c8f9e00bd349cb42033a072734a37431b4',
}, },
@ -40,7 +40,7 @@ const PluginList = () => {
value: { value: {
package: 'dify-test.difypkg', package: 'dify-test.difypkg',
repo: 'WTW0313/dify-test', repo: 'WTW0313/dify-test',
version: '0.0.5-beta.2', release: '0.0.5-beta.2',
github_plugin_unique_identifier: 'wtw0313/dify-test:0.0.1@1633daa043b47155d4228e2db7734245fd6d3e20ba812e5c02ce69fc1e3038f4', github_plugin_unique_identifier: 'wtw0313/dify-test:0.0.1@1633daa043b47155d4228e2db7734245fd6d3e20ba812e5c02ce69fc1e3038f4',
}, },
}, },

4
web/app/components/plugins/install-plugin/install-bundle/item/github-item.tsx
Unescape Escape View File

@ -25,8 +25,8 @@ const Item: FC<Props> = ({
const info = dependency.value const info = dependency.value
const { data, error } = useUploadGitHub({ const { data, error } = useUploadGitHub({
repo: info.repo!, repo: info.repo!,
version: info.version!, version: info.release!,
package: info.package!, package: info.packages!,
}) })
const [payload, setPayload] = React.useState<Plugin | null>(null) const [payload, setPayload] = React.useState<Plugin | null>(null)
useEffect(() => { useEffect(() => {

2
web/app/components/plugins/install-plugin/install-bundle/steps/install-multi.tsx
Unescape Escape View File

@ -23,7 +23,7 @@ const InstallByDSLList: FC<Props> = ({
onLoadedAllPlugin, onLoadedAllPlugin,
}) => { }) => {
const { isLoading: isFetchingMarketplaceData, data: marketplaceRes } = useFetchPluginsInMarketPlaceByIds(allPlugins.filter(d => d.type === 'marketplace').map(d => (d as GitHubItemAndMarketPlaceDependency).value.plugin_unique_identifier!)) const { isLoading: isFetchingMarketplaceData, data: marketplaceRes } = useFetchPluginsInMarketPlaceByIds(allPlugins.filter(d => d.type === 'marketplace').map(d => (d as GitHubItemAndMarketPlaceDependency).value.plugin_unique_identifier!))
console.log(allPlugins)
const [plugins, setPlugins, getPlugins] = useGetState<(Plugin | undefined)[]>((() => { const [plugins, setPlugins, getPlugins] = useGetState<(Plugin | undefined)[]>((() => {
const hasLocalPackage = allPlugins.some(d => d.type === 'package') const hasLocalPackage = allPlugins.some(d => d.type === 'package')
if (!hasLocalPackage) if (!hasLocalPackage)

2
web/app/components/plugins/install-plugin/install-from-local-package/index.tsx
Unescape Escape View File

@ -28,7 +28,7 @@ const InstallFromLocalPackage: React.FC<InstallFromLocalPackageProps> = ({
const [uniqueIdentifier, setUniqueIdentifier] = useState<string | null>(null) const [uniqueIdentifier, setUniqueIdentifier] = useState<string | null>(null)
const [manifest, setManifest] = useState<PluginDeclaration | null>(null) const [manifest, setManifest] = useState<PluginDeclaration | null>(null)
const [errorMsg, setErrorMsg] = useState<string | null>(null) const [errorMsg, setErrorMsg] = useState<string | null>(null)
const isBundle = file.name.endsWith('.bundle') const isBundle = file.name.endsWith('.difybndl')
const [dependencies, setDependencies] = useState<Dependency[]>([]) const [dependencies, setDependencies] = useState<Dependency[]>([])
const getTitle = useCallback(() => { const getTitle = useCallback(() => {

4
web/app/components/plugins/types.ts
Unescape Escape View File

@ -315,8 +315,8 @@ export type GitHubItemAndMarketPlaceDependency = {
type: 'github' | 'marketplace' | 'package' type: 'github' | 'marketplace' | 'package'
value: { value: {
repo?: string repo?: string
version?: string release?: string
package?: string packages?: string
github_plugin_unique_identifier?: string github_plugin_unique_identifier?: string
marketplace_plugin_unique_identifier?: string marketplace_plugin_unique_identifier?: string
plugin_unique_identifier?: string plugin_unique_identifier?: string

2
web/config/index.ts
Unescape Escape View File

@ -274,4 +274,4 @@ export const DISABLE_UPLOAD_IMAGE_AS_ICON = process.env.NEXT_PUBLIC_DISABLE_UPLO
export const GITHUB_ACCESS_TOKEN = process.env.NEXT_PUBLIC_GITHUB_ACCESS_TOKEN || globalThis.document?.body?.getAttribute('data-public-github-access-token') || '' export const GITHUB_ACCESS_TOKEN = process.env.NEXT_PUBLIC_GITHUB_ACCESS_TOKEN || globalThis.document?.body?.getAttribute('data-public-github-access-token') || ''
export const SUPPORT_INSTALL_LOCAL_FILE_EXTENSIONS = '.difypkg,.bundle' export const SUPPORT_INSTALL_LOCAL_FILE_EXTENSIONS = '.difypkg,.difybndl'

5
web/service/use-plugins.ts
Unescape Escape View File

@ -125,8 +125,8 @@ export const useInstallFromMarketplaceAndGitHub = ({
await post<InstallPackageResponse>('/workspaces/current/plugin/install/github', { await post<InstallPackageResponse>('/workspaces/current/plugin/install/github', {
body: { body: {
repo: data.value.repo!, repo: data.value.repo!,
version: data.value.version!, version: data.value.release!,
package: data.value.package!, package: data.value.packages!,
plugin_unique_identifier: data.value.github_plugin_unique_identifier!, plugin_unique_identifier: data.value.github_plugin_unique_identifier!,
}, },
}) })
@ -231,6 +231,7 @@ export const useFetchPluginsInMarketPlaceByIds = (unique_identifiers: string[])
unique_identifiers, unique_identifiers,
}, },
}), }),
enabled: unique_identifiers.filter(i => !!i).length > 0, // loaded then fetch
}) })
} }

Write Preview
Loading…
Cancel
Save