@adaptabletools/adaptable 13.1.1 → 14.0.0-canary.1

package/src/Strategy/AdaptableModuleBase.js

@@ -145,7 +145,7 @@ class AdaptableModuleBase {
                 return column.filterable;
             }
             else if (functionType == 'quickfilter') {
-                return this.api.columnApi.usesAdaptableQuickFilter(column.columnId);
+                return this.api.columnApi.internalApi.usesAdaptableQuickFilter(column.columnId);
             }
         }
         return true;
@@ -163,7 +163,7 @@ class AdaptableModuleBase {
     }
     getModuleCalculatedColumnReferences() {
         const references = [];
-        const allCalculatedColumns = this.api.calculatedColumnApi.getAllCalculatedColumn();
+        const allCalculatedColumns = this.api.calculatedColumnApi.getCalculatedColumns();
         this.getModuleAdaptableObjects().forEach((adaptableObject) => {
             const referencedColumnIds = this.getExplicitlyReferencedColumnIds(adaptableObject);
             referencedColumnIds.forEach((referencedColumnId) => {
@@ -178,7 +178,7 @@ class AdaptableModuleBase {
     }
     getModuleFreeTextColumnReferences() {
         const references = [];
-        const allFreeTextColumns = this.api.freeTextColumnApi.getAllFreeTextColumn();
+        const allFreeTextColumns = this.api.freeTextColumnApi.getFreeTextColumns();
         this.getModuleAdaptableObjects().forEach((adaptableObject) => {
             const referencedColumnIds = this.getExplicitlyReferencedColumnIds(adaptableObject);
             referencedColumnIds.forEach((referencedColumnId) => {
@@ -196,8 +196,8 @@ class AdaptableModuleBase {
         // extract special column references
         const referencedColumnIds = this.getExplicitlyReferencedColumnIds(adaptableObject);
         if (referencedColumnIds.length) {
-            const allCalculatedColumns = this.api.calculatedColumnApi.getAllCalculatedColumn();
-            const allFreeTextColumns = this.api.freeTextColumnApi.getAllFreeTextColumn();
+            const allCalculatedColumns = this.api.calculatedColumnApi.getCalculatedColumns();
+            const allFreeTextColumns = this.api.freeTextColumnApi.getFreeTextColumns();
             referencedColumnIds.forEach((referencedColumnId) => {
                 // check for calculated column
                 const referencedCalculatedColumn = allCalculatedColumns.find((calculatedColumn) => calculatedColumn.ColumnId === referencedColumnId);
@@ -240,7 +240,7 @@ class AdaptableModuleBase {
         return false;
     }
     showLayoutNotAssociatedObjects() {
-        return this.api.internalApi.showLayoutNotAssociatedObjects();
+        return this.api.layoutApi.internalApi.showLayoutNotAssociatedObjects();
     }
     getFriendlyName(module, friendlyName) {
         let returnValue = friendlyName;

package/src/Strategy/AlertModule.d.ts

@@ -14,17 +14,12 @@ export declare class AlertModule extends AdaptableModuleBase implements IModule
     getExplicitlyReferencedColumnIds(alertDefinition: AlertDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: AlertDefinition): string[];
     updateOldConfig(): void;
+    private updateAlertSingleToMultiplePredicates;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private handleCellDataChanged;
     private handleGridDataChanged;
     private handleReactiveAlertTriggered;
-    private showAlertForDefinitions;
-    private getAlertDefinitionsForCellDataChange;
     private getAlertDefinitionsForGridDataChange;
-    private getBaseAlertDefinitionsForDataChange;
-    private isAggregationAlertTriggered;
-    private isAlertPredicateTriggered;
-    private isAlertDefinitionForRowChangeEvent;
     getTeamSharingAction(): TeamSharingImportInfo<AlertDefinition>;
     toViewCompact(alert: AdaptableAlert): AdaptableObjectCompactView;
     toView(alert: AlertDefinition): AdaptableObjectView;

package/src/Strategy/AlertModule.js

@@ -7,7 +7,6 @@ const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/Syste
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
-const AdaptableQuery_1 = require("../PredefinedConfig/Common/AdaptableQuery");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
 const AlertWizard_1 = require("../View/Alert/Wizard/AlertWizard");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
@@ -18,7 +17,8 @@ const AlertEmptyView_1 = require("../View/Alert/AlertEmptyView");
 const AlertStatusSubPanel_1 = require("../View/Alert/AlertStatusSubPanel");
 const ActiveAlertsPanelItemLabel_1 = require("../View/Alert/ActiveAlertsPanelItemLabel");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
-const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
+const updateSingleToMultiplePredicates_1 = require("./Utilities/updateSingleToMultiplePredicates");
+const Helper_1 = require("../Utilities/Helpers/Helper");
 class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.AlertModuleId, ModuleConstants.AlertModuleFriendlyName, 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);
@@ -73,10 +73,11 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!queryExpression) {
             return [];
         }
-        return this.api.queryApi.getReferencedNamedQueryNames(queryExpression);
+        return this.api.queryApi.internalApi.getReferencedNamedQueryNames(queryExpression);
     }
     updateOldConfig() {
         var _a;
+        this.updateAlertSingleToMultiplePredicates();
         // 1. Make all (new) Flashing Cells have a Predicate if none exists
         const alertState = this.api.alertApi.getAlertState();
         const flashingAlertDefinitions = alertState.FlashingAlertDefinitions;
@@ -85,7 +86,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(flashingAlertDefinitions)) {
             this.api.flashingCellApi.setFlashingCellDefinitions(flashingAlertDefinitions);
             // TODO: state does not clear
-            this.api.internalApi.clearFlashingCellState();
+            this.api.flashingCellApi.internalApi.clearFlashingCellState();
         }
         (_a = alertState.AlertDefinitions) === null || _a === void 0 ? void 0 : _a.forEach((alertDefinition) => {
             // if ShowPopup then change to DisplayNotificate
@@ -115,16 +116,28 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         });
     }
+    updateAlertSingleToMultiplePredicates() {
+        const alertDefinitions = this.api.alertApi.getAlertDefinitions({
+            includeLayoutNotAssociatedObjects: true,
+        });
+        alertDefinitions.forEach((alertDefinition) => {
+            if (alertDefinition.Rule && 'Predicate' in alertDefinition.Rule) {
+                const preparedAlertDefinition = (0, Helper_1.cloneObject)(alertDefinition);
+                (0, updateSingleToMultiplePredicates_1.updateSingleToMultiplePredicates)(preparedAlertDefinition.Rule);
+                this.api.alertApi.editAlertDefinition(preparedAlertDefinition);
+            }
+        });
+    }
     addContextMenuItems(menuContext) {
         const items = [];
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn && menuContext.rowNode) {
                 let relevantAlert;
                 // find alerts which highlight the current cell
-                relevantAlert = this.api.internalApi.getAdaptableAlertWithHighlightCell(menuContext.adaptableColumn.columnId, menuContext.rowNode);
+                relevantAlert = this.api.alertApi.internalApi.getAdaptableAlertWithHighlightCell(menuContext.adaptableColumn.columnId, menuContext.rowNode);
                 if (!relevantAlert) {
                     // find alerts which highlight the current row
-                    relevantAlert = this.api.internalApi.getAdaptableAlertWithHighlightRow(menuContext.rowNode);
+                    relevantAlert = this.api.alertApi.internalApi.getAdaptableAlertWithHighlightRow(menuContext.rowNode);
                 }
                 if (relevantAlert) {
                     items.push(this.createColumnMenuItemReduxAction('Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
@@ -134,9 +147,9 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return items;
     }
     handleCellDataChanged(cellDataChangedInfo) {
-        const alertDefinitions = this.getAlertDefinitionsForCellDataChange(cellDataChangedInfo);
+        const alertDefinitions = this.api.alertApi.internalApi.getAlertDefinitionsForCellDataChange(cellDataChangedInfo);
         if (alertDefinitions === null || alertDefinitions === void 0 ? void 0 : alertDefinitions.length) {
-            this.showAlertForDefinitions(cellDataChangedInfo, alertDefinitions);
+            this.api.alertApi.internalApi.showAlertForDefinitions(cellDataChangedInfo, alertDefinitions);
         }
     }
     handleGridDataChanged(gridDataChangedInfo) {
@@ -145,15 +158,21 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const numberOfChangedRows = gridDataChangedInfo.rowNodes.length;
         const actionName = rowAdded ? 'Added' : 'Removed';
         const alertHeader = numberOfChangedRows > 1 ? `${actionName} Rows` : `${actionName} Row `;
-        const dynamicAlertMessage = numberOfChangedRows > 1
+        const defaultMessage = numberOfChangedRows > 1
             ? `${numberOfChangedRows} rows were ${actionName.toLowerCase()}`
             : `${numberOfChangedRows} row was ${actionName.toLowerCase()}`;
         alertDefinitions === null || alertDefinitions === void 0 ? void 0 : alertDefinitions.forEach((alertDefinition) => {
+            const customMessage = this.api.alertApi.internalApi.getCustomAlertDescription(alertDefinition, {
+                gridDataChangedInfo,
+            });
+            const customHeader = this.api.alertApi.internalApi.getCustomAlertMessageTitle(alertDefinition, {
+                gridDataChangedInfo,
+            });
             const alertMessage = alertDefinition.MessageText
                 ? alertDefinition.MessageText
-                : dynamicAlertMessage;
-            const alert = ObjectFactory_1.default.CreateRowChangedAlert(alertHeader, alertMessage, alertDefinition, gridDataChangedInfo);
-            this.api.alertApi.displayAlert(alert);
+                : customMessage !== null && customMessage !== void 0 ? customMessage : defaultMessage;
+            const alert = ObjectFactory_1.default.CreateRowChangedAlert(customHeader !== null && customHeader !== void 0 ? customHeader : alertHeader, alertMessage, alertDefinition, gridDataChangedInfo);
+            this.api.alertApi.showAdaptableAlert(alert);
         });
     }
     handleReactiveAlertTriggered(reactiveAlertInfo) {
@@ -165,100 +184,26 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         reactiveAlertInfo.dataChangeLogEntry.rowData =
             (_a = reactiveAlertInfo.dataChangeLogEntry.rowNode) === null || _a === void 0 ? void 0 : _a.data;
         if (reactiveAlertInfo.type === 'alert') {
-            this.showAlertForDefinitions(reactiveAlertInfo.dataChangeLogEntry, [
+            this.api.alertApi.internalApi.showAlertForDefinitions(reactiveAlertInfo.dataChangeLogEntry, [
                 reactiveAlertInfo.alertDefinition,
             ]);
         }
     }
-    showAlertForDefinitions(cellDataChangedInfo, alertDefinitions = []) {
-        alertDefinitions.forEach((alertDefinition) => {
-            const alert = ObjectFactory_1.default.CreateCellChangedAlert(this.api.alertApi.getAlertMessageTitle(alertDefinition, cellDataChangedInfo), this.api.alertApi.getAlertDescription(alertDefinition, cellDataChangedInfo), alertDefinition, cellDataChangedInfo);
-            this.api.alertApi.displayAlert(alert);
-        });
-    }
-    getAlertDefinitionsForCellDataChange(dataChangedEvent) {
-        return this.getBaseAlertDefinitionsForDataChange(dataChangedEvent, this.api.alertApi.getActiveNonReactiveAlertDefinitions());
-    }
     getAlertDefinitionsForGridDataChange(gridDataChangedInfo) {
-        return this.api.alertApi
+        return this.api.alertApi.internalApi
             .getActiveNonReactiveAlertDefinitions()
-            .filter((alertDefinition) => this.isAlertDefinitionForRowChangeEvent(alertDefinition))
+            .filter((alertDefinition) => this.api.alertApi.internalApi.isAlertDefinitionForRowChangeEvent(alertDefinition))
             .filter((alertDefinition) => {
-            var _a, _b, _c, _d;
+            var _a, _b;
             if (gridDataChangedInfo.rowTrigger === 'Add') {
-                return ((_b = (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicate) === null || _b === void 0 ? void 0 : _b.PredicateId) === 'AddedRow';
+                return (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates.some((predicate) => (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'AddedRow');
             }
             if (gridDataChangedInfo.rowTrigger === 'Delete') {
-                return ((_d = (_c = alertDefinition.Rule) === null || _c === void 0 ? void 0 : _c.Predicate) === null || _d === void 0 ? void 0 : _d.PredicateId) === 'RemovedRow';
+                return (_b = alertDefinition.Rule) === null || _b === void 0 ? void 0 : _b.Predicates.some((predicate) => (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'RemovedRow');
             }
             return false;
         });
     }
-    getBaseAlertDefinitionsForDataChange(dataChangedEvent, definitions, defaultNoPredicateReturn = false) {
-        let relatedAlertDefinitions = definitions
-            .filter((v) => this.api.scopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
-            .filter((alertDefinition) => !(0, AdaptableQuery_1.isReactiveQuery)(alertDefinition.Rule));
-        let triggeredAlerts = [];
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(relatedAlertDefinitions)) {
-            relatedAlertDefinitions.forEach((alertDefinition) => {
-                if (alertDefinition.Rule.BooleanExpression) {
-                    let expression = alertDefinition.Rule.BooleanExpression;
-                    let rowNode = dataChangedEvent.rowNode;
-                    if (!rowNode) {
-                        rowNode = this.api.gridApi.getRowNodeForPrimaryKey(dataChangedEvent.primaryKeyValue);
-                    }
-                    const isValidExpression = this.api.queryLanguageApi.isValidBooleanExpression(expression, this.moduleInfo.ModuleName, `Invalid Alert boolean expression '${expression}'`);
-                    const isSatisfiedExpression = isValidExpression &&
-                        this.api.internalApi
-                            .getQueryLanguageService()
-                            .evaluateBooleanExpression(expression, this.moduleInfo.ModuleName, rowNode);
-                    if (isSatisfiedExpression) {
-                        triggeredAlerts.push(alertDefinition);
-                    }
-                }
-                else if (alertDefinition.Rule.AggregatedBooleanExpression) {
-                    const isValidExpression = this.api.queryLanguageApi.isValidAggregatedBooleanExpression(alertDefinition.Rule.AggregatedBooleanExpression, this.moduleInfo.ModuleName, `Invalid Alert boolean expression '${alertDefinition.Rule.AggregatedBooleanExpression}'`);
-                    const isSatisfiedExpression = isValidExpression &&
-                        this.isAggregationAlertTriggered(alertDefinition, dataChangedEvent);
-                    if (isSatisfiedExpression) {
-                        triggeredAlerts.push(alertDefinition);
-                    }
-                }
-                else {
-                    if (!this.isAlertDefinitionForRowChangeEvent(alertDefinition) &&
-                        this.isAlertPredicateTriggered(alertDefinition, dataChangedEvent, defaultNoPredicateReturn)) {
-                        triggeredAlerts.push(alertDefinition);
-                    }
-                }
-            });
-        }
-        return triggeredAlerts;
-    }
-    isAggregationAlertTriggered(alertDefinition, dataChangedEvent) {
-        const changedColumn = dataChangedEvent.column.columnId;
-        const aggregationColumns = this.api.queryLanguageApi.getColumnsFromExpression(alertDefinition.Rule.AggregatedBooleanExpression);
-        if (!aggregationColumns.includes(changedColumn)) {
-            return false;
-        }
-        const aggregatedBooleanValue = this.api.internalApi
-            .getQueryLanguageService()
-            .computeAggregatedBooleanValue(alertDefinition.Rule.AggregatedBooleanExpression, ModuleConstants_1.AlertModuleId);
-        return aggregatedBooleanValue;
-    }
-    isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
-        return this.api.predicateApi.handlePredicate(alert.Rule.Predicate, {
-            value: dataChangedEvent.newValue,
-            oldValue: dataChangedEvent.oldValue,
-            // TODO send real display value
-            displayValue: null,
-            node: dataChangedEvent.rowNode,
-            column: dataChangedEvent.column,
-        }, defaultNoPredicateReturn);
-    }
-    isAlertDefinitionForRowChangeEvent(alertDefinition) {
-        return (this.api.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition) ||
-            this.api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition));
-    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.alertApi.getAlertDefinitions(),

package/src/Strategy/BulkUpdateModule.js

@@ -22,7 +22,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 !menuContext.adaptableColumn.readOnly &&
                 menuContext.isSelectedCell &&
                 menuContext.isSingleSelectedColumn &&
-                this.api.gridApi.areCellsEditable(menuContext.selectedCellInfo.gridCells)) {
+                this.api.gridApi.isEveryCellEditable(menuContext.selectedCellInfo.gridCells)) {
                 let popUpParams = {
                     source: 'ContextMenu',
                 };
@@ -84,7 +84,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             };
         }
         if (ArrayExtensions_1.default.IsNotNullOrEmpty(selectedCellInfo.gridCells) &&
-            !this.api.gridApi.areCellsEditable(selectedCellInfo.gridCells)) {
+            !this.api.gridApi.isEveryCellEditable(selectedCellInfo.gridCells)) {
             return {
                 IsValid: false,
                 Alert: {
@@ -106,7 +106,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let column;
         if (!this.api.internalApi.isGridInPivotMode()) {
             if (selectedCellInfo != null && selectedCellInfo.columns.length > 0) {
-                column = this.api.columnApi.getColumnFromId(selectedCellInfo.columns[0].columnId);
+                column = this.api.columnApi.getColumnWithColumnId(selectedCellInfo.columns[0].columnId);
                 let typedBulkUpdateValue;
                 switch (column.dataType) {
                     case 'Number':

package/src/Strategy/CalculatedColumnModule.js

@@ -20,10 +20,10 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.internalApi.dispatchReduxAction(CalculatedColumnRedux.CalculatedColumnReady(this.api.calculatedColumnApi.getCalculatedColumnState()));
     }
     getModuleAdaptableObjects() {
-        return this.api.calculatedColumnApi.getAllCalculatedColumn();
+        return this.api.calculatedColumnApi.getCalculatedColumns();
     }
     updateOldConfig() {
-        const calcColumns = this.api.calculatedColumnApi.getAllCalculatedColumn();
+        const calcColumns = this.api.calculatedColumnApi.getCalculatedColumns();
         let oldCalculatedColumns = [];
         calcColumns.forEach((cc) => {
             if (cc.ColumnExpression && !cc.Query) {
@@ -35,7 +35,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 (0, LoggingHelper_1.LogAdaptableWarning)(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
             }
         });
-        this.api.calculatedColumnApi.editCalculatedColumns(oldCalculatedColumns);
+        oldCalculatedColumns.forEach((oldCalcCol) => this.api.calculatedColumnApi.editCalculatedColumn(oldCalcCol));
     }
     getExplicitlyReferencedColumnIds(calculatedColumn) {
         var _a;
@@ -43,12 +43,12 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getReferencedNamedQueryNames(calculatedColumn) {
         var _a;
-        return ((_a = this.api.queryApi.getReferencedNamedQueryNames(this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
+        return ((_a = this.api.queryApi.internalApi.getReferencedNamedQueryNames(this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
     }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
             if (this.api.calculatedColumnApi
-                .getAllCalculatedColumn()
+                .getCalculatedColumns()
                 .find((cc) => cc.ColumnId == column.columnId)) {
                 let popupParam = {
                     column: column,
@@ -63,7 +63,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.calculatedColumnApi.getAllCalculatedColumn(),
+            ModuleEntities: this.api.calculatedColumnApi.getCalculatedColumns(),
             AddAction: CalculatedColumnRedux.CalculatedColumnAdd,
             EditAction: CalculatedColumnRedux.CalculatedColumnEdit,
         };

package/src/Strategy/ChartingModule.js

@@ -37,7 +37,7 @@ class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         // return false;
     }
     getModuleAdaptableObjects() {
-        return this.api.chartingApi.getAllChartDefinitions();
+        return this.api.chartingApi.getChartDefinitions();
     }
     toViewAll() {
         return this.getModuleAdaptableObjects().map((layout) => this.toView(layout));

package/src/Strategy/CustomSortModule.js

@@ -14,7 +14,7 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.CustomSortModuleId, ModuleConstants.CustomSortFriendlyName, 'custom-sort', 'CustomSortPopup', 'Provide bespoke sorting information for Columns (in place of alphabetical sorting)', api);
     }
     getModuleAdaptableObjects(config) {
-        return this.api.customSortApi.getAllCustomSort(config);
+        return this.api.customSortApi.getCustomSorts(config);
     }
     getExplicitlyReferencedColumnIds(customSort) {
         return [customSort.ColumnId];
@@ -25,11 +25,11 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable() && column.sortable) {
             let customSort = this.api.customSortApi
-                .getAllCustomSort()
+                .getCustomSorts()
                 .find((x) => x.ColumnId == column.columnId);
             let label = customSort ? 'Edit ' : 'Create ';
             // dont show a menu item if there is a custom sort that uses a comparer function
-            const columnSortComparer = this.api.internalApi.getCustomSortComparer(column);
+            const columnSortComparer = this.api.customSortApi.internalApi.getCustomSortComparer(column);
             if (columnSortComparer) {
                 return undefined;
             }
@@ -45,7 +45,7 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.customSortApi.getAllCustomSort(),
+            ModuleEntities: this.api.customSortApi.getCustomSorts(),
             AddAction: CustomSortRedux.CustomSortAdd,
             EditAction: CustomSortRedux.CustomSortEdit,
         };

package/src/Strategy/DashboardModule.js

@@ -26,7 +26,7 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (this.api.isDestroyed()) {
                 return;
             }
-            this.api.dashboardApi.fireDashboardChangedEvent('ADAPTABLE_READY', null, this.api.dashboardApi.getDashboardState());
+            this.api.dashboardApi.internalApi.fireDashboardChangedEvent('ADAPTABLE_READY', null, this.api.dashboardApi.getDashboardState());
         }, 20);
     }
     addColumnMenuItems() {
@@ -39,7 +39,7 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             let menuItems = [];
             if (this.isModuleEditable()) {
-                menuItems.push(this.createColumnMenuItemClickFunction('Configure', 'settings', () => this.api.dashboardApi.showDashboardPopup()));
+                menuItems.push(this.createColumnMenuItemClickFunction('Configure', 'settings', () => this.api.dashboardApi.openDashboardSettingsPanel()));
             }
             if (this.api.dashboardApi.getDashboardState().IsCollapsed) {
                 menuItems.push(this.createColumnMenuItemReduxAction('Expand', 'expand', DashboardRedux.DashboardSetIsCollapsed(false)));

package/src/Strategy/DataSetModule.js

@@ -13,7 +13,7 @@ class DataSetModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.DataSetModuleId, ModuleConstants.DataSetFriendlyName, 'data-set', 'DataSetPopup', 'Update the entire data source in AdapTable using pre-populated data sets', api);
     }
     handleAdaptableReady() {
-        this.api.dataSetApi.getAllDataSets().forEach((ds) => {
+        this.api.dataSetApi.getDataSets().forEach((ds) => {
             if (!ds.Uuid) {
                 ds.Uuid = (0, Uuid_1.createUuid)();
             }

package/src/Strategy/ExportModule.js

@@ -23,7 +23,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.ExportModuleId, ModuleConstants.ExportFriendlyName, 'export-data', 'ExportPopup', 'Export data from the Grid to numerous locations in numerous formatso', api);
     }
     getModuleAdaptableObjects() {
-        return this.api.exportApi.getAllReports();
+        return this.api.exportApi.getReports();
     }
     getExplicitlyReferencedColumnIds(report) {
         if (report.ReportColumnScope === 'ScopeColumns' &&
@@ -38,7 +38,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!report.Query) {
             return [];
         }
-        return this.api.queryApi.getReferencedNamedQueryNames(report.Query.BooleanExpression);
+        return this.api.queryApi.internalApi.getReferencedNamedQueryNames(report.Query.BooleanExpression);
     }
     addContextMenuItems(menuContext) {
         const canExport = !menuContext.isRowGroupColumn &&
@@ -54,7 +54,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         for (const destination of this.api.exportApi.getAvailableExportDestinations()) {
             menuItems.push(this.createColumnMenuItemClickFunction(destination, this.moduleInfo.Glyph, () => this.export(selectedCellReport, destination)));
         }
-        for (const customDestination of this.api.exportApi.getAllCustomDestination()) {
+        for (const customDestination of this.api.exportApi.getCustomDestinations()) {
             menuItems.push(this.createColumnMenuItemClickFunction(customDestination.name, this.moduleInfo.Glyph, () => this.export(selectedCellReport, customDestination.name)));
         }
         return [
@@ -176,7 +176,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.exportApi.getAllReports(),
+            ModuleEntities: this.api.exportApi.getReports(),
             AddAction: ExportRedux.ReportAdd,
             EditAction: ExportRedux.ReportEdit,
         };

package/src/Strategy/FilterModule.js

@@ -28,7 +28,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         const columnFilters = this.api.filterApi.getColumnFilters();
         columnFilters.forEach((cf) => {
-            if (!this.api.columnApi.doesColumnExist(cf.ColumnId)) {
+            if (!this.api.columnApi.isColumnInGrid(cf.ColumnId)) {
                 (0, LoggingHelper_1.LogAdaptableError)('Column Filter contains missing column: ' + cf.ColumnId);
             }
         });
@@ -43,10 +43,10 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 let isMultiple = menuContext.selectedCellInfo.gridCells.length > 1;
                 let clickFunction = isMultiple
                     ? () => {
-                        this.api.filterApi.createValuesColumnFilterForCells(menuContext.selectedCellInfo.gridCells);
+                        this.api.filterApi.internalApi.createValuesColumnFilterForCells(menuContext.selectedCellInfo.gridCells);
                     }
                     : () => {
-                        this.api.filterApi.createEqualityColumnFilterForCell(menuContext.selectedCellInfo.gridCells[0]);
+                        this.api.filterApi.internalApi.createEqualityColumnFilterForCell(menuContext.selectedCellInfo.gridCells[0]);
                     };
                 menuItemClickFunction = this.createColumnMenuItemClickFunction(isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction);
             }
@@ -57,7 +57,8 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let baseMenuItems = [];
         if (column && this.api.gridApi.isQuickFilterAvailable()) {
             const isFilterVisible = this.api.filterApi.isQuickFilterVisible();
-            if (this.isModuleEditable() && this.api.columnApi.usesAdaptableQuickFilter(column.columnId)) {
+            if (this.isModuleEditable() &&
+                this.api.columnApi.internalApi.usesAdaptableQuickFilter(column.columnId)) {
                 baseMenuItems.push(this.createColumnMenuItemReduxAction(isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
                     ? SystemRedux.SystemQuickFilterBarHide()
                     : SystemRedux.SystemQuickFilterBarShow()));
@@ -85,7 +86,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     toViewCompact(filter) {
         return {
             item: {
-                values: [this.api.filterApi.columnFilterToString(filter)],
+                values: [this.api.filterApi.internalApi.columnFilterToString(filter)],
             },
             abObject: filter,
         };
@@ -95,7 +96,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             items: [
                 {
                     name: 'Column',
-                    values: [this.api.columnApi.getFriendlyNameFromColumnId(filter.ColumnId)],
+                    values: [this.api.columnApi.getFriendlyNameForColumnId(filter.ColumnId)],
                 },
             ],
             abObject: filter,

package/src/Strategy/FlashingCellModule.d.ts

@@ -9,6 +9,8 @@ import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { FlashingCellDefinition } from '../PredefinedConfig/FlashingCellState';
 export declare class FlashingCellModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
+    updateOldConfig(): void;
+    private updateFlashingCellSingleToMultiplePredicates;
     getModuleAdaptableObjects(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): AdaptableObject[];

package/src/Strategy/FlashingCellModule.js

@@ -15,6 +15,8 @@ const FlashingCellWizard_1 = require("../View/FlashingCell/Wizard/FlashingCellWi
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const getFlashingTargetViewItems_1 = require("./Utilities/FlashingCell/getFlashingTargetViewItems");
 const getFlashingCellStyleViewItems_1 = require("./Utilities/FlashingCell/getFlashingCellStyleViewItems");
+const Helper_1 = require("../Utilities/Helpers/Helper");
+const updateSingleToMultiplePredicates_1 = require("./Utilities/updateSingleToMultiplePredicates");
 class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FlashingCellModuleId, ModuleConstants.FlashingCellFriendlyName, 'flashing-cell', 'FlashingAlert', 'Flash cells when they change', api);
@@ -41,6 +43,19 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             this.handleCellDataChanged(cellDataChangedInfo);
         });
     }
+    updateOldConfig() {
+        this.updateFlashingCellSingleToMultiplePredicates();
+    }
+    updateFlashingCellSingleToMultiplePredicates() {
+        const flashingCells = this.api.flashingCellApi.getFlashingCellDefinitions();
+        flashingCells.forEach((flashingCell) => {
+            if (flashingCell.Rule && 'Predicate' in flashingCell.Rule) {
+                const preparedFlashingCell = (0, Helper_1.cloneObject)(flashingCell);
+                (0, updateSingleToMultiplePredicates_1.updateSingleToMultiplePredicates)(preparedFlashingCell.Rule);
+                this.api.flashingCellApi.editFlashingCellDefinition(preparedFlashingCell);
+            }
+        });
+    }
     getModuleAdaptableObjects(config) {
         return this.api.flashingCellApi.getFlashingCellDefinitions(config);
     }
@@ -61,7 +76,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!queryExpression) {
             return [];
         }
-        return this.api.queryApi.getReferencedNamedQueryNames(queryExpression);
+        return this.api.queryApi.internalApi.getReferencedNamedQueryNames(queryExpression);
     }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
@@ -81,7 +96,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                             ColumnIds: [column.columnId],
                         },
                         Rule: {
-                            Predicate: { PredicateId: 'Any' },
+                            Predicates: [{ PredicateId: 'Any' }],
                         },
                     })),
                 ];
@@ -92,8 +107,8 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const items = [];
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn && menuContext.rowNode) {
-                const flashingCellForRow = this.api.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue);
-                const flashingCellForCell = this.api.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
+                const flashingCellForRow = this.api.flashingCellApi.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue);
+                const flashingCellForCell = this.api.flashingCellApi.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
                 if (flashingCellForRow) {
                     if (flashingCellForRow.flashTarget === 'row' ||
                         (Array.isArray(flashingCellForRow === null || flashingCellForRow === void 0 ? void 0 : flashingCellForRow.flashTarget) &&
@@ -201,7 +216,8 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return triggeredFlashingCells;
     }
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
-        return this.api.predicateApi.handlePredicate(alert.Rule.Predicate, {
+        var _a;
+        return this.api.predicateApi.handlePredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, {
             value: dataChangedEvent.newValue,
             oldValue: dataChangedEvent.oldValue,
             // TODO send real display value

package/src/Strategy/FormatColumnModule.d.ts

@@ -14,6 +14,7 @@ export declare class FormatColumnModule extends AdaptableModuleBase implements I
     getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
     hasNamedQueryReferences(): boolean;
     updateOldConfig(): void;
+    private updateFormatColumnSingleToMultiplePredicates;
     private updateConditionalStylesColumnsOldConfig;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FormatColumn>;