dataset inheritance permission (#2151)

* refactor: dataset create and update api

* chore: defaultpermission & resume fe

* refactor: database auth

* fix(ts): add inheritPermission into default data types

* chore: adjust the code

* fix: list api type filter

* fix: query condition
This commit is contained in:
Finley Ge
2024-07-25 19:03:24 +08:00
committed by GitHub
parent 5906daff9f
commit 65515e7952
20 changed files with 481 additions and 199 deletions

View File

@@ -42,6 +42,7 @@ import type { GetDatasetListBody } from '@/pages/api/core/dataset/list';
import type { UpdateDatasetCollectionParams } from '@/pages/api/core/dataset/collection/update';
import type { GetDatasetDataListProps } from '@/pages/api/core/dataset/data/list';
import type { UpdateDatasetDataProps } from '@fastgpt/global/core/dataset/controller';
import type { DatasetFolderCreateBody } from '@/pages/api/core/dataset/folder/create';
/* ======================== dataset ======================= */
export const getDatasets = (data: GetDatasetListBody) =>
@@ -69,6 +70,12 @@ export const postWebsiteSync = (data: PostWebsiteSyncParams) =>
timeout: 600000
}).catch();
export const postCreateDatasetFolder = (data: DatasetFolderCreateBody) =>
POST(`/core/dataset/folder/create`, data);
export const resumeInheritPer = (datasetId: string) =>
GET(`/core/dataset/resumeInheritPermission`, { datasetId });
/* =========== search test ============ */
export const postSearchText = (data: SearchTestProps) =>
POST<SearchTestResponse>(`/core/dataset/searchTest`, data);

View File

@@ -26,7 +26,8 @@ export const defaultDatasetDetail: DatasetItemType = {
permission: new DatasetPermission(),
vectorModel: defaultVectorModels[0],
agentModel: defaultQAModels[0],
defaultPermission: DatasetDefaultPermissionVal
defaultPermission: DatasetDefaultPermissionVal,
inheritPermission: true
};
export const defaultCollectionDetail: DatasetCollectionItemType = {
@@ -47,7 +48,8 @@ export const defaultCollectionDetail: DatasetCollectionItemType = {
status: 'active',
vectorModel: defaultVectorModels[0].model,
agentModel: defaultQAModels[0].model,
defaultPermission: DatasetDefaultPermissionVal
defaultPermission: DatasetDefaultPermissionVal,
inheritPermission: true
},
parentId: '',
name: '',

View File

@@ -11,7 +11,7 @@ type State = {
allDatasets: DatasetSimpleItemType[];
loadAllDatasets: () => Promise<DatasetSimpleItemType[]>;
myDatasets: DatasetListItemType[];
loadMyDatasets: (parentId?: string) => Promise<any>;
loadMyDatasets: (parentId?: string) => Promise<DatasetListItemType[]>;
};
export const useDatasetStore = create<State>()(