@acorex/modules 19.4.15 → 20.0.0-next.0

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

@@ -9,7 +9,6 @@ import { AXP_DATASOURCE_DEFINITION_PROVIDER } from '@acorex/platform/core';
 import { AXDataSource } from '@acorex/cdk/common';
 import { AXPWidgetsCatalog } from '@acorex/platform/layout/builder';
 import { AXSafePipe } from '@acorex/core/pipes';
-import { CommonModule } from '@angular/common';
 
 const config = {
     i18n: 'content-management',
@@ -83,10 +82,10 @@ class AXMEntityProvider {
         }
         return null;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AXMEntityProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AXMEntityProvider }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXMEntityProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXMEntityProvider }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AXMEntityProvider, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXMEntityProvider, decorators: [{
             type: Injectable
         }] });
 
@@ -155,10 +154,10 @@ class AXMPromotionServiceImpl extends AXMEntityCrudServiceImpl {
     constructor() {
         super(`${RootConfig.module.name}.${RootConfig.entities.promotion.name}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AXMPromotionServiceImpl, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AXMPromotionServiceImpl }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXMPromotionServiceImpl, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXMPromotionServiceImpl }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AXMPromotionServiceImpl, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXMPromotionServiceImpl, decorators: [{
             type: Injectable
         }], ctorParameters: () => [] });
 
@@ -255,18 +254,18 @@ class AXMPromotionSlotComponent {
         }));
         this.listData.set(mappedItems);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AXMPromotionSlotComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.10", type: AXMPromotionSlotComponent, isStandalone: true, selector: "acorex-platform-promotion-slot", ngImport: i0, template: "@for (item of listData(); track item.id) { @if (item.contentType?.name == 'media') {\n<img [src]=\"item.image?.url ?? ''\" class=\"ax-w-full ax-p-3 ax-border  {{\n    item.shape?.name == 'circle' ? 'ax-rounded-full' : 'ax-rounded-none'\n  }}\" />\n} @if(item.contentType?.name == 'text'){\n<div class=\"ax-m-1 ax-px-6 ax-p-4 ax-border ax-bg-primary ax-rounded-lg\">\n  <h1 class=\"ax-text-base/6\" [innerHTML]=\"item.body | safe : 'html'\"></h1>\n</div>\n\n} } ", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "pipe", type: AXSafePipe, name: "safe" }] }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXMPromotionSlotComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.0.4", type: AXMPromotionSlotComponent, isStandalone: true, selector: "acorex-platform-promotion-slot", ngImport: i0, template: "@for (item of listData(); track item.id) { @if (item.contentType?.name == 'media') {\n<img [src]=\"item.image?.url ?? ''\" class=\"ax-w-full ax-p-3 ax-border  {{\n    item.shape?.name == 'circle' ? 'ax-rounded-full' : 'ax-rounded-none'\n  }}\" />\n} @if(item.contentType?.name == 'text'){\n<div class=\"ax-m-1 ax-px-6 ax-p-4 ax-border ax-bg-primary ax-rounded-lg\">\n  <h1 class=\"ax-text-base/6\" [innerHTML]=\"item.body | safe : 'html'\"></h1>\n</div>\n\n} } ", dependencies: [{ kind: "pipe", type: AXSafePipe, name: "safe" }] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AXMPromotionSlotComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXMPromotionSlotComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'acorex-platform-promotion-slot', imports: [CommonModule, AXSafePipe], template: "@for (item of listData(); track item.id) { @if (item.contentType?.name == 'media') {\n<img [src]=\"item.image?.url ?? ''\" class=\"ax-w-full ax-p-3 ax-border  {{\n    item.shape?.name == 'circle' ? 'ax-rounded-full' : 'ax-rounded-none'\n  }}\" />\n} @if(item.contentType?.name == 'text'){\n<div class=\"ax-m-1 ax-px-6 ax-p-4 ax-border ax-bg-primary ax-rounded-lg\">\n  <h1 class=\"ax-text-base/6\" [innerHTML]=\"item.body | safe : 'html'\"></h1>\n</div>\n\n} } " }]
+            args: [{ selector: 'acorex-platform-promotion-slot', imports: [AXSafePipe], template: "@for (item of listData(); track item.id) { @if (item.contentType?.name == 'media') {\n<img [src]=\"item.image?.url ?? ''\" class=\"ax-w-full ax-p-3 ax-border  {{\n    item.shape?.name == 'circle' ? 'ax-rounded-full' : 'ax-rounded-none'\n  }}\" />\n} @if(item.contentType?.name == 'text'){\n<div class=\"ax-m-1 ax-px-6 ax-p-4 ax-border ax-bg-primary ax-rounded-lg\">\n  <h1 class=\"ax-text-base/6\" [innerHTML]=\"item.body | safe : 'html'\"></h1>\n</div>\n\n} } " }]
         }] });
 
 class AXMContentManagementModule {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AXMContentManagementModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.2.10", ngImport: i0, type: AXMContentManagementModule, imports: [i1.AXPComponentSlotModule] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AXMContentManagementModule, providers: [
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXMContentManagementModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.0.4", ngImport: i0, type: AXMContentManagementModule, imports: [i1.AXPComponentSlotModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXMContentManagementModule, providers: [
             {
                 provide: AXP_MENU_PROVIDER,
                 useClass: AXMMenuProvider,
@@ -323,7 +322,7 @@ class AXMContentManagementModule {
                 ],
             })] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AXMContentManagementModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXMContentManagementModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
@@ -441,6 +440,30 @@ function sanitizeForStorage(obj) {
     }
     return cleanedObj;
 }
+/**
+ * Sanitizes a filename by:
+ * 1. Removing special characters
+ * 2. Replacing spaces with hyphens
+ * 3. Ensuring unique timestamp
+ */
+function sanitizeFileName(fileName) {
+    if (!fileName)
+        return '';
+    // Get file extension
+    const ext = fileName.split('.').pop() || '';
+    // Get base name without extension
+    let baseName = fileName.slice(0, -(ext.length + 1));
+    // Remove special characters and replace spaces with hyphens
+    baseName = baseName
+        .replace(/[^\w\s-]/g, '') // Remove special chars except spaces and hyphens
+        .replace(/\s+/g, '-') // Replace spaces with hyphens
+        .replace(/-+/g, '-') // Replace multiple hyphens with single hyphen
+        .trim();
+    // Add timestamp to ensure uniqueness
+    const timestamp = new Date().getTime();
+    // Combine everything
+    return `${baseName}-${timestamp}.${ext}`;
+}
 async function promotionEntityFactory(injector) {
     const dataService = injector.get(AXMAppPromotionService);
     const fileStorageService = injector.get(AXPFileStorageService);
@@ -691,18 +714,23 @@ async function promotionEntityFactory(injector) {
                 execute: async (data) => {
                     data = sanitizeForStorage(data);
                     const entityPayload = { ...data };
+                    entityPayload.imageId = entityPayload.imageId || [];
                     const filesToUploadAfterSave = [];
-                    // const originalImageIdArray = Array.isArray(entityPayload.imageId) ? [...entityPayload.imageId] : [];
-                    if (entityPayload.imageId && Array.isArray(entityPayload.imageId)) {
+                    if (Array.isArray(entityPayload.imageId)) {
                         const processedImageIdForEntitySave = [];
                         for (const fileItem of entityPayload.imageId) {
                             if (fileItem.source?.kind === 'blob' && fileItem.source.value instanceof Blob) {
-                                filesToUploadAfterSave.push({ fileItem, blob: fileItem.source.value });
+                                // Sanitize the filename
+                                const sanitizedName = sanitizeFileName(fileItem.name);
+                                filesToUploadAfterSave.push({
+                                    fileItem: { ...fileItem, name: sanitizedName },
+                                    blob: fileItem.source.value
+                                });
                                 processedImageIdForEntitySave.push({
                                     tempId: fileItem.id,
-                                    name: fileItem.name,
+                                    name: sanitizedName,
                                     size: fileItem.size,
-                                    type: fileItem.source.value.type, // Type from blob is reliable
+                                    type: fileItem.source.value.type,
                                     status: 'pending_upload'
                                 });
                             }
@@ -747,6 +775,7 @@ async function promotionEntityFactory(injector) {
                                 category: '',
                                 name: blob.name,
                             });
+                            await fileStorageService.commit(fileStorageInfo.fileId);
                             finalImageIdReferences.push({
                                 id: fileStorageInfo.fileId,
                                 name: fileStorageInfo.name || blob.name,
@@ -794,21 +823,19 @@ async function promotionEntityFactory(injector) {
                 execute: async (data) => {
                     const entityId = data.id;
                     const filesToUpload = [];
-                    const processedImageReferences = []; // Will hold final file objects for DB
-                    // Ensure fileStorageService is available (it's injected at the factory level)
-                    // const fileStorageService = injector.get(AXPFileStorageService); // Already available in this scope from factory
+                    const processedImageReferences = [];
                     if (data.imageId && Array.isArray(data.imageId)) {
                         for (const fileItem of data.imageId) {
                             if (fileItem.status === 'deleted') {
-                                // File marked for deletion. Skip.
-                                // Optionally, you might want to call fileStorageService.delete(fileId) here
-                                // if fileItem.id points to an existing stored file and actual deletion is needed.
-                                // For now, we just disassociate it from the entity.
                                 continue;
                             }
                             if (fileItem.source?.kind === 'blob' && fileItem.source.value instanceof Blob) {
-                                filesToUpload.push({ fileItem, blob: fileItem.source.value });
-                                // Actual reference will be added to processedImageReferences after successful upload.
+                                // Sanitize the filename for new uploads
+                                const sanitizedName = sanitizeFileName(fileItem.name);
+                                filesToUpload.push({
+                                    fileItem: { ...fileItem, name: sanitizedName },
+                                    blob: fileItem.source.value
+                                });
                             }
                             else if (fileItem.source?.kind === 'fileId' && fileItem.id && typeof fileItem.source.value === 'string') {
                                 // This is an existing file, keep its reference.
@@ -816,14 +843,11 @@ async function promotionEntityFactory(injector) {
                                     id: fileItem.id,
                                     name: fileItem.name,
                                     size: fileItem.size,
-                                    status: fileItem.status || 'uploaded', // Default to 'uploaded' if status is missing
+                                    status: fileItem.status || 'uploaded',
                                     source: { kind: 'fileId', value: fileItem.source.value }
-                                    // 'type' is not typically part of AXPFileListItem for existing fileIds in 'create'
                                 });
                             }
                             else if (fileItem.id && fileItem.name) {
-                                // Fallback for items that might be from a previous save state (already processed)
-                                // These are likely already processed files that are being kept.
                                 processedImageReferences.push({
                                     id: fileItem.id,
                                     name: fileItem.name,
@@ -832,7 +856,6 @@ async function promotionEntityFactory(injector) {
                                     source: fileItem.source ? { kind: fileItem.source.kind, value: fileItem.source.value } : undefined
                                 });
                             }
-                            // Else: unknown fileItem structure, it will be ignored or you can log an error.
                         }
                     }
                     // Upload new files and add their successful/failed info to processedImageReferences
@@ -843,16 +866,17 @@ async function promotionEntityFactory(injector) {
                             }
                             const fileStorageInfo = await fileStorageService.save({
                                 file: blob,
-                                refId: entityId, // ID of the entity being updated
+                                refId: entityId,
                                 refType: `${RootConfig.module.name}.${RootConfig.entities.promotion.name}`,
-                                category: '', // Add category if applicable
-                                name: blob.name,
+                                category: '',
+                                name: fileItem.name, // Use the sanitized name from fileItem
                             });
+                            await fileStorageService.commit(fileStorageInfo.fileId);
                             processedImageReferences.push({
                                 id: fileStorageInfo.fileId,
-                                name: fileStorageInfo.name || blob.name,
+                                name: fileStorageInfo.name || fileItem.name,
                                 size: fileStorageInfo.size || blob.size,
-                                type: fileStorageInfo.mimeType || blob.type, // Store MIME type
+                                type: fileStorageInfo.mimeType || blob.type,
                                 status: 'uploaded',
                                 source: { kind: 'fileId', value: fileStorageInfo.fileId }
                             });
@@ -860,7 +884,7 @@ async function promotionEntityFactory(injector) {
                         catch (err) {
                             console.error('Error uploading file to FileStorage during update for entityId:', entityId, 'file:', fileItem.name, err);
                             processedImageReferences.push({
-                                tempId: fileItem.id, // Use fileItem.id if it's a unique temp client-side ID, or generate one
+                                tempId: fileItem.id,
                                 name: fileItem.name,
                                 size: fileItem.size,
                                 type: blob.type,
@@ -870,13 +894,8 @@ async function promotionEntityFactory(injector) {
                         }
                     }
                     // Construct the final data payload for the update.
-                    // Create a mutable copy of the input data.
                     const finalUpdatePayload = { ...data };
-                    // Replace the original imageId array with the newly processed one.
                     finalUpdatePayload.imageId = processedImageReferences;
-                    // Sanitize the entire payload before sending it to dataService.updateOne.
-                    // This ensures that the processedImageReferences (which are plain objects)
-                    // and all other fields in the payload are clean and serializable.
                     const fullySanitizedPayload = sanitizeForStorage(finalUpdatePayload);
                     return await dataService.updateOne(entityId, fullySanitizedPayload);
                 },
@@ -886,8 +905,6 @@ async function promotionEntityFactory(injector) {
             byKey: {
                 execute: async (id) => {
                     try {
-                        // Debug the incoming ID parameter
-                        console.log('byKey original id parameter:', id, typeof id);
                         // Ensure id is a valid key for IndexedDB - needs to be string or number
                         let validId;
                         // If id is an object (e.g., from router params or complex structure)
@@ -908,11 +925,8 @@ async function promotionEntityFactory(injector) {
                             // Convert to string to ensure consistency
                             validId = String(id);
                         }
-                        // Log the ID being used for the query
-                        console.log('Fetching record with id:', validId, typeof validId);
                         try {
                             const data = await dataService.getOne(validId);
-                            console.log('getOne result:', data ? 'Data found' : 'No data found');
                             // If no data was found
                             if (!data) {
                                 console.warn(`No record found with id: ${validId}`);
@@ -1190,6 +1204,7 @@ async function promotionEntityFactory(injector) {
                     actions: [],
                 },
                 list: {
+                    title: 't("promotionPlural", { scope: "content-management" })',
                     actions: [
                         {
                             title: `t("create", { scope: "common" })`,
@@ -1225,10 +1240,11 @@ async function promotionEntityFactory(injector) {
                             priority: 'secondary',
                             type: 'update',
                             scope: AXPEntityCommandScope.Individual,
+                            disabled: `{{ lock.check(context.eval("id"), "${RootConfig.module.name}.${RootConfig.entities.promotion.name}") }}`,
                         },
                         //TODO: add this to the entity
                         {
-                            title: 't("upload.title", { scope: "common" })',
+                            title: '@document-management:actions.upload-files',
                             command: {
                                 name: 'show-file-uploader-popup',
                                 options: {
@@ -1240,8 +1256,62 @@ async function promotionEntityFactory(injector) {
                                 }
                             },
                             priority: 'secondary',
+                            type: 'upload',
+                            scope: AXPEntityCommandScope.Individual,
+                        },
+                        {
+                            title: '@activity-log:actions.view-history',
+                            command: {
+                                name: 'show-version-history-popup',
+                                options: {
+                                    refId: '{{ context.eval("id") }}',
+                                    refType: RootConfig.module.name + '.' + RootConfig.entities.promotion.name,
+                                }
+                            },
+                            priority: 'secondary',
+                            type: 'version-history',
+                            scope: AXPEntityCommandScope.Individual,
+                        },
+                        {
+                            title: 'Compare',
+                            command: {
+                                name: 'show-entity-records-compare',
+                            },
+                            priority: 'secondary',
+                            type: 'version-history',
+                            scope: AXPEntityCommandScope.Selected
+                        },
+                        {
+                            title: '@common:actions.lock',
+                            name: 'lock-entity',
+                            command: {
+                                name: 'lock-popup',
+                                options: {
+                                    lockAction: 'lock',
+                                    refId: '{{ context.eval("id") }}',
+                                    refType: RootConfig.module.name + '.' + RootConfig.entities.promotion.name,
+                                }
+                            },
+                            priority: 'secondary',
+                            type: 'update',
+                            scope: AXPEntityCommandScope.Individual,
+                            hidden: `{{ lock.check(context.eval("id"), "${RootConfig.module.name}.${RootConfig.entities.promotion.name}") }}`,
+                        },
+                        {
+                            title: '@common:actions.unlock',
+                            name: 'unlock-entity',
+                            command: {
+                                name: 'lock-popup',
+                                options: {
+                                    refId: '{{ context.eval("id") }}',
+                                    refType: RootConfig.module.name + '.' + RootConfig.entities.promotion.name,
+                                    lockAction: 'unlock',
+                                }
+                            },
+                            priority: 'secondary',
                             type: 'update',
                             scope: AXPEntityCommandScope.Individual,
+                            hidden: `{{ !lock.check(context.eval("id"), "${RootConfig.module.name}.${RootConfig.entities.promotion.name}") }}`,
                         },
                     ],
                     views: [