@acorex/platform 19.1.8 → 19.1.9

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

@@ -2,7 +2,7 @@ import * as i2$1 from '@acorex/components/common';
 import { AXDataSource, AXCommonModule } from '@acorex/components/common';
 import { AXFormatService } from '@acorex/core/format';
 import * as i1$3 from '@acorex/platform/common';
-import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingScope, AXPSettingValueProviderService, AXPRefreshEvent, AXPWorkflowNavigateAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPToastAction } from '@acorex/platform/common';
+import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingScope, AXPSettingService, AXPRefreshEvent, AXPWorkflowNavigateAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPToastAction } from '@acorex/platform/common';
 import * as i2$3 from '@acorex/platform/workflow';
 import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i0 from '@angular/core';
@@ -13,10 +13,10 @@ 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 { 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 { AXDialogService } from '@acorex/components/dialog';
+import { AXLoadingDialogService } from '@acorex/components/loading-dialog';
 import { AXPopupService } from '@acorex/components/popup';
 import { AXPlatform } from '@acorex/core/platform';
 import { RouterModule, ROUTES } from '@angular/router';
@@ -278,9 +278,18 @@ class AXPEntityDetailListViewModel {
                 data[relatedColumn] = this.parent.data['id'];
             }
         }
+        console.log({ action, detailEntity: this.detailEntity });
         await this.workflow.execute(commandName, {
             entity: getEntityInfo(this.detailEntity()).source,
             data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
+            entityInfo: {
+                name: this.detailEntity()?.name,
+                module: this.detailEntity()?.module,
+                title: this.detailEntity()?.title,
+                parentKey: this.detailEntity()?.parentKey,
+                source: this.detailEntity()?.source,
+            },
+            options: action?.options,
         });
     }
 }
@@ -555,7 +564,7 @@ class AXPEntityMasterListViewModel {
         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.settings = this.injector.get(AXPSettingService);
         this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
         this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
         this.settingListViewKey = '';
@@ -1207,7 +1216,7 @@ class AXPEntityMasterSingleViewGroupViewModel {
     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.isLoading = signal(false);
         this.title = computed(() => {
@@ -1218,7 +1227,7 @@ class AXPEntityMasterSingleViewGroupViewModel {
         });
         this.layout = computed(() => {
             const source = cloneDeep(this.section.layout ?? {});
-            set(source, "positions.default.colSpan", 12);
+            set(source, 'positions.default.colSpan', 12);
             return source;
         });
         this.props = computed(() => {
@@ -1228,13 +1237,13 @@ class AXPEntityMasterSingleViewGroupViewModel {
                 .filter(({ groupId, schema }) => groupId === this.group.id && !schema.hidden)
                 .map(({ name }) => name);
             const viewProperties = interfaces?.master?.single?.properties?.filter(({ name }) => groupProperties.includes(name)) ?? [];
-            return viewProperties.map(prop => new AXPEntityMasterSingleElementViewModel(this.entity, this, prop));
+            return viewProperties.map((prop) => new AXPEntityMasterSingleElementViewModel(this.entity, this, prop));
         });
         this.editableProps = computed(() => {
             const { properties, interfaces } = this.entity;
             const editablePropertyNames = interfaces?.master?.update?.properties?.map(({ name }) => name) ?? [];
             const filteredProperties = properties.filter(({ groupId, schema, name }) => groupId === this.group.id && !schema.hidden && editablePropertyNames.includes(name));
-            return filteredProperties.map(prop => new AXPEntityMasterSingleElementViewModel(this.entity, this, prop));
+            return filteredProperties.map((prop) => new AXPEntityMasterSingleElementViewModel(this.entity, this, prop));
         });
         this.editable = computed(() => {
             return this.editableProps().length > 0;
@@ -1246,15 +1255,15 @@ class AXPEntityMasterSingleElementViewModel {
         this.entity = entity;
         this.section = section;
         this.propertyView = propertyView;
-        this.property = this.entity.properties.find(c => c.name == this.propertyView.name);
+        this.property = this.entity.properties.find((c) => c.name == this.propertyView.name);
         this.name = signal(this.property.name);
         this.title = signal(this.property.title);
         this.showLabel = signal(this.propertyView.layout?.label?.visible != false);
         this.description = signal(this.property.description);
         this.layout = computed(() => {
-            const viewProp = this.entity.interfaces?.master?.single?.properties?.find(c => c.name == this.property.name);
+            const viewProp = this.entity.interfaces?.master?.single?.properties?.find((c) => c.name == this.property.name);
             const source = cloneDeep(viewProp?.layout ?? {});
-            set(source, "positions.default.colSpan", 12);
+            set(source, 'positions.default.colSpan', 12);
             return source;
         });
         this.node = computed(() => {
@@ -1266,7 +1275,10 @@ class AXPEntityMasterSingleElementViewModel {
                 path: this.name(),
                 children: widget.children,
                 formula: widget.formula,
-                options: merge(schema.interface?.options)
+                options: merge(schema.interface?.options
+                //this.property.options?.create?.widget,
+                //{ validationRules: this.property.validations },
+                ),
             };
         });
     }
@@ -1285,20 +1297,20 @@ class AXPEntityMasterSingleViewModel {
         this.translateService = this.injector.get(AXTranslationService);
         this.context = signal(cloneDeep(this.entityData));
         this.actions = computed(() => {
-            return this.entityDef.interfaces?.master?.single?.actions?.map((tr) => new AXPEntityCommandTriggerViewModel(this.entityDef, tr)) ?? [];
+            return (this.entityDef.interfaces?.master?.single?.actions?.map((tr) => new AXPEntityCommandTriggerViewModel(this.entityDef, tr)) ?? []);
         });
         this.primaryActions = computed(() => {
-            return this.actions().filter(c => c.priority == 'primary');
+            return this.actions().filter((c) => c.priority == 'primary');
         });
         this.secondaryActions = computed(() => {
-            return this.actions().filter(c => c.priority == 'secondary');
+            return this.actions().filter((c) => c.priority == 'secondary');
         });
         this.sections = computed(() => {
             const { interfaces, properties } = this.entityDef;
             const viewProps = interfaces?.master?.single?.properties?.map(({ name }) => name) ?? [];
             const filteredProperties = properties.filter(({ groupId, schema, name }) => groupId && !schema.hidden && viewProps.includes(name));
             const groups = interfaces?.master?.single?.sections?.filter(({ id }) => filteredProperties.some(({ groupId }) => groupId === id)) ?? [];
-            return groups.map(section => new AXPEntityMasterSingleViewGroupViewModel(this.entityDef, section));
+            return groups.map((section) => new AXPEntityMasterSingleViewGroupViewModel(this.entityDef, section));
         });
         //****************** Title ******************//
         this.title = computed(() => {
@@ -1310,27 +1322,36 @@ class AXPEntityMasterSingleViewModel {
         });
         //****************** Description ******************//
         this.description = computed(() => {
-            return this._viewDef.description ? this.formatService.format(this._viewDef.description, 'string', this.context()) : null;
+            return this._viewDef.description
+                ? this.formatService.format(this._viewDef.description, 'string', this.context())
+                : null;
         });
         //****************** Beardcrumbs ******************//
         this.beardcrumbs = computed(() => {
             return [
                 {
                     title: this.translateService.translateSync('entity.home'),
-                    icon: "fa-solid fa-home ax-text-xs ax-me-2",
-                    url: [`/${this.session.application?.name}`]
+                    icon: 'fa-solid fa-home ax-text-xs ax-me-2',
+                    url: [`/${this.session.application?.name}`],
                 },
                 {
                     title: this.entityDef.formats.plural ?? this.entityDef.formats.individual,
-                    url: [`/${this.session.application?.name}`, 'm', `${this.entityDef.module}`, 'e', `${this.entityDef.name}`, 'list']
+                    url: [
+                        `/${this.session.application?.name}`,
+                        'm',
+                        `${this.entityDef.module}`,
+                        'e',
+                        `${this.entityDef.name}`,
+                        'list',
+                    ],
                 },
                 {
                     title: this.title(),
-                }
+                },
             ];
         });
         this.relatedEntities = computed(() => {
-            return this.entityDef.relatedEntities?.map(re => new AXPEntityDetailListViewModel(this.injector, re, { entity: this.entityDef, data: this.entityData })) ?? [];
+            return (this.entityDef.relatedEntities?.map((re) => new AXPEntityDetailListViewModel(this.injector, re, { entity: this.entityDef, data: this.entityData })) ?? []);
         });
         this.workflow.events$
             .pipe(ofType(AXPEntityDeletedEvent))
@@ -1339,7 +1360,7 @@ class AXPEntityMasterSingleViewModel {
             if (event.payload.entity == getEntityInfo(this.entityDef).source &&
                 event.payload.ids.includes(this.context().id)) {
                 this.workflow.execute('show-list-view', {
-                    entity: getEntityInfo(this.entityDef).source
+                    entity: getEntityInfo(this.entityDef).source,
                 });
             }
         });
@@ -1361,19 +1382,18 @@ class AXPEntityMasterSingleViewModel {
                     entity: getEntityInfo(this.entityDef).source,
                     data: {
                         id: this.context().id,
-                        properties: data.editableProps().map(m => m.name()),
+                        properties: data.editableProps().map((m) => m.name()),
                     },
                 });
                 break;
             }
-            default:
-                {
-                    const action = this.actions().find(c => c.name == commandName);
-                    this.workflow.execute(commandName, {
-                        entity: getEntityInfo(this.entityDef).source,
-                        data: action?.scope == AXPEntityCommandScope.Individual ? this.context() : null
-                    });
-                }
+            default: {
+                const action = this.actions().find((c) => c.name == commandName);
+                this.workflow.execute(commandName, {
+                    entity: getEntityInfo(this.entityDef).source,
+                    data: action?.scope == AXPEntityCommandScope.Individual ? this.context() : null,
+                });
+            }
         }
     }
     //
@@ -1416,35 +1436,57 @@ const AXPEntityDetailViewModelResolver = (route, state, service = inject(AXPEnti
     return service.create(moduleName, entityName, id);
 };
 
+class AXPEntityCommandSearchDefinitionProvider {
+    async provide(context) {
+        context.addDefinition('command', 'Commands', 'fa-solid fa-command', 1, {
+            format: {
+                id: '{{id}}',
+            },
+            actions: [
+                {
+                    name: 'open-entity',
+                    type: 'view',
+                    priority: 'primary',
+                },
+            ],
+        });
+    }
+}
+
 class AXPEntitySearchDefinitionProvider {
     constructor() {
         this.entityRegister = inject(AXPEntityDefinitionRegistryService);
     }
     async provide(context) {
+        const moduleDefinitions = new Map();
         this.entityRegister.getAll().forEach((entity) => {
-            const definitionName = `record.${entity.module}.${entity.name}`;
-            if (!context.hasEntity(definitionName)) {
-                context.addDefinition(definitionName, entity.title, 'fa-solid fa-objects-column', [
-                    {
-                        name: 'open',
-                        command: {
-                            name: 'view',
-                            options: {},
+            if (!moduleDefinitions.has(entity.module)) {
+                moduleDefinitions.set(`Module.${entity.module}`, {
+                    name: `Module.${entity.module}`,
+                    title: entity.formats.searchResult?.description ?? entity.module,
+                    icon: 'fa-solid fa-objects-column',
+                    order: 4,
+                    actions: [
+                        {
+                            name: 'open-entity',
+                            type: 'view',
+                            priority: 'primary',
                         },
-                        type: 'view',
-                        priority: 'primary',
+                    ],
+                    format: {
+                        title: entity.formats.searchResult?.title,
+                        description: (entity.formats.searchResult?.description ?? entity.module) + ' / ' + entity.title,
+                        id: '{{data.id}}',
                     },
-                ]);
+                });
             }
         });
-    }
-}
-
-class AXPEntityCommandSearchDefinitionProvider {
-    async provide(context) {
-        context.addDefinition('command', 'Commands', 'fa-solid fa-command', [
-            { name: 'open', command: { name: 'view', options: {} }, type: 'view', priority: 'primary' },
-        ]);
+        moduleDefinitions.forEach((definition) => {
+            context.addDefinition(definition.name, definition.title, definition.icon, definition.order, {
+                format: definition.format,
+                actions: definition.actions,
+            });
+        });
     }
 }
 
@@ -1865,9 +1907,9 @@ class AXPLookupWidgetEditComponent extends AXPWidgetComponent {
         this.translateService = inject(AXTranslationService);
         this.expose = computed(() => this.options()['expose']);
         this.entity = computed(() => this.options()['entity']);
-        this.validationRules = computed(() => this.options()["validationRules"] ?? []);
+        this.validationRules = computed(() => this.options()['validationRules'] ?? []);
         this.textField = computed(() => {
-            return this.entityDef()?.formats.lookup ?? this.entityDef()?.properties.find((c) => c.name != 'id')?.name ?? 'title';
+            return (this.entityDef()?.formats.lookup ?? this.entityDef()?.properties.find((c) => c.name != 'id')?.name ?? 'title');
         });
         this.entityDef = signal(null);
         this.searchTerm = signal(null);
@@ -2086,7 +2128,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImpor
                         AXLoadingModule,
                         AXValidationModule,
                         AXFormModule,
-                    ]
+                    ],
                 }]
         }], propDecorators: { textbox: [{
                 type: ViewChild,
@@ -2385,6 +2427,7 @@ class AXPEntityCreatePopupAction extends AXPWorkflowAction {
         const [module, entity] = context.getVariable('entity').split('.');
         const data = context.getVariable('data');
         const options = context.getVariable('options');
+        console.log('options', options);
         const process = options?.['process'];
         const decoration = options?.['decoration'];
         const headerTitle = decoration?.header?.title;
@@ -2656,14 +2699,14 @@ function routesFacory() {
 class AXPEntityModule {
     constructor(appInitService, injector) {
         const service = injector.get(AXPEntityDefinitionRegistryService);
-        appInitService.registerTask({
-            name: 'layout-theme',
-            statusText: 'Preload entities ...',
-            run: async () => {
-                // load in background
-                service.preload();
-            },
-        });
+        // appInitService.registerTask({
+        //   name: 'layout-theme',
+        //   statusText: 'Preload entities ...',
+        //   run: async () => {
+        //     // load in background
+        //     service.preload();
+        //   },
+        // });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModule, deps: [{ token: i1$3.AXPAppStartUpService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.NgModule }); }
     static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModule, imports: [RouterModule, i2$3.AXPWorkflowModule, i7.AXPLayoutBuilderModule] }); }
@@ -2706,6 +2749,7 @@ class AXPEntityModule {
                     'open-entity': AXPShowDetailsViewWorkflow,
                     'show-list-view': AXPShowListViewWorkflow,
                 },
+                functions: {},
             }),
             AXPLayoutBuilderModule.forChild({
                 widgets: [AXPLookupWidget, AXPWidgetSelectorWidget],
@@ -2738,6 +2782,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImpor
                                 'open-entity': AXPShowDetailsViewWorkflow,
                                 'show-list-view': AXPShowListViewWorkflow,
                             },
+                            functions: {},
                         }),
                         AXPLayoutBuilderModule.forChild({
                             widgets: [AXPLookupWidget, AXPWidgetSelectorWidget],