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

fix: fix duplicate app lose custom image (#19775)

Browse Source
pull/19995/head
CorrectRoad 9 months ago committed by GitHub
parent b2ae46b80f
commit 618981f1ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
api/controllers/console/app/app.py
Unescape Escape View File

@ -192,6 +192,7 @@ class AppCopyApi(Resource):
parser.add_argument("icon_type", type=str, location="json")
parser.add_argument("icon", type=str, location="json")
parser.add_argument("icon_background", type=str, location="json")
parser.add_argument("icon_url", type=str, location="json")
args = parser.parse_args()
with Session(db.engine) as session:
@ -206,6 +207,7 @@ class AppCopyApi(Resource):
description=args.get("description"),
icon_type=args.get("icon_type"),
icon=args.get("icon"),
icon_url=args.get("icon_url"),
icon_background=args.get("icon_background"),
)
session.commit()

10
api/services/app_dsl_service.py
Unescape Escape View File

@ -100,6 +100,7 @@ class PendingData(BaseModel):
description: str | None
icon_type: str | None
icon: str | None
icon_url: str | None
icon_background: str | None
app_id: str | None
@ -124,6 +125,7 @@ class AppDslService:
description: Optional[str] = None,
icon_type: Optional[str] = None,
icon: Optional[str] = None,
icon_url: Optional[str] = None,
icon_background: Optional[str] = None,
app_id: Optional[str] = None,
) -> Import:
@ -248,6 +250,7 @@ class AppDslService:
icon_type=icon_type,
icon=icon,
icon_background=icon_background,
icon_url=icon_url,
app_id=app_id,
)
redis_client.setex(
@ -288,6 +291,7 @@ class AppDslService:
description=description,
icon_type=icon_type,
icon=icon,
icon_url=icon_url,
icon_background=icon_background,
dependencies=check_dependencies_pending_data,
)
@ -409,6 +413,7 @@ class AppDslService:
description: Optional[str] = None,
icon_type: Optional[str] = None,
icon: Optional[str] = None,
icon_url: Optional[str] = None,
icon_background: Optional[str] = None,
dependencies: Optional[list[PluginDependency]] = None,
) -> App:
@ -421,12 +426,12 @@ class AppDslService:
# Set icon type
icon_type_value = icon_type or app_data.get("icon_type")
if icon_type_value in ["emoji", "link"]:
if icon_type_value in ["emoji", "link", "image"]:
icon_type = icon_type_value
else:
icon_type = "emoji"
icon = icon or str(app_data.get("icon", ""))
icon_url = icon_url or str(app_data.get("icon_url", ""))
if app:
# Update existing app
app.name = name or app_data.get("name", app.name)
@ -434,6 +439,7 @@ class AppDslService:
app.icon_type = icon_type
app.icon = icon
app.icon_background = icon_background or app_data.get("icon_background", app.icon_background)
app.icon_url = icon_url or app_data.get("icon_url", app.icon_url)
app.updated_by = account.id
else:
if account.current_tenant_id is None:

4
web/app/(commonLayout)/apps/AppCard.tsx
Unescape Escape View File

@ -111,14 +111,16 @@ const AppCard = ({ app, onRefresh }: AppCardProps) => {
}
}, [app.id, mutateApps, notify, onRefresh, t])
const onCopy: DuplicateAppModalProps['onConfirm'] = async ({ name, icon_type, icon, icon_background }) => {
const onCopy: DuplicateAppModalProps['onConfirm'] = async ({ name, icon_type, icon, icon_background, icon_url }) => {
try {
console.log('icon_url', icon_url)
const newApp = await copyApp({
appID: app.id,
name,
icon_type,
icon,
icon_background,
icon_url,
mode: app.mode,
})
setShowDuplicateModal(false)

2
web/app/components/app/duplicate-modal/index.tsx
Unescape Escape View File

@ -24,6 +24,7 @@ export type DuplicateAppModalProps = {
onConfirm: (info: {
name: string
icon_type: AppIconType
icon_url?: string | null
icon: string
icon_background?: string | null
}) => Promise<void>
@ -63,6 +64,7 @@ const DuplicateAppModal = ({
name,
icon_type: appIcon.type,
icon: appIcon.type === 'emoji' ? appIcon.icon : appIcon.fileId,
icon_url: appIcon.type === 'image' ? appIcon.url : undefined,
icon_background: appIcon.type === 'emoji' ? appIcon.background : undefined,
})
onHide()

8
web/service/apps.ts
Unescape Escape View File

@ -21,12 +21,12 @@ export const createApp: Fetcher<AppDetailResponse, { name: string; icon_type?: A
return post<AppDetailResponse>('apps', { body: { name, icon_type, icon, icon_background, mode, description, model_config: config } })
}
export const updateAppInfo: Fetcher<AppDetailResponse, { appID: string; name: string; icon_type: AppIconType; icon: string; icon_background?: string; description: string; use_icon_as_answer_icon?: boolean }> = ({ appID, name, icon_type, icon, icon_background, description, use_icon_as_answer_icon }) => {
return put<AppDetailResponse>(`apps/${appID}`, { body: { name, icon_type, icon, icon_background, description, use_icon_as_answer_icon } })
export const updateAppInfo: Fetcher<AppDetailResponse, { appID: string; name: string; icon_type: AppIconType; icon: string; icon_background?: string; icon_url?: string; description: string; use_icon_as_answer_icon?: boolean }> = ({ appID, name, icon_type, icon, icon_background, icon_url, description, use_icon_as_answer_icon }) => {
return put<AppDetailResponse>(`apps/${appID}`, { body: { name, icon_type, icon, icon_background, icon_url, description, use_icon_as_answer_icon } })
}
export const copyApp: Fetcher<AppDetailResponse, { appID: string; name: string; icon_type: AppIconType; icon: string; icon_background?: string | null; mode: AppMode; description?: string }> = ({ appID, name, icon_type, icon, icon_background, mode, description }) => {
return post<AppDetailResponse>(`apps/${appID}/copy`, { body: { name, icon_type, icon, icon_background, mode, description } })
export const copyApp: Fetcher<AppDetailResponse, { appID: string; name: string; icon_type: AppIconType; icon: string; icon_background?: string | null; icon_url?: string | null; mode: AppMode; description?: string }> = ({ appID, name, icon_type, icon, icon_background, icon_url, mode, description }) => {
return post<AppDetailResponse>(`apps/${appID}/copy`, { body: { name, icon_type, icon, icon_background, icon_url, mode, description } })
}
export const exportAppConfig: Fetcher<{ data: string }, { appID: string; include?: boolean }> = ({ appID, include = false }) => {

Write Preview
Loading…
Cancel
Save