@adaptabletools/adaptable 11.0.0-canary.5 → 11.0.0

package/src/Api/Implementation/QueryLanguageApiImpl.js

@@ -25,10 +25,19 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
         }
         return isValid;
     }
-    isValidAggregationExpression(expression, module, validationErrorMessage) {
+    isValidAggregatedBooleanExpression(expression, module, validationErrorMessage) {
         const { isValid, errorMessage } = this.adaptable.api.internalApi
             .getQueryLanguageService()
-            .validateAggregation(expression, module);
+            .validateAggregatedBoolean(expression, module);
+        if (!isValid && validationErrorMessage) {
+            LoggingHelper_1.LogAdaptableWarning(`${validationErrorMessage} :: ${errorMessage}`);
+        }
+        return isValid;
+    }
+    isValidAggregatedScalarExpression(expression, module, validationErrorMessage) {
+        const { isValid, errorMessage } = this.adaptable.api.internalApi
+            .getQueryLanguageService()
+            .validateAggregatedScalar(expression, module);
         if (!isValid && validationErrorMessage) {
             LoggingHelper_1.LogAdaptableWarning(`${validationErrorMessage} :: ${errorMessage}`);
         }
@@ -51,7 +60,7 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
         }
     }
     getQueryableColumnIds() {
-        let queryableColumns = this.getQueryLanguageOptions().queryableColumns;
+        let queryableColumns = this.getExpressionOptions().queryableColumns;
         if (!queryableColumns) {
             return undefined;
         }
@@ -67,7 +76,11 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
         }
     }
     getModuleExpressionFunctionMap() {
-        return this.getQueryLanguageOptions().moduleExpressionFunctions;
+        return this.getExpressionOptions().moduleExpressionFunctions;
+    }
+    getAdaptableQueryExpression(query) {
+        var _a, _b, _c, _d;
+        return ((_d = (_c = (_b = (_a = query.BooleanExpression) !== null && _a !== void 0 ? _a : query.ScalarExpression) !== null && _b !== void 0 ? _b : query.ObservableExpression) !== null && _c !== void 0 ? _c : query.AggregatedBooleanExpression) !== null && _d !== void 0 ? _d : query.AggregatedScalarExpression);
     }
 }
 exports.QueryLanguageApiImpl = QueryLanguageApiImpl;

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

@@ -0,0 +1,7 @@
+import { SettingsPanelApi } from '../SettingsPanelApi';
+import { ApiBase } from './ApiBase';
+import { AdaptableModule } from '../../../types';
+export declare class SettingsPanelApiImpl extends ApiBase implements SettingsPanelApi {
+    showSettingsPanel(moduleName?: AdaptableModule): void;
+    showCustomSettingsPanel(name: string): void;
+}

package/src/Api/Implementation/SettingsPanelApiImpl.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SettingsPanelApiImpl = void 0;
+const tslib_1 = require("tslib");
+const ApiBase_1 = require("./ApiBase");
+const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
+class SettingsPanelApiImpl extends ApiBase_1.ApiBase {
+    showSettingsPanel(moduleName) {
+        this.dispatchAction(PopupRedux.PopupShowScreen(moduleName));
+    }
+    showCustomSettingsPanel(name) {
+        this.dispatchAction(PopupRedux.PopupShowScreen(null, name));
+    }
+}
+exports.SettingsPanelApiImpl = SettingsPanelApiImpl;

package/src/Api/InternalApi.d.ts

@@ -6,7 +6,7 @@ import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
 import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../PredefinedConfig/Selection/SelectedRowInfo';
-import { AdaptableModule } from '../PredefinedConfig/Common/Types';
+import { AdaptableModule, AdaptableQLModule } from '../PredefinedConfig/Common/Types';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { IAdaptable } from '../AdaptableInterfaces/IAdaptable';
 import { IValidationService } from '../Utilities/Services/Interface/IValidationService';
@@ -15,7 +15,6 @@ import { IReportService } from '../Utilities/Services/Interface/IReportService';
 import { ICalculatedColumnExpressionService } from '../Utilities/Services/Interface/ICalculatedColumnExpressionService';
 import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { Layout } from '../PredefinedConfig/LayoutState';
-import { ServerSearchOption } from '../AdaptableOptions/SearchOptions';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
 import { AdaptableMessageType, DataChangedInfo, SystemStatusMessageInfo } from '../types';
@@ -94,7 +93,7 @@ export interface InternalApi {
     getTeamSharingService(): ITeamSharingService;
     getMetamodelService(): IMetamodelService;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
-    isServerSearchOptionSet(serverSearchOption: ServerSearchOption): boolean;
+    runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
     buildStandaloneColumnHeader(column: AdaptableColumn): AdaptableMenuItem[];
     getCustomSortComparer(column: AdaptableColumn): ColumnValuesComparer | undefined;
     clearFlashingCellState(): void;

package/src/Api/QueryApi.d.ts

@@ -45,7 +45,7 @@ export interface QueryApi {
     showExpandedQueryPopup(): void;
     /**
      * Set a Query as Current Query
-     * @param query Query to set
+     * @param query - Query to set
      */
     setCurrentQuery(query: string): void;
     /**
@@ -53,7 +53,7 @@ export interface QueryApi {
      */
     clearCurrentQuery(): void;
     /**
-     * Retuns the Current Query
+     * Returns the Current Query
      */
     getCurrentQuery(): string | undefined;
 }

package/src/Api/QueryLanguageApi.d.ts

@@ -1,5 +1,6 @@
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { ExpressionFunctionMap } from '../types';
+import { AdaptableQuery } from '../PredefinedConfig/Common/AdaptableQuery';
 /**
  * Manages AdapTableQL (Query Language)
  */
@@ -13,21 +14,28 @@ export interface QueryLanguageApi {
     isValidBooleanExpression(query: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
     /**
      * Whether the given ObservableExpression is valid
-     * @param query query to Check
-     * @param module module specific query
-     * @param validationErrorMessage optional validation error message; if provided, the error will be logged
+     * @param expression - ObservableExpression to check
+     * @param module - module specific query
+     * @param validationErrorMessage - optional validation error message; if provided, the error will be logged
      */
     isValidObservableExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
     /**
-     * Whether the given AggregationExpression is valid
-     * @param query query to Check
-     * @param module module specific query
-     * @param validationErrorMessage optional validation error message; if provided, the error will be logged
+     * Whether the given AggregatedBooleanExpression is valid
+     * @param expression -  AggregatedBooleanExpression to check
+     * @param module - module specific query
+     * @param validationErrorMessage - optional validation error message; if provided, the error will be logged
+     */
+    isValidAggregatedBooleanExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
+    /**
+     * Whether the given AggregatedScalarExpression is valid
+     * @param expression -  AggregatedScalarExpression to check
+     * @param module - module specific query
+     * @param validationErrorMessage - optional validation error message; if provided, the error will be logged
      */
-    isValidAggregationExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
+    isValidAggregatedScalarExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
     /**
-     * Returns all Columns referenced in a Query
-     * @param adaptableQuery Query to check
+     * Returns all Columns referenced in a QueryExpression
+     * @param expression - expression to check
      */
     getColumnsFromExpression(expression: string): string[];
     /**
@@ -43,4 +51,9 @@ export interface QueryLanguageApi {
      * @param expression expression to be run
      */
     getASTForExpression(expression: string): any;
+    /**
+     * Returns the Expression string of the given AdaptableQuery, which may be either a Boolean, an AggregatedBoolean, a Scalar, an AggregatedScalar or an ObservableExpression expression
+     * @param query - the AdaptableQuery
+     */
+    getAdaptableQueryExpression(query: Partial<AdaptableQuery>): string | undefined;
 }

package/src/Api/SettingsPanelApi.d.ts

@@ -0,0 +1,16 @@
+import { AdaptableModule } from '../../types';
+/**
+ * Provides run-time access to the Settings Panel
+ **/
+export interface SettingsPanelApi {
+    /**
+     * Opens Settings Panel and displays specified Module (if provided) or first available one
+     * @param moduleName name of Module to display
+     */
+    showSettingsPanel(moduleName?: AdaptableModule): void;
+    /**
+     * Opens Settings Panel with the Custom Settings Panel, provided by name, displayed
+     * @param name name of Custom Settings Panel to display
+     */
+    showCustomSettingsPanel(name: string): void;
+}

package/src/Api/SettingsPanelApi.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/PredefinedConfig/AlertState.d.ts

@@ -8,7 +8,7 @@ import { AdaptableButton, ButtonContext } from './Common/AdaptableButton';
 import { SuspendableObject } from './Common/SuspendableObject';
 import { AdaptableStyle } from './Common/AdaptableStyle';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
-import { AdaptableAggregationQuery, AdaptableBooleanQuery, AdaptableObservableQuery } from './Common/AdaptableQuery';
+import { AdaptableAggregatedBooleanQuery, AdaptableBooleanQuery, AdaptableObservableQuery } from './Common/AdaptableQuery';
 import { ButtonStyle } from './Common/ButtonStyle';
 import { AlertButtonContext } from '../types';
 /**
@@ -60,7 +60,11 @@ export interface AlertDefinitionPredicate extends AdaptablePredicate {
  */
 export declare type AlertRule = XOR<{
     Predicate: AlertDefinitionPredicate;
-}, XOR<AdaptableBooleanQuery, XOR<AdaptableObservableQuery, AdaptableAggregationQuery>>>;
+}, AdaptableAlertQuery>;
+/**
+ *  Alert Query which may be either a Boolean, Observable or AggregatedBoolean Expression
+ */
+export declare type AdaptableAlertQuery = XOR<AdaptableBooleanQuery, XOR<AdaptableObservableQuery, AdaptableAggregatedBooleanQuery>>;
 export declare type AdaptableAlertAction = 'highlight-cell' | 'jump-to-cell' | 'jump-to-row' | 'jump-to-column' | 'suspend' | 'undo';
 /**
  * Defines a button that appears in an Alert Form

package/src/PredefinedConfig/CalculatedColumnState.d.ts

@@ -1,7 +1,8 @@
 import { ConfigState } from './ConfigState';
 import { AdaptableObject } from './Common/AdaptableObject';
-import { AdaptableScalarQuery } from './Common/AdaptableQuery';
+import { AdaptableAggregatedScalarQuery, AdaptableScalarQuery } from './Common/AdaptableQuery';
 import { SpecialColumnSettings } from './Common/SpecialColumnSettings';
+import { XOR } from '../Utilities/Extensions/TypeExtensions';
 /**
  * Predefined Configuration for Calculated Column Module
  **/
@@ -28,9 +29,9 @@ export interface CalculatedColumn extends AdaptableObject {
      */
     CalculatedColumnSettings?: CalculatedColumnSettings;
     /**
-     * Scalar Expression used by AdapTableQL to evaluate Column's value
+     * Scalar/AggregatedScalar Query used by AdapTableQL to evaluate Column's value
      */
-    Query?: AdaptableScalarQuery;
+    Query?: AdaptableCalculatedColumnQuery;
 }
 /**
  * Set of optional properties that define a Calculated Column's behaviour
@@ -46,3 +47,7 @@ export interface CalculatedColumnSettings extends SpecialColumnSettings {
      */
     ShowToolTip?: boolean;
 }
+/**
+ * Calculated Column Query which may be a Scalar or an AggregatedScalar Expression
+ */
+export declare type AdaptableCalculatedColumnQuery = XOR<AdaptableScalarQuery, AdaptableAggregatedScalarQuery>;

package/src/PredefinedConfig/Common/AdaptableFormat.d.ts

@@ -61,6 +61,9 @@ export interface DateFormatterOptions {
      */
     Pattern?: string;
 }
+/**
+ * Formatter Options for String Columns
+ */
 export interface StringFormatterOptions {
     /**
      * Sets text to Upper or Lower case

package/src/PredefinedConfig/Common/AdaptableQuery.d.ts

@@ -8,12 +8,14 @@ export interface AdaptableScalarQuery {
 export interface AdaptableObservableQuery {
     ObservableExpression: string;
 }
-export interface AdaptableAggregationQuery {
-    AggregationExpression: string;
+export interface AdaptableAggregatedBooleanQuery {
+    AggregatedBooleanExpression: string;
+}
+export interface AdaptableAggregatedScalarQuery {
+    AggregatedScalarExpression: string;
 }
 /**
- * An AdaptableQuery can be either a Boolean, Scalar, Observable or Aggregation expression
+ * An AdaptableQuery can be either a Boolean, Scalar, Observable, AggregatedBoolean, or AggregatedScalar expression
  */
-export declare type AdaptableQuery = XOR<AdaptableBooleanQuery, XOR<AdaptableScalarQuery, XOR<AdaptableObservableQuery, AdaptableAggregationQuery>>>;
-export declare const getAdaptableQueryExpression: (query: Partial<AdaptableQuery>) => string | undefined;
+export declare type AdaptableQuery = XOR<AdaptableBooleanQuery, XOR<AdaptableScalarQuery, XOR<AdaptableObservableQuery, XOR<AdaptableAggregatedBooleanQuery, AdaptableAggregatedScalarQuery>>>>;
 export declare const isReactiveQuery: (query: Partial<AdaptableQuery>) => boolean;

package/src/PredefinedConfig/Common/AdaptableQuery.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isReactiveQuery = exports.getAdaptableQueryExpression = void 0;
-exports.getAdaptableQueryExpression = (query) => {
-    var _a, _b, _c;
-    return ((_c = (_b = (_a = query.BooleanExpression) !== null && _a !== void 0 ? _a : query.ScalarExpression) !== null && _b !== void 0 ? _b : query.ObservableExpression) !== null && _c !== void 0 ? _c : query.AggregationExpression);
-};
+exports.isReactiveQuery = void 0;
 exports.isReactiveQuery = (query) => {
-    return !!query.ObservableExpression || !!query.AggregationExpression;
+    return !!query.ObservableExpression || !!query.AggregatedBooleanExpression;
 };

package/src/PredefinedConfig/Common/Enums.d.ts

@@ -1,7 +1,6 @@
 export declare enum DataType {
     String = "String",
     Number = "Number",
-    NumberArray = "NumberArray",
     Boolean = "Boolean",
     Date = "Date",
     Object = "Object",

package/src/PredefinedConfig/Common/Enums.js

@@ -6,8 +6,6 @@ var DataType;
 (function (DataType) {
     DataType["String"] = "String";
     DataType["Number"] = "Number";
-    // FIXME AFL keep it or extend it to support https://www.ag-grid.com/javascript-data-grid/sparklines-data/ ?
-    DataType["NumberArray"] = "NumberArray";
     DataType["Boolean"] = "Boolean";
     DataType["Date"] = "Date";
     DataType["Object"] = "Object";

package/src/PredefinedConfig/Common/SpecialColumnSettings.d.ts

@@ -1,5 +1,5 @@
 /**
- * Base Settings for SpecialColumns
+ * Base Settings for Calculated Columns and FreeText Columns
  */
 export interface SpecialColumnSettings {
     /**

package/src/PredefinedConfig/Common/Types.d.ts

@@ -22,8 +22,13 @@ export declare type AdaptableModuleButtons = AdaptableModuleButton[];
 export declare type AdaptableModuleButton = 'Alert' | 'FlashingCell' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme';
 export declare type AdaptableStateKeys = AdaptableStateKey[];
 export declare type AdaptableStateKey = 'Alert' | 'FlashingCell' | 'Application' | 'CalculatedColumn' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataSource' | 'Export' | 'Filter' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'Theme' | 'ToolPanel';
-export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'CustomSettingsPanelModule';
+/**
+ * Modules provided by AdapTable, subject to Entitlements and usually have Predefined Config
+ */
+export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;
+export declare type AdaptableQLModules = AdaptableQLModule[];
+export declare type AdaptableQLModule = 'Filter' | 'Query';

package/src/PredefinedConfig/Common/Types.js

@@ -41,3 +41,4 @@ exports.ALL_TOOL_PANELS = [
     'SystemStatus',
     'Theme',
 ];
+//  | 'QuickSearch'

package/src/PredefinedConfig/ConditionalStyleState.d.ts

@@ -11,7 +11,7 @@ import { SuspendableObject } from './Common/SuspendableObject';
  **/
 export interface ConditionalStyleState extends ConfigState {
     /**
-     * Array of Conditional Styles to ship with Adaptable
+     * Array of Conditional Styles to ship with AdapTable
      */
     ConditionalStyles?: ConditionalStyle[];
 }
@@ -32,7 +32,7 @@ export interface ConditionalStyle extends SuspendableObject {
      */
     Style: AdaptableStyle;
     /**
-     * Whether to apply Style in Grouped Rows
+     * Whether to apply Style in Grouped Rows and when Pivoting
      * @defaultValue false
      */
     IncludeGroupedRows?: boolean;

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -48,6 +48,9 @@ export interface FormatColumn extends SuspendableObject {
      */
     IncludeGroupedRows?: boolean;
 }
+/**
+ * Special Style used when Formatting Columns: Gradient, PercentBar or CheckBox
+ */
 export interface ColumnStyle {
     /**
      * Style a numeric column so each cell value shows a gradient shade
@@ -62,6 +65,9 @@ export interface ColumnStyle {
      */
     CheckBoxStyle?: boolean;
 }
+/**
+ * Style used to display Percent Bars in Format Column
+ */
 export interface PercentBarStyle {
     /**
      * Ranges (e.g. to allow a traffic light effect)
@@ -85,6 +91,9 @@ export interface PercentBarStyle {
      */
     BackColor?: string;
 }
+/**
+ * Used to display Gradient Styles in Format Column
+ */
 export interface GradientStyle {
     /**
      * Ranges (e.g. to allow a traffic light effect)
@@ -95,6 +104,9 @@ export interface GradientStyle {
      */
     ColumnComparison?: ColumnComparison;
 }
+/**
+ * Defines which Colours to show in Gradient and Percent Bar Styles
+ */
 export interface CellColorRange {
     /**
      * Start number of Range
@@ -113,6 +125,9 @@ export interface CellColorRange {
      */
     ReverseGradient?: boolean;
 }
+/**
+ * Enables a Percent Bar or Gradient Style to use another column in its calculations
+ */
 export interface ColumnComparison {
     /**
      * Start value - either numeric or Column name

package/src/PredefinedConfig/Selection/GridCellRange.d.ts

@@ -1,5 +1,7 @@
 export interface GridCellRange {
     columnIds: string[];
-    primaryKeyValueStart: any;
+    primaryKeyValueStart?: any;
     primaryKeyValueEnd?: any;
+    rowIndexStart?: any;
+    rowIndexEnd?: any;
 }

package/src/PredefinedConfig/ToolPanelState.d.ts

@@ -29,4 +29,7 @@ export interface AdaptableToolPanelDefinition {
      */
     VisibilityMode?: 'expanded' | 'collapsed';
 }
+/**
+ * Whether a ToolPanel displays as expanded or collapsed
+ */
 export declare type ToolPanelVisibilityMode = 'expanded' | 'collapsed';

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -64,7 +64,7 @@ function MergeStateFunction(oldState, newState) {
     }
     // any Module in config that doesn't exist in state will be added
     for (const configModuleName in config) {
-        (_a = state[configModuleName]) !== null && _a !== void 0 ? _a : (state[configModuleName] = config[configModuleName]);
+        state[configModuleName] = (_a = state[configModuleName]) !== null && _a !== void 0 ? _a : config[configModuleName];
     }
     // any Module in state that has an older revision then the config will be replaced
     for (const stateModuleName in state) {

package/src/Redux/Store/AdaptableStore.js

@@ -496,6 +496,21 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 /*******************
                  * SPECIAL COLUMN ACTIONS
                  *******************/
+                case CalculatedColumnRedux.CALCULATED_COLUMN_READY: {
+                    // create aggregated scalar columns at grid startup
+                    const aggregatedCalculatedColumns = adaptable.api.calculatedColumnApi
+                        .getAllCalculatedColumn()
+                        .filter((calculatedColumn) => { var _a; return (_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression; });
+                    aggregatedCalculatedColumns.forEach((calculatedColumn) => {
+                        adaptable.api.internalApi
+                            .getCalculatedColumnExpressionService()
+                            .createAggregatedScalarCalculatedColumn(calculatedColumn);
+                    });
+                    // refresh calcualted columns
+                    const aggCalculatedColumnIds = aggregatedCalculatedColumns.map((calculatedColumn) => calculatedColumn.ColumnId);
+                    adaptable.refreshCells(null, aggCalculatedColumnIds, true);
+                    return;
+                }
                 /**
                  * Use Case: We have added / edited / deleted a Special Column (i.e. one not in initial ColumnDefs)
                  * Action: We update the Special ColumnDefs
@@ -504,7 +519,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case FreeTextColumnRedux.FREE_TEXT_COLUMN_EDIT:
                 case CalculatedColumnRedux.CALCULATED_COLUMN_ADD:
                 case CalculatedColumnRedux.CALCULATED_COLUMN_EDIT: {
-                    const returnAction = next(action);
+                    const actionTyped = action;
+                    const returnAction = next(actionTyped);
+                    if (returnAction.type === CalculatedColumnRedux.CALCULATED_COLUMN_ADD ||
+                        returnAction.type === CalculatedColumnRedux.CALCULATED_COLUMN_EDIT) {
+                        adaptable.api.internalApi
+                            .getCalculatedColumnExpressionService()
+                            .createAggregatedScalarCalculatedColumn(returnAction.calculatedColumn);
+                    }
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
                 }
@@ -524,7 +546,10 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         }));
                         return;
                     }
-                    const returnAction = next(action);
+                    const returnAction = next(actionTyped);
+                    adaptable.api.internalApi
+                        .getCalculatedColumnExpressionService()
+                        .destroyAggregatedScalarCalculatedColumn(returnAction.calculatedColumn);
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
                 }

package/src/Strategy/AlertModule.js

@@ -20,7 +20,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.AlertModuleId, 'Alert', 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);
         this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
             if (dataChangedInfo.trigger === 'undo' || dataChangedInfo.trigger === 'aggChange') {
-                // do NOT handle reverted changes
+                // do NOT handle reverted or aggregated changes
                 return;
             }
             if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
@@ -44,7 +44,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.alertApi.getAlertDefinitions();
     }
     getExplicitlyReferencedColumnIds(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (queryExpression) {
             return this.api.queryLanguageApi.getColumnsFromExpression(queryExpression);
         }
@@ -56,13 +56,14 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return [];
     }
     getReferencedNamedQueryNames(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (!queryExpression) {
             return [];
         }
         return this.api.queryApi.getReferencedNamedQueryNames(queryExpression);
     }
     updateOldConfig() {
+        var _a;
         // 1. Make all (new) Flashing Alerts have a Predicate if none exists
         const alertState = this.api.alertApi.getAlertState();
         const flashingAlertDefinitions = alertState.FlashingAlertDefinitions;
@@ -73,6 +74,14 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // TODO: state does not clear
             this.api.internalApi.clearFlashingCellState();
         }
+        //migrate alert definitions with `AggregationExpression` (now `AggregatedBooleanExpression`)
+        (_a = alertState.AlertDefinitions) === null || _a === void 0 ? void 0 : _a.forEach((alertDefinition) => {
+            // @ts-ignore
+            const obsoleteAggregationExpression = alertDefinition.Rule['AggregationExpression'];
+            if (obsoleteAggregationExpression) {
+                alertDefinition.Rule.AggregatedBooleanExpression = obsoleteAggregationExpression;
+            }
+        });
     }
     addContextMenuItems(menuContext) {
         const items = [];

package/src/Strategy/CalculatedColumnModule.js

@@ -33,12 +33,12 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.calculatedColumnApi.editCalculatedColumns(oldCalculatedColumns);
     }
     getExplicitlyReferencedColumnIds(calculatedColumn) {
-        var _a, _b;
-        return ((_b = this.api.queryLanguageApi.getColumnsFromExpression((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression)) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.api.queryLanguageApi.getColumnsFromExpression(this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
     }
     getReferencedNamedQueryNames(calculatedColumn) {
-        var _a, _b;
-        return ((_b = this.api.queryApi.getReferencedNamedQueryNames((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression)) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.api.queryApi.getReferencedNamedQueryNames(this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
     }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {

package/src/Strategy/ChartingModule.d.ts

@@ -1,6 +1,6 @@
-import { AdaptableModuleBase } from '@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase';
-import { IModule } from '@adaptabletools/adaptable/src/Strategy/Interface/IModule';
-import { AdaptableApi } from '@adaptabletools/adaptable/src/Api/AdaptableApi';
+import { IModule } from './Interface/IModule';
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class ChartingModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;

package/src/Strategy/ChartingModule.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartingModule = void 0;
 const tslib_1 = require("tslib");
-const AdaptableModuleBase_1 = require("@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase");
-const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants"));
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
+const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ChartingModuleId, 'Charts', 'chart', 'ChartPopup', 'Create Charts in order to see Adaptable Data visually', api);

package/src/Strategy/FlashingCellModule.js

@@ -42,7 +42,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.flashingCellApi.getFlashingCellDefinitions();
     }
     getExplicitlyReferencedColumnIds(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (queryExpression) {
             return this.api.queryLanguageApi.getColumnsFromExpression(queryExpression);
         }
@@ -54,7 +54,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return [];
     }
     getReferencedNamedQueryNames(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (!queryExpression) {
             return [];
         }

package/src/Strategy/FreeTextColumnModule.js

@@ -27,6 +27,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         for (const freeTextColumn of allFreeTextColumns) {
             if (!freeTextColumn.DataType) {
                 const updatedFreeTextColumn = Object.assign(Object.assign({}, freeTextColumn), { DataType: 'String' });
+                // FIXME AFL add api method to edit multiple columns in one run
                 this.api.freeTextColumnApi.editFreeTextColumn(updatedFreeTextColumn);
             }
         }

package/src/Strategy/Utilities/getAlertPreviewViewItems.js

@@ -13,7 +13,7 @@ exports.getAlertPreviewViewItems = (alert, api) => {
             if (!((_a = alert === null || alert === void 0 ? void 0 : alert.AlertProperties) === null || _a === void 0 ? void 0 : _a.DisplayNotification)) {
                 return React.createElement(Tag_1.Tag, null, alert.MessageType);
             }
-            return React.createElement(AlertDisplayWizardSection_1.AlertPreview, { style: { maxWidth: 400 }, mt: 2, api: api, alertDefinition: alert });
+            return (React.createElement(AlertDisplayWizardSection_1.AlertPreview, { focusFirstButton: false, style: { maxWidth: 400 }, mt: 2, api: api, alertDefinition: alert }));
         },
     };
 };