Fix deleteWorkbooks for non-Zitadel mode

datalens-tech · Dec 12, 2024 · 31beed6 · 31beed6
1 parent ad57c9d
commit 31beed6
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/src/services/new/workbook/delete-workbooks.ts b/src/services/new/workbook/delete-workbooks.ts
@@ -62,33 +62,31 @@ export const deleteWorkbooks = async (
 
     const workbooksMap: Map<WorkbookInstance, string[]> = new Map();
 
-    let parentIds: string[] = [];
-
     const checkDeletePermissionPromises = workbooks.map(async (workbook) => {
         if (workbook.model.isTemplate) {
             throw new AppError("Workbook template can't be deleted", {
                 code: US_ERRORS.WORKBOOK_TEMPLATE_CANT_BE_DELETED,
             });
         }
 
-        if (accessServiceEnabled) {
-            if (workbook.model.collectionId !== null) {
-                parentIds = await getParentIds({
-                    ctx,
-                    trx: targetTrx,
-                    collectionId: workbook.model.collectionId,
-                });
-            }
+        let parentIds: string[] = [];
 
-            workbooksMap.set(workbook, parentIds);
+        if (workbook.model.collectionId !== null) {
+            parentIds = await getParentIds({
+                ctx,
+                trx: targetTrx,
+                collectionId: workbook.model.collectionId,
+            });
+        }
 
-            if (!skipCheckPermissions) {
-                await workbook.checkPermission({
-                    parentIds,
-                    permission: WorkbookPermission.Delete,
-                });
-            }
+        if (accessServiceEnabled && !skipCheckPermissions) {
+            await workbook.checkPermission({
+                parentIds,
+                permission: WorkbookPermission.Delete,
+            });
         }
+
+        workbooksMap.set(workbook, parentIds);
     });
 
     await Promise.all(checkDeletePermissionPromises);