@acorex/platform 20.6.0-next.12 → 20.6.0-next.14

package/fesm2022/acorex-platform-layout-entity.mjs

@@ -21,7 +21,7 @@ import { AXFormatService } from '@acorex/core/format';
 import * as i4$1 from '@acorex/platform/common';
 import { AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingService, AXPRefreshEvent, AXPReloadEvent, AXPCommonSettings, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
 import * as i1$1 from '@acorex/platform/core';
-import { resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPBroadcastEventService, AXPPlatformScope, getChangedPaths, extractValue, setSmart, AXPSystemActionType } from '@acorex/platform/core';
+import { resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPBroadcastEventService, AXPPlatformScope, AXPDeviceService, getChangedPaths, extractValue, setSmart, AXPSystemActionType } from '@acorex/platform/core';
 import * as i2$3 from '@acorex/platform/workflow';
 import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
@@ -896,6 +896,29 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
                 }]
         }] });
 
+function ensureListActions(ctx) {
+    ctx.interfaces.update((i) => {
+        const next = i ?? {};
+        next.master = next.master ?? {};
+        next.master.list = next.master.list ?? { actions: [], views: [] };
+        next.master.list.actions = next.master.list.actions ?? [];
+        return next;
+    });
+}
+function actionExists(actions, commandName, name) {
+    if (!actions)
+        return false;
+    return actions.some((a) => {
+        const cmd = typeof a.command === 'object' ? a.command?.name : a.command;
+        if (name && a.name) {
+            return a.name === name;
+        }
+        return cmd === commandName;
+    });
+}
+
+const AXP_ENTITY_ACTION_PLUGIN = new InjectionToken('AXP_ENTITY_ACTION_PLUGIN');
+
 function createModifierContext(entity) {
     const ctx = {
         entity,
@@ -1105,29 +1128,6 @@ function createModifierContext(entity) {
 
 const AXP_ENTITY_MODIFIER = new InjectionToken('AXP_ENTITY_MODIFIER');
 
-function ensureListActions(ctx) {
-    ctx.interfaces.update((i) => {
-        const next = i ?? {};
-        next.master = next.master ?? {};
-        next.master.list = next.master.list ?? { actions: [], views: [] };
-        next.master.list.actions = next.master.list.actions ?? [];
-        return next;
-    });
-}
-function actionExists(actions, commandName, name) {
-    if (!actions)
-        return false;
-    return actions.some((a) => {
-        const cmd = typeof a.command === 'object' ? a.command?.name : a.command;
-        if (name && a.name) {
-            return a.name === name;
-        }
-        return cmd === commandName;
-    });
-}
-
-const AXP_ENTITY_ACTION_PLUGIN = new InjectionToken('AXP_ENTITY_ACTION_PLUGIN');
-
 class AXPEntityMiddleware {
     //#endregion
     //#region ----   Constructor   ----
@@ -1138,9 +1138,7 @@ class AXPEntityMiddleware {
         this.providedModifiers = inject(AXP_ENTITY_MODIFIER, { optional: true }) || [];
         this.providedActionPlugins = inject(AXP_ENTITY_ACTION_PLUGIN, { optional: true }) || [];
         this.injector = inject(Injector);
-        console.log('[AXPEntityMiddleware] Registering', this.providedModifiers.length, 'modifiers');
         for (const { entityName, modifier } of this.providedModifiers) {
-            console.log('[AXPEntityMiddleware] Registering modifier for pattern:', entityName);
             this.register(entityName, modifier);
         }
     }
@@ -1184,17 +1182,14 @@ class AXPEntityMiddleware {
         // Exact match first
         const exact = this.exactModifiers.get(entity.name);
         if (exact) {
-            console.log('[AXPEntityMiddleware] Found exact modifier for:', entity.name);
             modifiers.push(exact);
         }
         // Then all pattern matches
         for (const { pattern, modifier } of this.patternModifiers) {
             if (pattern.test(entity.name)) {
-                console.log('[AXPEntityMiddleware] Pattern matched for', entity.name, '- pattern:', pattern);
                 modifiers.push(modifier);
             }
         }
-        console.log('[AXPEntityMiddleware] Applying', modifiers.length, 'modifiers to entity:', entity.name);
         // Apply all matching modifiers in order
         for (const modifier of modifiers) {
             modifier(context);
@@ -4455,11 +4450,11 @@ const columnWidthMiddlewareProvider = createColumnWidthMiddlewareProvider(DEFAUL
  */
 const DEFAULT_SECTION_ORDER = {
     'basic-info': 0,
-    'classification': 20,
-    'appearance': 30,
-    'settings': 100,
-    'advanced': 110,
-    'metadata': 120,
+    classification: 20,
+    appearance: 30,
+    settings: 100,
+    advanced: 110,
+    metadata: 120,
 };
 /**
  * Default order for common properties
@@ -4487,19 +4482,19 @@ const DEFAULT_PROPERTY_ORDER = {
     'settings.isDisabled': 95,
     'settings.isArchived': 96,
     // Generic fallbacks (apply to any section if not specified above)
-    'code': 1,
-    'title': 2,
-    'name': 3,
-    'icon': 5,
-    'color': 6,
-    'avatar': 7,
-    'description': 10,
-    'categoryIds': 15,
-    'tags': 16,
-    'isDefault': 90,
-    'isPrimary': 91,
-    'isDisabled': 95,
-    'isArchived': 96,
+    code: 1,
+    title: 2,
+    name: 3,
+    icon: 5,
+    color: 6,
+    avatar: 7,
+    description: 10,
+    categoryIds: 15,
+    tags: 16,
+    isDefault: 90,
+    isPrimary: 91,
+    isDisabled: 95,
+    isArchived: 96,
 };
 /**
  * Get the property order for a given section and property name
@@ -4519,30 +4514,21 @@ const getPropertyOrder = (sectionId, propertyName, orderConfig) => {
  * Factory to create a layout ordering middleware
  */
 const layoutOrderingMiddlewareFactory = (config) => {
-    console.log('[Layout Ordering Middleware] Factory called - creating middleware function');
     return (context) => {
-        console.log('[Layout Ordering Middleware] ========================================');
-        console.log('[Layout Ordering Middleware] MIDDLEWARE CALLED FOR ENTITY:', context.entity.name);
-        console.log('[Layout Ordering Middleware] Entity module:', context.entity.module);
-        console.log('[Layout Ordering Middleware] ========================================');
         const { sections: sectionOrder, properties: propertyOrder } = config;
-        console.log('[Layout Ordering Middleware] Section order config:', sectionOrder);
         //#region ----   Order Sections   ----
         const orderSections = (layout) => {
             if (!layout || !layout.sections) {
-                console.log('[Layout Ordering Middleware] No sections found in layout');
                 return;
             }
-            console.log('[Layout Ordering Middleware] Before ordering sections:', layout.sections.map((s) => ({ id: s.id, order: s.order })));
             layout.sections.forEach((section) => {
                 const defaultOrder = sectionOrder[section.id];
                 if (defaultOrder !== undefined) {
-                    console.log(`[Layout Ordering Middleware] Setting section "${section.id}" order from ${section.order} to ${defaultOrder}`);
                     // Always apply the default order if configured (force override)
                     section.order = defaultOrder;
                 }
                 else {
-                    console.log(`[Layout Ordering Middleware] No default order for section "${section.id}"`);
+                    //   console.log(`[Layout Ordering Middleware] No default order for section "${section.id}"`);
                 }
             });
             // Sort sections by order
@@ -4551,7 +4537,6 @@ const layoutOrderingMiddlewareFactory = (config) => {
                 const orderB = b.order ?? 999;
                 return orderA - orderB;
             });
-            console.log('[Layout Ordering Middleware] After ordering sections:', layout.sections.map((s) => ({ id: s.id, order: s.order })));
         };
         //#endregion
         //#region ----   Order Properties Within Sections   ----
@@ -4590,7 +4575,6 @@ const layoutOrderingMiddlewareFactory = (config) => {
         //#region ----   Apply to All Layouts   ----
         // Apply to create layout
         context.interfaces.master.create.update((create) => {
-            console.log('[Layout Ordering Middleware] Processing CREATE layout');
             if (create) {
                 orderSections(create);
                 orderProperties(create);
@@ -4599,7 +4583,6 @@ const layoutOrderingMiddlewareFactory = (config) => {
         });
         // Apply to modify layout
         context.interfaces.master.modify.update((modify) => {
-            console.log('[Layout Ordering Middleware] Processing MODIFY layout');
             if (modify) {
                 orderSections(modify);
                 orderProperties(modify);
@@ -4608,7 +4591,6 @@ const layoutOrderingMiddlewareFactory = (config) => {
         });
         // Apply to single layout
         context.interfaces.master.single.update((single) => {
-            console.log('[Layout Ordering Middleware] Processing SINGLE layout');
             if (single) {
                 orderSections(single);
                 orderProperties(single);
@@ -4625,7 +4607,6 @@ const layoutOrderingMiddlewareFactory = (config) => {
  * By default it applies to all entities using the '*' pattern
  */
 const createLayoutOrderingMiddlewareProvider = (config = {}, entityName = '*') => {
-    console.log('[Layout Ordering Middleware] Creating provider for entityName pattern:', entityName);
     return {
         entityName,
         modifier: layoutOrderingMiddlewareFactory({
@@ -4638,10 +4619,6 @@ const createLayoutOrderingMiddlewareProvider = (config = {}, entityName = '*') =
  * Default provider registered with the default configuration
  */
 const layoutOrderingMiddlewareProvider = createLayoutOrderingMiddlewareProvider();
-console.log('[Layout Ordering Middleware] Provider initialized with config:', {
-    sections: DEFAULT_SECTION_ORDER,
-    propertyCount: Object.keys(DEFAULT_PROPERTY_ORDER).length
-});
 //#endregion
 
 class AXPEntityCommandSearchDefinitionProvider {
@@ -4778,31 +4755,31 @@ class AXPMiddlewareEntityStorageService extends AXPEntityStorageService {
     }
     async initial(entityName, collection, options) {
         const ctx = this.createCtx('initial', entityName, { data: collection });
-        return this.run(ctx, () => this.backend.initial(entityName, ctx.data, options));
+        return this.run(ctx, () => this.backend.initial(ctx.entityName, ctx.data, options));
     }
     async getOne(entityName, id) {
         const ctx = this.createCtx('getOne', entityName, { id });
-        return this.run(ctx, () => this.backend.getOne(entityName, id));
+        return this.run(ctx, () => this.backend.getOne(ctx.entityName, id));
     }
     async updateOne(entityName, id, keyValues) {
         const ctx = this.createCtx('update', entityName, { id, data: keyValues });
-        return this.run(ctx, () => this.backend.updateOne(entityName, id, ctx.data));
+        return this.run(ctx, () => this.backend.updateOne(ctx.entityName, id, ctx.data));
     }
     async deleteOne(entityName, id) {
         const ctx = this.createCtx('delete', entityName, { id });
-        return this.run(ctx, () => this.backend.deleteOne(entityName, id));
+        return this.run(ctx, () => this.backend.deleteOne(ctx.entityName, id));
     }
     async insertOne(entityName, entity) {
         const ctx = this.createCtx('create', entityName, { data: entity });
-        return this.run(ctx, () => this.backend.insertOne(entityName, ctx.data));
+        return this.run(ctx, () => this.backend.insertOne(ctx.entityName, ctx.data));
     }
     async getAll(entityName) {
         const ctx = this.createCtx('getAll', entityName);
-        return this.run(ctx, () => this.backend.getAll(entityName));
+        return this.run(ctx, () => this.backend.getAll(ctx.entityName));
     }
     async query(entityName, request) {
         const ctx = this.createCtx('query', entityName, { request });
-        return this.run(ctx, () => this.backend.query(entityName, request));
+        return this.run(ctx, () => this.backend.query(ctx.entityName, request));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPMiddlewareEntityStorageService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPMiddlewareEntityStorageService }); }
@@ -5173,7 +5150,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         this.workflow = inject(AXPWorkflowService);
         this.entityListTableService = inject(AXPEntityListTableService);
         this.entityListToolbarService = inject(AXPEntityListToolbarService);
-        this.layoutThemeService = inject(AXPLayoutThemeService);
+        this.deviceService = inject(AXPDeviceService);
         this.isMounted = signal(false, ...(ngDevMode ? [{ debugName: "isMounted" }] : []));
         this.entity = signal(null, ...(ngDevMode ? [{ debugName: "entity" }] : []));
         this.listNode = signal(null, ...(ngDevMode ? [{ debugName: "listNode" }] : []));
@@ -5216,7 +5193,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                 return !usedOverrideActions.has(actionKey);
             })
                 .map((action) => new AXPEntityCommandTriggerViewModel(this.entity(), action));
-            return [...additionalActions, ...mergedActions];
+            return [...additionalActions, ...mergedActions].filter((a) => !a.hidden);
         }, ...(ngDevMode ? [{ debugName: "allActions" }] : []));
         this.primaryActions = computed(() => {
             const actions = this.allActions()
@@ -5470,8 +5447,8 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         @for (action of primaryActions(); track $index) {
           @if (action.visible != false) {
             <ax-button
-              [class.ax-sm]="layoutThemeService.isSmall()"
-              [iconOnly]="layoutThemeService.isSmall()"
+              [class.ax-sm]="deviceService.isSmall()"
+              [iconOnly]="deviceService.isSmall()"
               [disabled]="action.disabled"
               [text]="action.title"
               [look]="'solid'"
@@ -5509,10 +5486,10 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         }
         @if (secondaryActions().length) {
           <ax-button
-            [class.ax-sm]="layoutThemeService.isSmall()"
-            [iconOnly]="layoutThemeService.isSmall()"
+            [class.ax-sm]="deviceService.isSmall()"
+            [iconOnly]="deviceService.isSmall()"
             [text]="'@general:terms.interface.actions' | translate | async"
-            [look]="layoutThemeService.isSmall() ? 'blank' : 'solid'"
+            [look]="deviceService.isSmall() ? 'blank' : 'solid'"
             [color]="'default'"
           >
             <ax-prefix>
@@ -5587,8 +5564,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
         @for (action of primaryActions(); track $index) {
           @if (action.visible != false) {
             <ax-button
-              [class.ax-sm]="layoutThemeService.isSmall()"
-              [iconOnly]="layoutThemeService.isSmall()"
+              [class.ax-sm]="deviceService.isSmall()"
+              [iconOnly]="deviceService.isSmall()"
               [disabled]="action.disabled"
               [text]="action.title"
               [look]="'solid'"
@@ -5626,10 +5603,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
         }
         @if (secondaryActions().length) {
           <ax-button
-            [class.ax-sm]="layoutThemeService.isSmall()"
-            [iconOnly]="layoutThemeService.isSmall()"
+            [class.ax-sm]="deviceService.isSmall()"
+            [iconOnly]="deviceService.isSmall()"
             [text]="'@general:terms.interface.actions' | translate | async"
-            [look]="layoutThemeService.isSmall() ? 'blank' : 'solid'"
+            [look]="deviceService.isSmall() ? 'blank' : 'solid'"
             [color]="'default'"
           >
             <ax-prefix>
@@ -8017,12 +7994,12 @@ class AXPEntityDynamicDialogService {
         //#region ----   Services & Dependencies   ----
         this.entityRegistry = inject(AXPEntityDefinitionRegistryService);
         this.layoutBuilder = inject(AXPLayoutBuilderService);
-        this.layoutTheme = inject(AXPLayoutThemeService);
+        this.deviceService = inject(AXPDeviceService);
     }
     //#endregion
     //#region ----   Public API   ----
     entity(fullName) {
-        return new InterfaceSelector(this.entityRegistry, this.layoutBuilder, this.layoutTheme, fullName);
+        return new InterfaceSelector(this.entityRegistry, this.layoutBuilder, this.deviceService, fullName);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDynamicDialogService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDynamicDialogService, providedIn: 'root' }); }
@@ -8033,24 +8010,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
         }] });
 //#region ----   Builders   ----
 class InterfaceSelector {
-    constructor(entityRegistry, layoutBuilder, layoutTheme, fullName) {
+    constructor(entityRegistry, layoutBuilder, deviceService, fullName) {
         this.entityRegistry = entityRegistry;
         this.layoutBuilder = layoutBuilder;
-        this.layoutTheme = layoutTheme;
+        this.deviceService = deviceService;
         this.fullName = fullName;
     }
     create() {
-        return new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.layoutTheme, this.fullName, 'create');
+        return new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'create');
     }
     update(id) {
-        return new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.layoutTheme, this.fullName, 'update', id);
+        return new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'update', id);
     }
 }
 class PropertyFilter {
-    constructor(entityRegistry, layoutBuilder, layoutTheme, fullName, kind, recordId) {
+    constructor(entityRegistry, layoutBuilder, deviceService, fullName, kind, recordId) {
         this.entityRegistry = entityRegistry;
         this.layoutBuilder = layoutBuilder;
-        this.layoutTheme = layoutTheme;
+        this.deviceService = deviceService;
         this.fullName = fullName;
         this.kind = kind;
         this.includeList = null;
@@ -8112,7 +8089,7 @@ class PropertyFilter {
         const allowedNames = this.computeAllowedNames(entityProps.map((p) => p.name));
         const dialog = this.layoutBuilder.create().dialog((d) => {
             d.setTitle(title);
-            d.setSize(this.externalSize ?? (this.layoutTheme.isMobileDevice() ? 'full' : 'md'));
+            d.setSize(this.externalSize ?? (this.deviceService.isMobileDevice() ? 'full' : 'md'));
             d.setCloseButton(true);
             d.content((layout) => {
                 layout.mode(this.externalMode ?? 'edit');