@acorex/platform 20.7.21 → 20.7.22

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

@@ -1,14 +1,14 @@
 import { AXToastService } from '@acorex/components/toast';
 import * as i6 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
+import * as i4$1 from '@acorex/platform/common';
+import { AXPSettingsService, AXPCommonSettings, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPRefreshEvent, AXPReloadEvent, AXPEntityQueryType, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, input, viewChild, signal, ElementRef, ChangeDetectionStrategy, Component, ApplicationRef, EnvironmentInjector, createComponent, computed, ChangeDetectorRef, effect, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, NgModule } from '@angular/core';
 import { Subject, takeUntil } from 'rxjs';
 import { AXPLayoutBuilderService } from '@acorex/platform/layout/builder';
 import { AXPDeviceService, AXPBroadcastEventService, applyFilterArray, applySortArray, resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPPlatformScope, AXPColumnWidthService, AXHighlightService, extractValue, setSmart, getChangedPaths, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPSystemActionType } from '@acorex/platform/core';
 import { merge, castArray, get, cloneDeep, set, orderBy, isNil, isEmpty, isEqual } from 'lodash-es';
-import * as i4$1 from '@acorex/platform/common';
-import { AXPSettingsService, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPRefreshEvent, AXPReloadEvent, AXPCommonSettings, AXPEntityQueryType, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
 import { AXPSessionService, AXPAuthGuard } from '@acorex/platform/auth';
 import { Router, RouterModule, ROUTES } from '@angular/router';
 import * as i3 from '@acorex/components/button';
@@ -53,7 +53,7 @@ import { AXFormModule } from '@acorex/components/form';
 import * as i6$1 from '@acorex/components/tag-box';
 import { AXTagBoxModule } from '@acorex/components/tag-box';
 import { AXValidationModule } from '@acorex/core/validation';
-import { AXP_DISABLED_PROPERTY, AXP_ALLOW_CLEAR_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DATA_PROPERTY_GROUP, AXP_ALLOW_MULTIPLE_PROPERTY, AXP_NAME_PROPERTY, AXPFileUploaderWidgetService } from '@acorex/platform/layout/widgets';
+import { AXP_DISABLED_PROPERTY, AXP_ALLOW_CLEAR_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DATA_PROPERTY_GROUP, AXP_ALLOW_MULTIPLE_PROPERTY, AXP_ROW_EXPR_PREFIX, AXP_NAME_PROPERTY, AXPFileUploaderWidgetService } from '@acorex/platform/layout/widgets';
 import * as i4$3 from '@acorex/components/dropdown';
 import { AXDropdownModule } from '@acorex/components/dropdown';
 import * as i4$4 from '@acorex/components/select-box';
@@ -1364,12 +1364,80 @@ function sortMergedSections(mainSections, extraSections, mainSectionIds) {
     return [...beforeSections, ...sortedMiddleBlock, ...afterSections];
 }
 
+//#endregion
+//#region ----   Entity Open Details Command   ----
+/**
+ * Generic command to open entity details view
+ * Can be used by any entity to navigate to its detail page
+ */
+class AXPOpenEntityDetailsCommand {
+    constructor() {
+        //#endregion
+        //#region ----   Services & Dependencies   ----
+        this.router = inject(Router);
+        this.sessionService = inject(AXPSessionService);
+    }
+    //#endregion
+    //#region ----   Command Execution   ----
+    /**
+     * Execute the command to navigate to entity details
+     * @param input - Command input containing entity and data information
+     */
+    async execute(input) {
+        const { entity, data } = input;
+        if (!entity) {
+            return {
+                success: false,
+                message: {
+                    text: 'Entity name is required for opening details view',
+                },
+            };
+        }
+        if (!data?.id) {
+            return {
+                success: false,
+                message: {
+                    text: 'Entity ID is required for opening details view',
+                },
+            };
+        }
+        const [module, entityName] = entity.split('.');
+        if (!module || !entityName) {
+            return {
+                success: false,
+                message: {
+                    text: 'Entity must be in format "ModuleName.EntityName"',
+                },
+            };
+        }
+        const url = `/${this.sessionService.application?.name}/m/${module}/e/${entityName}/${data.id}/view`;
+        // Navigate to the entity details page
+        this.router.navigate([url]);
+        return {
+            success: true,
+        };
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPOpenEntityDetailsCommand, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPOpenEntityDetailsCommand, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPOpenEntityDetailsCommand, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }] });
+
+var openEntityDetails_command = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    AXPOpenEntityDetailsCommand: AXPOpenEntityDetailsCommand
+});
+
 class AXPCreateEntityCommand {
     constructor() {
         this.entityForm = inject(AXPEntityFormBuilderService);
         this.entityService = inject(AXPEntityDefinitionRegistryService);
         this.toastService = inject(AXToastService);
         this.translationService = inject(AXTranslationService);
+        this.settingsService = inject(AXPSettingsService);
+        this.openEntityDetailsCommand = inject(AXPOpenEntityDetailsCommand);
         this.context = {};
     }
     async execute(input) {
@@ -1468,7 +1536,22 @@ class AXPCreateEntityCommand {
             }
         })
             .show();
-        return result;
+        const commandResult = result;
+        const redirectOption = options?.process?.redirect;
+        const shouldRedirect = redirectOption !== undefined
+            ? redirectOption
+            : await this.settingsService.get(AXPCommonSettings.RedirectToDetailsAfterCreate);
+        if (commandResult.success && shouldRedirect && commandResult.data) {
+            const createdItem = commandResult.data?.item ?? commandResult.data;
+            const createdId = createdItem?.id;
+            if (createdId != null) {
+                await this.openEntityDetailsCommand.execute({
+                    entity: `${moduleName}.${entityName}`,
+                    data: { id: String(createdId) },
+                });
+            }
+        }
+        return commandResult;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPCreateEntityCommand, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPCreateEntityCommand, providedIn: 'root' }); }
@@ -1709,72 +1792,6 @@ var viewEntityDetails_command = /*#__PURE__*/Object.freeze({
     AXPViewEntityDetailsCommand: AXPViewEntityDetailsCommand
 });
 
-//#endregion
-//#region ----   Entity Open Details Command   ----
-/**
- * Generic command to open entity details view
- * Can be used by any entity to navigate to its detail page
- */
-class AXPOpenEntityDetailsCommand {
-    constructor() {
-        //#endregion
-        //#region ----   Services & Dependencies   ----
-        this.router = inject(Router);
-        this.sessionService = inject(AXPSessionService);
-    }
-    //#endregion
-    //#region ----   Command Execution   ----
-    /**
-     * Execute the command to navigate to entity details
-     * @param input - Command input containing entity and data information
-     */
-    async execute(input) {
-        const { entity, data } = input;
-        if (!entity) {
-            return {
-                success: false,
-                message: {
-                    text: 'Entity name is required for opening details view',
-                },
-            };
-        }
-        if (!data?.id) {
-            return {
-                success: false,
-                message: {
-                    text: 'Entity ID is required for opening details view',
-                },
-            };
-        }
-        const [module, entityName] = entity.split('.');
-        if (!module || !entityName) {
-            return {
-                success: false,
-                message: {
-                    text: 'Entity must be in format "ModuleName.EntityName"',
-                },
-            };
-        }
-        const url = `/${this.sessionService.application?.name}/m/${module}/e/${entityName}/${data.id}/view`;
-        // Navigate to the entity details page
-        this.router.navigate([url]);
-        return {
-            success: true,
-        };
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPOpenEntityDetailsCommand, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPOpenEntityDetailsCommand, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPOpenEntityDetailsCommand, decorators: [{
-            type: Injectable,
-            args: [{ providedIn: 'root' }]
-        }] });
-
-var openEntityDetails_command = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPOpenEntityDetailsCommand: AXPOpenEntityDetailsCommand
-});
-
 class AXPEntityDetailPopoverComponent {
     constructor() {
         //#region ----   Dependencies   ----
@@ -5145,7 +5162,8 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                 return {
                     ...a,
                     zone: 'header',
-                    visible: !a.hidden,
+                    // visible: !a.hidden,
+                    hidden: a.hidden,
                     priority: 'primary',
                     name: a.name,
                     title: a.title,
@@ -5293,7 +5311,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
             return !usedOverrideActions.has(actionKey);
         })
             .map((action) => new AXPEntityCommandTriggerViewModel(entityDef, action));
-        return [...additionalActions, ...mergedActions].filter((a) => !a.hidden);
+        return [...additionalActions, ...mergedActions];
     }
 }
 
@@ -10801,6 +10819,7 @@ class AXPEntityListTableService {
             // 🎪 Events
             ...this.createDefaultEvents(entity, allActions),
         };
+        console.log('listOptions', listOptions);
         return listOptions;
     }
     //#endregion
@@ -10849,18 +10868,28 @@ class AXPEntityListTableService {
     createRowCommands(actions, priority) {
         return actions
             .filter((action) => action.scope === AXPEntityCommandScope.Individual && // Only individual actions
-            action.priority === priority && // Matching priority
-            !action.hidden)
+            action.priority === priority)
             .map((action) => ({
             name: action.name,
             text: action.title,
             icon: action.icon,
             color: action.color,
             look: 'outline',
-            visible: !action.hidden,
-            disabled: action.disabled,
+            hidden: priority === 'secondary' ? this.wrapRowExpr(action.hidden) : action.hidden,
+            disabled: priority === 'secondary' ? this.wrapRowExpr(action.disabled) : action.disabled,
         }));
     }
+    /**
+     * Wraps string values with AXP_ROW_EXPR_PREFIX so widget-renderer does not
+     * evaluate them (it only treats {{ ... }} as expressions). Data-list will
+     * unwrap and evaluate per row with row data. Only used for secondary commands.
+     */
+    wrapRowExpr(value) {
+        if (value === undefined || value === null || typeof value !== 'string') {
+            return value;
+        }
+        return `${AXP_ROW_EXPR_PREFIX}${value}`;
+    }
     /**
      * Check if entity has Selected Scope Actions
      */
@@ -11107,7 +11136,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                 return !usedOverrideActions.has(actionKey);
             })
                 .map((action) => new AXPEntityCommandTriggerViewModel(this.entity(), action));
-            return [...additionalActions, ...mergedActions].filter((a) => !a.hidden);
+            return [...additionalActions, ...mergedActions];
         }, ...(ngDevMode ? [{ debugName: "allActions" }] : []));
         this.primaryActions = computed(() => {
             const actions = this.allActions()