add scope

datalens-tech · Nov 16, 2023 · e9210c2 · e9210c2
1 parent 51e0bda
commit e9210c2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/services/entry/actions/create-in-workbook.ts b/src/services/entry/actions/create-in-workbook.ts
@@ -101,14 +101,12 @@ export async function createEntryInWorkbook(
 
     const {accessServiceEnabled} = ctx.config;
 
-    let permissions: Optional<UsPermission>;
+    const workbook = await getWorkbook(
+        {ctx, skipCheckPermissions: isPrivateRoute},
+        {workbookId, includePermissionsInfo},
+    );
 
     const createdEntry = await transaction(Entry.primary, async (trx) => {
-        const workbook = await getWorkbook(
-            {ctx, trx, skipCheckPermissions: isPrivateRoute},
-            {workbookId, includePermissionsInfo},
-        );
-
         if (accessServiceEnabled && !isPrivateRoute) {
             await checkWorkbookPermission({
                 ctx,
@@ -118,13 +116,6 @@ export async function createEntryInWorkbook(
             });
         }
 
-        if (includePermissionsInfo) {
-            permissions = getEntryPermissionsByWorkbook({
-                ctx,
-                workbook,
-            });
-        }
-
         const [entryId, revId] = await Promise.all([getId(), getId()]);
 
         // TODO: DLS.addEntity / iam registrate entry
@@ -173,6 +164,15 @@ export async function createEntryInWorkbook(
     });
 
     const resultEntry: Entry & {permissions?: UsPermission} = createdEntry!;
+    let permissions: Optional<UsPermission>;
+
+    if (includePermissionsInfo) {
+        permissions = getEntryPermissionsByWorkbook({
+            ctx,
+            workbook,
+            scope: resultEntry.scope,
+        });
+    }
 
     if (includePermissionsInfo) {
         resultEntry.permissions = permissions;

diff --git a/src/services/new/workbook/get-workbook-content.ts b/src/services/new/workbook/get-workbook-content.ts
@@ -112,7 +112,7 @@ export const getWorkbookContent = async (
         {ctx, trx, skipValidation: true, skipCheckPermissions},
         {
             workbookId,
-            includePermissionsInfo,
+            includePermissionsInfo: true,
         },
     );