@acorex/platform 19.1.1 → 19.1.2

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

@@ -6,16 +6,16 @@ import * as i1$3 from '@acorex/platform/workflow';
 import { AXPWorkflowService, createWorkFlowEvent, AXPWorkflowAction, ofType, 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 { cloneDeep, set, merge, isNil, get, sortBy } from 'lodash-es';
 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 { Subject, takeUntil } from 'rxjs';
-import { AXDialogService } from '@acorex/components/dialog';
-import { AXLoadingDialogService } from '@acorex/components/loading-dialog';
-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 * 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 { RouterModule, ROUTES } from '@angular/router';
@@ -77,7 +77,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImpor
 
 class AXPEntityCommandTriggerViewModel {
     constructor(entity, action) {
-        this.name = action.command;
+        this.name = typeof action.command === 'string' ? action.command : action.command.name;
+        this.options = typeof action.command === 'object' ? action.command.options : undefined;
         const resolvedLook = resolveActionLook(action);
         this.priority = action.priority;
         this.title = action.title;
@@ -354,28 +355,25 @@ class AXPEntityCreateViewSectionViewModel {
     constructor(entity, section) {
         this.entity = entity;
         this.section = section;
-        this.group = this.entity.groups?.find(c => c.id == this.section.id);
+        this.group = this.entity.groups?.find((c) => c.id == this.section.id);
         this.name = signal(this.group.id);
         this.title = computed(() => {
             return this.group.title ?? this.group.id;
         });
         this.description = computed(() => {
             return this.group.description;
-            ;
         });
         this.layout = computed(() => {
             const source = cloneDeep(this.section.layout ?? {});
-            set(source, "positions.default.colSpan", 12);
+            set(source, 'positions.default.colSpan', 12);
             return source;
         });
         this.elements = computed(() => {
             const { interfaces, properties } = this.entity;
             const createProps = interfaces?.master?.create?.properties ?? [];
             const createPropNames = new Set(createProps.map(({ name }) => name));
-            const filteredProperties = properties.filter(({ groupId, schema, name }) => groupId === this.group.id &&
-                !schema.hidden &&
-                createPropNames.has(name));
-            return filteredProperties.map(property => {
+            const filteredProperties = properties.filter(({ groupId, schema, name }) => groupId === this.group.id && !schema.hidden && createPropNames.has(name));
+            return filteredProperties.map((property) => {
                 const createProp = createProps.find(({ name }) => name === property.name);
                 return new AXPEntityCreateViewElementViewModel(this.entity, this, property, createProp);
             });
@@ -395,11 +393,11 @@ class AXPEntityCreateViewElementViewModel {
             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 source = cloneDeep(this.createProp.layout ?? {});
-            set(source, "positions.default.colSpan", 12);
+            set(source, 'positions.default.colSpan', 12);
             return source;
         });
         this.node = computed(() => {
@@ -414,7 +412,7 @@ class AXPEntityCreateViewElementViewModel {
                 triggers: widget.triggers,
                 options: merge(schema.interface?.options, 
                 //this.property.options?.create?.widget,
-                { validationRules: this.property.validations })
+                { validationRules: this.property.validations }),
             };
         });
     }
@@ -435,13 +433,13 @@ class AXPEntityMasterCreateViewModel {
             const createProps = interfaces?.master?.create?.properties?.map(({ name }) => name) ?? [];
             const visibleProperties = properties.filter(({ groupId, schema, name }) => groupId && !schema.hidden && createProps.includes(name));
             const sections = interfaces?.master?.create?.sections?.filter(({ id }) => visibleProperties.some(({ groupId }) => groupId === id)) ?? [];
-            return sections.map(section => new AXPEntityCreateViewSectionViewModel(this.entityDef, section));
+            return sections.map((section) => new AXPEntityCreateViewSectionViewModel(this.entityDef, section));
         });
         if (!initialData)
             initialData = {};
         this.config.properties
-            .filter(c => c.schema.defaultValue != null)
-            .forEach(p => {
+            .filter((c) => c.schema.defaultValue != null)
+            .forEach((p) => {
             if (typeof p.schema.defaultValue === 'function') {
                 const func = p.schema.defaultValue;
                 set(initialData, p.name, func(initialData));
@@ -459,7 +457,7 @@ class AXPEntityMasterCreateViewModel {
         try {
             this.isInProgress.set(true);
             const exec = this.entityDef.commands?.create?.execute;
-            return await exec((this.context()));
+            return await exec(this.context());
         }
         finally {
             this.isInProgress.set(false);
@@ -467,7 +465,11 @@ class AXPEntityMasterCreateViewModel {
     }
     async createNewOne() {
         await this.workflow.execute('create-entity', {
-            entity: getEntityInfo(this.entityDef).source
+            entity: getEntityInfo(this.entityDef).source,
+            options: {
+                redirect: false,
+                canCreateNewOne: this.canCreateNewOne,
+            },
         });
     }
 }
@@ -478,6 +480,7 @@ class AXPEntityCreateViewModelFactory {
         this.injector = inject(Injector);
     }
     async create(moduleName, entityName, initialData = null, options = { canCreateNewOne: false, redirect: true }) {
+        console.log(options);
         this.layout.setNavigationLoading(true);
         const config = await this.entityService.resolve(moduleName, entityName);
         this.layout.setNavigationLoading(false);
@@ -491,6 +494,97 @@ 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 });
+        }
+    }
+    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') }));
+    }
+    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',
+        },
+    },
+};
+
 const AXPEntityDeletedEvent = createWorkFlowEvent('[Entity] Deleted');
 class AXPEntityPerformDeleteAction extends AXPWorkflowAction {
     constructor() {
@@ -659,9 +753,6 @@ class AXPEntityMasterListViewModel {
         //****************** Views ******************//
         this.views = computed(() => {
             const views = this.entityDef.interfaces?.master?.list?.views ?? [];
-            console.log(views.map((v) => {
-                return new AXPEntityMasterListViewQueryViewModel(this.entityDef, this, v);
-            }));
             return views.map((v) => {
                 return new AXPEntityMasterListViewQueryViewModel(this.entityDef, this, v);
             });
@@ -796,7 +887,7 @@ class AXPEntityMasterListViewModel {
         };
         this.sortedFields = signal([]);
         this.workflow.events$
-            .pipe(ofType(AXPEntityDeletedEvent))
+            .pipe(ofType(AXPEntityDeletedEvent, AXPEntityCreateEvent))
             .pipe(takeUntil(this.destroyed))
             .subscribe((event) => {
             if (event.payload.entity == getEntityInfo(this.entityDef).source) {
@@ -924,9 +1015,18 @@ class AXPEntityMasterListViewModel {
                 ? 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,
         });
     }
     //
@@ -2276,96 +2376,6 @@ 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 canCreateNewOne = context.getVariable('canCreateNewOne') ?? false;
-        const redirect = context.getVariable('redirect') ?? true;
-        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') }));
-    }
-    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("redirect") != false' }],
-                    nextStepId: 'show-entity',
-                },
-            ],
-        },
-        'show-entity': {
-            action: 'AXPShowDetailViewAction',
-        },
-    },
-};
-
 class AXPShowDetailViewAction extends AXPWorkflowAction {
     constructor() {
         super(...arguments);