@acorex/platform 19.1.3 → 19.1.4

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

@@ -1,7 +1,7 @@
 import * as i2$1 from '@acorex/components/common';
 import { AXDataSource, AXCommonModule } from '@acorex/components/common';
 import { AXFormatService } from '@acorex/core/format';
-import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingValueProviderService, AXPWorkflowNavigateAction } from '@acorex/platform/common';
+import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingScope, AXPSettingValueProviderService, AXPWorkflowNavigateAction } from '@acorex/platform/common';
 import * as i1$3 from '@acorex/platform/workflow';
 import { AXPWorkflowService, createWorkFlowEvent, AXPWorkflowAction, ofType, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i0 from '@angular/core';
@@ -9,6 +9,8 @@ import { InjectionToken, inject, Injectable, computed, signal, Injector, effect,
 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 * 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 { AXPopupService } from '@acorex/components/popup';
 import { AXPlatform } from '@acorex/core/platform';
@@ -16,8 +18,6 @@ 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';
 import * as i1 from '@acorex/components/loading';
 import { AXLoadingModule } from '@acorex/components/loading';
@@ -35,7 +35,6 @@ import { AXSelectBoxModule } from '@acorex/components/select-box';
 import * as i2$2 from '@acorex/components/text-box';
 import { AXTextBoxComponent, AXTextBoxModule } from '@acorex/components/text-box';
 import { AXValidationModule } from '@acorex/core/validation';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import * as i1$2 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
 import * as i5 from '@acorex/components/data-table';
@@ -667,7 +666,7 @@ class AXPEntityPerformDeleteAction extends AXPWorkflowAction {
             }
             else {
                 // No items to delete (no successful or failed promises)
-                await this.dialogService.alert(await this.translationService.translateAsync('workflow.no-need'), await this.translationService.translateAsync('workflow.no-item'), 'info');
+                await this.dialogService.alert(await this.translationService.translateAsync('workflow.no-need'), await this.translationService.translateAsync('workflow.no-item'), 'primary');
             }
         }
         else {
@@ -910,9 +909,10 @@ class AXPEntityMasterListViewModel {
         // this.settings.set()
         if (viewName != this.view().name) {
             this.view.set(this.views().find((c) => c.name == (viewName || savedViewName)) ?? this.views()[0]);
-            this.settings.set(this.settingSelectedViewKey, this.view().name);
+            this.settings.scope(AXPSettingScope.User).set(this.settingSelectedViewKey, this.view().name);
             this.applyViewSorts();
             this.applyViewColumns();
+            this.applyViewFilters();
             this.applyFilterAndSort();
             this.applySettings();
         }
@@ -926,6 +926,7 @@ class AXPEntityMasterListViewModel {
         this.session = this.injector.get(AXPSessionService);
         this.workflow = this.injector.get(AXPWorkflowService);
         this.settings = this.injector.get(AXPSettingValueProviderService);
+        this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
         this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
         this.settingListViewKey = '';
         this.settingSelectedViewKey = '';
@@ -1015,15 +1016,20 @@ class AXPEntityMasterListViewModel {
         this.primaryRowActions = computed(() => this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'primary'));
         this.secondaryRowActions = computed(() => this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'secondary'));
         //****************** Filter ******************//
-        this.inlineFilters = {
+        this.simpleFilters = signal({
             field: null,
-            logic: 'or',
+            logic: 'and',
             operator: null,
-            filters: [],
-        };
-        this.advanceFilters = {
+            filters: this.view().conditions.map((f) => ({
+                field: f.name,
+                operator: f.operator,
+                value: f.value,
+            })),
+        });
+        this.lastFiltersApplied = signal(this.simpleFilters());
+        this.inlineFilters = {
             field: null,
-            logic: 'and',
+            logic: 'or',
             operator: null,
             filters: [],
         };
@@ -1071,7 +1077,6 @@ class AXPEntityMasterListViewModel {
             .pipe(ofType(AXPEntityDeletedEvent, AXPEntityCreateEvent, AXPEntityModifyEvent))
             .pipe(takeUntil(this.destroyed))
             .subscribe((event) => {
-            console.log('omed');
             if (event.payload.entity == getEntityInfo(this.entityDef).source) {
                 this.selectedItems.set([]);
                 this.events$.next({ action: 'refresh' });
@@ -1096,20 +1101,36 @@ class AXPEntityMasterListViewModel {
     get filtersDef() {
         const props = this.entityDef.properties.filter((c) => c.options?.filter?.advance?.enabled);
         return props.map((e) => {
+            const widgetConfig = this.widgetResolver.resolve(e.schema.interface?.type);
+            const type = (e.options?.filter?.advance?.widgetType ||
+                widgetConfig?.defaultFilterWidgetName ||
+                e.schema.interface?.type);
             return {
                 title: e.title,
                 field: e.name,
                 operator: {
                     type: 'equal',
                 },
-                widget: {
-                    type: e.schema.interface?.type,
-                },
+                widget: { ...e.schema.interface, path: e.name, type },
                 filters: [],
                 isParametric: false,
             };
         });
     }
+    applyViewFilters() {
+        const viewFilters = this.view().conditions.map((f) => ({
+            field: f.name,
+            operator: f.operator,
+            value: f.value,
+        }));
+        this.simpleFilters.update((prev) => ({ ...prev, filters: viewFilters }));
+    }
+    resetFilters() {
+        this.applyViewFilters();
+    }
+    discardFilters() {
+        this.simpleFilters.set(this.lastFiltersApplied());
+    }
     applyInlineFilter(value) {
         const props = this.entityDef.properties.filter((c) => c.options?.filter?.inline?.enabled);
         this.inlineFilters.filters = [];
@@ -1128,32 +1149,18 @@ class AXPEntityMasterListViewModel {
     }
     applyFilterAndSort() {
         this.dataSource.clearFilter();
-        //
         this.dataSource.sort(...this.sortedFields().map((s) => ({ dir: s.dir, field: s.name })));
-        //
-        this.advanceFilters.filters = this.view().conditions.map((f) => ({
-            field: f.name,
-            operator: f.operator,
-            value: f.value,
+        const allFilters = [
+            this.inlineFilters.filters?.length && this.inlineFilters,
+            this.simpleFilters().filters?.length && this.simpleFilters(),
+        ].filter(Boolean);
+        this.lastFiltersApplied.set(this.simpleFilters());
+        this.dataSource.filter(this.filterOperatorMiddleware.transformFilter({
+            field: null,
+            logic: 'and',
+            operator: null,
+            filters: allFilters,
         }));
-        //
-        const inline = this.inlineFilters.filters?.length ?? 0;
-        const advance = this.advanceFilters.filters?.length ?? 0;
-        if (inline && !advance) {
-            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter(this.inlineFilters));
-        }
-        else if (!inline && advance) {
-            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter(this.advanceFilters));
-        }
-        else if (inline && advance) {
-            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter({
-                field: null,
-                logic: 'and',
-                operator: null,
-                filters: [this.inlineFilters, this.advanceFilters],
-            }));
-        }
-        //
         this.dataSource.refresh();
     }
     resetColumns() {
@@ -1162,7 +1169,7 @@ class AXPEntityMasterListViewModel {
     async onColumnsChanged(columns) {
         const listViewSetting = await this.settings.get(this.settingListViewKey);
         if (this.settingListViewKey) {
-            this.settings.set(this.settingListViewKey, {
+            this.settings.scope(AXPSettingScope.User).set(this.settingListViewKey, {
                 ...listViewSetting,
                 columns: columns.map((c) => ({ name: c.name, visible: c.visible })),
             });
@@ -1214,7 +1221,6 @@ 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: {
@@ -1885,7 +1891,6 @@ class AXPLookupWidgetEditComponent extends AXPWidgetComponent {
         this.entityResolver = inject(AXPEntityResolver);
         this.formatService = inject(AXFormatService);
         this.popupService = inject(AXPopupService);
-        this.builderService = inject(AXPLayoutBuilderService);
         this.destroyRef = inject(DestroyRef);
         this.translateService = inject(AXTranslationService);
         this.expose = computed(() => this.options()['expose']);
@@ -1925,13 +1930,13 @@ class AXPLookupWidgetEditComponent extends AXPWidgetComponent {
     ngOnInit() {
         super.ngOnInit();
         //
-        this.builderService.onChanged.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async (c) => {
-            if (c.path == this.path) {
-                if (this.getValue()) {
-                    await this.findByValue();
-                }
-            }
-        });
+        // this.builderService.onContextChanged.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async (c) => {
+        //   if (c.path == this.path) {
+        //     if (this.getValue()) {
+        //       await this.findByValue();
+        //     }
+        //   }
+        // });
     }
     async findByValue() {
         this.isLoading.set(true);
@@ -2007,18 +2012,18 @@ class AXPLookupWidgetEditComponent extends AXPWidgetComponent {
         // extract data from valueField and set context by expose path
         if (this.expose()) {
             if (typeof this.expose() == 'string') {
-                this.builderService.setValue(this.expose(), item);
+                this.contextService.update(this.expose(), item);
             }
             // support multiple expose items
             else if (Array.isArray(this.expose())) {
                 this.expose().forEach((i) => {
                     if (typeof i == 'string') {
-                        this.builderService.setValue(i, item);
+                        this.contextService.update(i, item);
                     }
                     else {
                         // extract data from item by source path and set context by target path
                         const key = get(item, i.source);
-                        this.builderService.setValue(i.target, key);
+                        this.contextService.update(i.target, key);
                     }
                 });
             }
@@ -2026,7 +2031,7 @@ class AXPLookupWidgetEditComponent extends AXPWidgetComponent {
             else if (typeof this.expose() == 'object') {
                 const i = this.expose();
                 const key = get(item, i.source);
-                this.builderService.setValue(i.target, key);
+                this.contextService.update(i.target, key);
             }
         }
     }