@acorex/platform 19.2.9 → 19.2.10

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

@@ -8,10 +8,10 @@ import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXP
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injectable, computed, signal, Injector, effect, Component, ChangeDetectionStrategy, HostBinding, DestroyRef, ViewChild, NgModule } from '@angular/core';
 import { get, cloneDeep, set, merge, isNil, sortBy } from 'lodash-es';
+import * as i7 from '@acorex/platform/layout/builder';
+import { AXPPageStatus, AXPWidgetRegistryService, AXPWidgetComponent, AXPLayoutBuilderModule, AXPColumnWidgetComponent, AXP_WIDGETS_EDITOR_GROUP, AXPWidgetsCatalog } from '@acorex/platform/layout/builder';
 import { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
 import { AXPSessionService, AXPAuthGuard } from '@acorex/platform/auth';
-import * as i7 from '@acorex/platform/layout/builder';
-import { AXPWidgetRegistryService, AXPWidgetComponent, AXPLayoutBuilderModule, AXPColumnWidgetComponent, AXP_WIDGETS_EDITOR_GROUP, AXPWidgetsCatalog } from '@acorex/platform/layout/builder';
 import { Subject, takeUntil } from 'rxjs';
 import * as i8 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
@@ -79,6 +79,7 @@ class AXPEntityCommandTriggerViewModel {
     constructor(entity, action) {
         this.name = `${typeof action.command === 'string' ? action.command : action.command.name}&${action.name}`;
         this.options = typeof action.command === 'object' ? action.command.options : undefined;
+        this.metadata = typeof action.command === 'object' ? action.command.metadata : undefined;
         const resolvedLook = resolveActionLook(action);
         this.priority = action.priority;
         this.title = action.title;
@@ -227,22 +228,7 @@ class AXPEntityDetailListViewModel {
                     },
                 },
             };
-            const evaluateRecursive = async (data) => {
-                const evaluatedData = {};
-                for (const key in data) {
-                    if (typeof data[key] === 'object' && data[key] !== null) {
-                        evaluatedData[key] = await evaluateRecursive(data[key]);
-                    }
-                    else if (typeof data[key] === 'string' && data[key].includes('{{')) {
-                        evaluatedData[key] = await this.expressionEvaluator.evaluateExpression(parentData, data[key], scope);
-                    }
-                    else {
-                        evaluatedData[key] = data[key];
-                    }
-                }
-                return evaluatedData;
-            };
-            return await evaluateRecursive(actionData);
+            return await this.expressionEvaluator.evaluateExpression(parentData, actionData, scope);
         };
         this.initialize();
     }
@@ -316,34 +302,19 @@ class AXPEntityDetailListViewModel {
     }
     //******************  Commands ******************//
     async executeCommand(commandName, data = null) {
-        const action = this.allActions().find((c) => c.name == commandName &&
-            ((this.selectedItems().length
+        const action = this.allActions().find((c) => {
+            const isSelectedScope = this.selectedItems().length
                 ? c.scope == AXPEntityCommandScope.Selected
-                : c.scope == AXPEntityCommandScope.Individual) ||
-                c.scope == AXPEntityCommandScope.TypeLevel));
-        // if (action?.scope == AXPEntityCommandScope.TypeLevel) {
-        //   if (data == null) {
-        //     data = {};
-        //   }
-        //   let relatedColumn: string | null = null;
-        //   this.detailEntityConfig.conditions?.forEach((condition) => {
-        //     if (condition.value == 'id') {
-        //       relatedColumn = condition.name;
-        //     }
-        //   });
-        //   if (relatedColumn != null) {
-        //     data[relatedColumn] = this.parent.data['id'];
-        //   }
-        // }
-        const actionData = action?.options?.process?.data;
-        let initialData = {};
-        if (actionData) {
-            initialData = await this.evaluateExpressions(actionData);
-        }
-        const command = commandName.split('&')[0];
-        await this.workflow.execute(command, {
+                : c.scope == AXPEntityCommandScope.Individual;
+            return c.name == commandName && (isSelectedScope || c.scope == AXPEntityCommandScope.TypeLevel);
+        });
+        if (!action)
+            return;
+        const actionData = action.options?.process?.data;
+        const initialData = actionData ? { ...data, ...(await this.evaluateExpressions(actionData)) } : data;
+        await this.workflow.execute(commandName.split('&')[0], {
             entity: getEntityInfo(this.detailEntity()).source,
-            data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : initialData,
+            data: action.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : initialData,
             entityInfo: {
                 name: this.detailEntity()?.name,
                 module: this.detailEntity()?.module,
@@ -351,7 +322,7 @@ class AXPEntityDetailListViewModel {
                 parentKey: this.detailEntity()?.parentKey,
                 source: this.detailEntity()?.source,
             },
-            options: action?.options,
+            options: action.options,
         });
     }
 }
@@ -542,8 +513,8 @@ class AXPEntityMasterCreateViewModel {
         this.context = signal(this.initialData ?? {});
         this.options = signal(this.commandOptions ?? {});
         this.isInProgress = signal(false);
-        this.canCreateNewOne = signal(false);
-        this.redirect = signal(false);
+        this.canCreateNewOne = signal(true);
+        this.redirect = signal(true);
         this.sections = computed(() => {
             const { interfaces, properties } = this.entityDef;
             const createProps = interfaces?.master?.create?.properties?.map(({ name }) => name) ?? [];
@@ -567,15 +538,21 @@ class AXPEntityMasterCreateViewModel {
         this.context.set(initialData);
         this.options.set(commandOptions);
         //
-        const { redirect = false, canCreateNewOne = false } = commandOptions['process'];
+        const { redirect = true, canCreateNewOne = true } = commandOptions?.['process'] ?? {};
         this.canCreateNewOne.set(canCreateNewOne);
         this.redirect.set(redirect);
     }
     async save() {
         try {
             this.isInProgress.set(true);
+            this.builder.setStatus(AXPPageStatus.Submitting);
             const exec = this.entityDef.commands?.create?.execute;
-            return await exec(this.context());
+            const result = await exec(this.context());
+            this.builder.setStatus(AXPPageStatus.Submitted);
+            return result;
+        }
+        catch (error) {
+            this.builder.setStatus(AXPPageStatus.Error);
         }
         finally {
             this.isInProgress.set(false);
@@ -596,7 +573,7 @@ class AXPEntityCreateViewModelFactory {
         this.layout = inject(AXPLayoutThemeService);
         this.injector = inject(Injector);
     }
-    async create(moduleName, entityName, initialData = null, options = { canCreateNewOne: false, redirect: true }) {
+    async create(moduleName, entityName, initialData = null, options = { canCreateNewOne: true, redirect: true }) {
         this.layout.setNavigationLoading(true);
         const config = await this.entityService.resolve(moduleName, entityName);
         this.layout.setNavigationLoading(false);
@@ -832,14 +809,10 @@ class AXPEntityMasterListViewModel {
         const actions = await Promise.all(this.allActions()
             .filter((a) => a.scope === AXPEntityCommandScope.Individual && a.priority === 'secondary')
             .map(async (a) => {
-            const isHidden = typeof a.hidden === 'string' && a.hidden.includes('{{')
-                ? await this.expressionEvaluator.evaluateExpression(rowData, a.hidden, scope)
-                : a.hidden;
+            const isHidden = await this.expressionEvaluator.evaluateExpression(rowData, a.hidden, scope);
             if (isHidden)
                 return null;
-            const disabled = typeof a.disabled === 'string' && a.disabled.includes('{{')
-                ? await this.expressionEvaluator.evaluateExpression(rowData, a.disabled, scope)
-                : a.disabled;
+            const disabled = await this.expressionEvaluator.evaluateExpression(rowData, a.disabled, scope);
             return { ...a, disabled };
         }));
         return actions.filter(Boolean);
@@ -1031,6 +1004,7 @@ class AXPEntityMasterListViewModel {
             },
             data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
             options: action?.options,
+            metadata: action?.metadata,
         });
     }
     //
@@ -1214,12 +1188,12 @@ class AXPEntityMasterUpdateElementViewModel {
             return !(this.property.schema.readonly ?? false);
         });
         this.isRequired = computed(() => {
-            return this.property.validations?.some(c => c.rule == 'required') || false;
+            return this.property.validations?.some((c) => c.rule == 'required') || false;
         });
         this.layout = computed(() => {
-            const updateProp = this.entity.interfaces?.master?.update?.properties?.find(c => c.name == this.property.name);
+            const updateProp = this.entity.interfaces?.master?.update?.properties?.find((c) => c.name == this.property.name);
             const source = cloneDeep(updateProp?.layout ?? {});
-            set(source, "positions.default.colSpan", 12);
+            set(source, 'positions.default.colSpan', 12);
             return source;
         });
         this.node = computed(() => {
@@ -1233,7 +1207,9 @@ class AXPEntityMasterUpdateElementViewModel {
                 formula: widget.formula,
                 triggers: widget.triggers,
                 valueTransforms: widget.valueTransforms,
-                options: merge(schema.interface?.options, { validations: this.property.validations?.map(c => ({ rule: c.rule, message: c.message, options: c.options })) })
+                options: merge(schema.interface?.options, {
+                    validations: this.property.validations?.map((c) => ({ rule: c.rule, message: c.message, options: c.options })),
+                }),
             };
         });
     }
@@ -1249,22 +1225,27 @@ class AXPEntityMasterUpdateViewModel {
         this.isInProgress = signal(false);
         this.context = signal(cloneDeep(this.entityData));
         this.elements = computed(() => {
-            const props = this.entityDef.properties.filter(c => this.props.includes(c.name) &&
-                c.schema.hidden != true);
-            return props.map(e => {
+            const props = this.entityDef.properties.filter((c) => this.props.includes(c.name) && c.schema.hidden != true);
+            return props.map((e) => {
                 return new AXPEntityMasterUpdateElementViewModel(this.entityDef, e);
             });
         });
     }
     async save() {
         this.isInProgress.set(true);
+        this.builder.setStatus(AXPPageStatus.Submitting);
         try {
             const com = this.entityDef.commands?.update;
             if (com) {
                 const exec = com.execute;
-                return await exec(this.context());
+                const result = await exec(this.context());
+                this.builder.setStatus(AXPPageStatus.Submitted);
+                return result;
             }
         }
+        catch (error) {
+            this.builder.setStatus(AXPPageStatus.Error);
+        }
         finally {
             this.isInProgress.set(false);
         }