@acorex/platform 20.7.7 → 20.7.8

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

@@ -5012,7 +5012,9 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
             };
             return await context.expressionEvaluator.evaluate(actionData, scope);
         };
-        const evaluatedActions = await evaluateExpressions(relatedEntity?.actions);
+        // Don't evaluate actions here - keep expression strings for lazy evaluation at execution time
+        // This ensures actions use the latest context data when executed
+        const actions = relatedEntity?.actions ?? [];
         const filters = await Promise.all(relatedEntity.conditions?.map(async (c) => {
             const value = await evaluateExpressions(c.value);
             return {
@@ -5027,7 +5029,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
             title: `${context.rootTitle}`,
             label: relatedEntity.title,
             icon: relatedEntity.icon || entityDef.icon,
-            actions: this.mergeActions(entityDef, evaluatedActions)
+            actions: this.mergeActions(entityDef, actions)
                 ?.filter((a) => a.priority === 'primary')
                 ?.map((a) => {
                 return {
@@ -5051,7 +5053,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
             execute: async (command, executeContext) => {
                 try {
                     const commandName = command.name.split('&')[0];
-                    const mergedActions = this.mergeActions(entityDef, evaluatedActions);
+                    const mergedActions = this.mergeActions(entityDef, actions);
                     const action = mergedActions.find((a) => {
                         return a.name === commandName || a.name.split('&')[0] === commandName;
                     });
@@ -5065,6 +5067,28 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                             },
                         };
                     }
+                    // Evaluate action options with current root context for lazy evaluation
+                    // This ensures actions use the latest context data when executed
+                    let evaluatedOptions = action.options;
+                    if (action.options && context.context && context.expressionEvaluator) {
+                        try {
+                            const scope = {
+                                context: {
+                                    eval: (path) => {
+                                        return get(context.context, path);
+                                    },
+                                },
+                            };
+                            evaluatedOptions = await context.expressionEvaluator.evaluate(action.options, scope);
+                        }
+                        catch {
+                            // Keep original options if evaluation fails
+                            evaluatedOptions = action.options;
+                        }
+                    }
+                    const actionData = action.scope == AXPEntityCommandScope.Selected
+                        ? executeContext
+                        : evaluatedOptions?.['process']?.data || null;
                     if (context.commandService.exists(commandName)) {
                         // check options for evaluation
                         await context.commandService.execute(commandName, {
@@ -5077,13 +5101,11 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                                     parentKey: entityDef.parentKey,
                                     source: `${entityDef.module}.${entityDef.name}`,
                                 },
-                                data: action.scope == AXPEntityCommandScope.Selected
-                                    ? executeContext
-                                    : action.options?.['process']?.data || null,
-                                options: action.options,
+                                data: actionData,
+                                options: evaluatedOptions,
                                 metadata: action.metadata,
                             },
-                            options: action.options,
+                            options: evaluatedOptions,
                             metadata: action.metadata,
                         });
                     }
@@ -5097,10 +5119,8 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                                 parentKey: entityDef.parentKey,
                                 source: `${entityDef.module}.${entityDef.name}`,
                             },
-                            data: action.scope == AXPEntityCommandScope.Selected
-                                ? executeContext
-                                : action.options?.['process']?.data || null,
-                            options: action.options,
+                            data: actionData,
+                            options: evaluatedOptions,
                             metadata: action.metadata,
                         });
                     }
@@ -5129,7 +5149,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                     options: {
                         entity: relatedEntity.entity,
                         showEntityActions: false,
-                        actions: evaluatedActions,
+                        actions: actions,
                         includeColumns: relatedEntity.columns,
                     },
                 },
@@ -5216,7 +5236,9 @@ class AXPTabListConverter extends AXPBaseRelatedEntityConverter {
                 hidden: true,
             };
         }) ?? []);
-        const actions = await evaluateExpressions(relatedEntity.actions);
+        // Don't evaluate actions here - keep expression strings for lazy evaluation at execution time
+        // This ensures actions use the latest context data when executed
+        const actions = relatedEntity.actions;
         return {
             id: entityDef?.name ?? '',
             title: relatedEntity.title ?? entityDef?.title ?? '',
@@ -10742,6 +10764,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         this.deviceService = inject(AXPDeviceService);
         this.commandService = inject(AXPCommandService);
         this.eventService = inject(AXPBroadcastEventService);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
         this.isMounted = signal(false, ...(ngDevMode ? [{ debugName: "isMounted" }] : []));
         this.entity = signal(null, ...(ngDevMode ? [{ debugName: "entity" }] : []));
         this.listNode = signal(null, ...(ngDevMode ? [{ debugName: "listNode" }] : []));
@@ -10870,7 +10893,32 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                     c.scope == AXPEntityCommandScope.TypeLevel));
         });
         const command = commandName.split('&')[0];
-        // const options = await this.evaluateExpressions(action?.options, data);
+        // Get current context from contextService for lazy evaluation
+        const currentContext = this.contextService.initial();
+        console.log('currentContext', currentContext);
+        // Evaluate action options with current context if they contain expressions
+        let evaluatedOptions = action?.options;
+        if (action?.options && currentContext) {
+            try {
+                const scope = {
+                    context: {
+                        eval: (path) => {
+                            console.log({ path });
+                            return get(currentContext, path);
+                        },
+                    },
+                };
+                evaluatedOptions = await this.expressionEvaluator.evaluate(action.options, scope);
+            }
+            catch {
+                // Keep original options if evaluation fails
+                evaluatedOptions = action?.options;
+            }
+        }
+        debugger;
+        const actionData = action?.scope == AXPEntityCommandScope.Selected
+            ? this.selectedItems()
+            : evaluatedOptions?.['process']?.data || null;
         if (this.commandService.exists(command)) {
             await this.commandService.execute(command, {
                 __context__: {
@@ -10882,10 +10930,8 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                         parentKey: this.entity()?.parentKey,
                         source: `${this.entity()?.module}.${this.entity()?.name}`,
                     },
-                    data: action?.scope == AXPEntityCommandScope.Selected
-                        ? this.selectedItems()
-                        : action?.options?.['process']?.data || null,
-                    options: action?.options,
+                    data: actionData,
+                    options: evaluatedOptions,
                     metadata: action?.metadata,
                 },
             });
@@ -10900,10 +10946,8 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                     parentKey: this.entity()?.parentKey,
                     source: `${this.entity()?.module}.${this.entity()?.name}`,
                 },
-                data: action?.scope == AXPEntityCommandScope.Selected
-                    ? this.selectedItems()
-                    : action?.options?.['process']?.data || null,
-                options: action?.options,
+                data: actionData,
+                options: evaluatedOptions,
                 metadata: action?.metadata,
             });
         }
@@ -12401,7 +12445,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         //#region ----   Computed Properties   ----
         this.expose = computed(() => this.options()['expose'], ...(ngDevMode ? [{ debugName: "expose" }] : []));
         this.entity = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entity" }] : []));
-        this.disabled = computed(() => this.options()['disabled'], ...(ngDevMode ? [{ debugName: "disabled" }] : []));
+        this.disabled = computed(() => this.filterMode() ? false : this.options()['disabled'], ...(ngDevMode ? [{ debugName: "disabled" }] : []));
         this.columns = computed(() => this.options()['columns'] ?? [], ...(ngDevMode ? [{ debugName: "columns" }] : []));
         this.textField = computed(() => this.options()['textField'] ?? '', ...(ngDevMode ? [{ debugName: "textField" }] : []));
         this.hasClearButton = computed(() => this.options()['hasClearButton'] ?? false, ...(ngDevMode ? [{ debugName: "hasClearButton" }] : []));
@@ -12485,7 +12529,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                     value: newValue,
                     displayText: text,
                     operation: {
-                        type: this.multiple() ? 'in' : 'contains',
+                        type: this.multiple() ? 'in' : 'equal',
                     },
                 });
             }
@@ -15043,6 +15087,7 @@ function entityDetailsCreateActions(parentId) {
                     canCreateNewOne: true,
                     data: {
                         [parentId]: '{{context.eval("id")}}',
+                        notes: '{{context.eval("displayName")}}',
                     },
                 },
             },