Add check is private route (#161)

datalens-tech · Jul 23, 2024 · 414f152 · 414f152
1 parent 4d19e7d
commit 414f152
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/services/new/workbook/get-workbook-content.ts b/src/services/new/workbook/get-workbook-content.ts
@@ -109,7 +109,7 @@ export const getWorkbookContent = async (
 
     const targetTrx = getReplica(trx);
 
-    const {user, tenantId} = ctx.get('info');
+    const {user, tenantId, isPrivateRoute} = ctx.get('info');
 
     const workbook = await getWorkbook(
         {ctx, trx, skipValidation: true, skipCheckPermissions},
@@ -122,7 +122,11 @@ export const getWorkbookContent = async (
     const entriesPage = await JoinedEntryRevisionFavorite.findPage({
         where: (builder) => {
             builder.where({
-                'entries.tenantId': tenantId,
+                ...(isPrivateRoute
+                    ? {}
+                    : {
+                          'entries.tenantId': tenantId,
+                      }),
                 workbookId: workbookId,
                 isDeleted: false,
             });

diff --git a/src/services/new/workbook/get-workbook.ts b/src/services/new/workbook/get-workbook.ts
@@ -106,7 +106,7 @@ export const getWorkbook = async <T extends WorkbookInstance = WorkbookInstance>
     }
 
     logInfo(ctx, 'GET_WORKBOOK_FINISH', {
-        workbookId: Utils.encodeId(workbook.model.collectionId),
+        workbookId: Utils.encodeId(workbook.model.workbookId),
     });
 
     return workbook as T;