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

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

@@ -1,10 +1,10 @@
 import { AXPSessionService, AXPAuthGuard, AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex/platform/auth';
 import { AXPStateMessageComponent, AXP_PAGE_COMPONENT_PROVIDER, AXPThemeLayoutBlockComponent, AXPQueryFiltersComponent } from '@acorex/platform/layout/components';
 import { AXPEntityService, entityMasterCrudActions, entityMasterRecordActions, AXMEntityCrudServiceImpl, resolveEntityPluginDetailPageOrder, ensureListActions, AXPEntityDefinitionRegistryService, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_STORAGE_MIDDLEWARE, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
-import { AXPMultiLanguageStringResolverService, AXPHookService, AXPPlatformScope, AXPDataGenerator, AXPDeviceService, AXP_MODULE_MANIFEST_PROVIDER, AXP_FEATURE_DEFINITION_PROVIDER, AXP_DISTRIBUTED_EVENT_LISTENER_PROVIDER, resolvePlatformScopeKey, resolvePlatformScopeName } from '@acorex/platform/core';
+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 = {
@@ -2660,7 +2661,6 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
         this.workflow = inject(AXPWorkflowService);
         this.translate = inject(AXTranslationService);
         this.layoutBuilder = inject(AXPLayoutBuilderService);
-        this.multiLanguageResolver = inject(AXPMultiLanguageStringResolverService);
         this.attachmentsService = inject(DocumentAttachmentsService);
         this.filterMiddlewareService = inject(AXPFilterOperatorMiddlewareService);
         this.hooks = inject(AXPHookService, { optional: true });
@@ -2676,12 +2676,12 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
         this.mapFolderDtoToFolderNode = (folder) => {
             return {
                 id: folder.id,
-                name: this.multiLanguageResolver.resolve(folder.title),
+                name: this.translate.resolve(folder.title),
                 type: 'folder',
                 parentId: folder.parentId || null,
                 modifiedAt: folder?.updated?.at,
                 createdAt: folder?.created?.at,
-                description: folder.description != null ? this.multiLanguageResolver.resolve(folder.description) : undefined,
+                description: folder.description != null ? this.translate.resolve(folder.description) : undefined,
                 childrenCount: folder.childrenCount,
                 size: folder.size,
                 documentTypes: folder.documentTypes || [],
@@ -3103,9 +3103,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
      * Opens a file. For shortcut nodes, opens the target document.
      */
     async openFile(node) {
-        const documentId = node.storageType === 'shortcut' && node.targetDocumentId
-            ? node.targetDocumentId
-            : node.id;
+        const documentId = node.storageType === 'shortcut' && node.targetDocumentId ? node.targetDocumentId : node.id;
         const file = await this.documentData.byKey(documentId);
         // Could trigger open/edit workflow or preview
     }
@@ -3262,10 +3260,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
             else {
                 const folder = await this.folderData.byKey(targetId);
                 const rawTitle = folder?.title;
-                name =
-                    rawTitle != null && rawTitle !== ''
-                        ? this.multiLanguageResolver.resolve(rawTitle)
-                        : 'Folder';
+                name = rawTitle != null && rawTitle !== '' ? this.translate.resolve(rawTitle) : 'Folder';
             }
         }
         const payload = {
@@ -3359,7 +3354,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
             const folderData = {
                 ...folderRest,
                 title: newName,
-                description: descMl != null ? this.multiLanguageResolver.resolve(descMl) : undefined,
+                description: descMl != null ? this.translate.resolve(descMl) : undefined,
             };
             // Create the new folder
             return await this.createFolder(folderData);
@@ -3960,12 +3955,8 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
     async showFileViewerPopup(node, options) {
         const isVirtualFolder = node.parentId === 'virtual';
         const parentFolder = await this.folderData.byKey(node.parentId);
-        const parentFolderName = isVirtualFolder
-            ? 'Virtual'
-            : this.multiLanguageResolver.resolve(parentFolder?.title ?? '');
-        const documents = isVirtualFolder
-            ? (options?.folderVirtualFiles ?? [])
-            : (parentFolder?.documents ?? []);
+        const parentFolderName = isVirtualFolder ? 'Virtual' : this.translate.resolve(parentFolder?.title ?? '');
+        const documents = isVirtualFolder ? (options?.folderVirtualFiles ?? []) : (parentFolder?.documents ?? []);
         // Filter documents by gallery-supported extensions
         const filteredDocuments = documents.filter((item) => {
             if (!item.name)
@@ -5343,6 +5334,70 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                     ], template: "<!-- Breadcrumbs Section -->\n<div class=\"__breadcrumb ax-xs\">\n  <!-- Desktop Breadcrumb -->\n  @for (item of vm.currentPath(); track item.id; let i = $index;let last = $last) {\n  <!-- Navigation Button -->\n  <ax-button look=\"blank\" (onClick)=\"vm.navigateToFolder(item.id)\" [text]=\"item.name\" [disabled]=\"last\">\n    @if(i === 0) {\n    <ax-icon icon=\"fa-light fa-cloud\"></ax-icon>\n    }@else {\n    <ax-icon icon=\"fa-light fa-folder-closed\"></ax-icon>\n    }\n  </ax-button>\n  <!-- Separator -->\n  @if(!last) {\n  <i class=\"far fa-chevron-right rtl:ax-rotate-180 fa-fw fa-xs ax-me-2\"></i>\n  }\n  <!-- End Navigation Button -->\n  }\n</div>\n", styles: [":host{display:flex;width:100%;align-items:center}:host .__nav{display:flex;flex-direction:row;align-items:center;gap:.25rem;border-inline-end-width:1px;padding-inline-start:.25rem;padding-inline-end:.5rem}:host .__breadcrumb{display:flex;flex-direction:row;flex-wrap:wrap;align-items:center;padding-inline-start:.5rem;padding-inline-end:.25rem}:host .__breadcrumb .ax-state-disabled button,:host .__breadcrumb .ax-state-loading button{cursor:default!important}\n"] }]
         }] });
 
+/**
+ * Build a Blob for "clone" attachment from drive file metadata (storage fileId, url, or existing blob).
+ */
+async function resolveCloneBlob(fileInfo, fileStorageService) {
+    if (!fileInfo) {
+        return null;
+    }
+    if (fileInfo.source?.kind === 'blob' && fileInfo.source.value instanceof Blob) {
+        const b = fileInfo.source.value;
+        return { blob: b, name: fileInfo.name, size: fileInfo.size ?? b.size, mimeType: b.type };
+    }
+    const storageKeyFromSource = fileInfo.source?.kind === 'fileId' && typeof fileInfo.source.value === 'string'
+        ? fileInfo.source.value
+        : undefined;
+    if (storageKeyFromSource) {
+        try {
+            const storageInfo = await fileStorageService.getInfo(storageKeyFromSource);
+            const bin = storageInfo.binary;
+            return {
+                blob: new Blob([bin], { type: storageInfo.mimeType }),
+                name: storageInfo.name ?? fileInfo.name,
+                size: storageInfo.size,
+                mimeType: storageInfo.mimeType,
+            };
+        }
+        catch {
+            /* try fallbacks */
+        }
+    }
+    if (typeof fileInfo.id === 'string' && fileInfo.source?.kind !== 'url') {
+        try {
+            const storageInfo = await fileStorageService.getInfo(fileInfo.id);
+            const bin = storageInfo.binary;
+            return {
+                blob: new Blob([bin], { type: storageInfo.mimeType }),
+                name: storageInfo.name ?? fileInfo.name,
+                size: storageInfo.size,
+                mimeType: storageInfo.mimeType,
+            };
+        }
+        catch {
+            /* fall through */
+        }
+    }
+    if (fileInfo.source?.kind === 'url' && typeof fileInfo.source.value === 'string') {
+        try {
+            const res = await fetch(fileInfo.source.value, { credentials: 'include' });
+            if (!res.ok) {
+                return null;
+            }
+            const blob = await res.blob();
+            return {
+                blob,
+                name: fileInfo.name,
+                size: fileInfo.size ?? blob.size,
+                mimeType: blob.type || 'application/octet-stream',
+            };
+        }
+        catch {
+            return null;
+        }
+    }
+    return null;
+}
 const UploadFromDriveActionProvider = {
     key: 'file-uploader.actions',
     priority: 2,
@@ -5363,32 +5418,25 @@ const UploadFromDriveActionProvider = {
                     if (!result || result.length === 0) {
                         return;
                     }
-                    // Show confirm dialog for clone option
-                    // Yes/Okay -> clone, No/Cancel -> by-reference
                     const dialogTitle = await translationService.translateAsync('@document-management:actions.upload-options.title');
                     const dialogMessage = await translationService.translateAsync('@document-management:actions.upload-options.confirm-message');
                     const dialogResult = await dialogService.confirm(dialogTitle, dialogMessage, 'primary', 'horizontal', false, 'cancel');
-                    // Yes/Okay -> clone, No/Cancel -> by-reference
+                    // OK / primary -> clone copy; Cancel / secondary -> link by document reference (see i18n confirm-message)
                     const attachmentType = dialogResult.result ? 'clone' : 'by-reference';
-                    // Add files with uploading status
-                    const initialFiles = result.map((item) => ({
-                        ...(item.fileId ?? {}),
-                        status: 'uploading',
-                    }));
-                    capabilities.addFiles(initialFiles);
-                    // Process files based on attachment type
-                    for await (const item of result) {
+                    const finalItems = [];
+                    for (const item of result) {
                         if (item.type === 'folder') {
                             continue;
                         }
-                        const fileId = item.fileId?.id ?? '';
-                        const currentFile = capabilities.getFileById(fileId);
-                        if (!currentFile) {
-                            continue;
-                        }
+                        const fi = item.fileId;
+                        const displayName = (fi?.name ?? item.name ?? '').trim() || 'file';
+                        const displaySize = fi?.size ?? item.size ?? 0;
                         if (attachmentType === 'by-reference') {
-                            // By reference: just set documentId
-                            capabilities.updateFileById(fileId, {
+                            // Use document id as row id so storage/middleware correlation matches entity link (document:… after save)
+                            finalItems.push({
+                                id: item.id,
+                                name: displayName,
+                                size: displaySize,
                                 status: 'attached',
                                 source: {
                                     kind: 'reference',
@@ -5398,28 +5446,25 @@ const UploadFromDriveActionProvider = {
                                     },
                                 },
                             });
+                            continue;
                         }
-                        else {
-                            // Clone: get file info and create blob
-                            try {
-                                const storageInfo = await fileStorageService.getInfo(fileId);
-                                if (!storageInfo) {
-                                    capabilities.removeFile(currentFile);
-                                    continue;
-                                }
-                                capabilities.updateFileById(fileId, {
-                                    id: AXPDataGenerator.uuid(),
-                                    status: 'attached',
-                                    source: {
-                                        kind: 'blob',
-                                        value: new Blob([storageInfo.binary], { type: storageInfo.mimeType }),
-                                    },
-                                });
-                            }
-                            catch {
-                                capabilities.removeFile(currentFile);
-                            }
+                        const resolved = await resolveCloneBlob(fi, fileStorageService);
+                        if (!resolved) {
+                            continue;
                         }
+                        finalItems.push({
+                            id: AXPDataGenerator.uuid(),
+                            name: resolved.name ?? displayName,
+                            size: resolved.size ?? resolved.blob.size,
+                            status: 'attached',
+                            source: {
+                                kind: 'blob',
+                                value: resolved.blob,
+                            },
+                        });
+                    }
+                    if (finalItems.length > 0) {
+                        capabilities.addFiles(finalItems);
                     }
                 },
             },
@@ -6369,7 +6414,7 @@ const DocumentFileUploaderActionsByTypeProvider = {
                             return;
                         }
                     }
-                    await capabilities.addFiles(fileItems);
+                    capabilities.addFiles(fileItems);
                 },
             };
         });
@@ -6701,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. */
@@ -6765,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`
@@ -6795,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
@@ -6919,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)
@@ -6943,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) {
@@ -6971,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}`,
@@ -6986,7 +7053,9 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
                 });
             }
         }
-        //
+        if (this.driveViewDestroyed) {
+            return;
+        }
         this.recompute();
     }
     /**