diff --git a/docSite/content/zh-cn/docs/development/upgrading/491.md b/docSite/content/zh-cn/docs/development/upgrading/491.md index 8f489a4b7..b5140a621 100644 --- a/docSite/content/zh-cn/docs/development/upgrading/491.md +++ b/docSite/content/zh-cn/docs/development/upgrading/491.md @@ -62,3 +62,4 @@ curl --location --request POST 'https://{{host}}/api/admin/initv491' \ 8. 修复 promp 模式工具调用，未判空思考链，导致 UI 错误展示。 9. 编辑应用信息导致头像丢失。 10. 分享链接标题会被刷新掉。 +11. 计算 parentPath 时，存在鉴权失败清空。 diff --git a/packages/global/common/parentFolder/type.d.ts b/packages/global/common/parentFolder/type.d.ts index 800b6834a..b962435a4 100644 --- a/packages/global/common/parentFolder/type.d.ts +++ b/packages/global/common/parentFolder/type.d.ts @@ -1,3 +1,8 @@ +export type GetPathProps = { + sourceId?: ParentIdType; + type: 'current' | 'parent'; +}; + export type ParentTreePathItemType = { parentId: string; parentName: string; diff --git a/packages/web/i18n/en/app.json b/packages/web/i18n/en/app.json index cc0bc8f46..18149468e 100644 --- a/packages/web/i18n/en/app.json +++ b/packages/web/i18n/en/app.json @@ -82,7 +82,7 @@ "logs_chat_user": "user", "logs_empty": "No logs yet~", "logs_export_confirm_tip": "There are a total of {{total}} dialogue records, confirm the export?", - "logs_export_title": "Time, source, user, title, total number of messages, user feedback, custom feedback, number of labeled answers, conversation details", + "logs_export_title": "Time, source, user, contact, title, total number of messages, user good feedback, user bad feedback, custom feedback, labeled answers, conversation details", "logs_message_total": "Total Messages", "logs_source": "source", "logs_title": "Title", diff --git a/packages/web/i18n/zh-CN/app.json b/packages/web/i18n/zh-CN/app.json index 75232c3d2..c84f2ce04 100644 --- a/packages/web/i18n/zh-CN/app.json +++ b/packages/web/i18n/zh-CN/app.json @@ -82,7 +82,7 @@ "logs_chat_user": "使用者", "logs_empty": "还没有日志噢~", "logs_export_confirm_tip": "当前共 {{total}} 条对话记录，确认导出？", - "logs_export_title": "时间,来源,使用者,标题,消息总数,用户反馈,自定义反馈,标注答案数量,对话详情", + "logs_export_title": "时间,来源,使用者,联系方式,标题,消息总数,用户赞同反馈,用户反对反馈,自定义反馈,标注答案,对话详情", "logs_message_total": "消息总数", "logs_source": "来源", "logs_title": "标题", diff --git a/packages/web/i18n/zh-Hant/app.json b/packages/web/i18n/zh-Hant/app.json index dfa6bfc7d..23bdce776 100644 --- a/packages/web/i18n/zh-Hant/app.json +++ b/packages/web/i18n/zh-Hant/app.json @@ -82,7 +82,7 @@ "logs_chat_user": "使用者", "logs_empty": "還沒有紀錄喔～", "logs_export_confirm_tip": "當前共 {{total}} 條對話記錄，確認導出？", - "logs_export_title": "時間,來源,使用者,標題,消息總數,用戶反饋,自定義反饋,標註答案數量,對話詳情", + "logs_export_title": "時間,來源,使用者,聯繫方式,標題,消息總數,用戶贊同反饋,用戶反對反饋,自定義反饋,標註答案,對話詳情", "logs_message_total": "訊息總數", "logs_source": "来源", "logs_title": "標題", diff --git a/projects/app/src/components/core/app/DatasetSelectModal.tsx b/projects/app/src/components/core/app/DatasetSelectModal.tsx index 4d06ac847..c6f800862 100644 --- a/projects/app/src/components/core/app/DatasetSelectModal.tsx +++ b/projects/app/src/components/core/app/DatasetSelectModal.tsx @@ -40,26 +40,10 @@ export const DatasetSelectModal = ({ const { paths, setParentId, datasets, isFetching } = useDatasetSelect(); const { Loading } = useLoading(); - const filterDatasets = useMemo(() => { - const selectedInDatasets = datasets.filter((item) => - selectedDatasets.some((dataset) => dataset.datasetId === item._id) + const unSelectedDatasets = useMemo(() => { + return datasets.filter( + (item) => !selectedDatasets.some((dataset) => dataset.datasetId === item._id) ); - - const selectedNotInDatasets = selectedDatasets - .filter((selected) => !datasets.some((dataset) => dataset._id === selected.datasetId)) - .map((selected) => ({ - _id: selected.datasetId, - avatar: selected.avatar, - name: selected.name, - vectorModel: selected.vectorModel - })); - - return { - selected: [...selectedInDatasets, ...selectedNotInDatasets], - unSelected: datasets.filter( - (item) => !selectedDatasets.some((dataset) => dataset.datasetId === item._id) - ) - }; }, [datasets, selectedDatasets]); const activeVectorModel = selectedDatasets[0]?.vectorModel?.model; @@ -82,11 +66,11 @@ export const DatasetSelectModal = ({ ]} gridGap={3} > - {filterDatasets.selected.map((item) => + {selectedDatasets.map((item) => (() => { return ( { setSelectedDatasets((state) => - state.filter((dataset) => dataset.datasetId !== item._id) + state.filter((dataset) => dataset.datasetId !== item.datasetId) ); }} /> @@ -115,7 +99,7 @@ export const DatasetSelectModal = ({ )} - {filterDatasets.selected.length > 0 && } + {selectedDatasets.length > 0 && } - {filterDatasets.unSelected.map((item) => + {unSelectedDatasets.map((item) => (() => { return ( - {filterDatasets.unSelected.length === 0 && ( - - )} + {unSelectedDatasets.length === 0 && } diff --git a/projects/app/src/components/core/dataset/SelectModal.tsx b/projects/app/src/components/core/dataset/SelectModal.tsx index d899f73d6..f2479fa9a 100644 --- a/projects/app/src/components/core/dataset/SelectModal.tsx +++ b/projects/app/src/components/core/dataset/SelectModal.tsx @@ -6,6 +6,7 @@ import { useTranslation } from 'next-i18next'; import { Box } from '@chakra-ui/react'; import ParentPaths from '@/components/common/ParentPaths'; import MyBox from '@fastgpt/web/components/common/MyBox'; +import { useRequest2 } from '@fastgpt/web/hooks/useRequest'; type PathItemType = { parentId: string; @@ -70,8 +71,16 @@ const DatasetSelectContainer = ({ export function useDatasetSelect() { const [parentId, setParentId] = useState(''); - const { data, isFetching } = useQuery(['loadDatasetData', parentId], () => - Promise.all([getDatasets({ parentId }), getDatasetPaths(parentId)]) + const { data, loading: isFetching } = useRequest2( + () => + Promise.all([ + getDatasets({ parentId }), + getDatasetPaths({ sourceId: parentId, type: 'current' }) + ]), + { + manual: false, + refreshDeps: [parentId] + } ); const paths = useMemo(() => [...(data?.[1] || [])], [data]); diff --git a/projects/app/src/pageComponents/app/detail/SimpleApp/Header.tsx b/projects/app/src/pageComponents/app/detail/SimpleApp/Header.tsx index a2cde2dff..c71217645 100644 --- a/projects/app/src/pageComponents/app/detail/SimpleApp/Header.tsx +++ b/projects/app/src/pageComponents/app/detail/SimpleApp/Header.tsx @@ -61,10 +61,13 @@ const Header = ({ const { lastAppListRouteType } = useSystemStore(); - const { data: paths = [] } = useRequest2(() => getAppFolderPath(appId), { - manual: false, - refreshDeps: [appId] - }); + const { data: paths = [] } = useRequest2( + () => getAppFolderPath({ sourceId: appId, type: 'parent' }), + { + manual: false, + refreshDeps: [appId] + } + ); const onClickRoute = useCallback( (parentId: string) => { router.push({ diff --git a/projects/app/src/pageComponents/app/detail/SimpleApp/components/ToolSelectModal.tsx b/projects/app/src/pageComponents/app/detail/SimpleApp/components/ToolSelectModal.tsx index edd087a55..76db55b3d 100644 --- a/projects/app/src/pageComponents/app/detail/SimpleApp/components/ToolSelectModal.tsx +++ b/projects/app/src/pageComponents/app/detail/SimpleApp/components/ToolSelectModal.tsx @@ -112,8 +112,9 @@ const ToolSelectModal = ({ onClose, ...props }: Props & { onClose: () => void }) const { data: paths = [] } = useRequest2( () => { - if (templateType === TemplateTypeEnum.teamPlugin) return getAppFolderPath(parentId); - return getSystemPluginPaths(parentId); + if (templateType === TemplateTypeEnum.teamPlugin) + return getAppFolderPath({ sourceId: parentId, type: 'current' }); + return getSystemPluginPaths({ sourceId: parentId, type: 'current' }); }, { manual: false, @@ -186,7 +187,7 @@ const ToolSelectModal = ({ onClose, ...props }: Props & { onClose: () => void }) {/* route components */} {!searchKey && parentId && ( - onUpdateParentId(null)} /> + )} diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx index 428500286..d9ab80fd7 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx @@ -144,7 +144,7 @@ const ChatTest = ({ isOpen, nodes = [], edges = [], onClose }: Props) => { )} - + diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/NodeTemplatesModal.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/NodeTemplatesModal.tsx index b48d715da..ac1dd1046 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/NodeTemplatesModal.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/NodeTemplatesModal.tsx @@ -276,8 +276,9 @@ const RenderHeader = React.memo(function RenderHeader({ // Get paths const { data: paths = [] } = useRequest2( () => { - if (templateType === TemplateTypeEnum.teamPlugin) return getAppFolderPath(parentId); - return getSystemPluginPaths(parentId); + if (templateType === TemplateTypeEnum.teamPlugin) + return getAppFolderPath({ sourceId: parentId, type: 'current' }); + return getSystemPluginPaths({ sourceId: parentId, type: 'current' }); }, { manual: false, diff --git a/projects/app/src/pageComponents/app/detail/useChatTest.tsx b/projects/app/src/pageComponents/app/detail/useChatTest.tsx index 22a54dfeb..a6602702e 100644 --- a/projects/app/src/pageComponents/app/detail/useChatTest.tsx +++ b/projects/app/src/pageComponents/app/detail/useChatTest.tsx @@ -126,7 +126,7 @@ export const useChatTest = ({ const CustomChatContainer = useMemoizedFn(() => appDetail.type === AppTypeEnum.plugin ? ( - + { ); const { data: paths = [], runAsync: refetchPaths } = useRequest2( - () => getAppFolderPath(parentId), + () => getAppFolderPath({ sourceId: parentId, type: 'current' }), { manual: false, refreshDeps: [parentId] diff --git a/projects/app/src/pages/api/core/app/exportChatLogs.ts b/projects/app/src/pages/api/core/app/exportChatLogs.ts index 225dfffea..78dfd315f 100644 --- a/projects/app/src/pages/api/core/app/exportChatLogs.ts +++ b/projects/app/src/pages/api/core/app/exportChatLogs.ts @@ -18,6 +18,10 @@ import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSc import { ChatItemValueTypeEnum, ChatSourceEnum } from '@fastgpt/global/core/chat/constants'; import { AIChatItemValueItemType } from '@fastgpt/global/core/chat/type'; +const formatJsonString = (data: any) => { + return JSON.stringify(data).replace(/"/g, '""').replace(/\n/g, '\\n'); +}; + export type ExportChatLogsBody = GetAppChatLogsProps & { title: string; sourcesMap: Record; @@ -40,7 +44,30 @@ async function handler(req: ApiRequestProps, res: NextAp } const { teamId } = await authApp({ req, authToken: true, appId, per: WritePermissionVal }); - const teamMembers = await MongoTeamMember.find({ teamId }); + + const teamMemberWithContact = await MongoTeamMember.aggregate([ + { $match: { teamId: new Types.ObjectId(teamId) } }, + { + $lookup: { + from: 'users', + localField: 'userId', + foreignField: '_id', + as: 'user' + } + }, + { + $project: { + memberId: '$_id', + teamId: 1, + userId: 1, + name: 1, + role: 1, + status: 1, + contact: { $ifNull: [{ $arrayElemAt: ['$user.contact', 0] }, '-'] } + } + } + ]); + console.log(teamMemberWithContact); const where = { teamId: new Types.ObjectId(teamId), @@ -104,40 +131,32 @@ async function handler(req: ApiRequestProps, res: NextAp }, { $addFields: { - userGoodFeedbackCount: { - $size: { - $filter: { - input: '$chatitems', - as: 'item', - cond: { $ifNull: ['$$item.userGoodFeedback', false] } - } + userGoodFeedbackItems: { + $filter: { + input: '$chatitems', + as: 'item', + cond: { $ifNull: ['$$item.userGoodFeedback', false] } } }, - userBadFeedbackCount: { - $size: { - $filter: { - input: '$chatitems', - as: 'item', - cond: { $ifNull: ['$$item.userBadFeedback', false] } - } + userBadFeedbackItems: { + $filter: { + input: '$chatitems', + as: 'item', + cond: { $ifNull: ['$$item.userBadFeedback', false] } } }, - customFeedbacksCount: { - $size: { - $filter: { - input: '$chatitems', - as: 'item', - cond: { $gt: [{ $size: { $ifNull: ['$$item.customFeedbacks', []] } }, 0] } - } + customFeedbackItems: { + $filter: { + input: '$chatitems', + as: 'item', + cond: { $gt: [{ $size: { $ifNull: ['$$item.customFeedbacks', []] } }, 0] } } }, - markCount: { - $size: { - $filter: { - input: '$chatitems', - as: 'item', - cond: { $ifNull: ['$$item.adminFeedback', false] } - } + markItems: { + $filter: { + input: '$chatitems', + as: 'item', + cond: { $ifNull: ['$$item.adminFeedback', false] } } }, chatDetails: { @@ -161,10 +180,10 @@ async function handler(req: ApiRequestProps, res: NextAp source: 1, time: '$updateTime', messageCount: { $size: '$chatitems' }, - userGoodFeedbackCount: 1, - userBadFeedbackCount: 1, - customFeedbacksCount: 1, - markCount: 1, + userGoodFeedbackItems: 1, + userBadFeedbackItems: 1, + customFeedbackItems: 1, + markItems: 1, outLinkUid: 1, tmbId: 1, chatDetails: 1 @@ -187,14 +206,18 @@ async function handler(req: ApiRequestProps, res: NextAp const time = dayjs(doc.time.toISOString()).format('YYYY-MM-DD HH:mm:ss'); const source = sourcesMap[doc.source as ChatSourceEnum]?.label || doc.source; const title = doc.customTitle || doc.title; - const tmb = doc.outLinkUid + const tmbName = doc.outLinkUid ? doc.outLinkUid - : teamMembers.find((member) => String(member._id) === String(doc.tmbId))?.name; + : teamMemberWithContact.find((member) => String(member.memberId) === String(doc.tmbId))?.name; + const tmbContact = teamMemberWithContact.find( + (member) => String(member.memberId) === String(doc.tmbId) + )?.contact; const messageCount = doc.messageCount; - const userFeedbackCount = doc.userGoodFeedbackCount || doc.userBadFeedbackCount || '-'; - const customFeedbacksCount = doc.customFeedbacksCount || '-'; - const markCount = doc.markCount; + const userGoodFeedbackItems = doc.userGoodFeedbackItems || []; + const userBadFeedbackItems = doc.userBadFeedbackItems || []; + const customFeedbackItems = doc.customFeedbackItems || []; + const markItems = doc.markItems || []; const chatDetails = doc.chatDetails.map( (chat: { id: string; value: AIChatItemValueItemType[] }) => { return chat.value.map((item) => { @@ -228,9 +251,14 @@ async function handler(req: ApiRequestProps, res: NextAp }); } ); - let chatDetailsStr = JSON.stringify(chatDetails).replace(/"/g, '""').replace(/\n/g, '\\n'); - const res = `\n"${time}","${source}","${tmb}","${title}","${messageCount}","${userFeedbackCount}","${customFeedbacksCount}","${markCount}","${chatDetailsStr}"`; + const userGoodFeedbackItemsStr = formatJsonString(userGoodFeedbackItems); + const userBadFeedbackItemsStr = formatJsonString(userBadFeedbackItems); + const customFeedbackItemsStr = formatJsonString(customFeedbackItems); + const markItemsStr = formatJsonString(markItems); + const chatDetailsStr = formatJsonString(chatDetails); + + const res = `\n"${time}","${source}","${tmbName}","${tmbContact}","${title}","${messageCount}","${userGoodFeedbackItemsStr}","${userBadFeedbackItemsStr}","${customFeedbackItemsStr}","${markItemsStr}","${chatDetailsStr}"`; write(res); }); diff --git a/projects/app/src/pages/api/core/app/folder/path.ts b/projects/app/src/pages/api/core/app/folder/path.ts index 6c37684d3..10ac9cd9c 100644 --- a/projects/app/src/pages/api/core/app/folder/path.ts +++ b/projects/app/src/pages/api/core/app/folder/path.ts @@ -1,5 +1,6 @@ import type { NextApiRequest, NextApiResponse } from 'next'; import type { + GetPathProps, ParentIdType, ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type.d'; @@ -12,15 +13,15 @@ async function handler( req: NextApiRequest, res: NextApiResponse ): Promise { - const { parentId } = req.query as { parentId: string }; + const { sourceId: appId, type } = req.query as GetPathProps; - if (!parentId) { + if (!appId) { return []; } - await authApp({ req, authToken: true, appId: parentId, per: ReadPermissionVal }); + const { app } = await authApp({ req, authToken: true, appId, per: ReadPermissionVal }); - return await getParents(parentId); + return await getParents(type === 'current' ? appId : app.parentId); } export default NextAPI(handler); diff --git a/projects/app/src/pages/api/core/app/plugin/path.ts b/projects/app/src/pages/api/core/app/plugin/path.ts index 4d0abf8f8..76442545f 100644 --- a/projects/app/src/pages/api/core/app/plugin/path.ts +++ b/projects/app/src/pages/api/core/app/plugin/path.ts @@ -1,11 +1,9 @@ import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next'; import { NextAPI } from '@/service/middleware/entry'; -import { ParentIdType, ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type'; +import { GetPathProps, ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type'; import { getSystemPlugins } from '@/service/core/app/plugin'; -export type pathQuery = { - parentId: ParentIdType; -}; +export type pathQuery = GetPathProps; export type pathBody = {}; @@ -15,18 +13,18 @@ async function handler( req: ApiRequestProps, res: ApiResponseType ): Promise { - const { parentId } = req.query; + const { sourceId: pluginId, type } = req.query; - if (!parentId) return []; + if (!pluginId) return []; const plugins = await getSystemPlugins(); - const plugin = plugins.find((item) => item.id === parentId); + const plugin = plugins.find((item) => item.id === pluginId); if (!plugin) return []; return [ { - parentId: plugin.id, + parentId: type === 'current' ? plugin.id : plugin.parentId, parentName: plugin.name } ]; diff --git a/projects/app/src/pages/api/core/dataset/paths.ts b/projects/app/src/pages/api/core/dataset/paths.ts index 548f6baf7..cf28f7915 100644 --- a/projects/app/src/pages/api/core/dataset/paths.ts +++ b/projects/app/src/pages/api/core/dataset/paths.ts @@ -1,20 +1,28 @@ import type { NextApiRequest } from 'next'; import { MongoDataset } from '@fastgpt/service/core/dataset/schema'; -import type { ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type.d'; +import type { + GetPathProps, + ParentTreePathItemType +} from '@fastgpt/global/common/parentFolder/type.d'; import { authDataset } from '@fastgpt/service/support/permission/dataset/auth'; import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant'; import { NextAPI } from '@/service/middleware/entry'; async function handler(req: NextApiRequest) { - const { parentId } = req.query as { parentId: string }; + const { sourceId: datasetId, type } = req.query as GetPathProps; - if (!parentId) { + if (!datasetId) { return []; } - await authDataset({ req, authToken: true, datasetId: parentId, per: ReadPermissionVal }); + const { dataset } = await authDataset({ + req, + authToken: true, + datasetId, + per: ReadPermissionVal + }); - return await getParents(parentId); + return await getParents(type === 'current' ? dataset._id : dataset.parentId); } async function getParents(parentId?: string): Promise { diff --git a/projects/app/src/pages/dataset/list/context.tsx b/projects/app/src/pages/dataset/list/context.tsx index b4608c84c..d21083d62 100644 --- a/projects/app/src/pages/dataset/list/context.tsx +++ b/projects/app/src/pages/dataset/list/context.tsx @@ -97,10 +97,10 @@ function DatasetContextProvider({ children }: { children: React.ReactNode }) { ); const { data: paths = [], runAsync: refetchPaths } = useRequest2( - () => getDatasetPaths(parentId), + async () => getDatasetPaths({ sourceId: parentId, type: 'current' }), { manual: false, - refreshDeps: [parentId] + refreshDeps: [folderDetail] } ); diff --git a/projects/app/src/web/core/app/api/app.ts b/projects/app/src/web/core/app/api/app.ts index ee0f38d80..0dc719e21 100644 --- a/projects/app/src/web/core/app/api/app.ts +++ b/projects/app/src/web/core/app/api/app.ts @@ -1,7 +1,9 @@ import { DELETE, GET, POST } from '@/web/common/api/request'; import type { CreateAppFolderBody } from '@/pages/api/core/app/folder/create'; -import type { ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type'; -import type { ParentIdType } from '@fastgpt/global/common/parentFolder/type'; +import type { + GetPathProps, + ParentTreePathItemType +} from '@fastgpt/global/common/parentFolder/type'; import type { transitionWorkflowBody, transitionWorkflowResponse @@ -12,10 +14,10 @@ import type { copyAppQuery, copyAppResponse } from '@/pages/api/core/app/copy'; export const postCreateAppFolder = (data: CreateAppFolderBody) => POST('/core/app/folder/create', data); -export const getAppFolderPath = (parentId: ParentIdType) => { - if (!parentId) return Promise.resolve([]); +export const getAppFolderPath = (data: GetPathProps) => { + if (!data.sourceId) return Promise.resolve([]); - return GET(`/core/app/folder/path`, { parentId }); + return GET(`/core/app/folder/path`, data); }; /* detail */ diff --git a/projects/app/src/web/core/app/api/plugin.ts b/projects/app/src/web/core/app/api/plugin.ts index f22dffce2..2aa403983 100644 --- a/projects/app/src/web/core/app/api/plugin.ts +++ b/projects/app/src/web/core/app/api/plugin.ts @@ -12,6 +12,7 @@ import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constant import type { GetPreviewNodeQuery } from '@/pages/api/core/app/plugin/getPreviewNode'; import { AppTypeEnum } from '@fastgpt/global/core/app/constants'; import type { + GetPathProps, ParentIdType, ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type'; @@ -53,9 +54,9 @@ export const getPluginGroups = () => { : Promise.resolve([defaultGroup]); }; -export const getSystemPluginPaths = (parentId: ParentIdType) => { - if (!parentId) return Promise.resolve([]); - return GET('/core/app/plugin/path', { parentId }); +export const getSystemPluginPaths = (data: GetPathProps) => { + if (!data.sourceId) return Promise.resolve([]); + return GET('/core/app/plugin/path', data); }; export const getPreviewPluginNode = (data: GetPreviewNodeQuery) => diff --git a/projects/app/src/web/core/dataset/api.ts b/projects/app/src/web/core/dataset/api.ts index 09f0b553a..858c8a0b6 100644 --- a/projects/app/src/web/core/dataset/api.ts +++ b/projects/app/src/web/core/dataset/api.ts @@ -1,5 +1,6 @@ import { GET, POST, PUT, DELETE } from '@/web/common/api/request'; import type { + GetPathProps, ParentIdType, ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type.d'; @@ -77,8 +78,10 @@ export const getDatasetsByAppIdAndDatasetIds = (data: { appId: string; datasetId * get type=dataset list */ -export const getDatasetPaths = (parentId: ParentIdType) => - GET('/core/dataset/paths', { parentId }); +export const getDatasetPaths = (data: GetPathProps) => { + if (!data.sourceId) return Promise.resolve([]); + return GET('/core/dataset/paths', data); +}; export const getDatasetById = (id: string) => GET(`/core/dataset/detail?id=${id}`); diff --git a/projects/app/src/web/core/dataset/context/datasetPageContext.tsx b/projects/app/src/web/core/dataset/context/datasetPageContext.tsx index 26601605f..773e87889 100644 --- a/projects/app/src/web/core/dataset/context/datasetPageContext.tsx +++ b/projects/app/src/web/core/dataset/context/datasetPageContext.tsx @@ -250,7 +250,10 @@ export const DatasetPageContextProvider = ({ const { data: paths = [], runAsync: refetchPaths } = useRequest2( () => - getDatasetPaths(datasetDetail.parentId).then((res) => { + getDatasetPaths({ + sourceId: datasetDetail?._id, + type: 'parent' + }).then((res) => { res.push({ parentId: '', parentName: datasetDetail.name