@acorex/platform 20.0.0 → 20.0.2

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

@@ -5,10 +5,10 @@ import * as i2 from '@acorex/cdk/common';
 import { AXDataSource, AXCommonModule } from '@acorex/cdk/common';
 import { AXFormatService } from '@acorex/core/format';
 import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingService, AXPRefreshEvent, AXPLockService, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
-import * as i2$2 from '@acorex/platform/workflow';
-import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i1$4 from '@acorex/platform/core';
 import { AXPExpressionEvaluatorService, AXPPlatformScope, extractValue, setSmart } from '@acorex/platform/core';
+import * as i2$2 from '@acorex/platform/workflow';
+import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i7 from '@acorex/platform/layout/builder';
 import { AXPPageStatus, AXPWidgetRegistryService, AXPValueWidgetComponent, AXPLayoutBuilderModule, AXPColumnWidgetComponent, AXPWidgetsCatalog, AXPWidgetGroupEnum, AXP_WIDGETS_EDITOR_CATEGORY } from '@acorex/platform/layout/builder';
 import { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
@@ -244,6 +244,7 @@ class AXPEntityDetailListViewModel {
         });
         this.evaluateExpressions = async (actionData) => {
             const parentData = this.parent.data;
+            console.log({ actionData, parentData });
             const scope = {
                 context: {
                     eval: (path) => {
@@ -284,18 +285,19 @@ class AXPEntityDetailListViewModel {
         // }
         this.applyFilterAndSort();
     }
-    applyFilterAndSort() {
+    async applyFilterAndSort() {
         this.dataSource.clearFilter();
         //
         //this.dataSource.sort(...this.detailEntity.().map(s => ({ dir: s.dir, field: s.name } as AXDataSourceSortOption)));
         //
-        const parentFilters = this.detailEntityConfig.conditions?.map((c) => {
+        const parentFilters = (await Promise.all(this.detailEntityConfig.conditions?.map(async (c) => {
             return {
                 field: c.name,
                 operator: c.operator,
-                value: this.parent.data?.id,
+                // value: this.parent.data?.id,
+                value: await this.evaluateExpressions(c.value),
             };
-        }) ?? [];
+        }) ?? [])) ?? [];
         const parentFilterWrapper = {
             field: null,
             logic: 'and',
@@ -1220,18 +1222,6 @@ class AXPEntityMasterListViewModel {
     resetSorts() {
         this.applyViewSorts();
     }
-    applySorts() {
-        this.applyFilterAndSort();
-    }
-    addSort() {
-        const prop = this.sortableFields().find((c) => !this.sortedFields().some((s) => s.name == c.name));
-        if (prop) {
-            this.sortedFields.set([...this.sortedFields(), ...[prop]]);
-        }
-    }
-    removeSort(name) {
-        this.sortedFields.set(this.sortedFields().filter((c) => c.name != name));
-    }
     applyViewSorts() {
         const viewSorts = this.view().sorts;
         this.sortedFields.update((prev) => {
@@ -1249,8 +1239,7 @@ class AXPEntityMasterListViewModel {
     async executeCommand(commandName, data = null) {
         const action = this.allActions().find((c) => {
             return (c.name == commandName &&
-                ((this.selectedItems().length
-                    && !data // added by Arash
+                ((this.selectedItems().length && !data // added by Arash
                     ? c.scope == AXPEntityCommandScope.Selected
                     : c.scope == AXPEntityCommandScope.Individual) ||
                     c.scope == AXPEntityCommandScope.TypeLevel));
@@ -1317,6 +1306,21 @@ const AXPEntityListViewModelResolver = (route, state, service = inject(AXPEntity
     return service.create(moduleName, entityName);
 };
 
+class AXPEntityService {
+    constructor() {
+        this.sessionService = inject(AXPSessionService);
+    }
+    createPath(module, entity, path = 'list') {
+        return `/${this.sessionService.application?.name}/m/${module}/e/${entity}/${path}`;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXPEntityService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXPEntityService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXPEntityService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }] });
+
 const AXPEntityDeletedEvent = createWorkFlowEvent('[Entity] Deleted');
 class AXPEntityPerformDeleteAction extends AXPWorkflowAction {
     constructor() {
@@ -1796,6 +1800,7 @@ class AXPEntityMasterSingleViewModel {
         this.workflow = this.injector.get(AXPWorkflowService);
         this.destroyed = new Subject();
         this.translateService = this.injector.get(AXTranslationService);
+        this.entityService = this.injector.get(AXPEntityService);
         this.context = signal(cloneDeep(this.entityData));
         this.actions = computed(() => {
             return (this.entityDef.interfaces?.master?.single?.actions?.map((tr) => new AXPEntityCommandTriggerViewModel(this.entityDef, tr)) ?? []);
@@ -1870,6 +1875,13 @@ class AXPEntityMasterSingleViewModel {
             }
         });
     }
+    navigateToUp() {
+        this.workflow.execute('navigate', {
+            options: {
+                path: this.entityService.createPath(this.entityDef.module, this.entityDef.name),
+            },
+        });
+    }
     async executeCommand(commandName, data = null) {
         //TODO: syntact for workflow
         switch (commandName) {
@@ -3823,7 +3835,6 @@ class AXPEntityModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXPEntityModule, deps: [{ token: i1$4.AXPAppStartUpService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.NgModule }); }
     static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.0.4", ngImport: i0, type: AXPEntityModule, imports: [RouterModule, i2$2.AXPWorkflowModule, i7.AXPLayoutBuilderModule] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXPEntityModule, providers: [
-            // CUSTOMER_MODIFIER_PROVIDER,
             {
                 provide: ROUTES,
                 multi: true,
@@ -3910,7 +3921,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.4", ngImpor
                     exports: [],
                     declarations: [],
                     providers: [
-                        // CUSTOMER_MODIFIER_PROVIDER,
                         {
                             provide: ROUTES,
                             multi: true,
@@ -3930,21 +3940,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.4", ngImpor
                 }]
         }], ctorParameters: () => [{ type: i1$4.AXPAppStartUpService }, { type: i0.Injector }] });
 
-class AXPEntityService {
-    constructor() {
-        this.sessionService = inject(AXPSessionService);
-    }
-    createPath(module, entity, path = 'list') {
-        return `/${this.sessionService.application?.name}/m/${module}/e/${entity}/${path}`;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXPEntityService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXPEntityService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.4", ngImport: i0, type: AXPEntityService, decorators: [{
-            type: Injectable,
-            args: [{ providedIn: 'root' }]
-        }] });
-
 /**
  * Generated bundle index. Do not edit.
  */