fix: allDataset (#3031)

projects/app/src/pages/api/core/dataset/allDataset.ts

@@ -19,7 +19,7 @@ async function handler(req: NextApiRequest): Promise<DatasetSimpleItemType[]> {
   const {
   const {
     teamId,
     teamId,
     tmbId,
     tmbId,
-    permission: tmbPer
+    permission: myPer
   } = await authUserPer({
   } = await authUserPer({
     req,
     req,
     authToken: true,
     authToken: true,
@@ -43,65 +43,55 @@ async function handler(req: NextApiRequest): Promise<DatasetSimpleItemType[]> {
       })
       })
       .lean(),
       .lean(),
     MongoResourcePermission.find({
     MongoResourcePermission.find({
-      $and: [
-        {
-          resourceType: PerResourceTypeEnum.dataset,
-          teamId,
-          resourceId: {
-            $exists: true
-          }
-        },
-        { $or: [{ tmbId }, { groupId: { $in: myGroupIds } }] }
-      ]
+      resourceType: PerResourceTypeEnum.dataset,
+      teamId,
+      resourceId: {
+        $exists: true
+      }
     }).lean()
     }).lean()
   ]);
   ]);
 
 
   const filterDatasets = myDatasets
   const filterDatasets = myDatasets
     .map((dataset) => {
     .map((dataset) => {
-      const perVal = (() => {
-        const parentDataset = myDatasets.find(
-          (item) => String(item._id) === String(dataset.parentId)
+      const per = (() => {
+        const myPerList = perList.filter(
+          (item) =>
+            String(item.tmbId) === String(tmbId) || myGroupIds.includes(String(item.groupId))
         );
         );
 
 
-        if (dataset.inheritPermission && dataset.parentId && parentDataset) {
-          const tmbPer = perList.find(
-            (item) => String(item.resourceId) === String(parentDataset._id) && !!item.tmbId
+        const getPer = (id: string) => {
+          const tmbPer = myPerList.find(
+            (item) => String(item.resourceId) === id && !!item.tmbId
           )?.permission;
           )?.permission;
           const groupPer = getGroupPer(
           const groupPer = getGroupPer(
-            perList
+            myPerList
               .filter(
               .filter(
                 (item) =>
                 (item) =>
-                  String(item.resourceId) === String(parentDataset._id) &&
-                  myGroupIds.includes(String(item.groupId))
+                  String(item.resourceId) === id && myGroupIds.includes(String(item.groupId))
               )
               )
               .map((item) => item.permission)
               .map((item) => item.permission)
           );
           );
-          return tmbPer ?? groupPer ?? DatasetDefaultPermissionVal;
+
+          return new DatasetPermission({
+            per: tmbPer ?? groupPer ?? DatasetDefaultPermissionVal,
+            isOwner: String(dataset.tmbId) === String(tmbId) || myPer.isOwner
+          });
+        };
+
+        const parentDataset = myDatasets.find(
+          (item) => String(item._id) === String(dataset.parentId)
+        );
+
+        if (dataset.inheritPermission && dataset.parentId && parentDataset) {
+          return getPer(parentDataset._id);
         } else {
         } else {
-          const tmbPer = perList.find(
-            (item) => String(item.resourceId) === String(dataset._id) && !!item.tmbId
-          )?.permission;
-          const groupPer = getGroupPer(
-            perList
-              .filter(
-                (item) =>
-                  String(item.resourceId) === String(dataset._id) &&
-                  myGroupIds.includes(String(item.groupId))
-              )
-              .map((item) => item.permission)
-          );
-          return tmbPer ?? groupPer ?? DatasetDefaultPermissionVal;
+          return getPer(dataset._id);
         }
         }
       })();
       })();
 
 
-      const Per = new DatasetPermission({
-        per: perVal ?? DatasetDefaultPermissionVal,
-        isOwner: String(dataset.tmbId) === tmbId || tmbPer.isOwner
-      });
-
       return {
       return {
         ...dataset,
         ...dataset,
-        permission: Per
+        permission: per
       };
       };
     })
     })
     .filter((app) => app.permission.hasReadPer);
     .filter((app) => app.permission.hasReadPer);