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

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 = {
@@ -6745,9 +6746,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 +6813,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 +6850,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 +6974,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 +7001,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 +7032,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 +7053,9 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
                 });
             }
         }
-        //
+        if (this.driveViewDestroyed) {
+            return;
+        }
         this.recompute();
     }
     /**