fix: ts errors (#1916)

labring · Jul 2, 2024 · 0918b8a · 0918b8a
1 parent 4e8239d
commit 0918b8a
Show file tree

Hide file tree

Showing 7 changed files with 1,903 additions and 1,249 deletions.
diff --git a/packages/global/core/dataset/type.d.ts b/packages/global/core/dataset/type.d.ts
@@ -27,7 +27,7 @@ export type DatasetSchemaType = {
   intro: string;
   type: DatasetTypeEnum;
   status: `${DatasetStatusEnum}`;
-  permission: DatasetPermission;
+  // permission: DatasetPermission;
 
   // metadata
   websiteConfig?: {
@@ -146,6 +146,7 @@ export type DatasetListItemType = {
 export type DatasetItemType = Omit<DatasetSchemaType, 'vectorModel' | 'agentModel'> & {
   vectorModel: VectorModelItemType;
   agentModel: LLMModelItemType;
+  permission: DatasetPermission;
 };
 
 /* ================= collection ===================== */

diff --git a/packages/service/core/dataset/controller.ts b/packages/service/core/dataset/controller.ts
@@ -37,7 +37,7 @@ export async function findDatasetAndAllChildren({
     return datasets;
   };
   const [dataset, childDatasets] = await Promise.all([
-    MongoDataset.findById(datasetId),
+    MongoDataset.findById(datasetId).lean(),
     find(datasetId)
   ]);
 

diff --git a/packages/service/core/dataset/schema.ts b/packages/service/core/dataset/schema.ts
@@ -74,11 +74,6 @@ const DatasetSchema = new Schema({
     type: String,
     default: ''
   },
-  permission: {
-    type: String,
-    enum: Object.keys(PermissionTypeMap),
-    default: PermissionTypeEnum.private
-  },
   websiteConfig: {
     type: {
       url: {

diff --git a/packages/service/support/permission/inheritPermission.ts b/packages/service/support/permission/inheritPermission.ts
@@ -57,7 +57,7 @@ export async function syncChildrenPermission({
         },
         '_id parentId'
       )
-      .lean()
+      .lean<ResourceType[]>()
       .session(session);
 
     // bfs to get all children

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/projects/app/src/service/support/permission/auth/chat.ts b/projects/app/src/service/support/permission/auth/chat.ts
@@ -56,7 +56,7 @@ export async function autChatCrud({
     // auth team space chat
     if (spaceTeamId && teamToken) {
       const { uid } = await authTeamSpaceToken({ teamId: spaceTeamId, teamToken });
-      addLog.debug('Auth team token', { uid, spaceTeamId, teamToken, chatUid: chat.outLinkUid });
+      addLog.debug('Auth team token', { uid, spaceTeamId, teamToken, chatUid: chat?.outLinkUid });
       if (!chat || (String(chat.teamId) === String(spaceTeamId) && chat.outLinkUid === uid)) {
         return { uid };
       }

diff --git a/projects/app/src/web/core/dataset/constants.ts b/projects/app/src/web/core/dataset/constants.ts
@@ -45,7 +45,6 @@ export const defaultCollectionDetail: DatasetCollectionItemType = {
     name: '',
     intro: '',
     status: 'active',
-    permission: new DatasetPermission(),
     vectorModel: defaultVectorModels[0].model,
     agentModel: defaultQAModels[0].model,
     defaultPermission: DatasetDefaultPermissionVal