@adaptabletools/adaptable 14.0.0-canary.0 → 14.0.0-canary.1

package/src/Redux/Store/AdaptableStore.js

@@ -20,10 +20,10 @@ const GridRedux = tslib_1.__importStar(require("../ActionsReducers/GridRedux"));
 const SystemRedux = tslib_1.__importStar(require("../ActionsReducers/SystemRedux"));
 const PlusMinusRedux = tslib_1.__importStar(require("../ActionsReducers/PlusMinusRedux"));
 const ExportRedux = tslib_1.__importStar(require("../ActionsReducers/ExportRedux"));
-const ConditionalStyleRedux = tslib_1.__importStar(require("../ActionsReducers/ConditionalStyleRedux"));
 const QuickSearchRedux = tslib_1.__importStar(require("../ActionsReducers/QuickSearchRedux"));
 const ThemeRedux = tslib_1.__importStar(require("../ActionsReducers/ThemeRedux"));
 const FormatColumnRedux = tslib_1.__importStar(require("../ActionsReducers/FormatColumnRedux"));
+const StyledColumnRedux = tslib_1.__importStar(require("../ActionsReducers/StyledColumnRedux"));
 const ApplicationRedux = tslib_1.__importStar(require("../ActionsReducers/ApplicationRedux"));
 const FreeTextColumnRedux = tslib_1.__importStar(require("../ActionsReducers/FreeTextColumnRedux"));
 const LayoutRedux = tslib_1.__importStar(require("../ActionsReducers/LayoutRedux"));
@@ -131,7 +131,6 @@ class AdaptableStore {
             FlashingCell: FlashingCellRedux.FlashingCellReducer,
             Application: ApplicationRedux.ApplicationReducer,
             CalculatedColumn: CalculatedColumnRedux.CalculatedColumnReducer,
-            ConditionalStyle: ConditionalStyleRedux.ConditionalStyleReducer,
             CustomSort: CustomSortRedux.CustomSortReducer,
             Dashboard: DashboardRedux.DashboardReducer,
             Export: ExportRedux.ExportReducer,
@@ -148,10 +147,12 @@ class AdaptableStore {
             ToolPanel: ToolPanelRedux.ToolPanelReducer,
             Query: QueryRedux.QueryReducer,
             Charting: ChartingRedux.ChartingReducer,
+            StyledColumn: StyledColumnRedux.StyledColumnReducer,
             // dead reducers
             PercentBar: DeadRedux.PercentBarReducer,
             UpdatedRow: DeadRedux.UpdatedRowReducer,
             GradientColumn: DeadRedux.GradientColumnReducer,
+            ConditionalStyle: DeadRedux.ConditionalStyleReducer,
         };
         // allow plugins to participate in the root reducer
         adaptable.forPlugins((plugin) => {
@@ -293,7 +294,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case QueryRedux.NAMED_QUERY_DELETE: {
                     const actionTyped = action;
                     // check if Named Query is not referenced elsewhere
-                    const namedQueryReferences = adaptable.api.queryApi.getNamedQueryModuleReferences(actionTyped.namedQuery.Name);
+                    const namedQueryReferences = adaptable.api.queryApi.internalApi.getNamedQueryModuleReferences(actionTyped.namedQuery.Name);
                     if (namedQueryReferences.length) {
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
@@ -315,7 +316,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .Query.NamedQueries.find((namedQuery) => namedQuery.Uuid === editedNamedQuery.Uuid)) === null || _a === void 0 ? void 0 : _a.Name) !== null && _b !== void 0 ? _b : '';
                     if (editedNamedQuery.Name !== previousNamedQueryName) {
                         // if query is referenced elsewhere we cannot allow the name change, as it would turn the referents invalid
-                        const namedQueryReferences = adaptable.api.queryApi.getNamedQueryModuleReferences(previousNamedQueryName);
+                        const namedQueryReferences = adaptable.api.queryApi.internalApi.getNamedQueryModuleReferences(previousNamedQueryName);
                         if (namedQueryReferences.length) {
                             middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                                 alertType: 'generic',
@@ -337,8 +338,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case QueryRedux.QUERY_RUN: {
                     let ret = next(action);
                     setTimeout(() => adaptable.applyGridFiltering(), 5);
-                    adaptable.api.gridApi.fireSearchChangedEvent('CurrentQuery');
-                    adaptable.api.queryApi.fireQueryRunEvent();
+                    adaptable.api.queryApi.internalApi.fireQueryRunEvent();
                     return ret;
                 }
                 /*******************
@@ -364,7 +364,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  *******************/
                 case AlertRedux.ALERT_READY: {
                     // create observable alerts at grid startup
-                    const reactiveAlertDefinitions = adaptable.api.alertApi.getActiveReactiveAlertDefinitions();
+                    const reactiveAlertDefinitions = adaptable.api.alertApi.internalApi.getActiveReactiveAlertDefinitions();
                     reactiveAlertDefinitions.forEach((reactiveAlertDefinition) => adaptable.api.internalApi
                         .getAlertService()
                         .createReactiveAlert(reactiveAlertDefinition));
@@ -570,7 +570,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case CalculatedColumnRedux.CALCULATED_COLUMN_READY: {
                     // create aggregated scalar columns at grid startup
                     const aggregatedCalculatedColumns = adaptable.api.calculatedColumnApi
-                        .getAllCalculatedColumn()
+                        .getCalculatedColumns()
                         .filter((calculatedColumn) => { var _a; return (_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression; });
                     aggregatedCalculatedColumns.forEach((calculatedColumn) => {
                         adaptable.api.internalApi
@@ -608,7 +608,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case CalculatedColumnRedux.CALCULATED_COLUMN_DELETE: {
                     const actionTyped = action;
                     // check if CalculatedColumn is not referenced elsewhere
-                    const calculatedColumnReferences = adaptable.api.calculatedColumnApi.getCalculatedColumnModuleReferences(actionTyped.calculatedColumn);
+                    const calculatedColumnReferences = adaptable.api.calculatedColumnApi.internalApi.getCalculatedColumnModuleReferences(actionTyped.calculatedColumn);
                     if (calculatedColumnReferences.length) {
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
@@ -632,7 +632,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case FreeTextColumnRedux.FREE_TEXT_COLUMN_DELETE: {
                     const actionTyped = action;
                     // check if FreeTextColumn is not referenced elsewhere
-                    const freeTextColumnReferences = adaptable.api.freeTextColumnApi.getFreeTextColumnModuleReferences(actionTyped.freeTextColumn);
+                    const freeTextColumnReferences = adaptable.api.freeTextColumnApi.internalApi.getFreeTextColumnModuleReferences(actionTyped.freeTextColumn);
                     if (freeTextColumnReferences.length) {
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
@@ -657,18 +657,20 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case FormatColumnRedux.FORMAT_COLUMN_ADD:
                 case FormatColumnRedux.FORMAT_COLUMN_EDIT:
                 case FormatColumnRedux.FORMAT_COLUMN_DELETE:
+                case FormatColumnRedux.FORMAT_COLUMN_MOVE_DOWN:
+                case FormatColumnRedux.FORMAT_COLUMN_MOVE_UP:
                 case FormatColumnRedux.FORMAT_COLUMN_SUSPEND:
                 case FormatColumnRedux.FORMAT_COLUMN_UNSUSPEND:
+                case StyledColumnRedux.STYLED_COLUMN_ADD:
+                case StyledColumnRedux.STYLED_COLUMN_EDIT:
+                case StyledColumnRedux.STYLED_COLUMN_DELETE:
+                case StyledColumnRedux.STYLED_COLUMN_SUSPEND:
+                case StyledColumnRedux.STYLED_COLUMN_UNSUSPEND:
                 case CustomSortRedux.CUSTOM_SORT_ADD:
                 case CustomSortRedux.CUSTOM_SORT_EDIT:
                 case CustomSortRedux.CUSTOM_SORT_DELETE:
                 case CustomSortRedux.CUSTOM_SORT_SUSPEND:
-                case CustomSortRedux.CUSTOM_SORT_UNSUSPEND:
-                case ConditionalStyleRedux.CONDITIONAL_STYLE_ADD:
-                case ConditionalStyleRedux.CONDITIONAL_STYLE_EDIT:
-                case ConditionalStyleRedux.CONDITIONAL_STYLE_SUSPEND:
-                case ConditionalStyleRedux.CONDITIONAL_STYLE_UNSUSPEND:
-                case ConditionalStyleRedux.CONDITIONAL_STYLE_DELETE: {
+                case CustomSortRedux.CUSTOM_SORT_UNSUSPEND: {
                     const returnAction = next(action);
                     // called also for alert actions, see ALERT ACTIONS block
                     adaptable.setupColumns();
@@ -728,7 +730,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL: {
                     let returnAction;
                     // needs to be called before 'next' so previous and next column filters are known
-                    const shouldTriggerGridFiltering = adaptable.api.filterApi.shouldNewColumnFilterTriggerGridFiltering(action);
+                    const shouldTriggerGridFiltering = adaptable.api.filterApi.internalApi.shouldNewColumnFilterTriggerGridFiltering(action);
                     if ((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts) {
                         returnAction = next(action);
                     }
@@ -755,6 +757,18 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL:
                                 draftLayoutAction = GridRedux.LayoutDraftColumnFilterClearAll();
                                 break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterSuspend(action.columnFilter);
+                                break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND_ALL:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterSuspendAll();
+                                break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterUnsuspend(action.columnFilter);
+                                break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterUnsuspendAll();
+                                break;
                         }
                         returnAction = next(draftLayoutAction);
                     }
@@ -763,9 +777,8 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             adaptable.applyGridFiltering();
                         }
                     }, 5);
-                    adaptable.api.gridApi.fireSearchChangedEvent('Filter');
-                    adaptable.api.filterApi.fireFilterAppliedEvent();
-                    adaptable.api.layoutApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
+                    adaptable.api.filterApi.internalApi.fireFilterAppliedEvent();
+                    adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
                     return returnAction;
                 }
                 /*******************
@@ -778,7 +791,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case SystemRedux.SYSTEM_DATA_SET_SELECT: {
                     let returnAction = next(action);
                     const dataSet = adaptable.api.dataSetApi.getCurrentDataSet();
-                    adaptable.api.dataSetApi.fireDataSetSelectedEvent(dataSet);
+                    adaptable.api.dataSetApi.internalApi.fireDataSetSelectedEvent(dataSet);
                     requestAnimationFrame(() => {
                         if (dataSet.form) {
                             middlewareAPI.dispatch((0, PopupRedux_1.PopupShowForm)({
@@ -859,7 +872,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const oldDashboardState = middlewareAPI.getState().Dashboard;
                     let returnAction = next(action);
                     const newDashboardState = middlewareAPI.getState().Dashboard;
-                    adaptable.api.dashboardApi.fireDashboardChangedEvent(action.type, oldDashboardState, newDashboardState);
+                    adaptable.api.dashboardApi.internalApi.fireDashboardChangedEvent(action.type, oldDashboardState, newDashboardState);
                     return returnAction;
                 }
                 /*******************
@@ -876,11 +889,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const previousLayout = adaptable.api.layoutApi.getCurrentLayout();
                     let returnAction = next(action);
                     const newLayoutState = middlewareAPI.getState().Layout;
-                    adaptable.api.layoutApi.fireLayoutChangedEvent(action.type, oldLayoutState, newLayoutState);
+                    adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, oldLayoutState, newLayoutState);
                     const oldFilters = (_h = oldLayoutState.Layouts.find((l) => l.Name == oldLayoutState.CurrentLayout)) === null || _h === void 0 ? void 0 : _h.ColumnFilters;
                     const newFilters = (_j = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout)) === null || _j === void 0 ? void 0 : _j.ColumnFilters;
                     // Tell Grid to apply filtering if filters have been changed in a loaded Layout
-                    if (adaptable.api.filterApi.areColumnFiltersDifferent(oldFilters, newFilters)) {
+                    if (adaptable.api.filterApi.internalApi.areColumnFiltersDifferent(oldFilters, newFilters)) {
                         adaptable.applyGridFiltering();
                     }
                     if (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
@@ -917,7 +930,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             previousLayout !== savingLayout &&
                             // objects may have changed, but have the same contents
                             // this prevents pivot layout from infinite set-layout
-                            !adaptable.api.layoutApi.areLayoutsEqual(previousLayout, savingLayout)) {
+                            !adaptable.api.layoutApi.internalApi.areLayoutsEqual(previousLayout, savingLayout)) {
                             adaptable.setLayout(savingLayout);
                         }
                     }
@@ -1002,7 +1015,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case SmartEditRedux.SMART_EDIT_APPLY: {
                     let returnAction = next(action);
                     const actionTyped = action;
-                    adaptable.api.internalApi.setGridCells(actionTyped.gridCells);
+                    adaptable.api.gridApi.internalApi.setGridCells(actionTyped.gridCells);
                     return returnAction;
                 }
                 /*******************
@@ -1053,7 +1066,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case BulkUpdateRedux.BULK_UPDATE_APPLY: {
                     let returnAction = next(action);
                     const actionTyped = action;
-                    adaptable.api.internalApi.setGridCells(actionTyped.gridCells);
+                    adaptable.api.gridApi.internalApi.setGridCells(actionTyped.gridCells);
                     return returnAction;
                 }
                 /*******************
@@ -1080,7 +1093,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case PlusMinusRedux.PLUS_MINUS_APPLY: {
                     let returnAction = next(action);
                     const actionTyped = action;
-                    adaptable.api.internalApi.setGridCells(actionTyped.gridCells);
+                    adaptable.api.gridApi.internalApi.setGridCells(actionTyped.gridCells);
                     return returnAction;
                 }
                 /*******************
@@ -1306,7 +1319,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingLinkItem(...activeSharedEntities));
                     }
                     // mark the import process as ended after (we assume that) the import is finished
-                    adaptable.api.internalApi
+                    adaptable.api.teamSharingApi.internalApi
                         .waitForTeamSharingImportEnd()
                         .then(() => middlewareAPI.dispatch(TeamSharingRedux.TeamSharingCommitImport()))
                         .catch(() => middlewareAPI.dispatch(TeamSharingRedux.TeamSharingCommitImport()));
@@ -1411,14 +1424,12 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 }
                 case GridRedux.GRID_SET_SORT: {
                     let ret = next(action);
-                    adaptable.api.gridApi.fireSearchChangedEvent('Sort');
-                    adaptable.api.gridApi.fireGridSortedEvent();
+                    adaptable.api.gridApi.internalApi.fireGridSortedEvent();
                     return ret;
                 }
                 case GridRedux.GRID_CLEAR_SORT: {
                     let ret = next(action);
-                    adaptable.api.gridApi.fireSearchChangedEvent('Sort');
-                    adaptable.api.gridApi.fireGridSortedEvent();
+                    adaptable.api.gridApi.internalApi.fireGridSortedEvent();
                     return ret;
                 }
                 /*******************
@@ -1465,7 +1476,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     // make sure we have the grid columns in state, before we do any layout work
                     adaptable.updateColumnsIntoStore();
                     const layoutState = middlewareAPI.getState().Layout;
-                    const defaultLayout = adaptable.api.layoutApi.createDefaultLayoutIfNeeded();
+                    const defaultLayout = adaptable.api.layoutApi.internalApi.createDefaultLayoutIfNeeded();
                     let currentLayout = (layoutState === null || layoutState === void 0 ? void 0 : layoutState.CurrentLayout) || (defaultLayout === null || defaultLayout === void 0 ? void 0 : defaultLayout.Name);
                     if (!adaptable.api.layoutApi.getLayoutByName(currentLayout)) {
                         currentLayout = defaultLayout ? defaultLayout.Name : layoutState.Layouts[0].Name;

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");
@@ -16,9 +15,10 @@ const getAlertPreviewViewItems_1 = require("./Utilities/Alert/getAlertPreviewVie
 const getAlertBehaviourViewItems_1 = require("./Utilities/Alert/getAlertBehaviourViewItems");
 const AlertEmptyView_1 = require("../View/Alert/AlertEmptyView");
 const AlertStatusSubPanel_1 = require("../View/Alert/AlertStatusSubPanel");
-const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const ActiveAlertsPanelItemLabel_1 = require("../View/Alert/ActiveAlertsPanelItemLabel");
-const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
+const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+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(cellDataChangedInfo.column.friendlyName, 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.d.ts

@@ -1,7 +1,13 @@
-import { IModule } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableApi } from '../Api/AdaptableApi';
+import { ChartDefinition } from '../types';
 export declare class ChartingModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
+    updateOldConfig(): void;
     isModuleAvailable(): boolean;
+    getModuleAdaptableObjects(): ChartDefinition[];
+    toViewAll(): AdaptableObjectView[];
+    toView(chart: ChartDefinition): AdaptableObjectView;
+    getViewProperties(): AdaptableModuleView;
 }