@acorex/modules 20.2.3 → 20.2.4-next.1

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

@@ -85,6 +85,11 @@ class AXMMenuProvider {
                 text: `t('module-name', {scope:"${scope}"})`,
                 icon: module.icon,
                 name: 'content-management-menu',
+                data: {
+                    requiredPermission: [
+                        'platform'
+                    ],
+                },
                 children: [
                     {
                         text: RootConfig.entities.promotion.title,
@@ -93,13 +98,13 @@ class AXMMenuProvider {
                         priority: 1,
                         name: 'content-management-promotion-menu-item'
                     },
-                    {
-                        text: RootConfig.entities.glossary?.title,
-                        path: this.entityService.createPath(module.name, RootConfig.entities.glossary?.name),
-                        icon: RootConfig.entities.glossary?.icon,
-                        priority: 2,
-                        name: 'content-management-glossary-menu-item'
-                    },
+                    // {
+                    //   text: RootConfig.entities.glossary?.title,
+                    //   path: this.entityService.createPath(module.name, RootConfig.entities.glossary?.name),
+                    //   icon: RootConfig.entities.glossary?.icon,
+                    //   priority: 2,
+                    //   name: 'content-management-glossary-menu-item'
+                    // },
                     {
                         text: RootConfig.entities.appTerm?.title,
                         path: this.entityService.createPath(module.name, RootConfig.entities.appTerm?.name),
@@ -254,7 +259,6 @@ class AXMPromotionDataSourceDefinition {
                                 };
                             }
                             catch (e) {
-                                console.log(e);
                                 throw e;
                             }
                         },
@@ -389,7 +393,7 @@ class AXMNotifyAppTermComponent extends AXBasePageComponent {
         this.close({ data: this.data });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMNotifyAppTermComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.1.6", type: AXMNotifyAppTermComponent, isStandalone: true, selector: "axm-notify-app", usesInheritance: true, ngImport: i0, template: "@for (item of data; track $index) {\n<ax-content class=\"ax-block ax-px-4 ax-py-4 ax-font-bold\">{{ item.title }}</ax-content>\n<ax-content class=\"ax-block ax-px-4 ax-pb-4 ax-text-base/6\" [innerHTML]=\"transformContent(item.content) | safe : 'html'\"></ax-content>\n}\n<ax-footer class=\"ax-flex ax-items-center ax-justify-between ax-p-2\">\n  <ax-check-box [(value)]=\"isConfirm\">\n    <ax-label>{{ 'agreeTerm' | translate : { scope: i18n } | async }}</ax-label>\n  </ax-check-box>\n  <ax-button (click)=\"send()\" [text]=\"'okay' | translate | async\" [disabled]=\"!isConfirm\" color=\"primary\"></ax-button>\n</ax-footer>", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXLabelModule }, { kind: "component", type: i1.AXLabelComponent, selector: "ax-label", inputs: ["required", "for"], outputs: ["requiredChange"] }, { kind: "ngmodule", type: AXCheckBoxModule }, { kind: "component", type: i2.AXCheckBoxComponent, selector: "ax-check-box", inputs: ["disabled", "tabIndex", "readonly", "color", "value", "name", "id", "checked", "isLoading", "indeterminate"], outputs: ["onBlur", "onFocus", "valueChange", "onValueChanged"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i4.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }, { kind: "pipe", type: AXSafePipe, name: "safe" }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.1.6", type: AXMNotifyAppTermComponent, isStandalone: true, selector: "axm-notify-app", usesInheritance: true, ngImport: i0, template: "@for (item of data; track $index) {\n<ax-content class=\"ax-block ax-px-4 ax-py-4 ax-font-bold\">{{ item.title }}</ax-content>\n<ax-content class=\"ax-block ax-px-4 ax-pb-4 ax-text-base/6\" [innerHTML]=\"transformContent(item.content) | safe : 'html'\"></ax-content>\n}\n<ax-footer class=\"ax-flex ax-items-center ax-justify-between ax-p-2\">\n  <ax-check-box [(value)]=\"isConfirm\">\n    <ax-label>{{ 'agreeTerm' | translate : { scope: i18n } | async }}</ax-label>\n  </ax-check-box>\n  <ax-button (click)=\"send()\" [text]=\"'okay' | translate | async\" [disabled]=\"!isConfirm\" color=\"primary\"></ax-button>\n</ax-footer>", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXLabelModule }, { kind: "component", type: i1.AXLabelComponent, selector: "ax-label", inputs: ["required", "for"], outputs: ["requiredChange"] }, { kind: "ngmodule", type: AXCheckBoxModule }, { kind: "component", type: i2.AXCheckBoxComponent, selector: "ax-check-box", inputs: ["disabled", "tabIndex", "readonly", "color", "value", "name", "id", "isLoading", "indeterminate"], outputs: ["onBlur", "onFocus", "valueChange", "onValueChanged"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i4.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }, { kind: "pipe", type: AXSafePipe, name: "safe" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMNotifyAppTermComponent, decorators: [{
             type: Component,
@@ -718,86 +722,25 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
                 }]
         }], ctorParameters: () => [{ type: AppTermsCheckService }] });
 
-/**
- * Deeply sanitizes an object for storage in IndexedDB by removing non-serializable content
- */
-function sanitizeForStorage(obj) {
-    if (!obj) {
-        return obj;
-    }
-    // Handle primitive values
-    if (typeof obj !== 'object') {
-        return obj;
-    }
-    // Handle arrays
-    if (Array.isArray(obj)) {
-        return obj.map((item) => sanitizeForStorage(item));
-    }
-    // Handle Date objects
-    if (obj instanceof Date) {
-        return obj;
-    }
-    // Handle File objects specially
-    if (obj instanceof File) {
-        // File objects are handled separately, return as is
-        return obj;
-    }
-    // Handle Blob objects
-    if (obj instanceof Blob) {
-        // Blob objects are handled separately
-        return obj;
-    }
-    // Handle regular objects
-    const cleanedObj = {};
-    for (const [key, value] of Object.entries(obj)) {
-        // Skip functions, symbols and other non-serializable types
-        if (typeof value === 'function' || typeof value === 'symbol') {
-            continue;
-        }
-        // Handle null values
-        if (value === null) {
-            cleanedObj[key] = null;
-            continue;
-        }
-        // Recursively sanitize objects
-        if (typeof value === 'object') {
-            cleanedObj[key] = sanitizeForStorage(value);
-        }
-        else {
-            cleanedObj[key] = value;
-        }
-    }
-    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);
     const i18n = RootConfig.config.i18n;
     const entityDef = {
+        plugins: [
+            { name: 'history' },
+            { name: 'lock' },
+            { name: 'compare' },
+            { name: 'comments' },
+            {
+                name: 'attachments',
+                options: {
+                    field: 'imageId',
+                    accept: '.jpg,.jpeg,.png,.gif,.webp',
+                    multiple: true,
+                    fileEditable: true,
+                },
+            },
+        ],
         module: RootConfig.module.name,
         name: RootConfig.entities.promotion.name,
         source: '',
@@ -816,10 +759,6 @@ async function promotionEntityFactory(injector) {
                 id: 'promotion',
                 title: 'Promotion',
             },
-            {
-                id: 'comments',
-                title: 'Comments',
-            },
         ],
         properties: [
             {
@@ -885,20 +824,7 @@ async function promotionEntityFactory(injector) {
                     },
                 ],
             },
-            {
-                name: 'imageId',
-                title: `t("Gallery", { scope: "${i18n}" })`,
-                groupId: 'promotion',
-                schema: {
-                    dataType: 'string',
-                    interface: {
-                        type: AXPWidgetsCatalog.fileUploader,
-                        options: {
-                            multiple: true,
-                        },
-                    },
-                },
-            },
+            // attachments property comes from plugin when configured to create property
             {
                 name: 'contentType',
                 title: `t("contentType", { scope: "${i18n}" })`,
@@ -1028,137 +954,13 @@ async function promotionEntityFactory(injector) {
             //     },
             //   }
             //},
-            {
-                name: 'comments',
-                title: `Comments`,
-                groupId: 'comments',
-                schema: {
-                    dataType: 'object',
-                    interface: {
-                        type: 'comment',
-                        options: {
-                            refrenceType: RootConfig.module.name + '.' + RootConfig.entities.promotion.name,
-                            refrenceId: '{{ context.eval("id") }}',
-                            subject: '{{ context.eval("title") }}',
-                        },
-                    },
-                },
-            },
         ],
-        columns: [{ name: 'title' }, { name: 'placement' }, { name: 'imageId' }],
+        columns: [{ name: 'title' }, { name: 'placement' }],
         commands: {
             create: {
                 execute: async (data) => {
-                    data = sanitizeForStorage(data);
-                    const entityPayload = { ...data };
-                    entityPayload.imageId = entityPayload.imageId || [];
-                    const filesToUploadAfterSave = [];
-                    if (Array.isArray(entityPayload.imageId)) {
-                        const processedImageIdForEntitySave = [];
-                        for (const fileItem of entityPayload.imageId) {
-                            if (fileItem.source?.kind === 'blob' && fileItem.source.value instanceof Blob) {
-                                // Sanitize the filename
-                                const sanitizedName = sanitizeFileName(fileItem.name);
-                                filesToUploadAfterSave.push({
-                                    fileItem: { ...fileItem, name: sanitizedName },
-                                    blob: fileItem.source.value,
-                                });
-                                processedImageIdForEntitySave.push({
-                                    tempId: fileItem.id,
-                                    name: sanitizedName,
-                                    size: fileItem.size,
-                                    type: fileItem.source.value.type,
-                                    status: 'pending_upload',
-                                });
-                            }
-                            else if (fileItem.source?.kind === 'fileId' &&
-                                fileItem.id &&
-                                typeof fileItem.source.value === 'string') {
-                                // If it's a fileId, we assume it's already processed. We don't have type directly on AXPFileListItem.
-                                // We'll reconstruct it from fileStorageService or it should be part of what's saved if needed.
-                                processedImageIdForEntitySave.push({
-                                    id: fileItem.id,
-                                    name: fileItem.name,
-                                    size: fileItem.size,
-                                    // type: fileItem.type, // Removed: AXPFileListItem does not have .type
-                                    status: 'uploaded',
-                                    source: { kind: 'fileId', value: fileItem.source.value },
-                                });
-                            }
-                            else if (fileItem.id && fileItem.name) {
-                                // Fallback for items that might be from a previous save
-                                processedImageIdForEntitySave.push({
-                                    id: fileItem.id,
-                                    name: fileItem.name,
-                                    size: fileItem.size,
-                                    // type: fileItem.type, // Removed: AXPFileListItem does not have .type
-                                    status: fileItem.status, // Preserve existing status
-                                    source: fileItem.source ? { kind: fileItem.source.kind, value: fileItem.source.value } : undefined,
-                                });
-                            }
-                        }
-                        entityPayload.imageId = processedImageIdForEntitySave;
-                    }
-                    const savedEntityId = await dataService.insertOne(entityPayload);
-                    // const entityId = savedEntity.id; // Corrected based on typical service return
-                    const finalImageIdReferences = (entityPayload.imageId || []).filter((f) => f.status !== 'pending_upload');
-                    for (const { fileItem, blob } of filesToUploadAfterSave) {
-                        try {
-                            if (!fileStorageService) {
-                                throw new Error('fileStorageService is not available.');
-                            }
-                            const fileStorageInfo = await fileStorageService.save({
-                                file: blob,
-                                refId: savedEntityId,
-                                refType: `${RootConfig.module.name}.${RootConfig.entities.promotion.name}`,
-                                category: '',
-                                name: blob.name,
-                            });
-                            await fileStorageService.commit(fileStorageInfo.fileId);
-                            finalImageIdReferences.push({
-                                id: fileStorageInfo.fileId,
-                                name: fileStorageInfo.name || blob.name,
-                                size: fileStorageInfo.size || blob.size,
-                                type: fileStorageInfo.mimeType || blob.type,
-                                status: 'uploaded',
-                                source: { kind: 'fileId', value: fileStorageInfo.fileId },
-                            });
-                        }
-                        catch (err) {
-                            // Typed error
-                            console.error('Error uploading file to FileStorage for entityId:', savedEntityId, 'file:', fileItem.name, err);
-                            finalImageIdReferences.push({
-                                tempId: fileItem.id,
-                                name: fileItem.name,
-                                size: fileItem.size,
-                                type: blob.type, // Correctly access type from Blob/File
-                                status: 'upload_failed',
-                                error: err.message,
-                            });
-                        }
-                    }
-                    if (filesToUploadAfterSave.length > 0) {
-                        let needsUpdate = true;
-                        if (entityPayload.imageId && entityPayload.imageId.length === finalImageIdReferences.length) {
-                            const oldIds = entityPayload.imageId
-                                .map((f) => f.id || f.tempId)
-                                .sort()
-                                .join(',');
-                            const newIds = finalImageIdReferences
-                                .map((f) => f.id || f.tempId)
-                                .sort()
-                                .join(',');
-                            if (oldIds === newIds && !finalImageIdReferences.some((f) => f.status === 'upload_failed')) {
-                                needsUpdate = false;
-                            }
-                        }
-                        if (needsUpdate) {
-                            // Assuming updateOne takes the ID and an object of fields to update
-                            console.log(finalImageIdReferences);
-                            await dataService.updateOne(savedEntityId, { imageId: finalImageIdReferences });
-                        }
-                    }
-                    return { id: savedEntityId };
+                    const res = await dataService.insertOne(data);
+                    return { id: res };
                 },
             },
             delete: {
@@ -1168,86 +970,7 @@ async function promotionEntityFactory(injector) {
             },
             update: {
                 execute: async (data) => {
-                    await new Promise((resolve) => setTimeout(resolve, 1000));
-                    const entityId = data.id;
-                    const filesToUpload = [];
-                    const processedImageReferences = [];
-                    if (data.imageId && Array.isArray(data.imageId)) {
-                        for (const fileItem of data.imageId) {
-                            if (fileItem.status === 'deleted') {
-                                continue;
-                            }
-                            if (fileItem.source?.kind === 'blob' && fileItem.source.value instanceof Blob) {
-                                // 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.
-                                processedImageReferences.push({
-                                    id: fileItem.id,
-                                    name: fileItem.name,
-                                    size: fileItem.size,
-                                    status: fileItem.status || 'uploaded',
-                                    source: { kind: 'fileId', value: fileItem.source.value },
-                                });
-                            }
-                            else if (fileItem.id && fileItem.name) {
-                                processedImageReferences.push({
-                                    id: fileItem.id,
-                                    name: fileItem.name,
-                                    size: fileItem.size,
-                                    status: fileItem.status || 'uploaded',
-                                    source: fileItem.source ? { kind: fileItem.source.kind, value: fileItem.source.value } : undefined,
-                                });
-                            }
-                        }
-                    }
-                    // Upload new files and add their successful/failed info to processedImageReferences
-                    for (const { fileItem, blob } of filesToUpload) {
-                        try {
-                            if (!fileStorageService) {
-                                throw new Error('fileStorageService is not available.');
-                            }
-                            const fileStorageInfo = await fileStorageService.save({
-                                file: blob,
-                                refId: entityId,
-                                refType: `${RootConfig.module.name}.${RootConfig.entities.promotion.name}`,
-                                category: '',
-                                name: fileItem.name, // Use the sanitized name from fileItem
-                            });
-                            await fileStorageService.commit(fileStorageInfo.fileId);
-                            processedImageReferences.push({
-                                id: fileStorageInfo.fileId,
-                                name: fileStorageInfo.name || fileItem.name,
-                                size: fileStorageInfo.size || blob.size,
-                                type: fileStorageInfo.mimeType || blob.type,
-                                status: 'uploaded',
-                                source: { kind: 'fileId', value: fileStorageInfo.fileId },
-                            });
-                        }
-                        catch (err) {
-                            console.error('Error uploading file to FileStorage during update for entityId:', entityId, 'file:', fileItem.name, err);
-                            processedImageReferences.push({
-                                tempId: fileItem.id,
-                                name: fileItem.name,
-                                size: fileItem.size,
-                                type: blob.type,
-                                status: 'upload_failed',
-                                error: err.message,
-                            });
-                        }
-                    }
-                    // Construct the final data payload for the update.
-                    const finalUpdatePayload = { ...data };
-                    finalUpdatePayload.imageId = processedImageReferences;
-                    const fullySanitizedPayload = sanitizeForStorage(finalUpdatePayload);
-                    return await dataService.updateOne(entityId, fullySanitizedPayload);
+                    return await dataService.updateOne(data.id, data);
                 },
             },
         },
@@ -1299,7 +1022,9 @@ async function promotionEntityFactory(injector) {
             },
             list: {
                 execute: async (e) => {
-                    return await dataService.query({ skip: e.skip, take: e.take, filter: e.filter });
+                    const x = await dataService.query(e);
+                    console.log(x);
+                    return x;
                 },
                 type: AXPEntityQueryType.List,
             },
@@ -1335,17 +1060,7 @@ async function promotionEntityFactory(injector) {
                                 },
                             },
                         },
-                        {
-                            name: 'imageId',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 12,
-                                        order: 6,
-                                    },
-                                },
-                            },
-                        },
+                        // attachments property layout injected via plugin
                         {
                             name: 'contentType',
                             layout: {
@@ -1421,17 +1136,7 @@ async function promotionEntityFactory(injector) {
                                 },
                             },
                         },
-                        {
-                            name: 'imageId',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 12,
-                                        order: 6,
-                                    },
-                                },
-                            },
-                        },
+                        // attachments property layout injected via plugin
                         {
                             name: 'contentType',
                             layout: {
@@ -1484,9 +1189,9 @@ async function promotionEntityFactory(injector) {
                         {
                             id: 'promotion',
                         },
-                        {
-                            id: 'comments',
-                        },
+                        // {
+                        //   id: 'comments',
+                        // },
                     ],
                     properties: [
                         {
@@ -1509,17 +1214,7 @@ async function promotionEntityFactory(injector) {
                                 },
                             },
                         },
-                        {
-                            name: 'imageId',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 12,
-                                        order: 2,
-                                    },
-                                },
-                            },
-                        },
+                        // attachments property layout injected via plugin
                         {
                             name: 'contentType',
                             layout: {
@@ -1553,20 +1248,20 @@ async function promotionEntityFactory(injector) {
                                 },
                             },
                         },
-                        {
-                            name: 'comments',
-                            layout: {
-                                label: {
-                                    visible: false,
-                                },
-                                positions: {
-                                    lg: {
-                                        colSpan: 12,
-                                        order: 7,
-                                    },
-                                },
-                            },
-                        },
+                        // {
+                        //   name: 'comments',
+                        //   layout: {
+                        //     label: {
+                        //       visible: false,
+                        //     },
+                        //     positions: {
+                        //       lg: {
+                        //         colSpan: 12,
+                        //         order: 7,
+                        //       },
+                        //     },
+                        //   },
+                        // },
                     ],
                     actions: [],
                 },
@@ -1609,90 +1304,7 @@ async function promotionEntityFactory(injector) {
                             scope: AXPEntityCommandScope.Individual,
                             disabled: `{{ lock.check(context.eval("id"), "${RootConfig.module.name}.${RootConfig.entities.promotion.name}") }}`,
                         },
-                        //TODO: add this to the entity
-                        {
-                            title: '@document-management:actions.upload-files',
-                            command: {
-                                name: 'show-file-uploader-popup',
-                                options: {
-                                    id: '{{ context.eval("id") }}',
-                                    files: '{{ context.eval("imageId") }}',
-                                    multiple: true,
-                                    accept: '.jpg,.jpeg,.png,.gif,.webp',
-                                    key: 'imageId',
-                                    fileEditable: true,
-                                },
-                            },
-                            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: '@conversation:actions.show-comment-popup',
-                            command: {
-                                name: 'show-comment-popup',
-                                options: {
-                                    refId: '{{ context.eval("id") }}',
-                                    refType: RootConfig.module.name + '.' + RootConfig.entities.promotion.name,
-                                    subject: '{{ context.eval("title") }}',
-                                },
-                            },
-                            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: {
-                                    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: 'unlock-confirm',
-                                options: {
-                                    refId: '{{ context.eval("id") }}',
-                                    refType: RootConfig.module.name + '.' + RootConfig.entities.promotion.name,
-                                },
-                            },
-                            priority: 'secondary',
-                            type: 'update',
-                            scope: AXPEntityCommandScope.Individual,
-                            hidden: `{{ (await lock.check(context.eval("id"), "${RootConfig.module.name}.${RootConfig.entities.promotion.name}"))  == false }}`,
-                        },
+                        // upload files action is injected via attachments plugin
                     ],
                     views: [
                         createAllQueryView({ sorts: [{ name: 'title', dir: 'asc' }] }),
@@ -1912,7 +1524,7 @@ async function appTermEntityEntityFactory(injector) {
             },
             list: {
                 execute: async (e) => {
-                    const x = await dataService.query({ skip: e.skip, take: e.take, filter: e.filter });
+                    const x = await dataService.query(e);
                     return x;
                 },
                 type: AXPEntityQueryType.List,
@@ -2269,7 +1881,7 @@ async function glossaryEntityFactory(injector) {
             },
             list: {
                 execute: async (e) => {
-                    return await dataService.query({ skip: e.skip, take: e.take, filter: e.filter });
+                    return await dataService.query(e);
                 },
                 type: AXPEntityQueryType.List,
             },