@acorex/modules 20.3.0-next.7 → 20.3.0-next.8

package/common/index.d.ts

@@ -148,6 +148,7 @@ declare const AXPWidgetsList: {
         TimeDuration: string;
         DocumentUploader: string;
         MetaSelector: string;
+        MetaDataForm: string;
         ColumnFilterSelector: string;
         DataListFilter: string;
     };

package/data-management/index.d.ts

@@ -6,7 +6,7 @@ import { AXPEntity, AXPMenuProvider, AXPMenuProviderContext, AXPSearchCommandPro
 import { AXPEntityModel, AXMEntityCrudServiceImpl, AXPEntityDefinitionLoader, AXPEntityDefinitionPreloader, AXPEntityPreloadEntity } from '@acorex/platform/layout/entity';
 import { AXDataSource } from '@acorex/cdk/common';
 import { AXDropListDroppedEvent } from '@acorex/cdk/drag-drop';
-import { AXPFilterOperation, AXPFilterLogic } from '@acorex/platform/core';
+import { AXPFilterOperation, AXPFilterLogic, AXPExpressionEvaluatorScopeProvider, AXPExpressionEvaluatorScopeProviderContext } from '@acorex/platform/core';
 
 declare class AXMQueryEntityModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXMQueryEntityModule, never>;
@@ -26,9 +26,15 @@ declare class AXMMetaDataDefinitionEntityModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<AXMMetaDataDefinitionEntityModule>;
 }
 
+declare class AXMMetaDataFeatureModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMMetaDataFeatureModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMMetaDataFeatureModule, never, [typeof i1.AXPLayoutBuilderModule], never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMMetaDataFeatureModule>;
+}
+
 declare class AXMDataManagementModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXMDataManagementModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMDataManagementModule, never, [typeof i1.AXPLayoutBuilderModule, typeof AXMQueryEntityModule, typeof AXMDataSourceEntityModule, typeof AXMMetaDataDefinitionEntityModule], never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMDataManagementModule, never, [typeof i1.AXPLayoutBuilderModule, typeof AXMQueryEntityModule, typeof AXMDataSourceEntityModule, typeof AXMMetaDataDefinitionEntityModule, typeof AXMMetaDataFeatureModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AXMDataManagementModule>;
 }
 
@@ -495,5 +501,18 @@ declare class AXPQueryBuilderWidgetDesignerComponent extends AXPValueWidgetCompo
     static ɵcmp: i0.ɵɵComponentDeclaration<AXPQueryBuilderWidgetDesignerComponent, "axp-query-builder-widget-designer", never, {}, {}, never, never, true, never>;
 }
 
-export { AXMColumnFilterSelectorWidget, AXMColumnFilterSelectorWidgetColumnComponent, AXMColumnFilterSelectorWidgetEditComponent, AXMColumnFilterSelectorWidgetFilterComponent, AXMColumnFilterSelectorWidgetPrintComponent, AXMColumnFilterSelectorWidgetViewComponent, AXMDataManagementModule, AXMDataSourceEntityModule, AXMDataSourceOutputType, AXMDataSourceService, AXMDataSourceServiceImpl, AXMDataSourceType, AXMEntityProvider, AXMMenuProvider, AXMMetaDataDefinitionEntityModule, AXMMetaDataDefinitionService, AXMPMetaDataDefinitionServiceImpl, AXMQueryEntityModule, AXMQueryService, AXMQueryServiceImpl, AXMSearchCommandProvider, AXMSettingProvider, AXM_COLUMN_DEF_WIDGET, AXM_FILTER_DEF_WIDGET, AXPQueryBuilderWidget, AXPQueryBuilderWidgetColumnComponent, AXPQueryBuilderWidgetDesignerComponent, AXPQueryBuilderWidgetEditComponent, AXPQueryBuilderWidgetViewComponent, RootConfig, dataSourceEntityFactory, metaDataDefinitionFactory, queryFactory };
+/**
+ * Metadata Evaluator Scope Provider
+ *
+ * Provides expression evaluation capabilities for metadata operations:
+ * - Get category IDs from context/expressions
+ * - Retrieve metadata by category IDs
+ * - Access category metadata inheritance
+ */
+declare class AXMMetadataEvaluatorScopeProvider implements AXPExpressionEvaluatorScopeProvider {
+    private readonly queryService;
+    provide(context: AXPExpressionEvaluatorScopeProviderContext): Promise<void>;
+}
+
+export { AXMColumnFilterSelectorWidget, AXMColumnFilterSelectorWidgetColumnComponent, AXMColumnFilterSelectorWidgetEditComponent, AXMColumnFilterSelectorWidgetFilterComponent, AXMColumnFilterSelectorWidgetPrintComponent, AXMColumnFilterSelectorWidgetViewComponent, AXMDataManagementModule, AXMDataSourceEntityModule, AXMDataSourceOutputType, AXMDataSourceService, AXMDataSourceServiceImpl, AXMDataSourceType, AXMEntityProvider, AXMMenuProvider, AXMMetaDataDefinitionEntityModule, AXMMetaDataDefinitionService, AXMMetaDataFeatureModule, AXMMetadataEvaluatorScopeProvider, AXMPMetaDataDefinitionServiceImpl, AXMQueryEntityModule, AXMQueryService, AXMQueryServiceImpl, AXMSearchCommandProvider, AXMSettingProvider, AXM_COLUMN_DEF_WIDGET, AXM_FILTER_DEF_WIDGET, AXPQueryBuilderWidget, AXPQueryBuilderWidgetColumnComponent, AXPQueryBuilderWidgetDesignerComponent, AXPQueryBuilderWidgetEditComponent, AXPQueryBuilderWidgetViewComponent, RootConfig, dataSourceEntityFactory, metaDataDefinitionFactory, queryFactory };
 export type { AXMColumnFilterSelectorWidgetConfigType, AXMDataManagementQueryEntityModel, AXMDataSourceEntityModel, AXMDataSourceFilter, AXMDataSourceOutputTypeOption, AXMDataSourceTypeOption, AXMMetaDataDefinitionEntityModel, AXMQueryEntityModel, AXPQueryBuilderWidgetConfigType, ColumnFilterValue, QueryBuilderCondition$2 as QueryBuilderCondition };

package/fesm2022/acorex-modules-common.mjs

@@ -74,6 +74,7 @@ const AXPWidgetsList = {
         TimeDuration: 'time-duration',
         DocumentUploader: 'document-uploader',
         MetaSelector: 'meta-selector-editor',
+        MetaDataForm: 'meta-data-form-editor',
         ColumnFilterSelector: 'column-filter-selector-editor',
         DataListFilter: 'data-list-filter-editor',
     },
@@ -1081,6 +1082,8 @@ const categoryPlugin = {
         const categoryEntityName = `${baseEntityName}Category`;
         const propertyName = options?.propertyName?.trim()?.length ? options.propertyName : 'categoryIds';
         const allowMultiple = options?.allowMultiple ?? true;
+        const enableAppearance = options?.enableAppearance ?? false;
+        const enableMetaDataSelector = options?.enableMetaDataSelector ?? false;
         // Ensure group exists (prefer basic-info)
         const groups = ctx.groups.list() ?? [];
         const hasBasic = groups.some((g) => g.id === 'basic-info');
@@ -1153,6 +1156,8 @@ const categoryPlugin = {
             entity: `${moduleName}.${categoryEntityName}`,
             propertyName,
             allowMultiple,
+            enableAppearance,
+            enableMetaDataSelector,
         };
     },
 };
@@ -1169,14 +1174,48 @@ class AXMEntityCategoryProvider {
         if (entityName.endsWith('Category')) {
             const fullKey = `${moduleName}.${entityName}`;
             const dataService = runInInjectionContext(this.injector, () => new AXMEntityCrudServiceImpl(fullKey));
+            // Check if base entity has appearance enabled using lazy injection
+            const baseEntityName = entityName.replace('Category', '');
+            let enableAppearance = false;
+            let enableMetaDataSelector = false;
+            try {
+                // Use lazy injection to avoid circular dependency
+                const entityRegistry = runInInjectionContext(this.injector, () => {
+                    try {
+                        return inject(AXPEntityDefinitionRegistryService);
+                    }
+                    catch {
+                        return null;
+                    }
+                });
+                if (entityRegistry) {
+                    try {
+                        const baseEntity = await entityRegistry.resolve(moduleName, baseEntityName);
+                        if (baseEntity?.extensions?.category?.enableAppearance) {
+                            enableAppearance = true;
+                        }
+                        if (baseEntity?.extensions?.category?.enableMetaDataSelector) {
+                            enableMetaDataSelector = true;
+                        }
+                    }
+                    catch (error) {
+                        // Base entity not found or error loading, continue with default behavior
+                        console.warn(`Could not load base entity ${moduleName}.${baseEntityName} to check category plugin configuration:`, error);
+                    }
+                }
+            }
+            catch (error) {
+                // Registry not available, continue with default behavior
+                console.warn(`Entity registry not available, using default category configuration:`, error);
+            }
             const entityDef = {
                 module: moduleName,
                 name: entityName,
                 parentKey: 'parentId',
                 plugins: [
-                // { name: 'history' },
-                // { name: 'lock' },
-                // { name: 'compare' },
+                    // { name: 'lock' },
+                    // { name: 'compare' },
+                    ...(enableMetaDataSelector ? [{ name: 'meta-data-selector' }] : []),
                 ],
                 source: '',
                 title: '@general:terms.category.individual',
@@ -1191,6 +1230,7 @@ class AXMEntityCategoryProvider {
                 relatedEntities: [],
                 groups: [
                     { id: 'basic-info', title: '@general:terms.basic-info' },
+                    ...(enableAppearance ? [{ id: 'appearance', title: '@general:terms.appearance' }] : []),
                 ],
                 properties: [
                     {
@@ -1222,6 +1262,33 @@ class AXMEntityCategoryProvider {
                         groupId: 'basic-info',
                         schema: { dataType: 'string', interface: { type: AXPWidgetsCatalog.largeText } },
                     },
+                    // Appearance properties (only if enabled)
+                    ...(enableAppearance ? [
+                        {
+                            name: 'color',
+                            title: '@general:terms.color',
+                            groupId: 'appearance',
+                            schema: {
+                                dataType: 'string',
+                                interface: {
+                                    type: AXPWidgetsList.Theme.ThemeColorChooser,
+                                    options: {},
+                                },
+                            },
+                        },
+                        {
+                            name: 'icon',
+                            title: '@general:terms.icon',
+                            groupId: 'appearance',
+                            schema: {
+                                dataType: 'string',
+                                interface: {
+                                    type: AXPWidgetsList.Theme.IconChooser,
+                                    options: {},
+                                },
+                            },
+                        },
+                    ] : []),
                 ],
                 columns: [{ name: 'title' }, { name: 'description' }],
                 commands: {
@@ -1246,28 +1313,52 @@ class AXMEntityCategoryProvider {
                 interfaces: {
                     master: {
                         create: {
-                            sections: [{ id: 'basic-info' }],
+                            sections: [
+                                { id: 'basic-info' },
+                                ...(enableAppearance ? [{ id: 'appearance' }] : []),
+                            ],
                             properties: [
                                 { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                                 { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                                 { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                                // Appearance properties (only if enabled)
+                                ...(enableAppearance ? [
+                                    { name: 'color', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                                    { name: 'icon', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                                ] : []),
                             ],
                         },
                         update: {
-                            sections: [{ id: 'basic-info' }],
+                            sections: [
+                                { id: 'basic-info' },
+                                ...(enableAppearance ? [{ id: 'appearance' }] : []),
+                            ],
                             properties: [
                                 { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                                 { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                                 { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                                // Appearance properties (only if enabled)
+                                ...(enableAppearance ? [
+                                    { name: 'color', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                                    { name: 'icon', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                                ] : []),
                             ],
                         },
                         single: {
                             title: '{{title}}',
-                            sections: [{ id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } }],
+                            sections: [
+                                { id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } },
+                                ...(enableAppearance ? [{ id: 'appearance', layout: { positions: { lg: { colSpan: 12 } } } }] : []),
+                            ],
                             properties: [
                                 { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
                                 { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
                                 { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                                // Appearance properties (only if enabled)
+                                ...(enableAppearance ? [
+                                    { name: 'color', layout: { positions: { lg: { colSpan: 12, order: 4 } } } },
+                                    { name: 'icon', layout: { positions: { lg: { colSpan: 12, order: 5 } } } },
+                                ] : []),
                             ],
                             actions: [entityMasterDeleteAction()],
                         },