@acorex/platform 19.2.8 → 19.2.10

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

@@ -2,16 +2,16 @@ import * as i2$1 from '@acorex/components/common';
 import { AXDataSource, AXCommonModule } from '@acorex/components/common';
 import { AXFormatService } from '@acorex/core/format';
 import * as i1$3 from '@acorex/platform/common';
-import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingScope, AXPSettingService, AXPExpressionEvaluatorService, AXPRefreshEvent, AXPWorkflowNavigateAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPToastAction } from '@acorex/platform/common';
+import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPExpressionEvaluatorService, AXPEntityCommandScope, getEntityInfo, AXPSettingScope, AXPSettingService, AXPRefreshEvent, AXPWorkflowNavigateAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPToastAction } from '@acorex/platform/common';
 import * as i2$3 from '@acorex/platform/workflow';
 import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 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 { cloneDeep, set, merge, get, isNil, sortBy } from 'lodash-es';
 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;
@@ -119,6 +120,7 @@ class AXPEntityDetailListViewModel {
         this.formatService = this.injector.get(AXFormatService);
         this.workflow = this.injector.get(AXPWorkflowService);
         this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
+        this.expressionEvaluator = this.injector.get(AXPExpressionEvaluatorService);
         this.dataSource = new AXDataSource({
             byKey: (key) => {
                 const func = this.detailEntity()?.queries.byKey.execute;
@@ -144,6 +146,22 @@ class AXPEntityDetailListViewModel {
                 this.detailEntity()?.interfaces?.detail?.list?.title ??
                 this.detailEntity()?.formats.plural);
         });
+        //****************** Visibility ******************//
+        this.hidden = computed(async () => {
+            if (typeof this.detailEntityConfig.hidden == 'string') {
+                const scope = {
+                    context: {
+                        eval: (path) => {
+                            return get(this.parent.data, path);
+                        },
+                    },
+                };
+                return await this.expressionEvaluator.evaluateExpression(this.parent.data, this.detailEntityConfig.hidden, scope);
+            }
+            else {
+                return this.detailEntityConfig.hidden ?? false;
+            }
+        });
         //****************** Inline filter ******************//
         this.inlineFiltersPlaceholders = computed(() => {
             //return this.entityDef.properties.filter(p => p.options?.filter?.inline?.enabled).map(c => c.title);
@@ -155,7 +173,16 @@ class AXPEntityDetailListViewModel {
         //****************** Actions ******************//
         this.allActions = computed(() => {
             const list = this.detailEntity()?.interfaces?.master?.list?.actions ?? [];
-            return list.map((tr) => new AXPEntityCommandTriggerViewModel(this.detailEntity(), tr)) ?? [];
+            const detailEntityActionList = this.detailEntityConfig.actions ?? [];
+            const mergedActions = list.map((tr) => {
+                const commandName = typeof tr.command === 'string' ? tr.command : tr.command.name;
+                const overrideAction = detailEntityActionList.find((action) => {
+                    const actionCommandName = typeof action.command === 'string' ? action.command : action.command.name;
+                    return actionCommandName === commandName && action.name === tr.name;
+                });
+                return new AXPEntityCommandTriggerViewModel(this.detailEntity(), overrideAction ?? tr);
+            });
+            return mergedActions;
         });
         this.selectedScopeActionsCount = computed(() => {
             return this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Selected).length;
@@ -192,6 +219,17 @@ class AXPEntityDetailListViewModel {
             }
             return [];
         });
+        this.evaluateExpressions = async (actionData) => {
+            const parentData = this.parent.data;
+            const scope = {
+                context: {
+                    eval: (path) => {
+                        return get(parentData, path);
+                    },
+                },
+            };
+            return await this.expressionEvaluator.evaluateExpression(parentData, actionData, scope);
+        };
         this.initialize();
     }
     async initialize() {
@@ -264,30 +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 = null;
-            this.detailEntityConfig.conditions?.forEach((condition) => {
-                if (condition.value == 'id') {
-                    relatedColumn = condition.name;
-                }
-            });
-            if (relatedColumn != null) {
-                data[relatedColumn] = this.parent.data['id'];
-            }
-        }
-        console.log({ action, detailEntity: this.detailEntity });
-        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() : data,
+            data: action.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : initialData,
             entityInfo: {
                 name: this.detailEntity()?.name,
                 module: this.detailEntity()?.module,
@@ -295,7 +322,7 @@ class AXPEntityDetailListViewModel {
                 parentKey: this.detailEntity()?.parentKey,
                 source: this.detailEntity()?.source,
             },
-            options: action?.options,
+            options: action.options,
         });
     }
 }
@@ -468,24 +495,26 @@ class AXPEntityCreateViewElementViewModel {
                 formula: widget.formula,
                 triggers: widget.triggers,
                 valueTransforms: widget.valueTransforms,
-                options: merge(schema.interface?.options, 
-                //this.property.options?.create?.widget,
-                { validationRules: this.property.validations }),
+                options: merge(schema.interface?.options, {
+                    validations: this.property.validations?.map((c) => ({ rule: c.rule, message: c.message, options: c.options })),
+                }),
             };
         });
     }
 }
 class AXPEntityMasterCreateViewModel {
-    constructor(injector, config, initialData = {}, canCreateNewOne = true, redirect = false) {
+    constructor(injector, config, initialData = {}, commandOptions) {
         this.injector = injector;
         this.config = config;
         this.initialData = initialData;
+        this.commandOptions = commandOptions;
         this.entityDef = cloneDeep(this.config);
         this.workflow = this.injector.get(AXPWorkflowService);
         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) ?? [];
@@ -507,15 +536,23 @@ class AXPEntityMasterCreateViewModel {
             }
         });
         this.context.set(initialData);
+        this.options.set(commandOptions);
         //
+        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);
@@ -524,12 +561,9 @@ class AXPEntityMasterCreateViewModel {
     async createNewOne() {
         await this.workflow.execute('create-entity', {
             entity: getEntityInfo(this.entityDef).source,
-            options: {
-                process: {
-                    redirect: this.redirect(),
-                    canCreateNewOne: this.canCreateNewOne(),
-                },
-            },
+            options: this.options(),
+            data: this.initialData,
+            // entityInfo
         });
     }
 }
@@ -539,12 +573,11 @@ class AXPEntityCreateViewModelFactory {
         this.layout = inject(AXPLayoutThemeService);
         this.injector = inject(Injector);
     }
-    async create(moduleName, entityName, initialData = null, options = { canCreateNewOne: false, redirect: true }) {
-        console.log(options);
+    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);
-        return new AXPEntityMasterCreateViewModel(this.injector, config, initialData, options.canCreateNewOne, options.redirect);
+        return new AXPEntityMasterCreateViewModel(this.injector, config, initialData, options);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreateViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreateViewModelFactory, providedIn: 'root' }); }
@@ -776,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);
@@ -896,7 +925,7 @@ class AXPEntityMasterListViewModel {
                     filters: cleanedNestedFilters.filter(Boolean),
                 };
             }
-            if (filter.value === null || filter.value === undefined || filter.value === 'unknown') {
+            if (!filter.value || filter.value === 'unknown') {
                 return undefined;
             }
             return filter;
@@ -975,6 +1004,7 @@ class AXPEntityMasterListViewModel {
             },
             data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
             options: action?.options,
+            metadata: action?.metadata,
         });
     }
     //
@@ -1158,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(() => {
@@ -1177,9 +1207,9 @@ class AXPEntityMasterUpdateElementViewModel {
                 formula: widget.formula,
                 triggers: widget.triggers,
                 valueTransforms: widget.valueTransforms,
-                options: merge(schema.interface?.options, 
-                //this.property.options?.create?.widget,
-                { validationRules: this.property.validations })
+                options: merge(schema.interface?.options, {
+                    validations: this.property.validations?.map((c) => ({ rule: c.rule, message: c.message, options: c.options })),
+                }),
             };
         });
     }
@@ -1195,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);
         }
@@ -1362,7 +1397,6 @@ class AXPEntityMasterSingleViewGroupViewModel {
         });
         this.props = computed(() => {
             const { properties, interfaces } = this.entity;
-            console.log({ properties });
             const groupProperties = properties
                 .filter(({ groupId, schema }) => groupId === this.group.id && !schema.hidden)
                 .map(({ name }) => name);
@@ -1406,10 +1440,7 @@ class AXPEntityMasterSingleElementViewModel {
                 children: widget.children,
                 formula: widget.formula,
                 valueTransforms: widget.valueTransforms,
-                options: merge(schema.interface?.options
-                //this.property.options?.create?.widget,
-                //{ validationRules: this.property.validations },
-                ),
+                options: merge(schema.interface?.options),
             };
         });
     }
@@ -1481,8 +1512,10 @@ class AXPEntityMasterSingleViewModel {
                 },
             ];
         });
-        this.relatedEntities = computed(() => {
-            return (this.entityDef.relatedEntities?.map((re) => new AXPEntityDetailListViewModel(this.injector, re, { entity: this.entityDef, data: this.entityData })) ?? []);
+        this.relatedEntities = computed(async () => {
+            const relatedEntities = this.entityDef.relatedEntities?.map((re) => new AXPEntityDetailListViewModel(this.injector, re, { entity: this.entityDef, data: this.entityData })) ?? [];
+            const filteredEntities = await Promise.all(relatedEntities.map(async (re) => ((await re.hidden()) ? null : re)));
+            return filteredEntities.filter((re) => re !== null);
         });
         this.workflow.events$
             .pipe(ofType(AXPEntityDeletedEvent))
@@ -2026,7 +2059,6 @@ class AXPLookupWidgetEditComponent extends AXPWidgetComponent {
         this.translateService = inject(AXTranslationService);
         this.expose = computed(() => this.options()['expose']);
         this.entity = computed(() => this.options()['entity']);
-        this.validationRules = computed(() => this.options()['validationRules'] ?? []);
         this.textField = computed(() => {
             return (this.entityDef()?.formats.lookup ?? this.entityDef()?.properties.find((c) => c.name != 'id')?.name ?? 'title');
         });
@@ -2394,7 +2426,6 @@ class AXPWidgetSelectorWidgetEditComponent extends AXPWidgetComponent {
         this.selectedItem = signal(null);
         this.placeholder = computed(() => this.options()['placeholder'] ?? '');
         this.loading = computed(() => this.options()['loading'] ?? false);
-        this.validationRules = computed(() => this.options()['validationRules']);
     }
     ngAfterViewInit() {
         if (this.getValue()) {
@@ -2549,9 +2580,9 @@ class AXPEntityCreatePopupAction extends AXPWorkflowAction {
         console.log('data', data);
         const process = options?.['process'];
         const decoration = options?.['decoration'];
+        const layout = options?.['layout'];
         const headerTitle = decoration?.header?.title;
-        const redirect = process?.redirect;
-        const canCreateNewOne = process?.canCreateNewOne;
+        const size = layout?.size;
         const entityRef = await this.entityRegistery.resolve(module, entity);
         const com = await this.config.viewers.master.create();
         if (entityRef.parentKey) {
@@ -2561,18 +2592,14 @@ class AXPEntityCreatePopupAction extends AXPWorkflowAction {
             title: headerTitle
                 ? headerTitle
                 : `${await this.translateService.translateAsync('create-new')} ${await this.translateService.translateAsync(entityRef.formats.individual)}`,
-            size: this.platform.is('Mobile') || this.platform.is('SM') ? 'full' : 'md',
+            size: this.platform.is('Mobile') || this.platform.is('SM') ? 'full' : size ? size : 'md',
             data: {
-                vm: await this.factory.create(module, entity, data, {
-                    canCreateNewOne,
-                    redirect,
-                }),
+                vm: await this.factory.create(module, entity, data, options),
                 entity,
             },
         });
         context.setOutput('result', false);
         if (result.data?.save) {
-            console.log(result);
             context.setOutput('result', true);
             const prevData = context.getVariable('data');
             const prevMeta = context.getVariable('meta');