@acorex/modules 20.7.3 → 20.7.5

package/document-management/index.d.ts

@@ -10,7 +10,7 @@ import * as _acorex_platform_common from '@acorex/platform/common';
 import { AXPEntity, AXPFileStorageService, AXPFilterOperatorMiddlewareService, AXPFileType, AXPFileTypeInfoProvider, AXPFileTypeProviderService, AXPMenuProvider, AXPMenuProviderContext, AXPSearchCommandProvider, AXPSearchResult, AXPSettingDefinitionProvider, AXPSettingDefinitionProviderContext } from '@acorex/platform/common';
 import { AXPEntityModel, AXMEntityCrudServiceImpl, AXPEntityDefinitionLoader, AXPEntityDefinitionPreloader, AXPEntityPreloadEntity } from '@acorex/platform/layout/entity';
 import * as _acorex_platform_core from '@acorex/platform/core';
-import { AXPFileListItem, AXPMetaData, AXPApplicationUserReference, AXPPlatformScope, AXPQueryRequest, AXPActionMenuItem, AXPDeviceService, AXPBackButton, AXPBreadcrumbItem, AXPExecuteCommand } from '@acorex/platform/core';
+import { AXPFileListItem, AXPMetaData, AXPApplicationUserReference, AXPPlatformScope, AXPQueryRequest, AXPHookService, AXPActionMenuItem, AXPDeviceService, AXPBackButton, AXPBreadcrumbItem, AXPExecuteCommand } from '@acorex/platform/core';
 import * as _acorex_platform_themes_shared from '@acorex/platform/themes/shared';
 import * as _ngrx_signals from '@ngrx/signals';
 import * as _acorex_components_menu from '@acorex/components/menu';
@@ -514,6 +514,7 @@ declare class AXMDocumentManagerService implements AXMDocumentManagerServiceInte
     protected reviewService: AXMReviewService;
     protected attachmentsService: DocumentAttachmentsService;
     protected filterMiddlewareService: AXPFilterOperatorMiddlewareService;
+    protected hooks: AXPHookService | null;
     private scopedDriveCache;
     private buildPathCache;
     /**
@@ -618,7 +619,7 @@ declare class AXMDocumentManagerService implements AXMDocumentManagerServiceInte
      */
     openFile(node: AXMDocumentExplorerNode): Promise<void>;
     /**
-     * Downloads a file
+     * Downloads a file using the same logic as file-uploader component
      */
     downloadFile(node: AXMDocumentExplorerNode): Promise<void>;
     /**

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

@@ -1,7 +1,7 @@
 import { AXPSessionService, AXPAuthGuard, AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex/platform/auth';
 import { AXPEntityService, AXMEntityCrudServiceImpl, entityMasterCrudActions, entityMasterRecordActions, cloneLayoutArrays, ensureLayoutSection, ensureLayoutPropertyView, ensureListActions, actionExists, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
-import { AXPPlatformScope, AXPDataGenerator, AXP_DISTRIBUTED_EVENT_LISTENER_PROVIDER, AXP_MODULE_MANIFEST_PROVIDER, AXP_FEATURE_DEFINITION_PROVIDER, AXPDeviceService, resolvePlatformScopeKey, resolvePlatformScopeName } from '@acorex/platform/core';
-import { AXPSearchCommandProvider, createAllQueryView, createQueryView, AXPEntityCommandScope, AXPEntityQueryType, AXPFileTypeProviderService, AXP_FILE_TYPE_INFO_PROVIDER, AXPFileStorageService, AXPFilterOperatorMiddlewareService, AXPSettingsService, AXPLockService, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER } from '@acorex/platform/common';
+import { AXPHookService, AXPPlatformScope, AXPDataGenerator, AXP_MODULE_MANIFEST_PROVIDER, AXP_FEATURE_DEFINITION_PROVIDER, AXP_DISTRIBUTED_EVENT_LISTENER_PROVIDER, AXPDeviceService, resolvePlatformScopeKey, resolvePlatformScopeName } from '@acorex/platform/core';
+import { AXPSearchCommandProvider, createAllQueryView, createQueryView, AXPEntityCommandScope, AXPEntityQueryType, AXPFileTypeProviderService, AXP_FILE_TYPE_INFO_PROVIDER, AXPFileStorageService, AXPFilterOperatorMiddlewareService, AXPSettingsService, AXPLockService, UploadFromComputerActionProvider, AXP_FILE_ACTION_PROVIDER, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER } from '@acorex/platform/common';
 import * as i0 from '@angular/core';
 import { Injectable, inject, Injector, NgModule, ChangeDetectionStrategy, Component, signal, viewChild, computed, input, effect, ViewEncapsulation, untracked, HostListener } from '@angular/core';
 import * as i3$3 from '@acorex/core/translation';
@@ -4403,6 +4403,7 @@ class AXMDocumentManagerService {
         this.reviewService = inject(AXMReviewService);
         this.attachmentsService = inject(DocumentAttachmentsService);
         this.filterMiddlewareService = inject(AXPFilterOperatorMiddlewareService);
+        this.hooks = inject(AXPHookService, { optional: true });
         //#endregion
         //#region ----   Private Properties   ----
         this.scopedDriveCache = new Map();
@@ -4830,32 +4831,117 @@ class AXMDocumentManagerService {
         const file = await this.documentService.getOne(node.id);
     }
     /**
-     * Downloads a file
+     * Downloads a file using the same logic as file-uploader component
      */
     async downloadFile(node) {
-        // const file = await this.documentService.getOne(node.id);
-        if (node.fileId) {
-            if (node.fileId.source?.value &&
-                typeof node.fileId.source.value === 'string' &&
-                node.fileId.source.value?.startsWith('http')) {
-                const link = document.createElement('a');
-                link.href = node.fileId.source.value;
-                link.download = node.name;
-                document.body.appendChild(link);
-                link.click();
-                document.body.removeChild(link);
-                return;
-            }
-            const fileInfo = await this.fileService.getInfo(node.fileId.id ?? '');
+        if (!node.fileId) {
+            console.error('File ID is undefined, cannot download.', node);
+            return;
+        }
+        const file = {
+            ...node.fileId,
+            name: node.fileId.name ?? node.name,
+        };
+        // Run BeforeDownload hook if available
+        // if (this.hooks) {
+        //   try {
+        //     await this.hooks.runAsync<any>('file-uploader.fileItem.before-download', {
+        //       host: undefined,
+        //       file,
+        //       plugins: [],
+        //       excludePlugins: [],
+        //     });
+        //   } catch {
+        //     // Ignore hook errors
+        //   }
+        // }
+        if (!file.source) {
+            console.error('File source is undefined, cannot download.', file);
+            return;
+        }
+        const triggerDownload = (blob, fileName) => {
+            const url = URL.createObjectURL(blob);
             const link = document.createElement('a');
-            link.href = fileInfo.url ?? '';
-            link.download = node.name; // Set the desired file name
+            link.href = url;
+            link.download = fileName;
             document.body.appendChild(link);
             link.click();
             document.body.removeChild(link);
+            URL.revokeObjectURL(url);
+        };
+        switch (file.source.kind) {
+            case 'blob':
+                if (file.source.value instanceof Blob) {
+                    triggerDownload(file.source.value, file.name ?? node.name ?? 'download');
+                }
+                else {
+                    console.error('Source kind is blob, but value is not a Blob.', file);
+                }
+                break;
+            case 'fileId':
+                if (typeof file.source.value === 'string') {
+                    try {
+                        const fileInfo = await this.fileService.getInfo(file.source.value);
+                        if (fileInfo && fileInfo.url) {
+                            const link = document.createElement('a');
+                            link.href = fileInfo.url;
+                            link.download = file.name ?? node.name ?? fileInfo.name ?? 'download';
+                            link.target = '_blank';
+                            document.body.appendChild(link);
+                            link.click();
+                            document.body.removeChild(link);
+                        }
+                        else if (fileInfo && fileInfo.binary instanceof Blob) {
+                            triggerDownload(fileInfo.binary, file.name ?? node.name ?? fileInfo.name ?? 'download');
+                        }
+                        else {
+                            console.error('Could not retrieve file for download from fileId:', fileInfo);
+                        }
+                    }
+                    catch (error) {
+                        console.error('Error downloading file by fileId:', file.source.value, error);
+                    }
+                }
+                else {
+                    console.error('Source kind is fileId, but value is not a string ID.', file);
+                }
+                break;
+            case 'url':
+                if (typeof file.source.value === 'string') {
+                    const link = document.createElement('a');
+                    link.href = file.source.value;
+                    link.download = file.name ?? node.name ?? 'download';
+                    link.target = '_blank';
+                    document.body.appendChild(link);
+                    link.click();
+                    document.body.removeChild(link);
+                }
+                else {
+                    console.error('Source kind is url, but value is not a string URL.', file);
+                }
+                break;
+            case 'reference':
+                console.error('Download not supported for source kind: reference', file);
+                break;
+            case 'preview':
+            case 'none':
+            default:
+                console.error(`Download not supported for source kind: ${file.source.kind}`, file);
+                break;
         }
-        else {
-            throw new Error('File ID is required');
+        // Run AfterDownload hook if available
+        if (this.hooks) {
+            try {
+                await this.hooks.runAsync('file-uploader.fileItem.after-download', {
+                    host: undefined,
+                    file,
+                    plugins: [],
+                    excludePlugins: [],
+                });
+            }
+            catch {
+                // Ignore hook errors
+            }
         }
     }
     //#endregion
@@ -5439,7 +5525,7 @@ class AXMDocumentManagerService {
             return ext && ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'pdf'].includes(ext);
         });
         // Fetch documents with null fileId.source.value
-        const documentsWithNullFileId = filteredDocuments.filter((doc) => doc.fileId?.source?.kind === 'fileId' && !doc.fileId.source.value);
+        const documentsWithNullFileId = filteredDocuments.filter((doc) => !doc.fileId.source.value);
         // Fetch missing documents and replace them in the array
         if (documentsWithNullFileId.length > 0) {
             const fetchedDocuments = await Promise.all(documentsWithNullFileId.map((doc) => this.documentService.getOne(doc.id)));
@@ -5453,7 +5539,7 @@ class AXMDocumentManagerService {
         }
         // Collect all fileIds that need to be fetched
         const fileIds = filteredDocuments
-            .filter((doc) => doc.fileId?.source?.kind === 'fileId' && doc.fileId.source.value)
+            .filter((doc) => doc.fileId.source.value)
             .map((doc) => doc.fileId.source.value);
         // Fetch all file info at once (need URL for media viewer)
         const fileInfosMap = new Map();
@@ -6697,9 +6783,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                     ], 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"] }]
         }] });
 
-const UploadFromDriveHookProvider = {
+const UploadFromDriveActionProvider = {
     key: 'file-uploader.actions',
-    priority: 0,
+    priority: 2,
     execute: (payload) => {
         const driveService = inject(AXMDocumentManagerService);
         const fileStorageService = inject(AXPFileStorageService);
@@ -6712,7 +6798,7 @@ const UploadFromDriveHookProvider = {
                 global: true,
                 textKey: '@document-management:actions.choose-from-drive',
                 icon: 'fa-light fa-file-arrow-up',
-                run: async ({ host }) => {
+                run: async (capabilities) => {
                     const result = await driveService.showChooseFileDialog(AXPPlatformScope.Tenant);
                     if (!result || result.length === 0) {
                         return;
@@ -6724,29 +6810,25 @@ const UploadFromDriveHookProvider = {
                     const dialogResult = await dialogService.confirm(dialogTitle, dialogMessage, 'primary', 'horizontal', false, 'cancel');
                     // Yes/Okay -> clone, No/Cancel -> by-reference
                     const attachmentType = dialogResult.result ? 'clone' : 'by-reference';
-                    // Add files to host with uploading status
-                    host.setValue([
-                        ...(host.getValue() ?? []),
-                        ...result.map((item) => ({
-                            ...(item.fileId ?? {}),
-                            status: 'uploading',
-                        })),
-                    ]);
+                    // 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) {
                         if (item.type === 'folder') {
                             continue;
                         }
-                        const currentFiles = host.getValue();
-                        const fileIndex = currentFiles.findIndex((f) => f.id === (item.fileId?.id ?? ''));
-                        if (fileIndex === -1) {
+                        const fileId = item.fileId?.id ?? '';
+                        const currentFile = capabilities.getFileById(fileId);
+                        if (!currentFile) {
                             continue;
                         }
                         if (attachmentType === 'by-reference') {
                             // By reference: just set documentId
-                            const updatedFiles = [...currentFiles];
-                            updatedFiles[fileIndex] = {
-                                ...updatedFiles[fileIndex],
+                            capabilities.updateFileById(fileId, {
                                 status: 'attached',
                                 source: {
                                     kind: 'reference',
@@ -6755,33 +6837,27 @@ const UploadFromDriveHookProvider = {
                                         type: 'document',
                                     },
                                 },
-                            };
-                            host.setValue(updatedFiles);
+                            });
                         }
                         else {
                             // Clone: get file info and create blob
                             try {
-                                const storageInfo = await fileStorageService.getInfo(item.fileId?.id ?? '');
+                                const storageInfo = await fileStorageService.getInfo(fileId);
                                 if (!storageInfo) {
-                                    const currentFiles = host.getValue();
-                                    host.setValue(currentFiles.filter((f) => f.id !== (item.fileId?.id ?? '')));
+                                    capabilities.removeFile(currentFile);
                                     continue;
                                 }
-                                const updatedFiles = [...currentFiles];
-                                updatedFiles[fileIndex] = {
-                                    ...updatedFiles[fileIndex],
+                                capabilities.updateFileById(fileId, {
                                     id: AXPDataGenerator.uuid(),
                                     status: 'attached',
                                     source: {
                                         kind: 'blob',
                                         value: new Blob([storageInfo.binary], { type: storageInfo.mimeType }),
                                     },
-                                };
-                                host.setValue(updatedFiles);
+                                });
                             }
                             catch {
-                                const currentFiles = host.getValue();
-                                host.setValue(currentFiles.filter((f) => f.id !== (item.fileId?.id ?? '')));
+                                capabilities.removeFile(currentFile);
                             }
                         }
                     }
@@ -6796,7 +6872,8 @@ class AXMDriveChooseModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXMDriveChooseModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
     static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.16", ngImport: i0, type: AXMDriveChooseModule }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXMDriveChooseModule, providers: [
-            { provide: AXP_DISTRIBUTED_EVENT_LISTENER_PROVIDER, useValue: UploadFromDriveHookProvider, multi: true }
+            { provide: AXP_FILE_ACTION_PROVIDER, useValue: UploadFromComputerActionProvider, multi: true },
+            { provide: AXP_FILE_ACTION_PROVIDER, useValue: UploadFromDriveActionProvider, multi: true }
         ] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXMDriveChooseModule, decorators: [{
@@ -6804,7 +6881,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
             args: [{
                     imports: [],
                     providers: [
-                        { provide: AXP_DISTRIBUTED_EVENT_LISTENER_PROVIDER, useValue: UploadFromDriveHookProvider, multi: true }
+                        { provide: AXP_FILE_ACTION_PROVIDER, useValue: UploadFromComputerActionProvider, multi: true },
+                        { provide: AXP_FILE_ACTION_PROVIDER, useValue: UploadFromDriveActionProvider, multi: true }
                     ]
                 }]
         }] });