@acorex/platform 19.1.3 → 19.1.5

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

@@ -1,23 +1,23 @@
 import * as i2$1 from '@acorex/components/common';
 import { AXDataSource, AXCommonModule } from '@acorex/components/common';
 import { AXFormatService } from '@acorex/core/format';
-import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingValueProviderService, AXPWorkflowNavigateAction } from '@acorex/platform/common';
+import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingScope, AXPSettingValueProviderService, AXPRefreshEvent, AXPWorkflowNavigateAction } from '@acorex/platform/common';
 import * as i1$3 from '@acorex/platform/workflow';
-import { AXPWorkflowService, createWorkFlowEvent, AXPWorkflowAction, ofType, AXPWorkflowModule } 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 { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
 import { cloneDeep, set, merge, isNil, get, 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 { AXPopupService } from '@acorex/components/popup';
-import { AXPlatform } from '@acorex/core/platform';
-import * as i8 from '@acorex/core/translation';
-import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
 import { AXDialogService } from '@acorex/components/dialog';
 import { AXLoadingDialogService } from '@acorex/components/loading-dialog';
-import * as i7 from '@acorex/platform/layout/builder';
-import { AXPWidgetComponent, AXPLayoutBuilderModule, AXPLayoutBuilderService, AXPColumnWidgetComponent, AXP_WIDGETS_EDITOR_GROUP, AXPWidgetsCatalog, AXPWidgetRegistryService } from '@acorex/platform/layout/builder';
+import * as i8 from '@acorex/core/translation';
+import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
+import { AXPopupService } from '@acorex/components/popup';
+import { AXPlatform } from '@acorex/core/platform';
 import { RouterModule, ROUTES } from '@angular/router';
 import * as i1 from '@acorex/components/loading';
 import { AXLoadingModule } from '@acorex/components/loading';
@@ -35,7 +35,6 @@ import { AXSelectBoxModule } from '@acorex/components/select-box';
 import * as i2$2 from '@acorex/components/text-box';
 import { AXTextBoxComponent, AXTextBoxModule } from '@acorex/components/text-box';
 import { AXValidationModule } from '@acorex/core/validation';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import * as i1$2 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
 import * as i5 from '@acorex/components/data-table';
@@ -494,505 +493,112 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImpor
             args: [{ providedIn: 'root' }]
         }] });
 
-const AXPEntityCreateEvent = createWorkFlowEvent('[Entity] Created!');
-class AXPEntityCreatePopupAction extends AXPWorkflowAction {
-    constructor() {
-        super(...arguments);
-        this.entityRegistery = inject(AXPEntityDefinitionRegistryService);
-        this.popupService = inject(AXPopupService);
-        this.platform = inject(AXPlatform);
-        this.factory = inject(AXPEntityCreateViewModelFactory);
-        this.config = inject(AXP_ENTITY_CONFIG_TOKEN);
-        this.translateService = inject(AXTranslationService);
-    }
-    async execute(context) {
-        const [module, entity] = context.getVariable('entity').split('.');
-        const data = context.getVariable('data');
-        const options = context.getVariable('options');
-        const redirect = options?.['redirect'];
-        const canCreateNewOne = options?.['canCreateNewOne'];
-        const entityRef = await this.entityRegistery.resolve(module, entity);
-        const com = await this.config.viewers.master.create();
-        const result = await this.popupService.open(com, {
-            title: `${await this.translateService.translateAsync('create-new')} ${await this.translateService.translateAsync(entityRef.formats.individual)}`,
-            size: this.platform.is('Mobile') || this.platform.is('SM') ? 'full' : 'md',
-            data: {
-                vm: await this.factory.create(module, entity, data, { canCreateNewOne, redirect }),
-                entity,
-            },
-        });
-        context.setOutput('result', false);
-        if (result.data?.save) {
-            context.setOutput('result', true);
-            const prevData = context.getVariable('data');
-            context.setVariable('data', { ...prevData, ...result.data.item });
-        }
+class AXPEntityMasterListViewQueryViewModel {
+    constructor(entity, section, view) {
+        this.entity = entity;
+        this.section = section;
+        this.view = view;
+        this.name = this.view.name;
+        this.title = this.view.title;
+        this.sorts = this.view.sorts;
+        this.columns = this.view.columns;
+        this.conditions = this.view.conditions;
+        this.indexCol = this.view.indexCol;
+        this.pageSize = this.view.pageSize;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreatePopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreatePopupAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreatePopupAction, decorators: [{
-            type: Injectable
-        }] });
-class AXPEntityCreateSubmittedAction extends AXPWorkflowAction {
-    async execute(context) {
-        this.dispatch(AXPEntityCreateEvent({ entity: context.getVariable('entity'), meta: context.getVariable('meta') }));
+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()
+        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.applyViewSorts();
+            this.applyViewColumns();
+            this.applyViewFilters();
+            this.applyFilterAndSort();
+            this.applySettings();
+        }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreateSubmittedAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreateSubmittedAction }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreateSubmittedAction, decorators: [{
-            type: Injectable
-        }] });
-const AXPCreateEntityWorkflow = {
-    startStepId: 'show-popup',
-    steps: {
-        'show-popup': {
-            action: 'AXPEntityCreatePopupAction',
-            nextSteps: [
-                {
-                    conditions: [{ type: 'SINGLE', expression: 'context.getOutput("result") == true' }],
-                    nextStepId: 'show-toast',
-                },
-            ],
-        },
-        'show-toast': {
-            action: 'AXPToastAction',
-            input: {
-                color: 'success',
-                title: 'workflow.entity-created',
-                content: 'workflow.entity-created-body',
+    constructor(injector, config) {
+        this.injector = injector;
+        this.config = config;
+        this.entityDef = cloneDeep(this.config);
+        this._viewDef = cloneDeep(this.entityDef.interfaces?.master?.list);
+        this.formatService = this.injector.get(AXFormatService);
+        this.session = this.injector.get(AXPSessionService);
+        this.workflow = this.injector.get(AXPWorkflowService);
+        this.settings = this.injector.get(AXPSettingValueProviderService);
+        this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
+        this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
+        this.settingListViewKey = '';
+        this.settingSelectedViewKey = '';
+        this.destroyed = new Subject();
+        this.events$ = new Subject();
+        //****************** Views ******************//
+        this.views = computed(() => {
+            const views = this.entityDef.interfaces?.master?.list?.views ?? [];
+            return views.map((v) => {
+                return new AXPEntityMasterListViewQueryViewModel(this.entityDef, this, v);
+            });
+        });
+        this.view = signal(this.views()[0]);
+        this.dataSource = new AXDataSource({
+            byKey: (key) => {
+                const func = this.entityDef.queries.byKey.execute;
+                return func();
             },
-            nextSteps: [
-                {
-                    conditions: [],
-                    nextStepId: 'dispatch-event',
-                },
-            ],
-        },
-        'dispatch-event': {
-            action: 'AXPEntityCreateSubmittedAction',
-            nextSteps: [
+            load: (e) => {
+                const func = this.entityDef.queries.list?.execute;
+                return func(e);
+            },
+            pageSize: this.view().pageSize || 10,
+            key: 'id',
+        });
+        this.selectedItems = signal([]);
+        this.parentKey = computed(() => {
+            return this.entityDef.parentKey;
+        });
+        this.hasSelectedItems = computed(() => {
+            return this.selectedItems().length > 0;
+        });
+        //****************** Title ******************//
+        this.title = computed(() => {
+            return this._viewDef.title ?? this.entityDef.formats.plural;
+        });
+        //****************** Description ******************//
+        this.description = computed(() => {
+            return this._viewDef.description ?? null;
+        });
+        //****************** Inline filter ******************//
+        this.inlineFiltersPlaceholders = computed(() => {
+            return this.entityDef.properties.filter((p) => p.options?.filter?.inline?.enabled).map((c) => c.title ?? c.name);
+        });
+        this.hasInlineFilters = computed(() => {
+            return this.inlineFiltersPlaceholders().length > 0;
+        });
+        //****************** Beardcrumbs ******************//
+        this.beardcrumbs = computed(() => {
+            return [
                 {
-                    conditions: [{ type: 'SINGLE', expression: 'context.getVariable("options")?.redirect != false' }],
-                    nextStepId: 'show-entity',
+                    title: 'entity.home',
+                    icon: 'fa-solid fa-home ax-text-xs ax-me-2',
+                    url: [`/${this.session.application?.name}`],
                 },
-            ],
-        },
-        'show-entity': {
-            action: 'AXPShowDetailViewAction',
-        },
-    },
-};
-
-const AXPEntityDeletedEvent = createWorkFlowEvent('[Entity] Deleted');
-class AXPEntityPerformDeleteAction extends AXPWorkflowAction {
-    constructor() {
-        super(...arguments);
-        this.entityRegistery = inject(AXPEntityDefinitionRegistryService);
-        this.dialogService = inject(AXDialogService);
-        this.loadingDialog = inject(AXLoadingDialogService);
-        this.translationService = inject(AXTranslationService);
-    }
-    async execute(context) {
-        const moduleEntity = context.getVariable('entity');
-        const [moduleName, entityName] = moduleEntity.split('.');
-        const data = context.getVariable('data');
-        const meta = context.getVariable('meta');
-        const ids = Array.isArray(data) ? data.map((c) => c.id) : [data.id];
-        const entity = await this.entityRegistery.resolve(moduleName, entityName);
-        let deletedCount = 0;
-        context.setVariable('deleteSuccessful', false);
-        const dialog = this.loadingDialog.show({
-            title: await this.translationService.translateAsync('workflow.deleting'),
-            mode: 'determinate',
-            status: 'Deleting...',
-            progressValue: 0,
-            text: `0/${ids.length}`,
-            buttons: [
                 {
-                    text: await this.translationService.translateAsync('cancel'),
-                    color: 'danger',
-                    onClick: () => {
-                        dialog.close();
-                    },
+                    title: this.title(),
+                    url: [
+                        `/${this.session.application?.name}`,
+                        'm',
+                        `${this.entityDef.module}`,
+                        'e',
+                        `${this.entityDef.name}`,
+                        'list',
+                    ],
                 },
-            ],
-        });
-        if (entity.commands?.delete != null) {
-            const deleteExec = entity.commands?.delete?.execute;
-            const wrappedPromises = ids
-                .map((id, i) => {
-                return new Promise((resolve) => {
-                    setTimeout(() => {
-                        resolve(deleteExec(id));
-                    }, i * 200);
-                });
-            })
-                .map((p) => p?.then((value) => {
-                deletedCount++;
-                dialog.setProgressText(`${deletedCount}/${ids.length}`);
-                dialog.setProgressValue((deletedCount / ids.length) * 100);
-                return { status: 'fulfilled', value };
-            }, (reason) => ({ status: 'rejected', reason })));
-            const results = await Promise.all(wrappedPromises);
-            const successfulPromises = results.filter((result) => result?.status === 'fulfilled').length;
-            const failedPromises = results.filter((result) => result?.status === 'rejected').length;
-            setTimeout(() => {
-                dialog.close();
-            }, 300);
-            // Handle different scenarios for alerts
-            if (successfulPromises > 0 && failedPromises === 0) {
-                // All items deleted successfully
-                await this.dialogService.alert(await this.translationService.translateAsync('workflow.success-delete-title'), await this.translationService.translateAsync('workflow.success-delete-body', {
-                    params: { item: successfulPromises },
-                }), //TODO test translation
-                'success');
-                // Dispatch actions
-                this.dispatch(AXPEntityDeletedEvent({ entity: moduleEntity, ids: ids, meta: meta }));
-            }
-            else if (successfulPromises > 0 && failedPromises > 0) {
-                // Some items deleted successfully, some failed
-                await this.dialogService.alert(await this.translationService.translateAsync('workflow.success-partial-delete-title'), await this.translationService.translateAsync('workflow.partial-delete-body', {
-                    params: { success: successfulPromises, fail: failedPromises },
-                }), 'warning');
-                // Dispatch actions
-                this.dispatch(AXPEntityDeletedEvent({ entity: moduleEntity, ids: ids, meta: meta }));
-            }
-            else if (successfulPromises === 0 && failedPromises > 0) {
-                // No items deleted, all failed
-                await this.dialogService.alert(await this.translationService.translateAsync('workflow.fail-delete-title'), await this.translationService.translateAsync('workflow.fail-delete-body', {
-                    params: { item: failedPromises },
-                }), 'danger');
-            }
-            else {
-                // No items to delete (no successful or failed promises)
-                await this.dialogService.alert(await this.translationService.translateAsync('workflow.no-need'), await this.translationService.translateAsync('workflow.no-item'), 'info');
-            }
-        }
-        else {
-            throw new Error(`The delete operation cannot be performed on ${entity.title}. This action might be restricted or not applicable for the selected item.`);
-        }
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityPerformDeleteAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityPerformDeleteAction }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityPerformDeleteAction, decorators: [{
-            type: Injectable
-        }] });
-const AXPDeleteEntityWorkflow = {
-    startStepId: 'confirm-delete',
-    steps: {
-        'confirm-delete': {
-            action: 'show-prompt-dialog',
-            input: {
-                title: 'workflow.warning',
-                message: `workflow.confirm-delete`,
-                type: 'danger',
-            },
-            nextSteps: [
-                {
-                    conditions: [
-                        {
-                            type: 'AND',
-                            conditions: [{ type: 'SINGLE', expression: 'context.getOutput("result") == true' }],
-                        },
-                    ],
-                    nextStepId: 'perform-delete',
-                },
-            ],
-        },
-        'perform-delete': {
-            action: 'entity-perform-delete',
-        },
-    },
-};
-
-class AXPEntityMasterUpdateElementViewModel {
-    constructor(entity, property) {
-        this.entity = entity;
-        this.property = property;
-        this.name = signal(this.property.name);
-        this.title = signal(this.property.title);
-        this.description = signal(this.property.description);
-        this.editable = computed(() => {
-            return !(this.property.schema.readonly ?? false);
-        });
-        this.isRequired = computed(() => {
-            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 source = cloneDeep(updateProp?.layout ?? {});
-            set(source, "positions.default.colSpan", 12);
-            return source;
-        });
-        this.node = computed(() => {
-            const schema = this.property.schema;
-            const widget = schema.interface;
-            return {
-                type: widget.type,
-                mode: this.editable() ? 'edit' : 'view',
-                path: this.name(),
-                children: widget.children,
-                formula: widget.formula,
-                triggers: widget.triggers,
-                options: merge(schema.interface?.options, 
-                //this.property.options?.create?.widget,
-                { validationRules: this.property.validations })
-            };
-        });
-    }
-}
-class AXPEntityMasterUpdateViewModel {
-    constructor(injector, config, entityData, props) {
-        this.injector = injector;
-        this.config = config;
-        this.entityData = entityData;
-        this.props = props;
-        this.entityDef = cloneDeep(this.config);
-        this.workflow = this.injector.get(AXPWorkflowService);
-        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 => {
-                return new AXPEntityMasterUpdateElementViewModel(this.entityDef, e);
-            });
-        });
-    }
-    async save() {
-        this.isInProgress.set(true);
-        try {
-            const com = this.entityDef.commands?.update;
-            if (com) {
-                const exec = com.execute;
-                return await exec(this.context());
-            }
-        }
-        finally {
-            this.isInProgress.set(false);
-        }
-    }
-    reset() {
-        this.context.set(cloneDeep(this.entityData));
-    }
-}
-class AXPEntityMasterUpdateViewModelFactory {
-    constructor() {
-        this.entityService = inject(AXPEntityDefinitionRegistryService);
-        this.layout = inject(AXPLayoutThemeService);
-        this.injector = inject(Injector);
-    }
-    async create(moduleName, entityName, id, props) {
-        const config = await this.entityService.resolve(moduleName, entityName);
-        this.layout.setNavigationLoading(true);
-        if (config.queries.byKey) {
-            const func = config.queries.byKey.execute;
-            const data = await func(id);
-            this.layout.setNavigationLoading(false);
-            return new AXPEntityMasterUpdateViewModel(this.injector, config, data, props);
-        }
-        this.layout.setNavigationLoading(false);
-        return Promise.reject('cannot fetch ');
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, decorators: [{
-            type: Injectable,
-            args: [{ providedIn: 'root' }]
-        }] });
-
-const AXPEntityModifyEvent = createWorkFlowEvent('[Entity] Modified');
-class AXPEntityModifySectionPopupAction extends AXPWorkflowAction {
-    constructor() {
-        super(...arguments);
-        this.popupService = inject(AXPopupService);
-        this.platform = inject(AXPlatform);
-        this.translateService = inject(AXTranslationService);
-        this.entityRegistery = inject(AXPEntityDefinitionRegistryService);
-        this.config = inject(AXP_ENTITY_CONFIG_TOKEN);
-        this.factory = inject(AXPEntityMasterUpdateViewModelFactory);
-    }
-    async execute(context) {
-        const [moduleName, entityName] = context.getVariable('entity').split('.');
-        const { properties, id, title } = context.getVariable('data');
-        const entityRef = await this.entityRegistery.resolve(moduleName, entityName);
-        const vm = await this.factory.create(moduleName, entityName, id, properties);
-        const com = await this.config.viewers.master.modify();
-        const popup = await this.popupService.open(com, {
-            title: title ?? `${this.translateService.translateSync('entity.modify')} ${this.translateService.translateSync(entityRef.formats.individual)}`,
-            size: this.platform.is('Mobile') || this.platform.is('SM') ? 'full' : 'md',
-            data: {
-                vm,
-                properties,
-                entity: entityRef,
-            },
-        });
-        context.setOutput('result', false);
-        if (popup.data?.result == true) {
-            context.setOutput('result', true);
-            context.setVariable('data', cloneDeep(popup.data.context));
-        }
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifySectionPopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifySectionPopupAction }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifySectionPopupAction, decorators: [{
-            type: Injectable
-        }] });
-class AXPEntityModifyConfirmedAction extends AXPWorkflowAction {
-    async execute(context) {
-        const updatedData = context.getVariable('data');
-        this.dispatch(AXPEntityModifyEvent({ entity: context.getVariable('entity'), values: updatedData }));
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifyConfirmedAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifyConfirmedAction }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifyConfirmedAction, decorators: [{
-            type: Injectable
-        }] });
-const AXPModifyEntitySectionWorkflow = {
-    startStepId: 'modifyPopup',
-    steps: {
-        modifyPopup: {
-            id: 'modifyPopup',
-            action: 'AXPEntityModifySectionPopupAction',
-            nextSteps: [
-                {
-                    conditions: [{ type: 'SINGLE', expression: 'context.getOutput("result") == true' }],
-                    nextStepId: 'successToast',
-                },
-            ],
-        },
-        successToast: {
-            id: 'successToast',
-            action: 'AXPToastAction',
-            input: {
-                color: 'success',
-                title: 'workflow.entity-modified-title',
-                content: 'workflow.entity-modified-body',
-            },
-            nextSteps: [
-                {
-                    conditions: [],
-                    nextStepId: 'modifyConfirmed',
-                },
-            ],
-        },
-        modifyConfirmed: {
-            id: 'modifyConfirmed',
-            action: 'AXPEntityModifyConfirmedAction',
-        },
-    },
-};
-
-class AXPEntityMasterListViewQueryViewModel {
-    constructor(entity, section, view) {
-        this.entity = entity;
-        this.section = section;
-        this.view = view;
-        this.name = this.view.name;
-        this.title = this.view.title;
-        this.sorts = this.view.sorts;
-        this.columns = this.view.columns;
-        this.conditions = this.view.conditions;
-        this.indexCol = this.view.indexCol;
-        this.pageSize = this.view.pageSize;
-    }
-}
-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()
-        if (viewName != this.view().name) {
-            this.view.set(this.views().find((c) => c.name == (viewName || savedViewName)) ?? this.views()[0]);
-            this.settings.set(this.settingSelectedViewKey, this.view().name);
-            this.applyViewSorts();
-            this.applyViewColumns();
-            this.applyFilterAndSort();
-            this.applySettings();
-        }
-    }
-    constructor(injector, config) {
-        this.injector = injector;
-        this.config = config;
-        this.entityDef = cloneDeep(this.config);
-        this._viewDef = cloneDeep(this.entityDef.interfaces?.master?.list);
-        this.formatService = this.injector.get(AXFormatService);
-        this.session = this.injector.get(AXPSessionService);
-        this.workflow = this.injector.get(AXPWorkflowService);
-        this.settings = this.injector.get(AXPSettingValueProviderService);
-        this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
-        this.settingListViewKey = '';
-        this.settingSelectedViewKey = '';
-        this.destroyed = new Subject();
-        this.events$ = new Subject();
-        //****************** Views ******************//
-        this.views = computed(() => {
-            const views = this.entityDef.interfaces?.master?.list?.views ?? [];
-            return views.map((v) => {
-                return new AXPEntityMasterListViewQueryViewModel(this.entityDef, this, v);
-            });
-        });
-        this.view = signal(this.views()[0]);
-        this.dataSource = new AXDataSource({
-            byKey: (key) => {
-                const func = this.entityDef.queries.byKey.execute;
-                return func();
-            },
-            load: (e) => {
-                const func = this.entityDef.queries.list?.execute;
-                return func(e);
-            },
-            pageSize: this.view().pageSize || 10,
-            key: 'id',
-        });
-        this.selectedItems = signal([]);
-        this.parentKey = computed(() => {
-            return this.entityDef.parentKey;
-        });
-        this.hasSelectedItems = computed(() => {
-            return this.selectedItems().length > 0;
-        });
-        //****************** Title ******************//
-        this.title = computed(() => {
-            return this._viewDef.title ?? this.entityDef.formats.plural;
-        });
-        //****************** Description ******************//
-        this.description = computed(() => {
-            return this._viewDef.description ?? null;
-        });
-        //****************** Inline filter ******************//
-        this.inlineFiltersPlaceholders = computed(() => {
-            return this.entityDef.properties.filter((p) => p.options?.filter?.inline?.enabled).map((c) => c.title ?? c.name);
-        });
-        this.hasInlineFilters = computed(() => {
-            return this.inlineFiltersPlaceholders().length > 0;
-        });
-        //****************** Beardcrumbs ******************//
-        this.beardcrumbs = computed(() => {
-            return [
-                {
-                    title: 'entity.home',
-                    icon: 'fa-solid fa-home ax-text-xs ax-me-2',
-                    url: [`/${this.session.application?.name}`],
-                },
-                {
-                    title: this.title(),
-                    url: [
-                        `/${this.session.application?.name}`,
-                        'm',
-                        `${this.entityDef.module}`,
-                        'e',
-                        `${this.entityDef.name}`,
-                        'list',
-                    ],
-                },
-            ];
+            ];
         });
         //****************** Actions ******************//
         this.allActions = computed(() => {
@@ -1015,15 +621,20 @@ class AXPEntityMasterListViewModel {
         this.primaryRowActions = computed(() => this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'primary'));
         this.secondaryRowActions = computed(() => this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'secondary'));
         //****************** Filter ******************//
-        this.inlineFilters = {
+        this.simpleFilters = signal({
             field: null,
-            logic: 'or',
+            logic: 'and',
             operator: null,
-            filters: [],
-        };
-        this.advanceFilters = {
+            filters: this.view().conditions.map((f) => ({
+                field: f.name,
+                operator: f.operator,
+                value: f.value,
+            })),
+        });
+        this.lastFiltersApplied = signal(this.simpleFilters());
+        this.inlineFilters = {
             field: null,
-            logic: 'and',
+            logic: 'or',
             operator: null,
             filters: [],
         };
@@ -1068,10 +679,9 @@ class AXPEntityMasterListViewModel {
         };
         this.sortedFields = signal([]);
         this.workflow.events$
-            .pipe(ofType(AXPEntityDeletedEvent, AXPEntityCreateEvent, AXPEntityModifyEvent))
+            .pipe(ofType(AXPRefreshEvent))
             .pipe(takeUntil(this.destroyed))
             .subscribe((event) => {
-            console.log('omed');
             if (event.payload.entity == getEntityInfo(this.entityDef).source) {
                 this.selectedItems.set([]);
                 this.events$.next({ action: 'refresh' });
@@ -1096,20 +706,36 @@ class AXPEntityMasterListViewModel {
     get filtersDef() {
         const props = this.entityDef.properties.filter((c) => c.options?.filter?.advance?.enabled);
         return props.map((e) => {
+            const widgetConfig = this.widgetResolver.resolve(e.schema.interface?.type);
+            const type = (e.options?.filter?.advance?.widgetType ||
+                widgetConfig?.defaultFilterWidgetName ||
+                e.schema.interface?.type);
             return {
                 title: e.title,
                 field: e.name,
                 operator: {
                     type: 'equal',
                 },
-                widget: {
-                    type: e.schema.interface?.type,
-                },
+                widget: { ...e.schema.interface, path: e.name, type },
                 filters: [],
                 isParametric: false,
             };
         });
     }
+    applyViewFilters() {
+        const viewFilters = this.view().conditions.map((f) => ({
+            field: f.name,
+            operator: f.operator,
+            value: f.value,
+        }));
+        this.simpleFilters.update((prev) => ({ ...prev, filters: viewFilters }));
+    }
+    resetFilters() {
+        this.applyViewFilters();
+    }
+    discardFilters() {
+        this.simpleFilters.set(this.lastFiltersApplied());
+    }
     applyInlineFilter(value) {
         const props = this.entityDef.properties.filter((c) => c.options?.filter?.inline?.enabled);
         this.inlineFilters.filters = [];
@@ -1128,32 +754,18 @@ class AXPEntityMasterListViewModel {
     }
     applyFilterAndSort() {
         this.dataSource.clearFilter();
-        //
         this.dataSource.sort(...this.sortedFields().map((s) => ({ dir: s.dir, field: s.name })));
-        //
-        this.advanceFilters.filters = this.view().conditions.map((f) => ({
-            field: f.name,
-            operator: f.operator,
-            value: f.value,
+        const allFilters = [
+            this.inlineFilters.filters?.length && this.inlineFilters,
+            this.simpleFilters().filters?.length && this.simpleFilters(),
+        ].filter(Boolean);
+        this.lastFiltersApplied.set(this.simpleFilters());
+        this.dataSource.filter(this.filterOperatorMiddleware.transformFilter({
+            field: null,
+            logic: 'and',
+            operator: null,
+            filters: allFilters,
         }));
-        //
-        const inline = this.inlineFilters.filters?.length ?? 0;
-        const advance = this.advanceFilters.filters?.length ?? 0;
-        if (inline && !advance) {
-            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter(this.inlineFilters));
-        }
-        else if (!inline && advance) {
-            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter(this.advanceFilters));
-        }
-        else if (inline && advance) {
-            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter({
-                field: null,
-                logic: 'and',
-                operator: null,
-                filters: [this.inlineFilters, this.advanceFilters],
-            }));
-        }
-        //
         this.dataSource.refresh();
     }
     resetColumns() {
@@ -1162,7 +774,7 @@ class AXPEntityMasterListViewModel {
     async onColumnsChanged(columns) {
         const listViewSetting = await this.settings.get(this.settingListViewKey);
         if (this.settingListViewKey) {
-            this.settings.set(this.settingListViewKey, {
+            this.settings.scope(AXPSettingScope.User).set(this.settingListViewKey, {
                 ...listViewSetting,
                 columns: columns.map((c) => ({ name: c.name, visible: c.visible })),
             });
@@ -1207,57 +819,363 @@ class AXPEntityMasterListViewModel {
             });
         });
     }
-    //******************  Commands ******************//
-    async executeCommand(commandName, data = null) {
-        const action = this.allActions().find((c) => c.name == commandName &&
-            ((this.selectedItems().length
-                ? c.scope == AXPEntityCommandScope.Selected
-                : c.scope == AXPEntityCommandScope.Individual) ||
-                c.scope == AXPEntityCommandScope.TypeLevel));
-        console.log('action: ', action);
-        await this.workflow.execute(commandName, {
-            entity: getEntityInfo(this.entityDef).source,
-            entityInfo: {
-                name: this.entityDef.name,
-                module: this.entityDef.module,
-                title: this.entityDef.title,
-                parentKey: this.entityDef.parentKey,
-                source: this.entityDef.source,
-            },
-            data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
-            options: action?.options,
-        });
+    //******************  Commands ******************//
+    async executeCommand(commandName, data = null) {
+        const action = this.allActions().find((c) => c.name == commandName &&
+            ((this.selectedItems().length
+                ? c.scope == AXPEntityCommandScope.Selected
+                : c.scope == AXPEntityCommandScope.Individual) ||
+                c.scope == AXPEntityCommandScope.TypeLevel));
+        await this.workflow.execute(commandName, {
+            entity: getEntityInfo(this.entityDef).source,
+            entityInfo: {
+                name: this.entityDef.name,
+                module: this.entityDef.module,
+                title: this.entityDef.title,
+                parentKey: this.entityDef.parentKey,
+                source: this.entityDef.source,
+            },
+            data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
+            options: action?.options,
+        });
+    }
+    //
+    destroy() {
+        this.destroyed.next();
+        this.destroyed.complete();
+    }
+}
+class AXPEntityListViewModelFactory {
+    constructor() {
+        this.entityService = inject(AXPEntityDefinitionRegistryService);
+        this.layout = inject(AXPLayoutThemeService);
+        this.injector = inject(Injector);
+    }
+    async create(moduleName, entityName) {
+        this.layout.setNavigationLoading(true);
+        const config = await this.entityService.resolve(moduleName, entityName);
+        this.layout.setNavigationLoading(false);
+        return new AXPEntityMasterListViewModel(this.injector, config);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityListViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityListViewModelFactory, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityListViewModelFactory, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }] });
+const AXPEntityListViewModelResolver = (route, state, service = inject(AXPEntityListViewModelFactory)) => {
+    const moduleName = route.parent?.paramMap.get('module');
+    const entityName = route.paramMap.get('entity');
+    //
+    return service.create(moduleName, entityName);
+};
+
+const AXPEntityDeletedEvent = createWorkFlowEvent('[Entity] Deleted');
+class AXPEntityPerformDeleteAction extends AXPWorkflowAction {
+    constructor() {
+        super(...arguments);
+        this.entityRegistery = inject(AXPEntityDefinitionRegistryService);
+        this.dialogService = inject(AXDialogService);
+        this.loadingDialog = inject(AXLoadingDialogService);
+        this.translationService = inject(AXTranslationService);
+    }
+    async execute(context) {
+        const moduleEntity = context.getVariable('entity');
+        const [moduleName, entityName] = moduleEntity.split('.');
+        const data = context.getVariable('data');
+        const meta = context.getVariable('meta');
+        const ids = Array.isArray(data) ? data.map((c) => c.id) : [data.id];
+        const entity = await this.entityRegistery.resolve(moduleName, entityName);
+        let deletedCount = 0;
+        context.setVariable('deleteSuccessful', false);
+        const dialog = this.loadingDialog.show({
+            title: await this.translationService.translateAsync('workflow.deleting'),
+            mode: 'determinate',
+            status: 'Deleting...',
+            progressValue: 0,
+            text: `0/${ids.length}`,
+            buttons: [
+                {
+                    text: await this.translationService.translateAsync('cancel'),
+                    color: 'danger',
+                    onClick: () => {
+                        dialog.close();
+                    },
+                },
+            ],
+        });
+        if (entity.commands?.delete != null) {
+            const deleteExec = entity.commands?.delete?.execute;
+            const wrappedPromises = ids
+                .map((id, i) => {
+                return new Promise((resolve) => {
+                    setTimeout(() => {
+                        resolve(deleteExec(id));
+                    }, i * 200);
+                });
+            })
+                .map((p) => p?.then((value) => {
+                deletedCount++;
+                dialog.setProgressText(`${deletedCount}/${ids.length}`);
+                dialog.setProgressValue((deletedCount / ids.length) * 100);
+                return { status: 'fulfilled', value };
+            }, (reason) => ({ status: 'rejected', reason })));
+            const results = await Promise.all(wrappedPromises);
+            const successfulPromises = results.filter((result) => result?.status === 'fulfilled').length;
+            const failedPromises = results.filter((result) => result?.status === 'rejected').length;
+            setTimeout(() => {
+                dialog.close();
+            }, 300);
+            // Handle different scenarios for alerts
+            if (successfulPromises > 0 && failedPromises === 0) {
+                // All items deleted successfully
+                await this.dialogService.alert(await this.translationService.translateAsync('workflow.success-delete-title'), await this.translationService.translateAsync('workflow.success-delete-body', {
+                    params: { item: successfulPromises },
+                }), //TODO test translation
+                'success');
+                // Dispatch actions
+                this.dispatch(AXPEntityDeletedEvent({ entity: moduleEntity, ids: ids, meta: meta }));
+                this.dispatch(AXPRefreshEvent({ entity: moduleEntity }));
+            }
+            else if (successfulPromises > 0 && failedPromises > 0) {
+                // Some items deleted successfully, some failed
+                await this.dialogService.alert(await this.translationService.translateAsync('workflow.success-partial-delete-title'), await this.translationService.translateAsync('workflow.partial-delete-body', {
+                    params: { success: successfulPromises, fail: failedPromises },
+                }), 'warning');
+                // Dispatch actions
+                this.dispatch(AXPEntityDeletedEvent({ entity: moduleEntity, ids: ids, meta: meta }));
+            }
+            else if (successfulPromises === 0 && failedPromises > 0) {
+                // No items deleted, all failed
+                await this.dialogService.alert(await this.translationService.translateAsync('workflow.fail-delete-title'), await this.translationService.translateAsync('workflow.fail-delete-body', {
+                    params: { item: failedPromises },
+                }), 'danger');
+            }
+            else {
+                // No items to delete (no successful or failed promises)
+                await this.dialogService.alert(await this.translationService.translateAsync('workflow.no-need'), await this.translationService.translateAsync('workflow.no-item'), 'primary');
+            }
+        }
+        else {
+            throw new Error(`The delete operation cannot be performed on ${entity.title}. This action might be restricted or not applicable for the selected item.`);
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityPerformDeleteAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityPerformDeleteAction }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityPerformDeleteAction, decorators: [{
+            type: Injectable
+        }] });
+const AXPDeleteEntityWorkflow = {
+    startStepId: 'confirm-delete',
+    steps: {
+        'confirm-delete': {
+            action: 'show-prompt-dialog',
+            input: {
+                title: 'workflow.warning',
+                message: `workflow.confirm-delete`,
+                type: 'danger',
+            },
+            nextSteps: [
+                {
+                    conditions: [
+                        {
+                            type: 'AND',
+                            conditions: [{ type: 'SINGLE', expression: 'context.getOutput("result") == true' }],
+                        },
+                    ],
+                    nextStepId: 'perform-delete',
+                },
+            ],
+        },
+        'perform-delete': {
+            action: 'entity-perform-delete',
+        },
+    },
+};
+
+class AXPEntityMasterUpdateElementViewModel {
+    constructor(entity, property) {
+        this.entity = entity;
+        this.property = property;
+        this.name = signal(this.property.name);
+        this.title = signal(this.property.title);
+        this.description = signal(this.property.description);
+        this.editable = computed(() => {
+            return !(this.property.schema.readonly ?? false);
+        });
+        this.isRequired = computed(() => {
+            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 source = cloneDeep(updateProp?.layout ?? {});
+            set(source, "positions.default.colSpan", 12);
+            return source;
+        });
+        this.node = computed(() => {
+            const schema = this.property.schema;
+            const widget = schema.interface;
+            return {
+                type: widget.type,
+                mode: this.editable() ? 'edit' : 'view',
+                path: this.name(),
+                children: widget.children,
+                formula: widget.formula,
+                triggers: widget.triggers,
+                options: merge(schema.interface?.options, 
+                //this.property.options?.create?.widget,
+                { validationRules: this.property.validations })
+            };
+        });
+    }
+}
+class AXPEntityMasterUpdateViewModel {
+    constructor(injector, config, entityData, props) {
+        this.injector = injector;
+        this.config = config;
+        this.entityData = entityData;
+        this.props = props;
+        this.entityDef = cloneDeep(this.config);
+        this.workflow = this.injector.get(AXPWorkflowService);
+        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 => {
+                return new AXPEntityMasterUpdateElementViewModel(this.entityDef, e);
+            });
+        });
+    }
+    async save() {
+        this.isInProgress.set(true);
+        try {
+            const com = this.entityDef.commands?.update;
+            if (com) {
+                const exec = com.execute;
+                return await exec(this.context());
+            }
+        }
+        finally {
+            this.isInProgress.set(false);
+        }
     }
-    //
-    destroy() {
-        this.destroyed.next();
-        this.destroyed.complete();
+    reset() {
+        this.context.set(cloneDeep(this.entityData));
     }
 }
-class AXPEntityListViewModelFactory {
+class AXPEntityMasterUpdateViewModelFactory {
     constructor() {
         this.entityService = inject(AXPEntityDefinitionRegistryService);
         this.layout = inject(AXPLayoutThemeService);
         this.injector = inject(Injector);
     }
-    async create(moduleName, entityName) {
-        this.layout.setNavigationLoading(true);
+    async create(moduleName, entityName, id, props) {
         const config = await this.entityService.resolve(moduleName, entityName);
+        this.layout.setNavigationLoading(true);
+        if (config.queries.byKey) {
+            const func = config.queries.byKey.execute;
+            const data = await func(id);
+            this.layout.setNavigationLoading(false);
+            return new AXPEntityMasterUpdateViewModel(this.injector, config, data, props);
+        }
         this.layout.setNavigationLoading(false);
-        return new AXPEntityMasterListViewModel(this.injector, config);
+        return Promise.reject('cannot fetch ');
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityListViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityListViewModelFactory, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityListViewModelFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
-const AXPEntityListViewModelResolver = (route, state, service = inject(AXPEntityListViewModelFactory)) => {
-    const moduleName = route.parent?.paramMap.get('module');
-    const entityName = route.paramMap.get('entity');
-    //
-    return service.create(moduleName, entityName);
+
+const AXPEntityModifyEvent = createWorkFlowEvent('[Entity] Modified');
+class AXPEntityModifySectionPopupAction extends AXPWorkflowAction {
+    constructor() {
+        super(...arguments);
+        this.popupService = inject(AXPopupService);
+        this.platform = inject(AXPlatform);
+        this.translateService = inject(AXTranslationService);
+        this.entityRegistery = inject(AXPEntityDefinitionRegistryService);
+        this.config = inject(AXP_ENTITY_CONFIG_TOKEN);
+        this.factory = inject(AXPEntityMasterUpdateViewModelFactory);
+    }
+    async execute(context) {
+        const [moduleName, entityName] = context.getVariable('entity').split('.');
+        const { properties, id, title } = context.getVariable('data');
+        const entityRef = await this.entityRegistery.resolve(moduleName, entityName);
+        const vm = await this.factory.create(moduleName, entityName, id, properties);
+        const com = await this.config.viewers.master.modify();
+        const popup = await this.popupService.open(com, {
+            title: title ??
+                `${this.translateService.translateSync('entity.modify')} ${this.translateService.translateSync(entityRef.formats.individual)}`,
+            size: this.platform.is('Mobile') || this.platform.is('SM') ? 'full' : 'md',
+            data: {
+                vm,
+                properties,
+                entity: entityRef,
+            },
+        });
+        context.setOutput('result', false);
+        if (popup.data?.result == true) {
+            context.setOutput('result', true);
+            context.setVariable('data', cloneDeep(popup.data.context));
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifySectionPopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifySectionPopupAction }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifySectionPopupAction, decorators: [{
+            type: Injectable
+        }] });
+class AXPEntityModifyConfirmedAction extends AXPWorkflowAction {
+    async execute(context) {
+        const updatedData = context.getVariable('data');
+        this.dispatch(AXPEntityModifyEvent({ entity: context.getVariable('entity'), values: updatedData }));
+        this.dispatch(AXPRefreshEvent({ entity: context.getVariable('entity') }));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifyConfirmedAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifyConfirmedAction }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModifyConfirmedAction, decorators: [{
+            type: Injectable
+        }] });
+const AXPModifyEntitySectionWorkflow = {
+    startStepId: 'modifyPopup',
+    steps: {
+        modifyPopup: {
+            id: 'modifyPopup',
+            action: 'AXPEntityModifySectionPopupAction',
+            nextSteps: [
+                {
+                    conditions: [{ type: 'SINGLE', expression: 'context.getOutput("result") == true' }],
+                    nextStepId: 'successToast',
+                },
+            ],
+        },
+        successToast: {
+            id: 'successToast',
+            action: 'AXPToastAction',
+            input: {
+                color: 'success',
+                title: 'workflow.entity-modified-title',
+                content: 'workflow.entity-modified-body',
+            },
+            nextSteps: [
+                {
+                    conditions: [],
+                    nextStepId: 'modifyConfirmed',
+                },
+            ],
+        },
+        modifyConfirmed: {
+            id: 'modifyConfirmed',
+            action: 'AXPEntityModifyConfirmedAction',
+        },
+    },
 };
 
 class AXPEntityMasterSingleViewGroupViewModel {
@@ -1280,6 +1198,7 @@ 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);
@@ -1885,7 +1804,6 @@ class AXPLookupWidgetEditComponent extends AXPWidgetComponent {
         this.entityResolver = inject(AXPEntityResolver);
         this.formatService = inject(AXFormatService);
         this.popupService = inject(AXPopupService);
-        this.builderService = inject(AXPLayoutBuilderService);
         this.destroyRef = inject(DestroyRef);
         this.translateService = inject(AXTranslationService);
         this.expose = computed(() => this.options()['expose']);
@@ -1925,13 +1843,13 @@ class AXPLookupWidgetEditComponent extends AXPWidgetComponent {
     ngOnInit() {
         super.ngOnInit();
         //
-        this.builderService.onChanged.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async (c) => {
-            if (c.path == this.path) {
-                if (this.getValue()) {
-                    await this.findByValue();
-                }
-            }
-        });
+        // this.builderService.onContextChanged.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async (c) => {
+        //   if (c.path == this.path) {
+        //     if (this.getValue()) {
+        //       await this.findByValue();
+        //     }
+        //   }
+        // });
     }
     async findByValue() {
         this.isLoading.set(true);
@@ -2007,18 +1925,18 @@ class AXPLookupWidgetEditComponent extends AXPWidgetComponent {
         // extract data from valueField and set context by expose path
         if (this.expose()) {
             if (typeof this.expose() == 'string') {
-                this.builderService.setValue(this.expose(), item);
+                this.contextService.update(this.expose(), item);
             }
             // support multiple expose items
             else if (Array.isArray(this.expose())) {
                 this.expose().forEach((i) => {
                     if (typeof i == 'string') {
-                        this.builderService.setValue(i, item);
+                        this.contextService.update(i, item);
                     }
                     else {
                         // extract data from item by source path and set context by target path
                         const key = get(item, i.source);
-                        this.builderService.setValue(i.target, key);
+                        this.contextService.update(i.target, key);
                     }
                 });
             }
@@ -2026,7 +1944,7 @@ class AXPLookupWidgetEditComponent extends AXPWidgetComponent {
             else if (typeof this.expose() == 'object') {
                 const i = this.expose();
                 const key = get(item, i.source);
-                this.builderService.setValue(i.target, key);
+                this.contextService.update(i.target, key);
             }
         }
     }
@@ -2189,6 +2107,7 @@ const AXPLookupWidget = {
     title: 'Lookup',
     visible: false,
     group: AXP_WIDGETS_EDITOR_GROUP,
+    defaultFilterWidgetName: 'lookup-filter',
     type: 'editor',
     properties: [
         AXP_DISABLED_PROPERTY,
@@ -2394,6 +2313,98 @@ const AXPWidgetSelectorWidget = {
     },
 };
 
+const AXPEntityCreateEvent = createWorkFlowEvent('[Entity] Created!');
+class AXPEntityCreatePopupAction extends AXPWorkflowAction {
+    constructor() {
+        super(...arguments);
+        this.entityRegistery = inject(AXPEntityDefinitionRegistryService);
+        this.popupService = inject(AXPopupService);
+        this.platform = inject(AXPlatform);
+        this.factory = inject(AXPEntityCreateViewModelFactory);
+        this.config = inject(AXP_ENTITY_CONFIG_TOKEN);
+        this.translateService = inject(AXTranslationService);
+    }
+    async execute(context) {
+        const [module, entity] = context.getVariable('entity').split('.');
+        const data = context.getVariable('data');
+        const options = context.getVariable('options');
+        const redirect = options?.['redirect'];
+        const canCreateNewOne = options?.['canCreateNewOne'];
+        const entityRef = await this.entityRegistery.resolve(module, entity);
+        const com = await this.config.viewers.master.create();
+        const result = await this.popupService.open(com, {
+            title: `${await this.translateService.translateAsync('create-new')} ${await this.translateService.translateAsync(entityRef.formats.individual)}`,
+            size: this.platform.is('Mobile') || this.platform.is('SM') ? 'full' : 'md',
+            data: {
+                vm: await this.factory.create(module, entity, data, { canCreateNewOne, redirect }),
+                entity,
+            },
+        });
+        context.setOutput('result', false);
+        if (result.data?.save) {
+            context.setOutput('result', true);
+            const prevData = context.getVariable('data');
+            context.setVariable('data', { ...prevData, ...result.data.item });
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreatePopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreatePopupAction }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreatePopupAction, decorators: [{
+            type: Injectable
+        }] });
+class AXPEntityCreateSubmittedAction extends AXPWorkflowAction {
+    async execute(context) {
+        this.dispatch(AXPEntityCreateEvent({ entity: context.getVariable('entity'), meta: context.getVariable('meta') }));
+        this.dispatch(AXPRefreshEvent({ entity: context.getVariable('entity') }));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreateSubmittedAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreateSubmittedAction }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityCreateSubmittedAction, decorators: [{
+            type: Injectable
+        }] });
+const AXPCreateEntityWorkflow = {
+    startStepId: 'show-popup',
+    steps: {
+        'show-popup': {
+            action: 'AXPEntityCreatePopupAction',
+            nextSteps: [
+                {
+                    conditions: [{ type: 'SINGLE', expression: 'context.getOutput("result") == true' }],
+                    nextStepId: 'show-toast',
+                },
+            ],
+        },
+        'show-toast': {
+            action: 'AXPToastAction',
+            input: {
+                color: 'success',
+                title: 'workflow.entity-created',
+                content: 'workflow.entity-created-body',
+            },
+            nextSteps: [
+                {
+                    conditions: [],
+                    nextStepId: 'dispatch-event',
+                },
+            ],
+        },
+        'dispatch-event': {
+            action: 'AXPEntityCreateSubmittedAction',
+            nextSteps: [
+                {
+                    conditions: [{ type: 'SINGLE', expression: 'context.getVariable("options")?.redirect != false' }],
+                    nextStepId: 'show-entity',
+                },
+            ],
+        },
+        'show-entity': {
+            action: 'AXPShowDetailViewAction',
+        },
+    },
+};
+
 class AXPQuickEntityModifyPopupAction extends AXPWorkflowAction {
     constructor() {
         super(...arguments);