@acorex/modules 21.0.0-next.39 → 21.0.0-next.41

package/fesm2022/acorex-modules-document-management.mjs

@@ -4,7 +4,7 @@ import { AXPEntityService, entityMasterCrudActions, entityMasterRecordActions, A
 import { AXPHookService, AXPPlatformScope, AXPDataGenerator, AXPDeviceService, AXP_MODULE_MANIFEST_PROVIDER, AXP_FEATURE_DEFINITION_PROVIDER, AXP_DISTRIBUTED_EVENT_LISTENER_PROVIDER, resolvePlatformScopeKey, resolvePlatformScopeName } from '@acorex/platform/core';
 import { AXPSearchCommandProvider, createEntitySearchCommand, AXPFileTypeProviderService, AXP_FILE_TYPE_INFO_PROVIDER, createAllQueryView, AXPFileStorageService, AXPSettingsService, AXPFileStorageStatus, AXPFilterOperatorMiddlewareService, AXPLockService, UploadFromComputerActionProvider, AXP_FILE_ACTION_PROVIDER, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER, AXP_SETTING_DEFINITION_PROVIDER } from '@acorex/platform/common';
 import * as i0 from '@angular/core';
-import { Injectable, inject, Injector, ChangeDetectionStrategy, Component, signal, NgModule, viewChild, computed, input, effect, ViewEncapsulation, untracked, HostListener } from '@angular/core';
+import { Injectable, inject, Injector, ChangeDetectionStrategy, Component, signal, NgModule, viewChild, computed, input, effect, ViewEncapsulation, untracked, DestroyRef, HostListener } from '@angular/core';
 import * as i3$2 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
 import { AXPCommonMenuKeys } from '@acorex/modules/common';
@@ -59,6 +59,7 @@ import { AXDropdownModule } from '@acorex/components/dropdown';
 import { AXDropdownButtonModule } from '@acorex/components/dropdown-button';
 import { AXSearchBoxModule } from '@acorex/components/search-box';
 import { AXPPageLayoutBaseComponent, AXPPageLayoutBase, AXPPageLayoutComponent } from '@acorex/platform/layout/views';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { AXBreadcrumbsModule } from '@acorex/components/breadcrumbs';
 
 const config = {
@@ -2716,6 +2717,32 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
         };
     }
     //#endregion
+    //#region ----   Backend response helpers   ----
+    /**
+     * Some command APIs return `{ result: T }` instead of `T`. Prefer the inner value when that shape is used.
+     */
+    unwrapBackendPayload(value) {
+        if (value !== null && typeof value === 'object' && 'result' in value) {
+            return value.result;
+        }
+        return value;
+    }
+    /**
+     * Resolves the entity id from a create response (plain id string or entity object with `id`).
+     */
+    resolveCreatedEntityId(created) {
+        if (typeof created === 'string' && created.trim() !== '') {
+            return created;
+        }
+        if (created && typeof created === 'object' && 'id' in created) {
+            const id = created.id;
+            if (typeof id === 'string' && id.trim() !== '') {
+                return id;
+            }
+        }
+        throw new Error('Failed to resolve created entity id');
+    }
+    //#endregion
     //#region ----   Scope Management Methods   ----
     /**
      * Creates a scoped drive service for the specified platform scope.
@@ -2920,23 +2947,82 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
     //#endregion
     //#region ----   Root and Folder Operations   ----
     /**
-     * Loads shortcuts for a folder and attaches them; recurses into child folders.
+     * Collects every folder id in the tree rooted at `folder` (including that folder).
      */
-    async enrichFolderWithShortcuts(folder) {
-        const shortcutRes = await this.shortcutData.query({
-            skip: 0,
-            take: 500,
-            filter: {
-                operator: null,
-                logic: 'and',
-                filters: [{ field: 'folderId', operator: { type: 'equal' }, value: folder.id }],
-            },
-        });
-        folder.shortcuts =
-            shortcutRes.items ?? [];
+    collectFolderTreeIds(folder, into) {
+        if (folder.id) {
+            into.add(folder.id);
+        }
         for (const child of folder.folders ?? []) {
-            await this.enrichFolderWithShortcuts(child);
+            this.collectFolderTreeIds(child, into);
+        }
+    }
+    /**
+     * Loads shortcuts for all folders in the tree using chunked `folderId IN (…)` queries instead of one query per folder.
+     */
+    async loadShortcutsForFolderIdChunks(folderIds) {
+        if (folderIds.length === 0) {
+            return [];
+        }
+        const CHUNK = 80;
+        const PAGE = 500;
+        const out = [];
+        for (let c = 0; c < folderIds.length; c += CHUNK) {
+            const chunk = folderIds.slice(c, c + CHUNK);
+            let skip = 0;
+            for (;;) {
+                const res = await this.shortcutData.query({
+                    skip,
+                    take: PAGE,
+                    filter: {
+                        operator: null,
+                        logic: 'and',
+                        filters: [{ field: 'folderId', operator: { type: 'in' }, value: chunk }],
+                    },
+                });
+                const items = res.items ?? [];
+                out.push(...items);
+                if (items.length < PAGE) {
+                    break;
+                }
+                skip += PAGE;
+            }
+        }
+        return out;
+    }
+    /**
+     * Loads shortcuts for every folder in the tree and assigns them to `folder.shortcuts` per node.
+     */
+    async enrichFolderTreeWithShortcuts(root) {
+        const folderIds = new Set();
+        this.collectFolderTreeIds(root, folderIds);
+        if (folderIds.size === 0) {
+            return;
+        }
+        const shortcuts = await this.loadShortcutsForFolderIdChunks([...folderIds]);
+        const byFolderId = new Map();
+        for (const s of shortcuts) {
+            const fid = s.folderId;
+            if (fid == null || fid === '') {
+                continue;
+            }
+            const list = byFolderId.get(fid);
+            if (list) {
+                list.push(s);
+            }
+            else {
+                byFolderId.set(fid, [s]);
+            }
         }
+        const assign = (folder) => {
+            const id = folder.id ?? '';
+            folder.shortcuts =
+                byFolderId.get(id) ?? [];
+            for (const child of folder.folders ?? []) {
+                assign(child);
+            }
+        };
+        assign(root);
     }
     /**
      * Gets the root folder for the given scope.
@@ -2944,7 +3030,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
      */
     async getRoot(scope) {
         const rootFolder = await this.documentManagementService.getRoot(scope);
-        await this.enrichFolderWithShortcuts(rootFolder);
+        await this.enrichFolderTreeWithShortcuts(rootFolder);
         const result = this.mapFolderDtoToFolderNode(rootFolder);
         const path = await this.buildPath(result);
         return { path, result };
@@ -2954,7 +3040,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
      */
     async getRootByEntityRef(refType, refId) {
         const folder = await this.documentManagementService.getRootByEntityRef(refType, refId);
-        await this.enrichFolderWithShortcuts(folder);
+        await this.enrichFolderTreeWithShortcuts(folder);
         const result = this.mapFolderDtoToFolderNode(folder);
         return { path: [result], result };
     }
@@ -2987,9 +3073,14 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
         if (!folder) {
             throw new Error('Folder not found');
         }
-        await this.enrichFolderWithShortcuts(folder);
+        await this.enrichFolderTreeWithShortcuts(folder);
         const result = this.mapFolderDtoToFolderNode(folder);
-        const path = await this.buildPath(result, (await this.getRoot(scope)).result.id);
+        const rootEntity = await this.documentManagementService.getRoot(scope);
+        const rootFolderId = rootEntity.id;
+        if (!rootFolderId) {
+            throw new Error('Drive root folder id is missing');
+        }
+        const path = await this.buildPath(result, rootFolderId);
         return { path, result };
     }
     /**
@@ -3011,8 +3102,9 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
             isDeleted: false,
             size: data.size ?? 0,
         };
-        const createdId = await this.folderData.create(folderToCreate);
-        const folder = await this.folderData.byKey(createdId);
+        const created = this.unwrapBackendPayload(await this.folderData.create(folderToCreate));
+        const createdId = this.resolveCreatedEntityId(created);
+        const folder = this.unwrapBackendPayload(await this.folderData.byKey(createdId));
         if (!folder) {
             throw new Error('Failed to load created folder');
         }
@@ -3272,8 +3364,9 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
         else {
             payload['targetFolderId'] = targetId;
         }
-        const createdId = await this.shortcutData.create(payload);
-        const shortcut = await this.shortcutData.byKey(createdId);
+        const created = this.unwrapBackendPayload(await this.shortcutData.create(payload));
+        const createdId = this.resolveCreatedEntityId(created);
+        const shortcut = this.unwrapBackendPayload(await this.shortcutData.byKey(createdId));
         if (!shortcut)
             throw new Error('Failed to load created shortcut');
         return this.mapShortcutToNode(shortcut);
@@ -6745,9 +6838,12 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
         this.vm = inject(AXPDocumentExplorerViewModel);
         this.router = inject(Router);
         this.activatedRoute = inject(ActivatedRoute);
+        this.destroyRef = inject(DestroyRef);
         //#endregion
         //#region ----------------   View Properties   ----------------
         this.previousFolderId = null;
+        /** When true, in-flight async work must not call `router.navigate` or sync layout loading. */
+        this.driveViewDestroyed = false;
         /** Resolved once per drive page visit; avoids repeated getRoot calls when normalizing URL scope. */
         this.driveRootIds = null;
         /** Filter definitions: document type (cascade parent) + metadata + search + file type. */
@@ -6809,6 +6905,13 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
     #loadingEffect;
     //#endregion
     //#region ----------------   Lifecycle Hooks   ----------------
+    ngOnDestroy() {
+        this.driveViewDestroyed = true;
+        // Balance `setNavigationLoading(true)` from `#loadingEffect` when the view is torn down while still loading.
+        if (this.vm.isLoading()) {
+            this.layoutService.setNavigationLoading(false);
+        }
+    }
     async ngOnInit() {
         super.ngOnInit();
         // Resolve scope from the route before loading filter definitions (see `initialize` early `patchState`
@@ -6839,11 +6942,11 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
             await this.performSearch(searchQuery);
         }
         else {
-            this.activatedRoute.paramMap.subscribe(async () => {
-                this.loadDrive();
+            this.activatedRoute.paramMap.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => {
+                void this.loadDrive();
             });
         }
-        this.activatedRoute.queryParams.subscribe(async (params) => {
+        this.activatedRoute.queryParams.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async (params) => {
             if (!params['search'] && this.vm.isVirtual()) {
                 const currentNode = this.vm.currentNode();
                 const targetFolderId = this.previousFolderId
@@ -6963,6 +7066,9 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
         this.selectionMode.set('single');
     }
     handleNavigateToFolder(folderId) {
+        if (this.driveViewDestroyed) {
+            return;
+        }
         const queryParams = this.activatedRoute.snapshot.queryParams;
         this.router.navigate([`${this.sessionService.application?.name}/drive/${resolvePlatformScopeName(this.vm.scope())}/${folderId}`], {
             queryParams: queryParams, // Preserve query params (e.g., search)
@@ -6987,6 +7093,9 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
         }
         await this.vm.initialize({ browseMode: 'file', scope: AXPPlatformScope.Tenant });
         await this.vm.loadFolderContents(folderId);
+        if (this.driveViewDestroyed) {
+            return;
+        }
         const queryParams = this.activatedRoute.snapshot.queryParams;
         const app = this.sessionService.application?.name;
         if (!app) {
@@ -7015,11 +7124,17 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
         const queryParams = this.activatedRoute.snapshot.queryParams;
         if (folderId) {
             await this.vm.loadFolderContents(folderId);
+            if (this.driveViewDestroyed) {
+                return;
+            }
             await this.correctDriveUrlIfTenantRootFolder(folderId);
         }
         else {
             // TODO: get root from tenant or user by scope
             const root = await this.driveService.getRoot(this.vm.scope());
+            if (this.driveViewDestroyed) {
+                return;
+            }
             if (root.result) {
                 await this.router.navigate([
                     `${this.sessionService.application?.name}/drive/${resolvePlatformScopeName(this.vm.scope())}/${root.result.id}`,
@@ -7030,7 +7145,9 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
                 });
             }
         }
-        //
+        if (this.driveViewDestroyed) {
+            return;
+        }
         this.recompute();
     }
     /**