@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.0

package/src/Api/Implementation/GridApiImpl.js

@@ -1,22 +1,24 @@
 import { ApiBase } from './ApiBase';
-import * as GridRedux from '../../Redux/ActionsReducers/GridRedux';
-import { SystemHighlightCellAdd, SystemHighlightCellDelete, SystemHighlightCellDeleteAll, SystemHighlightRowAdd, SystemHighlightRowDelete, SystemHighlightRowDeleteAll, SystemHighlightRowsAdd, SystemHighlightRowsDelete, } from '../../Redux/ActionsReducers/SystemRedux';
+import { HighlightCellAdd, HighlightCellDelete, HighlightCellDeleteAll, HighlightRowAdd, HighlightRowDelete, GridHighlightRowDeleteAll, HighlightRowsAdd, GridHighlightRowsDelete, } from '../../Redux/ActionsReducers/InternalRedux';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { GridInternalApi } from '../Internal/GridInternalApi';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { WINDOW_SHOW_TRANSPOSED_VIEW } from '../../View/Components/Popups/WindowPopups/windowFactory';
 import { ROW_SUMMARY_ROW_ID } from '../../PredefinedConfig/Common/RowSummary';
-import { logDeprecationExternal } from '../../Utilities/logDeprecation';
+import { errorOnce } from '../../agGrid/AdaptableLogger';
 export class GridApiImpl extends ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
         this.internalApi = new GridInternalApi(_adaptable);
     }
+    getAgGridColumnDefs() {
+        return this._adaptable.agGridAdapter.getAgGridApi().getColumnDefs();
+    }
     getVariant() {
         return this.getAdaptableVariant();
     }
-    getGridState() {
-        return this.getAdaptableState().Grid;
+    getInternalState() {
+        return this.getAdaptableState().Internal;
     }
     loadGridData(dataSource) {
         // we intentionally set an initial empty array,
@@ -26,7 +28,8 @@ export class GridApiImpl extends ApiBase {
         this._adaptable.agGridAdapter.setGridOption('rowData', []);
         this._adaptable.setGridData(dataSource);
         const allRowNodes = this.getAllRowNodes();
-        this.internalApi.fireGridDataChangedEvent(dataSource, allRowNodes, 'Load');
+        const rowDataChangedInfo = this.getAdaptableInternalApi().buildRowDataChangedInfo(dataSource, allRowNodes, 'Load');
+        this.getAdaptableInternalApi().getDataService().CreateRowDataChangedEvent(rowDataChangedInfo);
     }
     getGridData() {
         return this._adaptable.getGridData();
@@ -45,16 +48,19 @@ export class GridApiImpl extends ApiBase {
     }
     async updateGridData(dataRows, dataUpdateConfig) {
         const rowNodes = await this._adaptable.updateRows(dataRows, dataUpdateConfig);
-        this.internalApi.fireGridDataChangedEvent(dataRows, rowNodes, 'Update');
+        const rowDataChangedInfo = this.getAdaptableInternalApi().buildRowDataChangedInfo(dataRows, rowNodes, 'Update');
+        this.getAdaptableInternalApi().getDataService().CreateRowDataChangedEvent(rowDataChangedInfo);
         return rowNodes;
     }
     async addOrUpdateGridData(dataRows, dataUpdateConfig) {
         const { added, updated } = await this._adaptable.addOrUpdateRows(dataRows, dataUpdateConfig);
         if (ArrayExtensions.IsNotNullOrEmpty(updated)) {
-            this.internalApi.fireGridDataChangedEvent(dataRows, updated, 'Update');
+            const rowDataChangedInfo = this.getAdaptableInternalApi().buildRowDataChangedInfo(dataRows, updated, 'Update');
+            this.getAdaptableInternalApi().getDataService().CreateRowDataChangedEvent(rowDataChangedInfo);
         }
         if (ArrayExtensions.IsNotNullOrEmpty(added)) {
-            this.internalApi.fireGridDataChangedEvent(dataRows, added, 'Add');
+            const rowDataChangedInfo = this.getAdaptableInternalApi().buildRowDataChangedInfo(dataRows, added, 'Add');
+            this.getAdaptableInternalApi().getDataService().CreateRowDataChangedEvent(rowDataChangedInfo);
         }
         return {
             addedRows: added,
@@ -63,7 +69,8 @@ export class GridApiImpl extends ApiBase {
     }
     async addGridData(dataRows, dataUpdateConfig) {
         const rowNodes = await this._adaptable.addRows(dataRows, dataUpdateConfig);
-        this.internalApi.fireGridDataChangedEvent(dataRows, rowNodes, 'Add');
+        const rowDataChangedInfo = this.getAdaptableInternalApi().buildRowDataChangedInfo(dataRows, rowNodes, 'Add');
+        this.getAdaptableInternalApi().getDataService().CreateRowDataChangedEvent(rowDataChangedInfo);
         return rowNodes;
     }
     undoCellEdit(cellDataChangedInfo) {
@@ -71,7 +78,7 @@ export class GridApiImpl extends ApiBase {
         this.getAdaptableInternalApi().getDataService().logUndoChange(cellDataChangedInfo);
         const cellUpdateRequest = {
             columnId: cellDataChangedInfo.column.columnId,
-            newValue: cellDataChangedInfo.oldValue,
+            newValue: cellDataChangedInfo.oldValue, // need old value as we are undoing
             primaryKeyValue: cellDataChangedInfo.primaryKeyValue,
             rowNode: cellDataChangedInfo.rowNode,
         };
@@ -81,34 +88,37 @@ export class GridApiImpl extends ApiBase {
     async deleteGridData(dataRows, dataUpdateConfig) {
         if (this.checkArrayExists(dataRows)) {
             const rowNodes = await this._adaptable.deleteRows(dataRows, dataUpdateConfig);
-            this.internalApi.fireGridDataChangedEvent(dataRows, rowNodes, 'Delete');
+            const rowDataChangedInfo = this.getAdaptableInternalApi().buildRowDataChangedInfo(dataRows, rowNodes, 'Delete');
+            this.getAdaptableInternalApi().getDataService().CreateRowDataChangedEvent(rowDataChangedInfo);
             return rowNodes;
         }
         return [];
     }
     setCellValue(cellUpdateRequest) {
-        var _a;
         const abColumn = this.getColumnApi().getColumnWithColumnId(cellUpdateRequest.columnId);
         if (!abColumn) {
             this.logWarn(`setCellValue() - column not found for columnId: ${cellUpdateRequest.columnId}`);
             return;
         }
-        const rowNode = (_a = cellUpdateRequest.rowNode) !== null && _a !== void 0 ? _a : this.getRowNodeForPrimaryKey(cellUpdateRequest.primaryKeyValue);
+        const rowNode = cellUpdateRequest.rowNode ?? this.getRowNodeForPrimaryKey(cellUpdateRequest.primaryKeyValue);
         if (!rowNode) {
             this.logWarn(`setCellValue() - rowNode not found for primaryKeyValue: ${cellUpdateRequest.primaryKeyValue}`);
             return;
         }
         this._adaptable.setDataValue(cellUpdateRequest.newValue, abColumn, cellUpdateRequest.primaryKeyValue, rowNode);
-        this.refreshCells([rowNode], [abColumn.columnId]);
+        this.refreshCell(rowNode, abColumn.columnId);
     }
     setCellValues(cellUpdateRequests) {
-        cellUpdateRequests === null || cellUpdateRequests === void 0 ? void 0 : cellUpdateRequests.forEach((cellUpdateRequest) => this.setCellValue(cellUpdateRequest));
+        cellUpdateRequests?.forEach((cellUpdateRequest) => this.setCellValue(cellUpdateRequest));
+    }
+    getCellSummaryInfo() {
+        return this.getAdaptableState().Internal.CellSummary.CellSummaryInfo;
     }
     getSelectedCellInfo() {
-        return this.getGridState().SelectedCellInfo;
+        return this.getInternalState().SelectedCellInfo;
     }
     getSelectedRowInfo() {
-        return this.getGridState().SelectedRowInfo;
+        return this.getInternalState().SelectedRowInfo ?? { gridRows: [] };
     }
     getCellDisplayValue(primaryKeyValue, columnId) {
         const rowNode = this.getRowNodeForPrimaryKey(primaryKeyValue);
@@ -122,36 +132,25 @@ export class GridApiImpl extends ApiBase {
         const rowNode = this.getRowNodeForPrimaryKey(primaryKeyValue);
         return rowNode ? this.getNormalisedValueFromRowNode(rowNode, columnId) : undefined;
     }
-    hideFilterForm() {
-        this._adaptable.hideColumnFilterForm();
-    }
-    applyGridFiltering() {
-        this._adaptable.applyColumnFiltering();
+    applyFiltering() {
+        this._adaptable.applyFiltering();
     }
-    clearGridFiltering() {
+    clearFiltering() {
         // slightly round the houses but we have to call ColumnFilterAPI as it does it properly
-        this.getAdaptableApi().columnFilterApi.clearColumnFilters();
+        this.getColumnFilterApi().clearColumnFilters();
     }
     getColumnSorts() {
-        return this.getAdaptableState().Grid.ColumnSorts;
+        return this.getLayoutApi().getCurrentLayout().ColumnSorts;
     }
     getColumnSortForColumn(columnId) {
         let columnSorts = this.getColumnSorts();
-        return columnSorts === null || columnSorts === void 0 ? void 0 : columnSorts.find((cs) => cs.ColumnId == columnId);
+        return columnSorts?.find((cs) => cs.ColumnId == columnId);
     }
     setAdaptableSorting(columnSorts) {
         this._adaptable.setColumnSort(columnSorts);
-        this.setColumnSorts(columnSorts);
     }
     clearAdaptableSorting() {
         this._adaptable.clearColumnSort();
-        this.clearColumnSorts();
-    }
-    setColumnSorts(columnSorts) {
-        this.dispatchAction(GridRedux.GridSetSort(columnSorts));
-    }
-    clearColumnSorts() {
-        this.dispatchAction(GridRedux.GridClearSort());
     }
     selectRow(primaryKeyValue, clearSelection) {
         this.selectNode(this.getRowNodeForPrimaryKey(primaryKeyValue), clearSelection);
@@ -217,9 +216,17 @@ export class GridApiImpl extends ApiBase {
     }
     selectCellRangeByQuery(query, gridCellRange, clearSelection) {
         const filteredRowNodes = [];
-        const isRowNodeInQuery = (rowNode) => this.getAdaptableApi()
-            .internalApi.getQueryLanguageService()
-            .evaluateBooleanExpression(query, 'GridInfo', rowNode);
+        const isRowNodeInQuery = (rowNode) => {
+            try {
+                return this.getAdaptableApi()
+                    .internalApi.getQueryLanguageService()
+                    .evaluateBooleanExpression(query, 'GridInfo', rowNode);
+            }
+            catch (error) {
+                errorOnce(error.message);
+                return false;
+            }
+        };
         if (gridCellRange) {
             const [startNode, endNode] = this.getSelectionStartEndNodes(gridCellRange);
             for (let rowIndex = startNode.rowIndex; rowIndex <= endNode.rowIndex; rowIndex++) {
@@ -243,7 +250,7 @@ export class GridApiImpl extends ApiBase {
              */
             const currentLayout = this.getLayoutApi().getCurrentLayout();
             preapredGridCellRange = {
-                columnIds: currentLayout.Columns,
+                columnIds: currentLayout.TableColumns,
             };
         }
         // ranges of row with consecutive indexes
@@ -340,21 +347,23 @@ export class GridApiImpl extends ApiBase {
     collapseAllRowGroups() {
         this._adaptable.collapseAllRowGroups();
     }
-    getExpandRowGroupsKeys() {
-        return this._adaptable.getExpandRowGroupsKeys();
-    }
     expandRowGroupsForValues(columnValues) {
         this._adaptable.expandRowGroupsForValues(columnValues);
     }
     isGridPivotable() {
-        return !this.getAdaptableInternalApi().isGridInTreeMode();
+        return !this.isTreeDataGrid();
     }
     isGridGroupable() {
-        return !this.getAdaptableInternalApi().isGridInTreeMode();
+        return !this.isTreeDataGrid();
     }
     isGridRowSelectable() {
         return this._adaptable.isGridRowSelectable();
     }
+    isGridRowSelected(primaryKeyValue) {
+        const rowInfo = this.getSelectedRowInfo();
+        const row = rowInfo.gridRows.find((gr) => gr.primaryKeyValue == primaryKeyValue);
+        return row != undefined;
+    }
     isGridRangeSelectable() {
         return this._adaptable.isGridRangeSelectable();
     }
@@ -364,12 +373,20 @@ export class GridApiImpl extends ApiBase {
     isGridInPivotMode() {
         return this.getLayoutApi().isCurrentLayoutPivot();
     }
+    isMasterDetailGrid() {
+        return this.getAgGridApi().getGridOption('masterDetail');
+    }
+    isTreeDataGrid() {
+        return this.getAgGridApi().getGridOption('treeData');
+    }
     isGroupRowNode(rowNode) {
         return this._adaptable.isGroupRowNode(rowNode);
     }
+    isVisibleRowNode(rowNode) {
+        return this._adaptable.isRowNodeVisible(rowNode);
+    }
     isSummaryNode(rowNode) {
-        var _a;
-        return !!((_a = rowNode === null || rowNode === void 0 ? void 0 : rowNode.data) === null || _a === void 0 ? void 0 : _a[ROW_SUMMARY_ROW_ID]);
+        return !!rowNode?.data?.[ROW_SUMMARY_ROW_ID];
     }
     isQuickFilterAvailable() {
         return this._adaptable.isQuickFilterAvailable();
@@ -393,7 +410,7 @@ export class GridApiImpl extends ApiBase {
     }
     getCellRawValueCount(columnId, rawValue) {
         const gridCells = this.getGridCellsForRawValue(columnId, rawValue);
-        return gridCells === null || gridCells === void 0 ? void 0 : gridCells.length;
+        return gridCells?.length;
     }
     getGridCellsForDisplayValue(columnId, displayValue) {
         const gridCells = this._adaptable.getGridCellsForColumn(columnId);
@@ -415,12 +432,12 @@ export class GridApiImpl extends ApiBase {
     jumpToColumn(columnId) {
         this._adaptable.jumpToColumn(columnId);
     }
-    jumpToCell(primaryKeyValue, columnId) {
-        const node = this._adaptable.getRowNodeForPrimaryKey(primaryKeyValue);
+    jumpToCell(primaryKeyValue, columnId, rowNode) {
+        const node = rowNode ?? this._adaptable.getRowNodeForPrimaryKey(primaryKeyValue);
         this._adaptable.jumpToCell(columnId, node);
     }
     highlightCell(cellHighlightInfo) {
-        this.dispatchAction(SystemHighlightCellAdd(cellHighlightInfo));
+        this.dispatchAction(HighlightCellAdd(cellHighlightInfo));
         if (cellHighlightInfo.timeout) {
             setTimeout(() => {
                 this.unHighlightCell(cellHighlightInfo.primaryKeyValue, cellHighlightInfo.columnId);
@@ -428,13 +445,13 @@ export class GridApiImpl extends ApiBase {
         }
     }
     unHighlightCell(primaryKeyValue, columnId) {
-        this.dispatchAction(SystemHighlightCellDelete(primaryKeyValue, columnId));
+        this.dispatchAction(HighlightCellDelete(primaryKeyValue, columnId));
     }
     unHighlightAllCells() {
-        this.dispatchAction(SystemHighlightCellDeleteAll());
+        this.dispatchAction(HighlightCellDeleteAll());
     }
     highlightRow(rowHighlightInfo) {
-        this.dispatchAction(SystemHighlightRowAdd(rowHighlightInfo));
+        this.dispatchAction(HighlightRowAdd(rowHighlightInfo));
         if (rowHighlightInfo.timeout) {
             setTimeout(() => {
                 this.unHighlightRow(rowHighlightInfo.primaryKeyValue);
@@ -442,7 +459,7 @@ export class GridApiImpl extends ApiBase {
         }
     }
     highlightRows(rowHighlightInfos) {
-        this.dispatchAction(SystemHighlightRowsAdd(rowHighlightInfos));
+        this.dispatchAction(HighlightRowsAdd(rowHighlightInfos));
         if (rowHighlightInfos.timeout) {
             setTimeout(() => {
                 this.unHighlightRows(rowHighlightInfos.primaryKeyValues);
@@ -450,22 +467,25 @@ export class GridApiImpl extends ApiBase {
         }
     }
     unHighlightRow(primaryKeyValue) {
-        this.dispatchAction(SystemHighlightRowDelete(primaryKeyValue));
+        this.dispatchAction(HighlightRowDelete(primaryKeyValue));
     }
     unHighlightRows(primaryKeyValues) {
-        this.dispatchAction(SystemHighlightRowsDelete(primaryKeyValues));
+        this.dispatchAction(GridHighlightRowsDelete(primaryKeyValues));
     }
     unHighlightAllRows() {
-        this.dispatchAction(SystemHighlightRowDeleteAll());
+        this.dispatchAction(GridHighlightRowDeleteAll());
+    }
+    refreshCell(rowNode, columnId, suppressFlash = true) {
+        this._adaptable.refreshCell(rowNode, columnId, suppressFlash);
     }
-    refreshCells(rowNodes, columnIds, suppressFlash = true) {
-        this._adaptable.refreshCells(rowNodes, columnIds, suppressFlash);
+    refreshCells(rowNode, columnIds, suppressFlash = true) {
+        this._adaptable.refreshCells(rowNode, columnIds, suppressFlash);
     }
     refreshAllCells(forceUpdate = false) {
         this._adaptable.refreshAllCells(forceUpdate);
     }
     refreshGridCell(gridCell) {
-        this.refreshCells([gridCell.rowNode], [gridCell.column.columnId]);
+        this.refreshCell(gridCell.rowNode, gridCell.column.columnId);
     }
     refreshGridCells(gridCells) {
         gridCells.forEach((gc) => {
@@ -473,10 +493,10 @@ export class GridApiImpl extends ApiBase {
         });
     }
     refreshColumn(columnId) {
-        this._adaptable.refreshCells(null, [columnId], true);
+        this._adaptable.refreshColumns([columnId], true);
     }
     refreshColumns(columnIds) {
-        this._adaptable.refreshCells(null, columnIds, true);
+        this._adaptable.refreshColumns(columnIds, true);
     }
     refreshRowByPrimaryKey(primaryKey) {
         const rowNode = this.getRowNodeForPrimaryKey(primaryKey);
@@ -494,7 +514,6 @@ export class GridApiImpl extends ApiBase {
         this._adaptable.updateRowGroupsExpandedState();
     }
     isCellEditable(gridCell) {
-        // Note if cell.editable in AG Grid is a function (and nothing is provided in Adaptble) this will return true.
         // If not Grid Cell or Column then return false - GridCell.column may be undefined for cells from synthetic columns created by AG Grid (ex. autoGroup columns)
         if (!gridCell || !gridCell.column || !gridCell.rowNode) {
             return false;
@@ -502,12 +521,9 @@ export class GridApiImpl extends ApiBase {
         if (gridCell.rowNode && this.isSummaryNode(gridCell.rowNode)) {
             return false;
         }
-        // checking `gridCell.column.readOnly` might return misleading results
-        // because cell editability is defined by EditOptions.isCellEditable() as well
         const agGridColumn = this.getColumnApi().internalApi.getAgGridColumnForAdaptableColumn(gridCell.column.columnId);
-        // this will invoke the colDef.editable callback
-        // there we check both Adaptable and AG Grid editability
-        return agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.isCellEditable(gridCell.rowNode);
+        // this will invoke the colDef.editable callback where we check both AdapTable and AG Grid editability
+        return agGridColumn?.isCellEditable(gridCell.rowNode);
     }
     isCellEdited(gridCell) {
         if (!gridCell) {
@@ -545,10 +561,6 @@ export class GridApiImpl extends ApiBase {
     deselectAll() {
         this._adaptable.deselectAll();
     }
-    destroy() {
-        logDeprecationExternal(this._adaptable.logger, 'GridApi', 'destroy', 'AdaptableApi', 'destroy');
-        this.getAdaptableApi().destroy();
-    }
     getGridContainerElement() {
         return this._adaptable.getAgGridContainerElement();
     }
@@ -559,12 +571,11 @@ export class GridApiImpl extends ApiBase {
         return this._adaptable.getAgGridRowModelType();
     }
     showTransposedView(transposeConfig = {}) {
-        var _a, _b, _c, _d, _e;
-        const transposedColumnId = (_a = transposeConfig.transposedColumnId) !== null && _a !== void 0 ? _a : this.getAdaptableApi().optionsApi.getPrimaryKey();
-        const hideTransposedColumn = (_b = transposeConfig.hideTransposedColumn) !== null && _b !== void 0 ? _b : true;
-        const visibleColumns = (_c = transposeConfig.visibleColumns) !== null && _c !== void 0 ? _c : false;
-        const visibleRows = (_d = transposeConfig.visibleRows) !== null && _d !== void 0 ? _d : false;
-        const autosize = (_e = transposeConfig.autosize) !== null && _e !== void 0 ? _e : true;
+        const transposedColumnId = transposeConfig.transposedColumnId ?? this.getOptionsApi().getPrimaryKey();
+        const hideTransposedColumn = transposeConfig.hideTransposedColumn ?? true;
+        const visibleColumns = transposeConfig.visibleColumns ?? false;
+        const visibleRows = transposeConfig.visibleRows ?? false;
+        const autosize = transposeConfig.autosize ?? true;
         this.getAdaptableInternalApi().showPopupWindow({
             id: WINDOW_SHOW_TRANSPOSED_VIEW,
             factoryId: WINDOW_SHOW_TRANSPOSED_VIEW,
@@ -609,7 +620,6 @@ export class GridApiImpl extends ApiBase {
     setAgGridColumnDefinitions(columnDefinitions) {
         const agGridApi = this._adaptable.agGridAdapter.getAgGridApi();
         agGridApi.setGridOption('columnDefs', columnDefinitions);
-        this._adaptable.updateColumnModelAndRefreshGrid({ skipColDefsRefresh: true });
     }
     updateAgGridColumnDefinition(columnDefinitionToBeUpdated) {
         const currentColDefs = [...this._adaptable.agGridAdapter.getAgGridApi().getColumnDefs()];
@@ -622,7 +632,7 @@ export class GridApiImpl extends ApiBase {
             return;
         }
         const updatedColDefs = this._adaptable.agGridAdapter.traverseColDefs(currentColDefs, (colDef) => {
-            return colDef.colId === columnId ? Object.assign(Object.assign({}, colDef), columnDefinitionToBeUpdated) : colDef;
+            return colDef.colId === columnId ? { ...colDef, ...columnDefinitionToBeUpdated } : colDef;
         });
         this.setAgGridColumnDefinitions(updatedColDefs);
     }
@@ -630,7 +640,7 @@ export class GridApiImpl extends ApiBase {
         const currentColDefs = [...this._adaptable.agGridAdapter.getAgGridApi().getColumnDefs()];
         const updatedColDefs = this._adaptable.agGridAdapter.traverseColDefs(currentColDefs, (colDef) => {
             const newColDef = newColumnDefinitions.find((c) => c.colId === colDef.colId);
-            return newColDef ? Object.assign(Object.assign({}, colDef), newColDef) : colDef;
+            return newColDef ? { ...colDef, ...newColDef } : colDef;
         });
         // find out new columns which are not in the current column definitions
         const currentColIds = [];
@@ -661,7 +671,7 @@ export class GridApiImpl extends ApiBase {
         this.setAgGridColumnDefinitions(updatedColDefs);
     }
     addAgGridColumnDefinition(newColumnDefinition) {
-        const currentColDefs = this._adaptable.agGridAdapter.getAgGridApi().getColumnDefs();
+        const currentColDefs = this.getAgGridColumnDefs();
         // just in case check of there is not already an existing column with the same id and eliminate it
         const sanitizedColDefs = this._adaptable.agGridAdapter
             .traverseColDefs(currentColDefs, (colDef) => {

package/src/Api/Implementation/GridFilterApiImpl.js

@@ -9,12 +9,14 @@ export class GridFilterApiImpl extends ApiBase {
         this.internalApi = new GridFilterInternalApi(_adaptable);
     }
     getCurrentGridFilter() {
-        var _a;
-        return (_a = this.getLayoutApi().getCurrentLayout()) === null || _a === void 0 ? void 0 : _a.GridFilter;
+        return this.getLayoutApi().getCurrentLayout()?.GridFilter;
     }
     getCurrentGridFilterExpression() {
         const gridFilter = this.getCurrentGridFilter();
-        return gridFilter && !gridFilter.IsSuspended ? gridFilter.Expression : '';
+        if (!gridFilter || gridFilter.IsSuspended) {
+            return '';
+        }
+        return gridFilter.Expression;
     }
     setGridFilterExpression(filter) {
         this.dispatchAction(LayoutRedux.LayoutGridFilterSet(filter));
@@ -23,7 +25,7 @@ export class GridFilterApiImpl extends ApiBase {
         this.dispatchAction(LayoutRedux.LayoutGridFilterClear());
     }
     openUIEditorForGridFilter(expression) {
-        const preparedQuery = expression !== null && expression !== void 0 ? expression : this.getCurrentGridFilterExpression();
+        const preparedQuery = expression ?? this.getCurrentGridFilterExpression();
         this.getAdaptableInternalApi().showPopupWindow({
             id: WINDOW_GRID_FILTER_EDITOR,
             title: ModuleConstants.GridFilterFriendlyName,

package/src/Api/Implementation/LayoutApiImpl.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { LayoutApi } from '../LayoutApi';
-import { Layout, LayoutState } from '../../PredefinedConfig/LayoutState';
+import { Layout, LayoutState, PivotLayout, TableLayout } from '../../PredefinedConfig/LayoutState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
@@ -10,13 +10,13 @@ import { ExtendedLayoutInfo } from '../../PredefinedConfig/Common/ExtendedLayout
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     internalApi: LayoutInternalApi;
     constructor(_adaptable: IAdaptable);
+    updateCurrentLayout(updateFn: (layout: TableLayout | PivotLayout) => TableLayout | PivotLayout): void;
     isCurrentLayoutPivot(): boolean;
     getLayoutState(): LayoutState;
-    shouldAutoSaveLayouts: () => boolean;
-    getCurrentVisibleColumnIdsMap(): {
+    getCurrentVisibleColumnIdsMapForTableLayout(): {
         [key: string]: boolean;
     };
-    getCurrentVisibleColumnIds(): string[];
+    getCurrentVisibleColumnIdsForTableLayout(): string[];
     getCurrentRowGroupsColumnIds(): string[];
     setLayout(layoutName: string): void;
     getCurrentLayout(): Layout;
@@ -36,15 +36,13 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     createOrUpdateLayout(layout: Layout): void;
     showChangeColumnCaption(column: AdaptableColumn): void;
     openLayoutSettingsPanel(): void;
-    showLayoutEditor(layoutName?: string, action?: ModuleParams['action']): void;
+    showLayoutEditor(layoutName?: string, layoutType?: 'table' | 'pivot', action?: ModuleParams['action']): void;
     isCurrentLayoutReadOnly(): boolean;
     deleteLayout(layout: Layout): void;
     deleteLayoutByName(layoutName: string): void;
-    isDefaultLayout(layout: Layout): boolean;
-    isCurrentLayoutDefault(): boolean;
     removeColumnFromCurrentLayout(columnId: string): void;
     removeColumnFromAllLayouts(columnId: string): void;
     removeColumnFromLayout(columnId: string, layoutName: string): void;
-    addColumnToLayout(columnId: string, layoutName: string): void;
-    addColumnToCurrentLayout(columnId: string): void;
+    addColumnToTableLayout(columnId: string, layoutName: string): void;
+    addColumnToCurrentTableLayout(columnId: string): void;
 }