@acorex/platform 18.2.2 → 18.2.3

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

@@ -5,13 +5,14 @@ import { InjectionToken, inject, Injectable, computed, signal, Injector, effect,
 import * as i1$3 from '@acorex/platform/workflow';
 import { createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowService, ofType, AXPWorkflowModule } from '@acorex/platform/workflow';
 import { AXPSessionService, AXPAuthGuard } from '@acorex/platform/auth';
-import { resolveActionLook, AXPLayoutService, AXPEntityCommandScope, getEntityInfo, AXPWorkflowNavigateAction } from '@acorex/platform/common';
+import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPWorkflowNavigateAction } from '@acorex/platform/common';
 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 { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
 import * as i2$1 from '@acorex/components/common';
 import { AXDataSource, AXCommonModule } from '@acorex/components/common';
 import { Subject, takeUntil } from 'rxjs';
@@ -369,7 +370,7 @@ class AXPEntityMasterUpdateViewModel {
 class AXPEntityMasterUpdateViewModelFactory {
     constructor() {
         this.entityService = inject(AXPEntityDefinitionRegistryService);
-        this.layout = inject(AXPLayoutService);
+        this.layout = inject(AXPLayoutThemeService);
         this.injector = inject(Injector);
     }
     async create(moduleName, entityName, id, props) {
@@ -484,6 +485,7 @@ class AXPEntityDetailListViewModel {
         this.detailEntity = signal(null);
         this.formatService = this.injector.get(AXFormatService);
         this.workflow = this.injector.get(AXPWorkflowService);
+        this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
         this.dataSource = new AXDataSource({
             byKey: (key) => {
                 const func = this.detailEntity()?.queries.byKey.execute;
@@ -604,19 +606,20 @@ class AXPEntityDetailListViewModel {
         const inline = this.inlineFilters.filters?.length ?? 0;
         const parent = parentFilterWrapper.filters?.length ?? 0;
         //
+        debugger;
         if (inline) {
-            this.dataSource.filter(this.inlineFilters);
+            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter(this.inlineFilters));
         }
         else if (!inline && parent) {
-            this.dataSource.filter(parentFilterWrapper);
+            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter(parentFilterWrapper));
         }
         else if (inline && parent) {
-            this.dataSource.filter({
+            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter({
                 field: null,
                 logic: 'and',
                 operator: null,
                 filters: [this.inlineFilters, parentFilterWrapper],
-            });
+            }));
         }
         //
         this.dataSource.refresh();
@@ -831,7 +834,7 @@ class AXPEntityMasterSingleViewModel {
 class AXPEntityDetailViewModelFactory {
     constructor() {
         this.entityService = inject(AXPEntityDefinitionRegistryService);
-        this.layout = inject(AXPLayoutService);
+        this.layout = inject(AXPLayoutThemeService);
         this.injector = inject(Injector);
     }
     async create(moduleName, entityName, id) {
@@ -980,7 +983,7 @@ class AXPEntityMasterCreateViewModel {
 class AXPEntityCreateViewModelFactory {
     constructor() {
         this.entityService = inject(AXPEntityDefinitionRegistryService);
-        this.layout = inject(AXPLayoutService);
+        this.layout = inject(AXPLayoutThemeService);
         this.injector = inject(Injector);
     }
     async create(moduleName, entityName, initialData = null) {
@@ -1018,6 +1021,7 @@ class AXPEntityMasterListViewModel {
         this.formatService = this.injector.get(AXFormatService);
         this.session = this.injector.get(AXPSessionService);
         this.workflow = this.injector.get(AXPWorkflowService);
+        this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
         this.destroyed = new Subject();
         this.events$ = new Subject();
         this.dataSource = new AXDataSource({
@@ -1194,18 +1198,18 @@ class AXPEntityMasterListViewModel {
         const inline = this.inlineFilters.filters?.length ?? 0;
         const advance = this.advanceFilters.filters?.length ?? 0;
         if (inline && !advance) {
-            this.dataSource.filter(this.inlineFilters);
+            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter(this.inlineFilters));
         }
         else if (!inline && advance) {
-            this.dataSource.filter(this.advanceFilters);
+            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter(this.advanceFilters));
         }
         else if (inline && advance) {
-            this.dataSource.filter({
+            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter({
                 field: null,
                 logic: 'and',
                 operator: null,
                 filters: [this.inlineFilters, this.advanceFilters],
-            });
+            }));
         }
         //
         this.dataSource.refresh();
@@ -1285,7 +1289,7 @@ class AXPEntityMasterListViewModel {
 class AXPEntityListViewModelFactory {
     constructor() {
         this.entityService = inject(AXPEntityDefinitionRegistryService);
-        this.layout = inject(AXPLayoutService);
+        this.layout = inject(AXPLayoutThemeService);
         this.injector = inject(Injector);
     }
     async create(moduleName, entityName) {
@@ -2385,6 +2389,17 @@ function routesFacory() {
                         //   resolve: { loader: AXPEntityDetailViewLoaderResolver },
                         //   component: AXPEntityDetailsViewComponent,
                         // },
+                        // {
+                        //   path: 'settings',
+                        //   component: AXPSettingsMenuComponent,
+                        //   data: { reuse: true },
+                        //   children: [
+                        //     {
+                        //       path: ':group',
+                        //       component: AXPSettingsPreviewComponent,
+                        //     },
+                        //   ],
+                        // },
                         {
                             path: 'e/:entity/list',
                             loadComponent: () => {