@acorex/platform 19.2.9 → 19.2.11

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, AXPExpressionEvaluatorService, AXPEntityCommandScope, getEntityInfo, AXPSettingScope, AXPSettingService, AXPRefreshEvent, AXPWorkflowNavigateAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPToastAction } from '@acorex/platform/common';
+import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPExpressionEvaluatorService, AXPEntityCommandScope, getEntityInfo, AXPSettingService, AXPRefreshEvent, AXPSettingScope, 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 { 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);
@@ -626,12 +603,10 @@ class AXPEntityMasterListViewQueryViewModel {
 }
 class AXPEntityMasterListViewModel {
     async setView(viewName = null) {
-        this.settingSelectedViewKey = `${this.config.module}:${this.config.name}:selected-view`;
-        const savedViewName = await this.settings.get(this.settingSelectedViewKey);
-        // this.settings.set()
+        const entitySetting = await this.settings.get(this.settingEntityKey);
+        const selectedViewName = entitySetting?.list?.currentView;
         if (viewName != this.view().name) {
-            this.view.set(this.views().find((c) => c.name == (viewName || savedViewName)) ?? this.views()[0]);
-            this.settings.scope(AXPSettingScope.User).set(this.settingSelectedViewKey, this.view().name);
+            this.view.set(this.views().find((c) => c.name == (viewName || selectedViewName)) ?? this.views()[0]);
             this.applyViewSorts();
             this.applyViewColumns();
             this.applyViewFilters();
@@ -651,8 +626,7 @@ class AXPEntityMasterListViewModel {
         this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
         this.expressionEvaluator = this.injector.get(AXPExpressionEvaluatorService);
         this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
-        this.settingListViewKey = '';
-        this.settingSelectedViewKey = '';
+        this.settingEntityKey = `${this.config.module}:${this.config.name}`;
         this.destroyed = new Subject();
         this.events$ = new Subject();
         //****************** Views ******************//
@@ -807,14 +781,58 @@ class AXPEntityMasterListViewModel {
         this.sortedFields.set(this.sortableFields());
     }
     async applySettings() {
-        this.settingListViewKey = `${this.config.module}:${this.config.name}:list-view:${this.view().name}`;
-        const listViewSetting = await this.settings.get(this.settingListViewKey);
+        this.saveSettings('view');
+        const listViewSetting = await this.settings.get(this.settingEntityKey);
         if (listViewSetting) {
-            const columnVisibilityMap = new Map(listViewSetting.columns.map((col) => [col.name, col.visible]));
+            const columns = listViewSetting.list.views[this.view().name].columns;
+            const columnVisibilityMap = new Map(columns.map((col) => [col.name, col.visible]));
+            const columnWidthsMap = new Map(columns.map((col) => [col.name, col.width]));
             this.columns.update((prev) => prev
-                .map((c) => ({ ...c, visible: columnVisibilityMap.get(c.name) ?? c.visible })) // Update visibility
-                .sort((a, b) => listViewSetting.columns.findIndex((col) => col.name === a.name) -
-                listViewSetting.columns.findIndex((col) => col.name === b.name)));
+                .map((c) => {
+                return { ...c, width: columnWidthsMap.get(c.name), visible: columnVisibilityMap.get(c.name) ?? c.visible };
+            }) // Update visibility
+                .sort((a, b) => columns.findIndex((col) => col.name === a.name) -
+                columns.findIndex((col) => col.name === b.name)));
+        }
+    }
+    async saveSettings(changesType, data) {
+        const updateSettings = (updateFn) => {
+            this.settings.scope(AXPSettingScope.User).update(this.settingEntityKey, updateFn);
+        };
+        switch (changesType) {
+            case 'columnSizes':
+                updateSettings((prev) => {
+                    const field = data.dataField.split('-')[1];
+                    const newSettings = { ...prev };
+                    set(newSettings, `list.views.${this.view().name}.columns`, prev?.list?.views?.[this.view().name]?.columns?.map((c) => ({
+                        ...c,
+                        width: c.name === field ? data.width : c.width,
+                    })));
+                    return newSettings;
+                });
+                break;
+            case 'columnOrders':
+                updateSettings((prev) => {
+                    const newSettings = { ...prev };
+                    set(newSettings, `list.views.${this.view().name}.columns`, data.map((c) => ({
+                        name: c.name,
+                        visible: c.visible,
+                        width: c.width,
+                    })));
+                    return newSettings;
+                });
+                break;
+            case 'view':
+                updateSettings((prev) => ({
+                    ...prev,
+                    list: {
+                        ...prev?.list,
+                        currentView: this.view().name,
+                    },
+                }));
+                break;
+            default:
+                break;
         }
     }
     clearSelection() {
@@ -832,14 +850,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);
@@ -963,13 +977,7 @@ class AXPEntityMasterListViewModel {
         this.applyViewColumns();
     }
     async onColumnsChanged(columns) {
-        const listViewSetting = await this.settings.get(this.settingListViewKey);
-        if (this.settingListViewKey) {
-            this.settings.scope(AXPSettingScope.User).set(this.settingListViewKey, {
-                ...listViewSetting,
-                columns: columns.map((c) => ({ name: c.name, visible: c.visible })),
-            });
-        }
+        this.saveSettings('columnOrders', columns);
     }
     applyViewColumns() {
         const cols = this.view().columns;
@@ -1031,6 +1039,7 @@ class AXPEntityMasterListViewModel {
             },
             data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
             options: action?.options,
+            metadata: action?.metadata,
         });
     }
     //
@@ -1214,12 +1223,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 +1242,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 +1260,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);
         }
@@ -1870,7 +1886,7 @@ class AXPLookupWidgetSelectorComponent extends AXBasePageComponent {
         }
       </ax-suffix>
     </ax-footer>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "pipe", type: i1$1.AsyncPipe, name: "async" }, { kind: "ngmodule", type: AXCommonModule }, { kind: "directive", type: i2$1.AXAutoFocusDirective, selector: "[axAutoFocus]", inputs: ["axAutoFocus", "axAutoFocusTime"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i4.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i4.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i4.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXDropdownButtonModule }, { kind: "ngmodule", type: AXDataTableModule }, { kind: "component", type: i5.AXDataTableComponent, selector: "ax-data-table", inputs: ["dataSource", "parentField", "rowTemplate", "emptyTemplate", "alternative", "showHeader", "fixedHeader", "showFooter", "fixedFooter", "itemHeight", "allowReordering", "paging", "fetchDataMode", "loading", "focusedRow"], outputs: ["selectedRowsChange", "focusedRowChange", "onRowClick", "onRowDbClick", "onColumnsOrderChanged", "onColumnSizeChanged"] }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i6.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXPLayoutBuilderModule }, { kind: "component", type: i7.AXPWidgetColumnRendererComponent, selector: "axp-widget-column-renderer", inputs: ["caption", "customExpandIcon", "customCollapseIcon", "node", "footerTemplate", "expandHandler", "cellTemplate", "headerTemplate"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i8.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "pipe", type: i1$1.AsyncPipe, name: "async" }, { kind: "ngmodule", type: AXCommonModule }, { kind: "directive", type: i2$1.AXAutoFocusDirective, selector: "[axAutoFocus]", inputs: ["axAutoFocus", "axAutoFocusTime"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i4.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i4.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i4.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXDropdownButtonModule }, { kind: "ngmodule", type: AXDataTableModule }, { kind: "component", type: i5.AXDataTableComponent, selector: "ax-data-table", inputs: ["dataSource", "parentField", "rowTemplate", "emptyTemplate", "alternative", "showHeader", "fixedHeader", "showFooter", "fixedFooter", "itemHeight", "allowReordering", "paging", "fetchDataMode", "loading", "focusedRow"], outputs: ["selectedRowsChange", "focusedRowChange", "onRowClick", "onRowDbClick", "onColumnsOrderChanged", "onColumnSizeChanged"] }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i6.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXPLayoutBuilderModule }, { kind: "component", type: i7.AXPWidgetColumnRendererComponent, selector: "axp-widget-column-renderer", inputs: ["caption", "customExpandIcon", "customCollapseIcon", "customWidth", "node", "footerTemplate", "expandHandler", "cellTemplate", "headerTemplate"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i8.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPLookupWidgetSelectorComponent, decorators: [{
             type: Component,