outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat/add-mode-in-import-structure' into deploy/dev

Browse Source
This commit is contained in:
twwu 2025-03-18 11:08:18 +08:00
commit 0c2177be53
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/components/app/create-app-dialog/app-list/index.tsx
View File

@ -151,7 +151,7 @@ const Apps = ({
if (app.app_id) if (app.app_id)
await handleCheckPluginDependencies(app.app_id) await handleCheckPluginDependencies(app.app_id)
localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1') localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1')
getRedirection(isCurrentWorkspaceEditor, { id: app.app_id, mode }, push) getRedirection(isCurrentWorkspaceEditor, { id: app.app_id!, mode }, push)
} }
catch (e) { catch (e) {
Toast.notify({ type: 'error', message: t('app.newApp.appCreateFailed') }) Toast.notify({ type: 'error', message: t('app.newApp.appCreateFailed') })

9
web/app/components/app/create-from-dsl-modal/index.tsx
View File

@ -102,8 +102,7 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
if (!response) if (!response)
return return
const { id, status, app_id, app_mode, imported_dsl_version, current_dsl_version } = response
const { id, status, app_id, imported_dsl_version, current_dsl_version } = response
if (status === DSLImportStatus.COMPLETED || status === DSLImportStatus.COMPLETED_WITH_WARNINGS) { if (status === DSLImportStatus.COMPLETED || status === DSLImportStatus.COMPLETED_WITH_WARNINGS) {
if (onSuccess) if (onSuccess)
onSuccess() onSuccess()
@ -118,7 +117,7 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1') localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1')
if (app_id) if (app_id)
await handleCheckPluginDependencies(app_id) await handleCheckPluginDependencies(app_id)
getRedirection(isCurrentWorkspaceEditor, { id: app_id }, push) getRedirection(isCurrentWorkspaceEditor, { id: app_id!, mode: app_mode }, push)
} }
else if (status === DSLImportStatus.PENDING) { else if (status === DSLImportStatus.PENDING) {
setVersions({ setVersions({
@ -151,7 +150,7 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
import_id: importId, import_id: importId,
}) })
const { status, app_id } = response const { status, app_id, app_mode } = response
if (status === DSLImportStatus.COMPLETED) { if (status === DSLImportStatus.COMPLETED) {
if (onSuccess) if (onSuccess)
@ -166,7 +165,7 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
if (app_id) if (app_id)
await handleCheckPluginDependencies(app_id) await handleCheckPluginDependencies(app_id)
localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1') localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1')
getRedirection(isCurrentWorkspaceEditor, { id: app_id }, push) getRedirection(isCurrentWorkspaceEditor, { id: app_id!, mode: app_mode }, push)
} }
else if (status === DSLImportStatus.FAILED) { else if (status === DSLImportStatus.FAILED) {
notify({ type: 'error', message: t('app.newApp.appCreateFailed') }) notify({ type: 'error', message: t('app.newApp.appCreateFailed') })

2
web/app/components/explore/app-list/index.tsx
View File

@ -146,7 +146,7 @@ const Apps = ({
if (app.app_id) if (app.app_id)
await handleCheckPluginDependencies(app.app_id) await handleCheckPluginDependencies(app.app_id)
localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1') localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1')
getRedirection(isCurrentWorkspaceEditor, { id: app.app_id, mode }, push) getRedirection(isCurrentWorkspaceEditor, { id: app.app_id!, mode }, push)
} }
catch (e) { catch (e) {
Toast.notify({ type: 'error', message: t('app.newApp.appCreateFailed') }) Toast.notify({ type: 'error', message: t('app.newApp.appCreateFailed') })

3
web/models/app.ts
View File

@ -1,5 +1,5 @@
import type { LangFuseConfig, LangSmithConfig, OpikConfig, TracingProvider } from '@/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/type' import type { LangFuseConfig, LangSmithConfig, OpikConfig, TracingProvider } from '@/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/type'
import type { App, AppSSO, AppTemplate, SiteConfig } from '@/types/app' import type { App, AppMode, AppSSO, AppTemplate, SiteConfig } from '@/types/app'
import type { Dependency } from '@/app/components/plugins/types' import type { Dependency } from '@/app/components/plugins/types'
/* export type App = { /* export type App = {
@ -84,6 +84,7 @@ export type AppDetailResponse = App
export type DSLImportResponse = { export type DSLImportResponse = {
id: string id: string
status: DSLImportStatus status: DSLImportStatus
app_mode: AppMode
app_id?: string app_id?: string
current_dsl_version?: string current_dsl_version?: string
imported_dsl_version?: string imported_dsl_version?: string

4
web/utils/app-redirection.ts
View File

@ -1,6 +1,8 @@
import type { AppMode } from '@/types/app'
export const getRedirection = ( export const getRedirection = (
isCurrentWorkspaceEditor: boolean, isCurrentWorkspaceEditor: boolean,
app: any, app: { id: string, mode: AppMode },
redirectionFunc: (href: string) => void, redirectionFunc: (href: string) => void,
) => { ) => {
if (!isCurrentWorkspaceEditor) { if (!isCurrentWorkspaceEditor) {