@acorex/platform 19.2.10 → 19.2.11

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, AXPExpressionEvaluatorService, AXPEntityCommandScope, getEntityInfo, AXPSettingScope, AXPSettingService, AXPRefreshEvent, AXPWorkflowNavigateAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPToastAction } from '@acorex/platform/common';
+import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPExpressionEvaluatorService, AXPEntityCommandScope, getEntityInfo, AXPSettingService, AXPRefreshEvent, AXPSettingScope, 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';
@@ -603,12 +603,10 @@ class AXPEntityMasterListViewQueryViewModel {
 }
 class AXPEntityMasterListViewModel {
     async setView(viewName = null) {
-        this.settingSelectedViewKey = `${this.config.module}:${this.config.name}:selected-view`;
-        const savedViewName = await this.settings.get(this.settingSelectedViewKey);
-        // this.settings.set()
+        const entitySetting = await this.settings.get(this.settingEntityKey);
+        const selectedViewName = entitySetting?.list?.currentView;
         if (viewName != this.view().name) {
-            this.view.set(this.views().find((c) => c.name == (viewName || savedViewName)) ?? this.views()[0]);
-            this.settings.scope(AXPSettingScope.User).set(this.settingSelectedViewKey, this.view().name);
+            this.view.set(this.views().find((c) => c.name == (viewName || selectedViewName)) ?? this.views()[0]);
             this.applyViewSorts();
             this.applyViewColumns();
             this.applyViewFilters();
@@ -628,8 +626,7 @@ class AXPEntityMasterListViewModel {
         this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
         this.expressionEvaluator = this.injector.get(AXPExpressionEvaluatorService);
         this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
-        this.settingListViewKey = '';
-        this.settingSelectedViewKey = '';
+        this.settingEntityKey = `${this.config.module}:${this.config.name}`;
         this.destroyed = new Subject();
         this.events$ = new Subject();
         //****************** Views ******************//
@@ -784,14 +781,58 @@ class AXPEntityMasterListViewModel {
         this.sortedFields.set(this.sortableFields());
     }
     async applySettings() {
-        this.settingListViewKey = `${this.config.module}:${this.config.name}:list-view:${this.view().name}`;
-        const listViewSetting = await this.settings.get(this.settingListViewKey);
+        this.saveSettings('view');
+        const listViewSetting = await this.settings.get(this.settingEntityKey);
         if (listViewSetting) {
-            const columnVisibilityMap = new Map(listViewSetting.columns.map((col) => [col.name, col.visible]));
+            const columns = listViewSetting.list.views[this.view().name].columns;
+            const columnVisibilityMap = new Map(columns.map((col) => [col.name, col.visible]));
+            const columnWidthsMap = new Map(columns.map((col) => [col.name, col.width]));
             this.columns.update((prev) => prev
-                .map((c) => ({ ...c, visible: columnVisibilityMap.get(c.name) ?? c.visible })) // Update visibility
-                .sort((a, b) => listViewSetting.columns.findIndex((col) => col.name === a.name) -
-                listViewSetting.columns.findIndex((col) => col.name === b.name)));
+                .map((c) => {
+                return { ...c, width: columnWidthsMap.get(c.name), visible: columnVisibilityMap.get(c.name) ?? c.visible };
+            }) // Update visibility
+                .sort((a, b) => columns.findIndex((col) => col.name === a.name) -
+                columns.findIndex((col) => col.name === b.name)));
+        }
+    }
+    async saveSettings(changesType, data) {
+        const updateSettings = (updateFn) => {
+            this.settings.scope(AXPSettingScope.User).update(this.settingEntityKey, updateFn);
+        };
+        switch (changesType) {
+            case 'columnSizes':
+                updateSettings((prev) => {
+                    const field = data.dataField.split('-')[1];
+                    const newSettings = { ...prev };
+                    set(newSettings, `list.views.${this.view().name}.columns`, prev?.list?.views?.[this.view().name]?.columns?.map((c) => ({
+                        ...c,
+                        width: c.name === field ? data.width : c.width,
+                    })));
+                    return newSettings;
+                });
+                break;
+            case 'columnOrders':
+                updateSettings((prev) => {
+                    const newSettings = { ...prev };
+                    set(newSettings, `list.views.${this.view().name}.columns`, data.map((c) => ({
+                        name: c.name,
+                        visible: c.visible,
+                        width: c.width,
+                    })));
+                    return newSettings;
+                });
+                break;
+            case 'view':
+                updateSettings((prev) => ({
+                    ...prev,
+                    list: {
+                        ...prev?.list,
+                        currentView: this.view().name,
+                    },
+                }));
+                break;
+            default:
+                break;
         }
     }
     clearSelection() {
@@ -936,13 +977,7 @@ class AXPEntityMasterListViewModel {
         this.applyViewColumns();
     }
     async onColumnsChanged(columns) {
-        const listViewSetting = await this.settings.get(this.settingListViewKey);
-        if (this.settingListViewKey) {
-            this.settings.scope(AXPSettingScope.User).set(this.settingListViewKey, {
-                ...listViewSetting,
-                columns: columns.map((c) => ({ name: c.name, visible: c.visible })),
-            });
-        }
+        this.saveSettings('columnOrders', columns);
     }
     applyViewColumns() {
         const cols = this.view().columns;
@@ -1851,7 +1886,7 @@ class AXPLookupWidgetSelectorComponent extends AXBasePageComponent {
         }
       </ax-suffix>
     </ax-footer>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "pipe", type: i1$1.AsyncPipe, name: "async" }, { kind: "ngmodule", type: AXCommonModule }, { kind: "directive", type: i2$1.AXAutoFocusDirective, selector: "[axAutoFocus]", inputs: ["axAutoFocus", "axAutoFocusTime"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i4.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i4.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i4.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: AXDropdownButtonModule }, { kind: "ngmodule", type: AXDataTableModule }, { kind: "component", type: i5.AXDataTableComponent, selector: "ax-data-table", inputs: ["dataSource", "parentField", "rowTemplate", "emptyTemplate", "alternative", "showHeader", "fixedHeader", "showFooter", "fixedFooter", "itemHeight", "allowReordering", "paging", "fetchDataMode", "loading", "focusedRow"], outputs: ["selectedRowsChange", "focusedRowChange", "onRowClick", "onRowDbClick", "onColumnsOrderChanged", "onColumnSizeChanged"] }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i6.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXPLayoutBuilderModule }, { kind: "component", type: i7.AXPWidgetColumnRendererComponent, selector: "axp-widget-column-renderer", inputs: ["caption", "customExpandIcon", "customCollapseIcon", "node", "footerTemplate", "expandHandler", "cellTemplate", "headerTemplate"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i8.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "pipe", type: i1$1.AsyncPipe, name: "async" }, { kind: "ngmodule", type: AXCommonModule }, { kind: "directive", type: i2$1.AXAutoFocusDirective, selector: "[axAutoFocus]", inputs: ["axAutoFocus", "axAutoFocusTime"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i4.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i4.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i4.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: AXDropdownButtonModule }, { kind: "ngmodule", type: AXDataTableModule }, { kind: "component", type: i5.AXDataTableComponent, selector: "ax-data-table", inputs: ["dataSource", "parentField", "rowTemplate", "emptyTemplate", "alternative", "showHeader", "fixedHeader", "showFooter", "fixedFooter", "itemHeight", "allowReordering", "paging", "fetchDataMode", "loading", "focusedRow"], outputs: ["selectedRowsChange", "focusedRowChange", "onRowClick", "onRowDbClick", "onColumnsOrderChanged", "onColumnSizeChanged"] }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i6.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXPLayoutBuilderModule }, { kind: "component", type: i7.AXPWidgetColumnRendererComponent, selector: "axp-widget-column-renderer", inputs: ["caption", "customExpandIcon", "customCollapseIcon", "customWidth", "node", "footerTemplate", "expandHandler", "cellTemplate", "headerTemplate"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i8.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPLookupWidgetSelectorComponent, decorators: [{
             type: Component,