@acorex/modules 20.4.2 → 20.5.0-next.1

package/common/index.d.ts

@@ -1,22 +1,16 @@
 import * as i0 from '@angular/core';
 import { Injector, OnInit, Type, InjectionToken } from '@angular/core';
-import * as i1 from '@acorex/platform/workflow';
-import { AXPWorkflowAction, AXPWorkflowContext, AXPWorkflow } from '@acorex/platform/workflow';
 import { AXPAppStartUpService } from '@acorex/platform/core';
-import * as i1$1 from '@acorex/platform/layout/components';
+import * as i1 from '@acorex/platform/layout/components';
 import { AXPCompareViewInputs, AXPCompareViewMode } from '@acorex/platform/layout/components';
-import * as i5 from '@acorex/platform/layout/widgets';
+import * as i1$1 from '@acorex/platform/workflow';
+import { AXPWorkflowAction, AXPWorkflowContext, AXPWorkflow } from '@acorex/platform/workflow';
+import * as i4 from '@acorex/platform/layout/widgets';
 import { AXBasePageComponent } from '@acorex/components/page';
 import { AXPMenuProvider, AXPMenuProviderContext, AXPSearchCommandProvider, AXPSearchResult, AXPSettingDefinitionProvider, AXPSettingDefinitionProviderContext, AXPSearchDisplayGroupResult, AXPSearchDisplayResult } from '@acorex/platform/common';
 import { Subject } from 'rxjs';
 import { AXPEntityActionPlugin } from '@acorex/platform/layout/entity';
 
-declare class AXMLockSystemModule {
-    static ɵfac: i0.ɵɵFactoryDeclaration<AXMLockSystemModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMLockSystemModule, never, [typeof i1.AXPWorkflowModule], never>;
-    static ɵinj: i0.ɵɵInjectorDeclaration<AXMLockSystemModule>;
-}
-
 declare class AXPExtraPropertiesModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXPExtraPropertiesModule, never>;
     static ɵmod: i0.ɵɵNgModuleDeclaration<AXPExtraPropertiesModule, never, never, never>;
@@ -32,13 +26,13 @@ declare class AXPCategoryModule {
 declare class AXPGlobalSearchModule {
     constructor(appInitService: AXPAppStartUpService, injector: Injector);
     static ɵfac: i0.ɵɵFactoryDeclaration<AXPGlobalSearchModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPGlobalSearchModule, never, [typeof i1$1.AXPComponentSlotModule, typeof i1.AXPWorkflowModule], never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPGlobalSearchModule, never, [typeof i1.AXPComponentSlotModule, typeof i1$1.AXPWorkflowModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AXPGlobalSearchModule>;
 }
 
 declare class AXPVersionHistoryModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXPVersionHistoryModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPVersionHistoryModule, never, [typeof i1.AXPWorkflowModule], never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPVersionHistoryModule, never, [typeof i1$1.AXPWorkflowModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AXPVersionHistoryModule>;
 }
 
@@ -50,19 +44,19 @@ declare class AXPComputedPropertiesModule {
 
 declare class AXPClonePluginModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXPClonePluginModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPClonePluginModule, never, [typeof i1.AXPWorkflowModule], never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPClonePluginModule, never, [typeof i1$1.AXPWorkflowModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AXPClonePluginModule>;
 }
 
 declare class AXPArchivePluginModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXPArchivePluginModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPArchivePluginModule, never, [typeof i1.AXPWorkflowModule], never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPArchivePluginModule, never, [typeof i1$1.AXPWorkflowModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AXPArchivePluginModule>;
 }
 
 declare class AXPDisablePluginModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXPDisablePluginModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPDisablePluginModule, never, [typeof i1.AXPWorkflowModule], never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPDisablePluginModule, never, [typeof i1$1.AXPWorkflowModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AXPDisablePluginModule>;
 }
 
@@ -83,7 +77,7 @@ declare class AXPComparePopupComponent extends AXBasePageComponent implements On
 
 declare class AXPCompareModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXPCompareModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPCompareModule, never, [typeof AXPComparePopupComponent, typeof i1.AXPWorkflowModule], [typeof AXPComparePopupComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXPCompareModule, never, [typeof AXPComparePopupComponent, typeof i1$1.AXPWorkflowModule], [typeof AXPComparePopupComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AXPCompareModule>;
 }
 
@@ -107,16 +101,17 @@ declare class AXPAvatarPluginModule {
 
 declare class AXMCommonModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXMCommonModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCommonModule, never, [typeof AXMLockSystemModule, typeof AXPExtraPropertiesModule, typeof AXPCategoryModule, typeof AXPGlobalSearchModule, typeof i5.AXPWidgetsModule, typeof AXPVersionHistoryModule, typeof AXPComputedPropertiesModule, typeof AXPClonePluginModule, typeof AXPArchivePluginModule, typeof AXPDisablePluginModule, typeof AXPPrimaryPluginModule, typeof AXPCompareModule, typeof AXPIconPluginModule, typeof AXPColorPluginModule, typeof AXPAvatarPluginModule], never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCommonModule, never, [typeof AXPExtraPropertiesModule, typeof AXPCategoryModule, typeof AXPGlobalSearchModule, typeof i4.AXPWidgetsModule, typeof AXPVersionHistoryModule, typeof AXPComputedPropertiesModule, typeof AXPClonePluginModule, typeof AXPArchivePluginModule, typeof AXPDisablePluginModule, typeof AXPPrimaryPluginModule, typeof AXPCompareModule, typeof AXPIconPluginModule, typeof AXPColorPluginModule, typeof AXPAvatarPluginModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AXMCommonModule>;
 }
 
 declare const RootConfig: {
     config: {
         i18n: string;
+        module: string;
     };
     module: {
-        module: string;
+        route: string;
         name: string;
         title: string;
         icon: string;
@@ -127,6 +122,7 @@ declare const RootConfig: {
 declare class AXMMenuProvider implements AXPMenuProvider {
     private sessionService;
     private homePageService;
+    private entityService;
     provide(context: AXPMenuProviderContext): Promise<void>;
 }
 
@@ -147,8 +143,10 @@ declare const AXPWidgetsList: {
     Editors: {
         DocumentAttachment: string;
         TagBox: string;
+        TagEditor: string;
         CheckBox: string;
         ColorBox: string;
+        ColorPalette: string;
         DateTimeBox: string;
         Direction: string;
         LargeTextBox: string;

package/data-management/index.d.ts

@@ -3,10 +3,10 @@ import { Injector } from '@angular/core';
 import * as i1 from '@acorex/platform/layout/widget-core';
 import { AXPWidgetConfig, AXPValueWidgetComponent, AXPWidgetNode, AXPWidgetCoreContextChangeEvent, AXPMetaDataDefinition } from '@acorex/platform/layout/widget-core';
 import { AXPEntity, AXPMenuProvider, AXPMenuProviderContext, AXPSearchCommandProvider, AXPSearchResult, AXPSettingDefinitionProvider, AXPSettingDefinitionProviderContext } from '@acorex/platform/common';
-import { AXPEntityModel, AXMEntityCrudServiceImpl, AXPEntityDefinitionLoader, AXPEntityDefinitionPreloader, AXPEntityPreloadEntity } from '@acorex/platform/layout/entity';
+import { AXPEntityModel, AXMEntityCrudServiceImpl, AXPEntityDefinitionLoader, AXPEntityDefinitionPreloader, AXPEntityPreloadEntity, AXPEntityActionPlugin } from '@acorex/platform/layout/entity';
 import { AXDataSource } from '@acorex/cdk/common';
 import { AXDropListDroppedEvent } from '@acorex/cdk/drag-drop';
-import { AXPFilterOperation, AXPFilterLogic, AXPExpressionEvaluatorScopeProvider, AXPExpressionEvaluatorScopeProviderContext } from '@acorex/platform/core';
+import { AXPFilterOperation, AXPFilterLogic, AXPExpressionEvaluatorScopeProvider, AXPExpressionEvaluatorScopeProviderContext, AXPTagProvider, AXPTag } from '@acorex/platform/core';
 
 declare class AXMQueryEntityModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXMQueryEntityModule, never>;
@@ -32,9 +32,21 @@ declare class AXMMetaDataFeatureModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<AXMMetaDataFeatureModule>;
 }
 
+declare class AXMTagEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMTagEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMTagEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMTagEntityModule>;
+}
+
+declare class AXMTagsFeatureModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMTagsFeatureModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMTagsFeatureModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMTagsFeatureModule>;
+}
+
 declare class AXMDataManagementModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXMDataManagementModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMDataManagementModule, never, [typeof i1.AXPWidgetCoreModule, typeof AXMQueryEntityModule, typeof AXMDataSourceEntityModule, typeof AXMMetaDataDefinitionEntityModule, typeof AXMMetaDataFeatureModule], never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMDataManagementModule, never, [typeof i1.AXPWidgetCoreModule, typeof AXMQueryEntityModule, typeof AXMDataSourceEntityModule, typeof AXMMetaDataDefinitionEntityModule, typeof AXMMetaDataFeatureModule, typeof AXMTagEntityModule, typeof AXMTagsFeatureModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AXMDataManagementModule>;
 }
 
@@ -79,6 +91,12 @@ declare const RootConfig: {
             titlePlural: string;
             icon: string;
         };
+        tag: {
+            name: string;
+            source: string;
+            title: string;
+            icon: string;
+        };
     };
 };
 
@@ -350,6 +368,30 @@ declare class AXMPMetaDataDefinitionServiceImpl extends AXMMetaDataDefinitionSer
     static ɵprov: i0.ɵɵInjectableDeclaration<AXMPMetaDataDefinitionServiceImpl>;
 }
 
+declare function factory(injector: Injector): Promise<AXPEntity | null>;
+
+declare class AXMTagEntityService extends AXMEntityCrudServiceImpl<any, any> {
+    constructor();
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMTagEntityService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<AXMTagEntityService>;
+}
+
+/**
+ * Tag entity model
+ */
+interface AXMTag {
+    id: string;
+    text: string;
+    color: string;
+    icon?: string;
+    description?: string;
+    scope: 'system' | 'tenant' | 'user';
+    isReadonly?: boolean;
+    createdBy?: string;
+    createdAt?: Date;
+    updatedAt?: Date;
+}
+
 declare class AXMEntityProvider implements AXPEntityDefinitionLoader, AXPEntityDefinitionPreloader {
     private injector;
     preload(): AXPEntityPreloadEntity[];
@@ -363,6 +405,14 @@ declare class AXMMenuProvider implements AXPMenuProvider {
     provide(context: AXPMenuProviderContext): Promise<void>;
 }
 
+declare const AXPDataManagementMenuKeys: {
+    readonly Root: "data-management:menu";
+    readonly Queries: "data-management:menu:queries";
+    readonly DataSources: "data-management:menu:data-sources";
+    readonly MetaDataDefinitions: "data-management:menu:metadata-definitions";
+    readonly Tags: "data-management:menu:tags";
+};
+
 declare class AXMSearchCommandProvider extends AXPSearchCommandProvider {
     commands: AXPSearchResult[];
 }
@@ -521,5 +571,19 @@ declare class AXMMetadataEvaluatorScopeProvider implements AXPExpressionEvaluato
 declare const META_DATA_SELECTOR_FIELD = "metaDataList";
 declare const META_DATA_FORM_FIELD = "metaDataForm";
 
-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, META_DATA_FORM_FIELD, META_DATA_SELECTOR_FIELD, RootConfig, dataSourceEntityFactory, metaDataDefinitionFactory, queryFactory };
-export type { AXMColumnFilterSelectorWidgetConfigType, AXMDataManagementQueryEntityModel, AXMDataSourceEntityModel, AXMDataSourceFilter, AXMDataSourceOutputTypeOption, AXMDataSourceTypeOption, AXMMetaDataDefinitionEntityModel, AXMQueryEntityModel, AXPQueryBuilderWidgetConfigType, ColumnFilterValue, QueryBuilderCondition$2 as QueryBuilderCondition };
+/**
+ * Default system tag provider
+ * Provides readonly system-level tags
+ */
+declare class AXPSystemTagProvider extends AXPTagProvider {
+    name: string;
+    /**
+     * Provide default system tags
+     */
+    provide(): Promise<AXPTag[]>;
+}
+
+declare const tagsPlugin: AXPEntityActionPlugin;
+
+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, AXMTagEntityModule, AXMTagEntityService, AXMTagsFeatureModule, AXM_COLUMN_DEF_WIDGET, AXM_FILTER_DEF_WIDGET, AXPDataManagementMenuKeys, AXPQueryBuilderWidget, AXPQueryBuilderWidgetColumnComponent, AXPQueryBuilderWidgetDesignerComponent, AXPQueryBuilderWidgetEditComponent, AXPQueryBuilderWidgetViewComponent, AXPSystemTagProvider, META_DATA_FORM_FIELD, META_DATA_SELECTOR_FIELD, RootConfig, dataSourceEntityFactory, factory, metaDataDefinitionFactory, queryFactory, tagsPlugin };
+export type { AXMColumnFilterSelectorWidgetConfigType, AXMDataManagementQueryEntityModel, AXMDataSourceEntityModel, AXMDataSourceFilter, AXMDataSourceOutputTypeOption, AXMDataSourceTypeOption, AXMMetaDataDefinitionEntityModel, AXMQueryEntityModel, AXMTag, AXPQueryBuilderWidgetConfigType, ColumnFilterValue, QueryBuilderCondition$2 as QueryBuilderCondition };

package/fesm2022/{acorex-modules-application-management-acorex-modules-application-management-3Z51H2O-.mjs → acorex-modules-application-management-acorex-modules-application-management-BqYLpEvY.mjs}

@@ -239,24 +239,27 @@ class AXPCustomMenuMiddleware {
     //#region ----   Private Methods   ----
     /**
      * Load menu customization from settings
-     * Explicitly checks User scope first, then falls back to Tenant scope
+     * Merges Tenant and User scope customizations (User overrides Tenant)
      */
     async loadCustomization() {
         try {
-            // Try User scope first
-            const userSettings = this.settingService.scope(AXPPlatformScope.User);
-            const userCustomization = await userSettings.get(AXP_MENU_CUSTOMIZATION_KEY);
-            if (userCustomization && userCustomization.version) {
-                return userCustomization;
-            }
-            // Fall back to Tenant scope
+            // Load both scopes
             const tenantSettings = this.settingService.scope(AXPPlatformScope.Tenant);
+            const userSettings = this.settingService.scope(AXPPlatformScope.User);
             const tenantCustomization = await tenantSettings.get(AXP_MENU_CUSTOMIZATION_KEY);
-            if (tenantCustomization && tenantCustomization.version) {
-                return tenantCustomization;
-            }
-            // No customization found at any level, return default
-            return AXP_MENU_CUSTOMIZATION_DEFAULT;
+            const userCustomization = await userSettings.get(AXP_MENU_CUSTOMIZATION_KEY);
+            // Merge customizations: Tenant as base, User overrides
+            const merged = {
+                version: userCustomization?.version || tenantCustomization?.version || AXP_MENU_CUSTOMIZATION_DEFAULT.version,
+                overrides: {
+                    ...(tenantCustomization?.overrides || {}),
+                    ...(userCustomization?.overrides || {}), // User overrides win
+                },
+                customItems: [...(tenantCustomization?.customItems || []), ...(userCustomization?.customItems || [])],
+            };
+            // Return merged result or default if both are empty
+            const hasCustomizations = Object.keys(merged.overrides).length > 0 || merged.customItems.length > 0;
+            return hasCustomizations ? merged : AXP_MENU_CUSTOMIZATION_DEFAULT;
         }
         catch (error) {
             console.error('Failed to load menu customization:', error);
@@ -1770,7 +1773,7 @@ function routesFactory() {
             children: [
                 {
                     path: '',
-                    loadComponent: () => import('./acorex-modules-application-management-menu-list.component-LIRwdWs6.mjs').then((c) => c.AXMMenuListComponent),
+                    loadComponent: () => import('./acorex-modules-application-management-menu-list.component-D4uW0aXY.mjs').then((c) => c.AXMMenuListComponent),
                     data: { reuse: true },
                 },
             ],
@@ -1920,4 +1923,4 @@ class AXMSettingProvider {
  */
 
 export { AXP_MENU_CUSTOMIZATION_KEY as A, RootConfig as R, AXP_MENU_CUSTOMIZATION_DEFAULT as a, AXMApplicationManagementModule as b, AXMApplicationManagementModuleConst as c, applicationEntityFactory as d, AXMApplicationEntityModule as e, AXMApplicationService as f, AXMApplicationServiceImpl as g, editionEntityFactory as h, AXMEditionEntityModule as i, AXMEditionService as j, AXMEditionServiceImpl as k, featureEntityFactory as l, AXMFeatureEntityModule as m, AXMFeatureService as n, AXMFeatureServiceImpl as o, moduleEntityFactory as p, AXMModuleEntityModule as q, AXMModuleService as r, AXMModuleServiceImpl as s, AXMEntityProvider as t, AXMApplicationManagmentModuleMenuProvider as u, AXMSearchCommandProvider as v, AXMSettingProvider as w };
-//# sourceMappingURL=acorex-modules-application-management-acorex-modules-application-management-3Z51H2O-.mjs.map
+//# sourceMappingURL=acorex-modules-application-management-acorex-modules-application-management-BqYLpEvY.mjs.map