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

perf: private app check (#3376)

Browse Source 
* perf: private app check

* perf: clb count
This commit is contained in:
Archer
2024-12-11 22:12:57 +08:00
committed by GitHub
parent c0135f5f21
commit 4b9b0dbbb9
2 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
projects/app/src/pages/api/core/app/list.ts
View File

@@ -157,26 +157,30 @@ async function handler(req: ApiRequestProps<ListAppBody>): Promise<AppListItemTy
.map((item) => item.permission)
);
// Count app collaborators
const clbCount = perList.filter(
(item) => String(item.resourceId) === String(app._id)
).length;
return {
Per: new AppPermission({
per: tmbPer ?? groupPer ?? AppDefaultPermissionVal,
isOwner: String(app.tmbId) === String(tmbId) || teamPer.isOwner
}),
privateApp: AppFolderTypeList.includes(app.type) ? clbCount <= 1 : clbCount === 0
};
return new AppPermission({
per: tmbPer ?? groupPer ?? AppDefaultPermissionVal,
isOwner: String(app.tmbId) === String(tmbId) || teamPer.isOwner
});
};
// Inherit app
if (app.inheritPermission && app.parentId && !AppFolderTypeList.includes(app.type)) {
return getPer(String(app.parentId));
} else {
return getPer(String(app._id));
const getClbCount = (appId: string) => {
return perList.filter((item) => String(item.resourceId) === String(appId)).length;
};
// Inherit app, check parent folder clb
if (!AppFolderTypeList.includes(app.type) && app.parentId && app.inheritPermission) {
return {
Per: getPer(String(app.parentId)),
privateApp: getClbCount(String(app.parentId)) <= 1
};
}
return {
Per: getPer(String(app._id)),
privateApp: AppFolderTypeList.includes(app.type)
? getClbCount(String(app._id)) <= 1
: getClbCount(String(app._id)) === 0
};
})();
return {

34
projects/app/src/pages/api/core/dataset/list.ts
View File

@@ -127,29 +127,33 @@ async function handler(req: ApiRequestProps<GetDatasetListBody>) {
.filter((item) => String(item.resourceId) === datasetId && !!item.groupId)
.map((item) => item.permission)
);
const clbCount = perList.filter(
(item) => String(item.resourceId) === String(dataset._id)
).length;
return {
Per: new DatasetPermission({
per: tmbPer ?? groupPer ?? DatasetDefaultPermissionVal,
isOwner: String(dataset.tmbId) === String(tmbId) || teamPer.isOwner
}),
privateDataset: dataset.type === 'folder' ? clbCount <= 1 : clbCount === 0
};
return new DatasetPermission({
per: tmbPer ?? groupPer ?? DatasetDefaultPermissionVal,
isOwner: String(dataset.tmbId) === String(tmbId) || teamPer.isOwner
});
};
const getClbCount = (datasetId: string) => {
return perList.filter((item) => String(item.resourceId) === String(datasetId)).length;
};
// inherit
if (
dataset.inheritPermission &&
dataset.parentId &&
dataset.type !== DatasetTypeEnum.folder
) {
return getPer(String(dataset.parentId));
} else {
return getPer(String(dataset._id));
return {
Per: getPer(String(dataset.parentId)),
privateDataset: getClbCount(String(dataset.parentId)) <= 1
};
}
return {
Per: getPer(String(dataset._id)),
privateDataset:
dataset.type === DatasetTypeEnum.folder
? getClbCount(String(dataset._id)) <= 1
: getClbCount(String(dataset._id)) === 0
};
})();
return {