@acorex/modules 20.5.0-next.0 → 20.5.0-next.2

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,7 +101,7 @@ 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>;
 }
 

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

@@ -232,33 +232,37 @@ class AXPCustomMenuMiddleware {
             context.sort();
         }
         catch (error) {
-            // Silent fail - don't break menu rendering
+            console.error('Error applying menu customizations:', error);
         }
     }
     //#endregion
     //#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);
             return AXP_MENU_CUSTOMIZATION_DEFAULT;
         }
     }
@@ -271,11 +275,6 @@ class AXPCustomMenuMiddleware {
             if (!finder.exists()) {
                 return;
             }
-            // Skip custom items - they're handled in addCustomItems
-            const isCustomItem = customization.customItems.some(item => item.name === menuName);
-            if (isCustomItem) {
-                return;
-            }
             // Hide menu item
             if (override.hidden) {
                 finder.remove();
@@ -289,11 +288,9 @@ class AXPCustomMenuMiddleware {
             if (override.properties) {
                 finder.update(override.properties);
             }
-            // Move to different parent (check if property exists)
-            if ('parentName' in override) {
-                // Empty string means root level, otherwise use the actual parent name
-                const targetParent = override.parentName === '' ? null : override.parentName;
-                finder.moveTo(targetParent);
+            // Move to different parent
+            if (override.parentName !== undefined) {
+                finder.moveTo(override.parentName);
             }
         });
     }
@@ -302,22 +299,7 @@ class AXPCustomMenuMiddleware {
      */
     addCustomItems(context, customization) {
         if (customization.customItems && customization.customItems.length > 0) {
-            // Add custom items first
             context.add(...customization.customItems);
-            // Then apply parent overrides for custom items
-            customization.customItems.forEach(customItem => {
-                if (customItem.name) {
-                    const override = customization.overrides[customItem.name];
-                    if (override && 'parentName' in override) {
-                        const finder = context.findByName(customItem.name);
-                        if (finder.exists()) {
-                            // Empty string means root level, otherwise use the actual parent name
-                            const targetParent = override.parentName === '' ? null : override.parentName;
-                            finder.moveTo(targetParent);
-                        }
-                    }
-                }
-            });
         }
     }
 }
@@ -1791,7 +1773,7 @@ function routesFactory() {
             children: [
                 {
                     path: '',
-                    loadComponent: () => import('./acorex-modules-application-management-menu-list.component-BMbl5rtn.mjs').then((c) => c.AXMMenuListComponent),
+                    loadComponent: () => import('./acorex-modules-application-management-menu-list.component-D4uW0aXY.mjs').then((c) => c.AXMMenuListComponent),
                     data: { reuse: true },
                 },
             ],
@@ -1941,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-CQMnhxLa.mjs.map
+//# sourceMappingURL=acorex-modules-application-management-acorex-modules-application-management-BqYLpEvY.mjs.map