ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-07-21 11:43:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: app/dataset list folders' side menu permission bug (#4734)

Browse Source
This commit is contained in:
Finley Ge
2025-04-30 12:07:53 +08:00
committed by GitHub
parent 4b8db293ce
commit 9f21add7b5
2 changed files with 17 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
projects/app/src/pages/dashboard/apps/index.tsx
View File

@@ -25,7 +25,6 @@ import {
import type { CreateAppType } from '@/pageComponents/dashboard/apps/CreateModal';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import MyBox from '@fastgpt/web/components/common/MyBox';
import LightRowTabs from '@fastgpt/web/components/common/Tabs/LightRowTabs';
import { useSystem } from '@fastgpt/web/hooks/useSystem';
import MyIcon from '@fastgpt/web/components/common/Icon';
import JsonImportModal from '@/pageComponents/dashboard/apps/JsonImportModal';
@@ -35,6 +34,7 @@ import List from '@/pageComponents/dashboard/apps/List';
import MCPToolsEditModal from '@/pageComponents/dashboard/apps/MCPToolsEditModal';
import { getUtmWorkflow } from '@/web/support/marketing/utils';
import { useMount } from 'ahooks';
import { AppCollaboratorDeleteParams } from '@fastgpt/global/core/app/collaborator';
const CreateModal = dynamic(() => import('@/pageComponents/dashboard/apps/CreateModal'));
const EditFolderModal = dynamic(
@@ -286,49 +286,17 @@ const MyApps = ({ MenuIcon }: { MenuIcon: JSX.Element }) => {
permission: folderDetail.permission,
onGetCollaboratorList: () => getCollaboratorList(folderDetail._id),
permissionList: AppPermissionList,
onUpdateCollaborators: ({
members,
groups,
permission
}: {
members?: string[];
groups?: string[];
permission: PermissionValueType;
}) => {
return postUpdateAppCollaborators({
members,
groups,
permission,
onUpdateCollaborators: (props) =>
postUpdateAppCollaborators({
...props,
appId: folderDetail._id
});
},
}),
refreshDeps: [folderDetail._id, folderDetail.inheritPermission],
onDelOneCollaborator: async ({
tmbId,
groupId,
orgId
}: {
tmbId?: string;
groupId?: string;
orgId?: string;
}) => {
if (tmbId) {
return deleteAppCollaborators({
appId: folderDetail._id,
tmbId
});
} else if (groupId) {
return deleteAppCollaborators({
appId: folderDetail._id,
groupId
});
} else if (orgId) {
return deleteAppCollaborators({
appId: folderDetail._id,
orgId
});
}
}
onDelOneCollaborator: async (params) =>
deleteAppCollaborators({
...params,
appId: folderDetail._id
})
}}
/>
</Box>

37
projects/app/src/pages/dataset/list/index.tsx
View File

@@ -242,39 +242,16 @@ const Dataset = () => {
permission: folderDetail.permission,
onGetCollaboratorList: () => getCollaboratorList(folderDetail._id),
permissionList: DatasetPermissionList,
onUpdateCollaborators: ({
members,
groups,
permission
}: {
members?: string[];
groups?: string[];
permission: PermissionValueType;
}) =>
onUpdateCollaborators: (params) =>
postUpdateDatasetCollaborators({
members,
groups,
permission,
...params,
datasetId: folderDetail._id
}),
onDelOneCollaborator: async (params) =>
deleteDatasetCollaborators({
...params,
datasetId: folderDetail._id
}),
onDelOneCollaborator: async ({ tmbId, groupId, orgId }) => {
if (tmbId) {
return deleteDatasetCollaborators({
datasetId: folderDetail._id,
tmbId
});
} else if (groupId) {
return deleteDatasetCollaborators({
datasetId: folderDetail._id,
groupId
});
} else if (orgId) {
return deleteDatasetCollaborators({
datasetId: folderDetail._id,
orgId
});
}
},
refreshDeps: [folderDetail._id, folderDetail.inheritPermission]
}}
/>