@adaptabletools/adaptable 13.1.1 → 14.0.0-canary.1

package/src/Api/Implementation/GridApiImpl.js

@@ -7,7 +7,13 @@ const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/Grid
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+const logDeprecation_1 = require("../../Utilities/logDeprecation");
+const GridInternalApi_1 = require("../Internal/GridInternalApi");
 class GridApiImpl extends ApiBase_1.ApiBase {
+    constructor(adaptable) {
+        super(adaptable);
+        this.internalApi = new GridInternalApi_1.GridInternalApi(adaptable);
+    }
     getGridState() {
         return this.getAdaptableState().Grid;
     }
@@ -25,12 +31,12 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     async updateGridData(dataRows, dataUpdateConfig) {
         const rowNodes = await this.adaptable.updateRows(dataRows, dataUpdateConfig);
-        this.fireGridDataChangedEvent(dataRows, rowNodes, 'Edit');
+        this.internalApi.fireGridDataChangedEvent(dataRows, rowNodes, 'Edit');
         return rowNodes;
     }
     async addGridData(dataRows, dataUpdateConfig) {
         const rowNodes = await this.adaptable.addRows(dataRows, dataUpdateConfig);
-        this.fireGridDataChangedEvent(dataRows, rowNodes, 'Add');
+        this.internalApi.fireGridDataChangedEvent(dataRows, rowNodes, 'Add');
         return rowNodes;
     }
     undoCellEdit(cellDataChangedInfo) {
@@ -42,13 +48,13 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     async deleteGridData(dataRows, dataUpdateConfig) {
         if (this.checkArrayExists(dataRows)) {
             const rowNodes = await this.adaptable.deleteRows(dataRows, dataUpdateConfig);
-            this.fireGridDataChangedEvent(dataRows, rowNodes, 'Delete');
+            this.internalApi.fireGridDataChangedEvent(dataRows, rowNodes, 'Delete');
             return rowNodes;
         }
         return [];
     }
     setCellValue(columnId, newValue, primaryKeyValue) {
-        const abColumn = this.adaptable.api.columnApi.getColumnFromId(columnId);
+        const abColumn = this.adaptable.api.columnApi.getColumnWithColumnId(columnId);
         if (!abColumn) {
             (0, LoggingHelper_1.LogAdaptableWarning)(`setCellValue() - column not found for columnId: ${columnId}`);
             return;
@@ -61,6 +67,10 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.setDataValue(newValue, abColumn, primaryKeyValue, rowNode);
     }
     setCellsValue(gridCells) {
+        (0, logDeprecation_1.logDeprecation)('GridApi', 'setCellsValue', 'setCellValues');
+        this.setCellValues(gridCells);
+    }
+    setCellValues(gridCells) {
         gridCells === null || gridCells === void 0 ? void 0 : gridCells.forEach((gridCell) => this.setCellValue(gridCell.columnId, gridCell.newValue, gridCell.primaryKeyValue));
     }
     getSelectedCellInfo() {
@@ -147,14 +157,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     deSelectNodes(rowNodes, clearSelection) {
         this.adaptable.deSelectNodes(rowNodes, clearSelection);
     }
-    selectCellRange(gridCellRange, clearSelection) {
-        if (gridCellRange == undefined) {
-            return;
-        }
-        if (gridCellRange.primaryKeyValueStart == undefined &&
-            gridCellRange.rowIndexStart == undefined) {
-            return;
-        }
+    getSelectionStartEndNodes(gridCellRange) {
         let startNode;
         let endNode;
         startNode = gridCellRange.primaryKeyValueEnd
@@ -169,10 +172,79 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         else {
             endNode = startNode;
         }
+        return [startNode, endNode];
+    }
+    selectCellRange(gridCellRange, clearSelection) {
+        if (gridCellRange == undefined) {
+            return;
+        }
+        if (gridCellRange.primaryKeyValueStart == undefined &&
+            gridCellRange.rowIndexStart == undefined) {
+            return;
+        }
+        const [startNode, endNode] = this.getSelectionStartEndNodes(gridCellRange);
         if (startNode && endNode) {
             this.adaptable.selectCells(gridCellRange.columnIds, startNode, endNode, clearSelection);
         }
     }
+    selectCellRangeByQuery(query, gridCellRange, clearSelection) {
+        const filteredRowNodes = [];
+        const isRowNodeInQuery = (rowNode) => this.adaptable.api.internalApi
+            .getQueryLanguageService()
+            .evaluateBooleanExpression(query, 'GridInfo', rowNode);
+        if (gridCellRange) {
+            const [startNode, endNode] = this.getSelectionStartEndNodes(gridCellRange);
+            for (let rowIndex = startNode.rowIndex; rowIndex <= endNode.rowIndex; rowIndex++) {
+                const rowNode = this.adaptable.getRowNodeByIndex(rowIndex);
+                isRowNodeInQuery(rowNode) && filteredRowNodes.push(rowNode);
+            }
+        }
+        else {
+            // include all row
+            this.adaptable.forAllRowNodesDo((rowNode) => {
+                isRowNodeInQuery(rowNode) && filteredRowNodes.push(rowNode);
+            });
+        }
+        if (!filteredRowNodes.length) {
+            return;
+        }
+        let preapredGridCellRange = gridCellRange;
+        if (!preapredGridCellRange) {
+            /**
+             * Select all rows and all columns
+             */
+            const currentLayout = this.adaptable.api.layoutApi.getCurrentLayout();
+            preapredGridCellRange = {
+                columnIds: currentLayout.Columns,
+            };
+        }
+        // ranges of row with consecutive indexes
+        const rowRanges = filteredRowNodes.reduce((acc, rowNode, index, collection) => {
+            // add start if there is none
+            const prevRange = acc[acc.length - 1];
+            if (prevRange.startNode === undefined) {
+                prevRange.startNode = rowNode;
+            }
+            // add end if next is not consecutive
+            const nextNode = collection[index + 1];
+            if (nextNode && nextNode.rowIndex - 1 !== rowNode.rowIndex) {
+                prevRange.endNode = rowNode;
+                // start a new one
+                acc.push({});
+            }
+            // if at the end close last range
+            if (index === collection.length - 1) {
+                prevRange.endNode = rowNode;
+            }
+            return acc;
+        }, [{}]);
+        let preparedClearSelection = clearSelection;
+        rowRanges.forEach((range) => {
+            // clear only on fisrt range selection
+            this.adaptable.selectCells(preapredGridCellRange.columnIds, range.startNode, range.endNode, preparedClearSelection);
+            preparedClearSelection = false;
+        });
+    }
     selectColumn(columnId) {
         this.selectColumns([columnId]);
     }
@@ -205,7 +277,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     getNormalisedValueFromRowNode(rowNode, columnId) {
         const rawValue = this.adaptable.getRawValueFromRowNode(rowNode, columnId);
-        const abColumn = this.adaptable.api.columnApi.getColumnFromId(columnId);
+        const abColumn = this.adaptable.api.columnApi.getColumnWithColumnId(columnId);
         return this.adaptable.getNormalisedValueFromRawValue(rawValue, abColumn);
     }
     getRowNodesForPrimaryKeys(primaryKeyValues) {
@@ -233,6 +305,10 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.expandAllRowGroups();
     }
     closeAllRowGroups() {
+        (0, logDeprecation_1.logDeprecation)('GridApi', 'closeAllRowGroups', 'collapseAllRowGroups');
+        this.collapseAllRowGroups();
+    }
+    collapseAllRowGroups() {
         this.adaptable.closeAllRowGroups();
     }
     getExpandRowGroupsKeys() {
@@ -263,50 +339,17 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.redrawBody();
         this.adaptable.redrawHeader();
     }
-    fireSearchChangedEvent(searchChangedTrigger) {
-        if (this.adaptable.isLive) {
-            const adaptableSearchState = this.adaptable.api.configApi.getAdaptableSearchState();
-            const adaptableSortState = this.adaptable.api.configApi.getAdaptableSortState();
-            const searchChangedInfo = {
-                adaptableApi: this.adaptable.api,
-                searchChangedTrigger,
-                adaptableSearchState: adaptableSearchState,
-                adaptableSortState: adaptableSortState,
-            };
-            this.adaptable.api.eventApi.emit('SearchChanged', searchChangedInfo);
-        }
-    }
     fireGridSortedEvent() {
-        if (this.adaptable.isLive) {
-            const adaptableSortState = this.adaptable.api.configApi.getAdaptableSortState();
-            const adaptableApi = this.getAdaptableApi();
-            const gridSortedInfo = {
-                adaptableSortState: adaptableSortState,
-                adaptableApi: adaptableApi,
-            };
-            adaptableApi.eventApi.emit('GridSorted', gridSortedInfo);
-        }
+        (0, logDeprecation_1.logDeprecationInternal)('GridApi', 'fireGridSortedEvent');
+        this.internalApi.fireGridSortedEvent();
     }
     fireCellChangedEvent(cellDataChangedInfo) {
-        if (this.adaptable.isLive) {
-            const cellChangedInfo = {
-                adaptableApi: this.adaptable.api,
-                cellChange: cellDataChangedInfo,
-            };
-            this.adaptable.api.eventApi.emit('CellChanged', cellChangedInfo);
-        }
+        (0, logDeprecation_1.logDeprecationInternal)('GridApi', 'fireCellChangedEvent');
+        this.internalApi.fireCellChangedEvent(cellDataChangedInfo);
     }
     fireGridDataChangedEvent(dataRows, rowNodes = [], rowTrigger) {
-        if (this.adaptable.isLive) {
-            const gridDataChangedInfo = {
-                changedAt: Date.now(),
-                adaptableApi: this.adaptable.api,
-                rowTrigger,
-                dataRows,
-                rowNodes,
-            };
-            this.adaptable.api.eventApi.emit('GridDataChanged', gridDataChangedInfo);
-        }
+        (0, logDeprecation_1.logDeprecationInternal)('GridApi', 'fireGridDataChangedEvent');
+        this.internalApi.fireGridDataChangedEvent(dataRows, rowNodes, rowTrigger);
     }
     jumpToRow(primaryKeyValue) {
         const node = this.adaptable.getRowNodeForPrimaryKey(primaryKeyValue);
@@ -371,17 +414,26 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     refreshRowNodes(rowNodes) {
         this.adaptable.redrawRows(rowNodes);
     }
+    isCellEditable(gridCell) {
+        if (!gridCell) {
+            return false;
+        }
+        if (!gridCell.column) {
+            // GridCell.column may be undefined for cells from synthetic columns created by AG Grid (ex. autoGroup columns)
+            return false;
+        }
+        if (gridCell.column.readOnly) {
+            return false;
+        }
+        return this.adaptable.isCellEditable(gridCell.rowNode, this.adaptable.getAgGridColumnForColumnId(gridCell.column.columnId));
+    }
     areCellsEditable(gridCells) {
+        (0, logDeprecation_1.logDeprecation)('GridApi', 'areCellsEditable', 'isEveryCellEditable');
+        return this.isEveryCellEditable(gridCells);
+    }
+    isEveryCellEditable(gridCells) {
         for (let gridCell of gridCells) {
-            if (!gridCell.column) {
-                // GridCell.column may be undefined for cells from synthetic columns created by AG Grid (ex. autoGroup columns)
-                return false;
-            }
-            if (gridCell.column.readOnly) {
-                return false;
-            }
-            const isCellEditable = this.adaptable.isCellEditable(gridCell.rowNode, this.adaptable.getAgGridColumnForColumnId(gridCell.column.columnId));
-            if (!isCellEditable) {
+            if (!this.isCellEditable(gridCell)) {
                 return false;
             }
         }
@@ -418,6 +470,10 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         return this.adaptable.getAgGridContainerElement();
     }
     showGridInfoPopup() {
+        (0, logDeprecation_1.logDeprecation)('GridApi', 'showGridInfoPopup', 'openGridInfoSettingsPanel');
+        this.openGridInfoSettingsPanel();
+    }
+    openGridInfoSettingsPanel() {
         this.showModulePopup(ModuleConstants.GridInfoModuleId);
     }
 }

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

@@ -1,10 +1,14 @@
 import { ApiBase } from './ApiBase';
 import { LayoutApi } from '../LayoutApi';
-import { LayoutState, Layout } from '../../PredefinedConfig/LayoutState';
+import { Layout, LayoutState } from '../../PredefinedConfig/LayoutState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { LayoutInternalApi } from '../Internal/LayoutInternalApi';
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
+    internalApi: LayoutInternalApi;
+    constructor(adaptable: IAdaptable);
     getLayoutState(): LayoutState;
     shouldAutoSaveLayout: (layout?: Layout) => boolean;
     getCurrentVisibleColumnIdsMap(): {
@@ -12,13 +16,13 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     };
     getCurrentVisibleColumnIds(): string[];
     setLayout(layoutName: string): void;
-    fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState, skipEqualityCheck?: boolean): void;
+    fireLayoutChangedEvent(trigger: string, oldState: LayoutState, newState: LayoutState, skipEqualityCheck?: boolean): void;
     getCurrentLayout(): Layout;
     getCurrentLayoutColumnSort(columnId: string): ColumnSort['SortOrder'] | null;
-    areDraftAndCurrentLayoutEqual(): boolean;
     getCurrentLayoutName(): string;
     getLayoutByName(layoutName: string): Layout | null;
     getAllLayout(): Layout[];
+    getLayouts(): Layout[];
     getLayoutById(id: Layout['Uuid']): Layout;
     saveCurrentLayout(): void;
     doesLayoutExist(layout: Layout): boolean;
@@ -27,21 +31,18 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     cloneAndSetLayout(layoutToClone: Layout, layoutName: string): Layout | false;
     cloneLayout(layoutToClone: Layout, layoutName: string): Layout | false;
     setColumnCaption(columnId: string, caption: string): void;
-    saveLayout(layoutToSave: Layout): void;
     createOrUpdateLayout(layout: Layout): void;
     areLayoutsEqual(layout1: Layout, layout2: Layout): boolean;
-    getLayoutDescription(layout: Layout): string;
-    private getColumnSort;
     createDefaultLayoutIfNeeded(): Layout | null;
     showChangeColumnCaption(column: AdaptableColumn): void;
     showLayoutPopup(): void;
+    openLayoutSettingsPanel(): void;
     showLayoutEditor(layoutName?: string, action?: ModuleParams['action']): void;
     isCurrentLayoutReadOnly(): boolean;
     deleteLayout(layout: Layout): void;
     deleteLayoutByName(layoutName: string): void;
     isDefaultLayout(layout: Layout): boolean;
     isCurrentLayoutDefault(): boolean;
-    areExpandedRowGroupsSavedInLayouts(): boolean;
     removeColumnFromCurrentLayout(columnId: string): void;
     removeColumnFromAllLayouts(columnId: string): void;
     removeColumnFromLayout(columnId: string, layoutName: string): void;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayoutApiImpl = void 0;
 const tslib_1 = require("tslib");
 const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/LayoutRedux"));
+const LayoutRedux_1 = require("../../Redux/ActionsReducers/LayoutRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ApiBase_1 = require("./ApiBase");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
@@ -10,15 +11,13 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectF
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
-const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
-const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
 const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
-const LayoutRedux_1 = require("../../Redux/ActionsReducers/LayoutRedux");
+const logDeprecation_1 = require("../../Utilities/logDeprecation");
+const LayoutInternalApi_1 = require("../Internal/LayoutInternalApi");
 class LayoutApiImpl extends ApiBase_1.ApiBase {
-    constructor() {
-        super(...arguments);
+    constructor(adaptable) {
+        super(adaptable);
         this.shouldAutoSaveLayout = (layout) => {
             var _a;
             let autoSave = (_a = this.adaptable.adaptableOptions.layoutOptions) === null || _a === void 0 ? void 0 : _a.autoSaveLayouts;
@@ -27,6 +26,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             }
             return autoSave;
         };
+        this.internalApi = new LayoutInternalApi_1.LayoutInternalApi(adaptable);
     }
     getLayoutState() {
         return this.getAdaptableState().Layout;
@@ -50,17 +50,9 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             }
         }
     }
-    fireLayoutChangedEvent(trigger, oldSate, newState, skipEqualityCheck) {
-        const layoutChangedInfo = {
-            adaptableApi: this.getAdaptableApi(),
-            actionName: trigger,
-            oldLayoutState: oldSate,
-            newLayoutState: newState,
-        };
-        if (!skipEqualityCheck && (0, isEqual_1.default)(oldSate, newState)) {
-            return;
-        }
-        this.adaptable.api.eventApi.emit('LayoutChanged', layoutChangedInfo);
+    fireLayoutChangedEvent(trigger, oldState, newState, skipEqualityCheck) {
+        (0, logDeprecation_1.logDeprecationInternal)('LayoutApi', 'fireLayoutChangedEvent');
+        this.internalApi.fireLayoutChangedEvent(trigger, oldState, newState, skipEqualityCheck);
     }
     getCurrentLayout() {
         const state = this.getAdaptableState();
@@ -75,29 +67,28 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         const currentLayout = this.getCurrentLayout();
         return ((_d = (_c = (_b = (_a = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.ColumnSorts) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (sort) => sort.ColumnId === columnId)) === null || _c === void 0 ? void 0 : _c.SortOrder) !== null && _d !== void 0 ? _d : null);
     }
-    areDraftAndCurrentLayoutEqual() {
-        const state = this.getAdaptableState();
-        const currentLayout = this.getLayoutByName(state.Layout.CurrentLayout);
-        const draftLayout = state.Grid.CurrentLayout;
-        return this.areLayoutsEqual(currentLayout, draftLayout);
-    }
     getCurrentLayoutName() {
         return this.getAdaptableState().Layout.CurrentLayout;
     }
     getLayoutByName(layoutName) {
         if (StringExtensions_1.default.IsNotNullOrEmpty(layoutName)) {
-            let layout = this.getAllLayout().find((l) => l.Name == layoutName);
+            let layout = this.getLayouts().find((l) => l.Name == layoutName);
             if (this.checkItemExists(layout, layoutName, 'Layout')) {
                 return layout;
             }
         }
     }
     getAllLayout() {
-        return this.getAdaptableState().Layout.Layouts;
+        (0, logDeprecation_1.logDeprecation)('LayouApi', 'getAllLayout', 'getLayouts');
+        return this.getLayouts();
+    }
+    getLayouts() {
+        var _a;
+        return (_a = this.getAdaptableState().Layout.Layouts) !== null && _a !== void 0 ? _a : [];
     }
     getLayoutById(id) {
         var _a;
-        return (_a = this.getAllLayout()) === null || _a === void 0 ? void 0 : _a.find((layout) => (layout === null || layout === void 0 ? void 0 : layout.Uuid) === id);
+        return (_a = this.getLayouts()) === null || _a === void 0 ? void 0 : _a.find((layout) => (layout === null || layout === void 0 ? void 0 : layout.Uuid) === id);
     }
     saveCurrentLayout() {
         var _a;
@@ -113,7 +104,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         if (layout == null) {
             return false;
         }
-        let existingLayout = this.getAllLayout().find((l) => l.Uuid == layout.Uuid || l.Name === layout.Name);
+        let existingLayout = this.getLayouts().find((l) => l.Uuid == layout.Uuid || l.Name === layout.Name);
         return existingLayout != null;
     }
     createAndSetLayout(layoutToCreate) {
@@ -159,15 +150,6 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             }
         }
     }
-    saveLayout(layoutToSave) {
-        if (!this.doesLayoutExist(layoutToSave)) {
-            this.addUidToAdaptableObject(layoutToSave);
-            this.dispatchAction(LayoutRedux.LayoutAdd(layoutToSave));
-        }
-        else {
-            this.dispatchAction(LayoutRedux.LayoutSave(layoutToSave));
-        }
-    }
     createOrUpdateLayout(layout) {
         if (!this.doesLayoutExist(layout)) {
             this.createLayout(layout);
@@ -177,77 +159,12 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         }
     }
     areLayoutsEqual(layout1, layout2) {
-        if (!layout1 && !layout2) {
-            return true;
-        }
-        if (!layout1 || !layout2) {
-            return false;
-        }
-        const defaults = {
-            ColumnSorts: [],
-            //   ColumnFlexMap: {},
-            ColumnWidthMap: {},
-            RowGroupedColumns: [],
-        };
-        layout1 = Object.assign(Object.assign({}, defaults), layout1);
-        layout2 = Object.assign(Object.assign({}, defaults), layout2);
-        return (0, isEqual_1.default)(layout1, layout2);
-    }
-    getLayoutDescription(layout) {
-        let returnString = '';
-        returnString += layout.Columns.length + ' Columns; ';
-        returnString += '\n';
-        returnString += ' Sort: ' + this.getColumnSort(layout.ColumnSorts);
-        return returnString;
-    }
-    getColumnSort(columnSorts) {
-        if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(columnSorts)) {
-            return 'None';
-        }
-        let returnString = '';
-        columnSorts.forEach((gs) => {
-            returnString +=
-                this.adaptable.api.columnApi.getFriendlyNameFromColumnId(gs.ColumnId) + Enums_1.SortOrder.Asc
-                    ? ' [asc] '
-                    : ' [desc] ';
-        });
-        return returnString;
+        (0, logDeprecation_1.logDeprecationInternal)('LayoutApi', 'areLayoutsEqual');
+        return this.internalApi.areLayoutsEqual(layout1, layout2);
     }
     createDefaultLayoutIfNeeded() {
-        let gridState = this.getAdaptableApi().gridApi.getGridState();
-        let layoutState = this.getLayoutState();
-        const isLayoutDefined = (layoutName) => !!layoutState.Layouts.filter((layout) => layout.Name === layoutName)[0];
-        let defaultLayoutColumns = gridState.Columns.filter((column) => column.visible);
-        const columnsMap = gridState.Columns.reduce((acc, col) => {
-            acc[col.columnId] = col;
-            return acc;
-        }, {});
-        let shouldCreateDefaultLayout = this.getLayoutOptions().createDefaultLayout;
-        if (!layoutState.Layouts || !layoutState.Layouts.length) {
-            shouldCreateDefaultLayout = true;
-        }
-        if (shouldCreateDefaultLayout) {
-            if (!layoutState.Layouts || !isLayoutDefined(GeneralConstants_1.DEFAULT_LAYOUT)) {
-                let defaultLayout = ObjectFactory_1.default.CreateEmptyLayout({
-                    Name: GeneralConstants_1.DEFAULT_LAYOUT,
-                    Columns: defaultLayoutColumns.map((c) => c.columnId),
-                    AggregationColumns: defaultLayoutColumns.reduce((acc, col) => {
-                        if (col.aggregationFunction) {
-                            acc[col.columnId] = col.aggregationFunction;
-                        }
-                        return acc;
-                    }, {}),
-                    PinnedColumnsMap: defaultLayoutColumns.reduce((acc, col) => {
-                        if (col.pinned) {
-                            acc[col.columnId] = col.pinned;
-                        }
-                        return acc;
-                    }, {}),
-                }, gridState.Columns);
-                this.createOrUpdateLayout(defaultLayout);
-                return defaultLayout;
-            }
-        }
+        (0, logDeprecation_1.logDeprecationInternal)('LayoutApi', 'createDefaultLayoutIfNeeded');
+        return this.internalApi.createDefaultLayoutIfNeeded();
     }
     showChangeColumnCaption(column) {
         this.dispatchAction((0, PopupRedux_1.PopupShowPrompt)({
@@ -259,6 +176,10 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         }));
     }
     showLayoutPopup() {
+        (0, logDeprecation_1.logDeprecation)('LayoutApi', 'showLayoutPopup', 'openLayoutSettingsPanel');
+        this.openLayoutSettingsPanel();
+    }
+    openLayoutSettingsPanel() {
         this.showModulePopup(ModuleConstants.LayoutModuleId);
     }
     showLayoutEditor(layoutName, action = 'Edit') {
@@ -289,7 +210,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             (0, LoggingHelper_1.LogAdaptableWarning)('The Default Layout cannot be deleted');
             return;
         }
-        const layoutCount = this.getAllLayout().length;
+        const layoutCount = this.getLayouts().length;
         if (layoutCount === 1) {
             (0, LoggingHelper_1.LogAdaptableWarning)('You cannot delete the only Layout.  AdapTable always requires one layout');
             return;
@@ -310,20 +231,16 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
     isCurrentLayoutDefault() {
         return this.isDefaultLayout(this.getCurrentLayout());
     }
-    areExpandedRowGroupsSavedInLayouts() {
-        return (this.getLayoutOptions().includeExpandedRowGroups ||
-            this.getLayoutOptions().displayRowGroups === 'dynamic');
-    }
     removeColumnFromCurrentLayout(columnId) {
         this.removeColumnFromLayout(columnId, this.getCurrentLayoutName());
     }
     removeColumnFromAllLayouts(columnId) {
-        this.getAllLayout().forEach((layout) => {
+        this.getLayouts().forEach((layout) => {
             this.removeColumnFromLayout(columnId, layout.Name);
         });
     }
     removeColumnFromLayout(columnId, layoutName) {
-        const column = this.getAdaptableApi().columnApi.getColumnFromId(columnId);
+        const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
         if (column) {
             const layout = this.getLayoutByName(layoutName);
             if (layout) {

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

@@ -1,6 +1,6 @@
+import { PluginsState } from '../../Redux/ActionsReducers/PluginsRedux';
 import { PluginsApi } from '../PluginsApi';
 import { ApiBase } from './ApiBase';
-import { PluginsState } from '../../Redux/ActionsReducers/PluginsRedux';
 import { IPushPullApi } from '../IPushPullApi';
 import { Glue42Api } from '../Glue42Api';
 import { OpenFinApi } from '../OpenFinApi';

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

@@ -1,5 +1,5 @@
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
-import { PlusMinusState, PlusMinusNudge } from '../../PredefinedConfig/PlusMinusState';
+import { PlusMinusNudge, PlusMinusState } from '../../PredefinedConfig/PlusMinusState';
 import { PlusMinusApi } from '../PlusMinusApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 export declare class PlusMinusApiImpl extends ApiBase implements PlusMinusApi {
@@ -11,6 +11,7 @@ export declare class PlusMinusApiImpl extends ApiBase implements PlusMinusApi {
     runPlusMinusNudge(plusMinusNudge: PlusMinusNudge, cellsToUpdate: GridCell[], direction: 'up' | 'down'): void;
     applyPlusMinus(gridCells: GridCell[]): void;
     showPlusMinusPopup(): void;
+    openPlusMinusSettingsPanel(): void;
     editPlusMinusNudge(plusMinusNudge: PlusMinusNudge): PlusMinusNudge;
     suspendPlusMinusNudge(plusMinusNudge: PlusMinusNudge): PlusMinusNudge;
     unSuspendPlusMinusNudge(plusMinusNudge: PlusMinusNudge): PlusMinusNudge;

package/src/Api/Implementation/PlusMinusApiImpl.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const PlusMinusRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PlusMinusRedux"));
+const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class PlusMinusApiImpl extends ApiBase_1.ApiBase {
     getPlusMinusState() {
         return this.getAdaptableState().PlusMinus;
@@ -31,6 +32,10 @@ class PlusMinusApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(PlusMinusRedux.PlusMinusApply(gridCells));
     }
     showPlusMinusPopup() {
+        (0, logDeprecation_1.logDeprecation)('PlusMinusApi', 'showPlusMinusPopup', 'openPlusMinusSettingsPanel');
+        this.openPlusMinusSettingsPanel();
+    }
+    openPlusMinusSettingsPanel() {
         this.showModulePopup(ModuleConstants.PlusMinusModuleId);
     }
     editPlusMinusNudge(plusMinusNudge) {

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

@@ -1,8 +1,12 @@
 import { ApiBase } from './ApiBase';
 import { PredicateApi } from '../PredicateApi';
-import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, PredicateModuleScope } from '../../PredefinedConfig/Common/AdaptablePredicate';
+import { AdaptablePredicate, AdaptablePredicateDef, PredicateDefHandlerParams, PredicateModuleScope } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableColumnDataType, SystemFilterPredicateId } from '../../types';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { PredicateInternalApi } from '../Internal/PredicateInternalApi';
 export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
+    internalApi: PredicateInternalApi;
+    constructor(adaptable: IAdaptable);
     getPredicateDefs(): AdaptablePredicateDef[];
     getSystemPredicateDefs(): AdaptablePredicateDef[];
     getCustomPredicateDefs(): AdaptablePredicateDef[];
@@ -12,15 +16,14 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     getCustomPredicateDefById(predicateId: string): AdaptablePredicateDef;
     predicateToString(predicate: AdaptablePredicate): string | undefined;
     isValidPredicate(predicate: AdaptablePredicate | undefined): boolean;
+    arePredicatesValid(predicates: AdaptablePredicate[]): boolean;
+    isEveryPredicateValid(predicates: AdaptablePredicate[]): boolean;
     handlePredicate(predicate: AdaptablePredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
+    handlePredicates(predicates: AdaptablePredicate[], params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
     hasPredicateValues(predicate: AdaptablePredicate): boolean;
-    private getSystemFilterPredicateIds;
     getFilterPredicateDefs(): AdaptablePredicateDef[];
-    private getSystemAlertPredicateIds;
     getAlertPredicateDefs(): AdaptablePredicateDef[];
-    private getSystemFormatColumnPredicateIds;
     getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
-    private getSystemFlashingCellPredicateIds;
     getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
 }