@acorex/platform 20.3.0-next.23 → 20.3.0-next.24

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

@@ -18,6 +18,7 @@ import { CommonModule } from '@angular/common';
 import { castArray, get, cloneDeep, set, merge, isEqual, isNil, isEmpty, sortBy } from 'lodash-es';
 import { AXDataSource } from '@acorex/cdk/common';
 import { AXFormatService } from '@acorex/core/format';
+import * as i4$1 from '@acorex/platform/common';
 import { AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingService, AXPRefreshEvent, AXPReloadEvent, AXPCommonSettings, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
 import * as i1$2 from '@acorex/platform/core';
 import { resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPBroadcastEventService, AXPPlatformScope, getChangedPaths, extractValue, setSmart, AXPSystemActionType } from '@acorex/platform/core';
@@ -32,7 +33,7 @@ import { AXPopupService } from '@acorex/components/popup';
 import { AXPlatform } from '@acorex/core/platform';
 import * as i3$2 from '@acorex/components/decorators';
 import { AXDecoratorModule } from '@acorex/components/decorators';
-import * as i4$1 from '@acorex/components/dropdown';
+import * as i4$2 from '@acorex/components/dropdown';
 import { AXDropdownModule } from '@acorex/components/dropdown';
 import { AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DISABLED_PROPERTY, AXP_ALLOW_CLEAR_PROPERTY, AXP_DATA_PROPERTY_GROUP, AXP_ALLOW_MULTIPLE_PROPERTY, AXPFileUploaderWidgetService } from '@acorex/platform/layout/widgets';
 import * as i1$1 from '@angular/forms';
@@ -3309,7 +3310,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
             return await context.expressionEvaluator.evaluate(actionData, scope);
         };
         const evaluatedActions = await evaluateExpressions(relatedEntity?.actions);
-        const filters = relatedEntity.conditions?.map(async (c) => {
+        const filters = await Promise.all(relatedEntity.conditions?.map(async (c) => {
             const value = await evaluateExpressions(c.value);
             return {
                 field: c.name,
@@ -3317,7 +3318,8 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                 value: value,
                 hidden: true,
             };
-        }) ?? [];
+        }) ?? []);
+        const transformedFilters = await context.filterOperatorMiddleware?.transformFilters(filters);
         return {
             id: entityDef?.name ?? '',
             title: `${context.rootTitle}`,
@@ -3397,7 +3399,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                     name: 'page-list',
                     defaultValue: {
                         toolbar: {
-                            filters: await Promise.all(filters),
+                            filters: await Promise.all(transformedFilters),
                         },
                     },
                     options: {
@@ -3480,7 +3482,7 @@ class AXPTabListConverter extends AXPBaseRelatedEntityConverter {
             return await context.expressionEvaluator.evaluate(actionData, scope);
         };
         // console.log({ relatedEntity });
-        const filters = relatedEntity.conditions?.map(async (c) => {
+        const filters = await Promise.all(relatedEntity.conditions?.map(async (c) => {
             const value = await evaluateExpressions(c.value);
             return {
                 field: c.name,
@@ -3488,8 +3490,9 @@ class AXPTabListConverter extends AXPBaseRelatedEntityConverter {
                 value: value,
                 hidden: true,
             };
-        }) ?? [];
+        }) ?? []);
         const actions = await evaluateExpressions(relatedEntity.actions);
+        const transformedFilters = await Promise.all(context.filterOperatorMiddleware?.transformFilters(filters));
         return {
             id: entityDef?.name ?? '',
             title: relatedEntity.title ?? entityDef?.title ?? '',
@@ -3500,7 +3503,7 @@ class AXPTabListConverter extends AXPBaseRelatedEntityConverter {
                     name: `${relatedEntity.entity}-tab-list`,
                     defaultValue: {
                         toolbar: {
-                            filters: await Promise.all(filters),
+                            filters: transformedFilters,
                         },
                     },
                     options: {
@@ -3558,6 +3561,7 @@ class AXPMainEntityContentBuilder {
         this.relatedEntityConverterFactory = relatedEntityConverterFactory;
         this.workflowService = inject(AXPWorkflowService);
         this.commandService = inject(AXPCommandService);
+        this.filterOperatorMiddleware = inject(AXPFilterOperatorMiddlewareService);
     }
     async build(entity, rootContext, dependencies, rootTitle) {
         const groups = entity?.groups ?? [];
@@ -4142,6 +4146,7 @@ class AXPMainEntityContentBuilder {
                 entityResolver: dependencies.entityResolver,
                 expressionEvaluator: dependencies.expressionEvaluator,
                 context: rootContext,
+                filterOperatorMiddleware: this.filterOperatorMiddleware,
             }));
         }
         return tabs;
@@ -4157,10 +4162,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImpor
         }], ctorParameters: () => [{ type: AXPRelatedEntityConverterFactory }] });
 
 class AXPLayoutAdapterFactory {
-    constructor(relatedEntityConverterFactory, mainEntityContentBuilder, layoutAdapterBuilder) {
+    constructor(relatedEntityConverterFactory, mainEntityContentBuilder, layoutAdapterBuilder, filterOperatorMiddleware) {
         this.relatedEntityConverterFactory = relatedEntityConverterFactory;
         this.mainEntityContentBuilder = mainEntityContentBuilder;
         this.layoutAdapterBuilder = layoutAdapterBuilder;
+        this.filterOperatorMiddleware = filterOperatorMiddleware;
     }
     async createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies) {
         const entity = await entityResolver.resolve(moduleName, entityName);
@@ -4209,6 +4215,7 @@ class AXPLayoutAdapterFactory {
                 ...dependencies,
                 context: rootContext,
                 rootTitle: rootTitle,
+                filterOperatorMiddleware: this.filterOperatorMiddleware,
             }));
         }
         // Include nested page-related entities from merge-detail related entities
@@ -4288,7 +4295,7 @@ class AXPLayoutAdapterFactory {
         const title = await dependencies.expressionEvaluator.evaluate(entity.interfaces?.master?.single?.title, rootContext);
         return title;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: AXPLayoutAdapterFactory, deps: [{ token: AXPRelatedEntityConverterFactory }, { token: AXPMainEntityContentBuilder }, { token: AXPLayoutAdapterBuilder }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: AXPLayoutAdapterFactory, deps: [{ token: AXPRelatedEntityConverterFactory }, { token: AXPMainEntityContentBuilder }, { token: AXPLayoutAdapterBuilder }, { token: i4$1.AXPFilterOperatorMiddlewareService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: AXPLayoutAdapterFactory, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: AXPLayoutAdapterFactory, decorators: [{
@@ -4296,7 +4303,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImpor
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [{ type: AXPRelatedEntityConverterFactory }, { type: AXPMainEntityContentBuilder }, { type: AXPLayoutAdapterBuilder }] });
+        }], ctorParameters: () => [{ type: AXPRelatedEntityConverterFactory }, { type: AXPMainEntityContentBuilder }, { type: AXPLayoutAdapterBuilder }, { type: i4$1.AXPFilterOperatorMiddlewareService }] });
 
 const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver = inject(AXPEntityDefinitionRegistryService), expressionEvaluator = inject(AXPExpressionEvaluatorService), session = inject(AXPSessionService), formatService = inject(AXFormatService), workflowService = inject(AXPWorkflowService), layoutAdapterFactory = inject(AXPLayoutAdapterFactory)) => {
     const moduleName = route.parent?.paramMap.get('module');
@@ -5156,7 +5163,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         ></ng-container>
       }
     </div>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "directive", type: i3$1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "component", type: i3.AXButtonItemComponent, selector: "ax-button-item", inputs: ["color", "disabled", "text", "selected", "divided", "data", "name"], outputs: ["onClick", "onFocus", "onBlur", "disabledChange"] }, { kind: "component", type: i3.AXButtonItemListComponent, selector: "ax-button-item-list", inputs: ["items"], outputs: ["onItemClick"] }, { kind: "ngmodule", type: AXDropdownModule }, { kind: "component", type: i4$1.AXDropdownPanelComponent, selector: "ax-dropdown-panel", inputs: ["isOpen", "fitParent", "dropdownWidth", "position", "placement", "_target", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "directive", type: i3$1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "component", type: i3.AXButtonItemComponent, selector: "ax-button-item", inputs: ["color", "disabled", "text", "selected", "divided", "data", "name"], outputs: ["onClick", "onFocus", "onBlur", "disabledChange"] }, { kind: "component", type: i3.AXButtonItemListComponent, selector: "ax-button-item-list", inputs: ["items"], outputs: ["onItemClick"] }, { kind: "ngmodule", type: AXDropdownModule }, { kind: "component", type: i4$2.AXDropdownPanelComponent, selector: "ax-dropdown-panel", inputs: ["isOpen", "fitParent", "dropdownWidth", "position", "placement", "_target", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: AXPEntityListWidgetViewComponent, decorators: [{
             type: Component,
@@ -7115,12 +7122,12 @@ class AXPQuickEntityModifyPopupAction extends AXPWorkflowAction {
         if (parentKey) {
             context.setVariable('parentKey', parentKey);
         }
+        console.log(`${this.translateService.translateSync('entity.modify')}`);
         const com = await this.config.viewers.master.modify();
         const popup = await this.popupService.open(com, {
             title: headerTitle
                 ? headerTitle
-                : (title ??
-                    `${this.translateService.translateSync('entity.modify')} ${this.translateService.translateSync(entityRef.formats.individual)}`),
+                : `${this.translateService.translateSync('@general:actions.modify.title')} ${this.translateService.translateSync(entityRef.formats.individual)}`,
             size: this.platform.is('Mobile') || this.platform.is('SM') ? 'full' : size ? size : 'md',
             data: {
                 vm,