@adaptabletools/adaptable 10.0.4-canary.5 → 11.0.0-canary.0

package/src/View/FlashingCell/Wizard/isValidFlashingCellRules.js

@@ -5,7 +5,7 @@ const ModuleConstants_1 = require("../../../Utilities/Constants/ModuleConstants"
 exports.isValidFlashingCellRules = (flashingCell, api, context) => {
     let valid = true;
     if (!flashingCell.Rule.Predicate && !flashingCell.Rule.BooleanExpression) {
-        return 'No condition defined for flashing cell';
+        return 'No Rule defined for Flashing Cell';
     }
     if (valid && flashingCell.Rule.Predicate) {
         valid = api.predicateApi.isValidPredicate(flashingCell.Rule.Predicate);

package/src/View/GridInfo/GridInfoPopup.js

@@ -91,11 +91,12 @@ exports.GridInfoPopup = (props) => {
     let gridSummaries = CreateGridSummaries(propValueColItems).map((x, index) => {
         return React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { key: index, colItems: x });
     });
+    const showRadioButtons = [showGridSummary, showAdaptableOptions, showColumnInfo].filter((item) => item).length > 1;
     return (React.createElement(PopupPanel_1.PopupPanel, { headerText: 'Grid Info', glyphicon: 'info-sign' },
-        React.createElement(rebass_1.Flex, { marginBottom: 2, padding: 3 },
+        React.createElement(rebass_1.Flex, { marginBottom: 2, padding: 3 }, showRadioButtons && (React.createElement(React.Fragment, null,
             showGridSummary && (React.createElement(Radio_1.default, { "data-name": "radioButton-GridSummary", marginRight: 3, value: "GridSummary", checked: state.ActiveTab == 'GridSummary', onChange: (_, e) => onShowGridSummaryChanged('GridSummary') }, "Grid Summary")),
             showAdaptableOptions && (React.createElement(Radio_1.default, { "data-name": "radioButton-AdaptableOptions", marginRight: 3, value: "AdaptableOptions", checked: state.ActiveTab == 'AdaptableOptions', onChange: (_, e) => onShowGridSummaryChanged('AdaptableOptions') }, "Adaptable Options")),
-            showColumnInfo && (React.createElement(Radio_1.default, { "data-name": "radioButton-Column", value: "Column", checked: state.ActiveTab == 'ColumnInfo', onChange: (_, e) => onShowGridSummaryChanged('ColumnInfo') }, "Column Info"))),
+            showColumnInfo && (React.createElement(Radio_1.default, { "data-name": "radioButton-Column", value: "Column", checked: state.ActiveTab == 'ColumnInfo', onChange: (_, e) => onShowGridSummaryChanged('ColumnInfo') }, "Column Info"))))),
         state.ActiveTab == 'GridSummary' && (React.createElement(rebass_1.Box, { margin: 2 },
             React.createElement(AdaptableObjectCollection_1.AdaptableObjectCollection, { colItems: propValueColItems, items: gridSummaries }))),
         state.ActiveTab == 'AdaptableOptions' && React.createElement(AdaptableOptionsComponent_1.AdaptableOptionsComponent, { api: props.api }),

package/src/View/Query/Wizard/NamedQueryWizard.js

@@ -19,13 +19,16 @@ function NamedQueryWizard(props) {
             : ObjectFactory_1.default.CreateEmptyNamedQuery();
     });
     const dispatch = react_redux_1.useDispatch();
-    if (props.data) {
-        dispatch(QueryRedux.NamedQueryEdit);
-    }
-    else {
-        dispatch(QueryRedux.NamedQueryAdd);
-    }
-    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, onFinish: props.onFinishWizard, sections: [
+    const handleFinish = () => {
+        if (props.data) {
+            dispatch(QueryRedux.NamedQueryEdit(namedQuery));
+        }
+        else {
+            dispatch(QueryRedux.NamedQueryAdd(namedQuery));
+        }
+        props.onFinishWizard(namedQuery);
+    };
+    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, onFinish: handleFinish, sections: [
             {
                 title: 'Expression',
                 details: 'Specify the query expression',

package/src/View/QuickSearch/QuickSearchPopup.js

@@ -40,7 +40,7 @@ const QuickSearchPopupComponent = (props) => {
             React.createElement(rebass_1.Flex, { flexDirection: "column" },
                 React.createElement(FormLayout_1.default, { columns: [1, 2] },
                     React.createElement(FormLayout_1.FormRow, null,
-                        React.createElement(CheckBox_1.CheckBox, { value: "existing", marginLeft: 1, marginRight: 3, checked: state.RunQueryAfterQuickSearch, disabled: StringExtensions_1.default.IsNotNullOrEmpty(searchText), onChange: onQuickSearchBehaviourChange }, "Run simultaneous Query"))))),
+                        React.createElement(CheckBox_1.CheckBox, { value: "existing", marginLeft: 1, marginRight: 3, checked: state.RunQueryAfterQuickSearch, disabled: StringExtensions_1.default.IsNotNullOrEmpty(searchText), onChange: onQuickSearchBehaviourChange }, "Run Simultaneous Query"))))),
         React.createElement(StyleComponent_1.StyleComponent, { style: { height: '100%' }, api: props.api, Style: props.QuickSearchStyle, UpdateStyle: onUpdateStyle })));
 };
 function mapStateToProps(state, ownProps) {

package/src/View/Shortcut/shortcutKeys.js

@@ -6,7 +6,6 @@ exports.shortcutKeys = [
     'B',
     'C',
     'D',
-    'E',
     'F',
     'G',
     'H',

package/src/View/UIHelper.d.ts

@@ -32,8 +32,6 @@ export declare function getEmptyConfigState(): EditableConfigEntityState;
 export declare function getDescriptionForDataType(dataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown'): "string" | "number" | "date";
 export declare function getPlaceHolderforDataType(dataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown'): "Enter Value" | "Enter Number" | "Enter Date";
 export declare function getModalContainer(adaptableOptions: AdaptableOptions, document: Document): HTMLElement;
-export declare function getChartContainer(adaptableOptions: AdaptableOptions, document: Document, showModal: boolean): HTMLElement;
-export declare function isValidUserChartContainer(adaptableOptions: AdaptableOptions, document: Document): boolean;
 export declare function IsEmptyStyle(style: AdaptableStyle): boolean;
 export declare function IsNotEmptyStyle(style: AdaptableStyle): boolean;
 export declare function getMessageTypeByStatusColour(statusColour: StatusColour): AdaptableMessageType;
@@ -62,8 +60,6 @@ export declare const UIHelper: {
     getDescriptionForDataType: typeof getDescriptionForDataType;
     getPlaceHolderforDataType: typeof getPlaceHolderforDataType;
     getModalContainer: typeof getModalContainer;
-    getChartContainer: typeof getChartContainer;
-    isValidUserChartContainer: typeof isValidUserChartContainer;
     IsEmptyStyle: typeof IsEmptyStyle;
     IsNotEmptyStyle: typeof IsNotEmptyStyle;
     getMessageTypeByStatusColour: typeof getMessageTypeByStatusColour;

package/src/View/UIHelper.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UIHelper = exports.isBrowserDocumentAvailable = exports.setCSSVariableValue = exports.getCSSVariableValue = exports.getAdaptableToolPanelWidth = exports.getButtonTextColourForMessageType = exports.getButtonTextColourForArrayandMessageType = exports.getButtonColourForAdaptableAlerts = exports.getMessageTypeFromAdaptableAlerts = exports.getWeekDayByIndex = exports.getScheduleDescription = exports.getButtonToneForMessageType = exports.getGlyphForMessageType = exports.getGlyphForStatusColour = exports.getStyleForMessageType = exports.getStyleForStatusColour = exports.getColorByMessageType = exports.getGlyphByMessageType = exports.getButtonToneByMessageType = exports.getMessageTypeByStatusColour = exports.IsNotEmptyStyle = exports.IsEmptyStyle = exports.isValidUserChartContainer = exports.getChartContainer = exports.getModalContainer = exports.getPlaceHolderforDataType = exports.getDescriptionForDataType = exports.getEmptyConfigState = exports.getDefaultColors = exports.getHexForName = exports.ORANGE = exports.LIGHT_RED = exports.RED = exports.DARK_RED = exports.PURPLE = exports.MAGENTA = exports.CYAN = exports.LIGHT_BLUE = exports.BLUE = exports.DARK_BLUE = exports.LIGHT_YELLOW = exports.YELLOW = exports.LIME_GREEN = exports.GREEN = exports.DARK_GREEN = exports.BROWN = exports.GRAY = exports.LIGHT_GRAY = exports.WHITE = exports.BLACK = void 0;
+exports.UIHelper = exports.isBrowserDocumentAvailable = exports.setCSSVariableValue = exports.getCSSVariableValue = exports.getAdaptableToolPanelWidth = exports.getButtonTextColourForMessageType = exports.getButtonTextColourForArrayandMessageType = exports.getButtonColourForAdaptableAlerts = exports.getMessageTypeFromAdaptableAlerts = exports.getWeekDayByIndex = exports.getScheduleDescription = exports.getButtonToneForMessageType = exports.getGlyphForMessageType = exports.getGlyphForStatusColour = exports.getStyleForMessageType = exports.getStyleForStatusColour = exports.getColorByMessageType = exports.getGlyphByMessageType = exports.getButtonToneByMessageType = exports.getMessageTypeByStatusColour = exports.IsNotEmptyStyle = exports.IsEmptyStyle = exports.getModalContainer = exports.getPlaceHolderforDataType = exports.getDescriptionForDataType = exports.getEmptyConfigState = exports.getDefaultColors = exports.getHexForName = exports.ORANGE = exports.LIGHT_RED = exports.RED = exports.DARK_RED = exports.PURPLE = exports.MAGENTA = exports.CYAN = exports.LIGHT_BLUE = exports.BLUE = exports.DARK_BLUE = exports.LIGHT_YELLOW = exports.YELLOW = exports.LIME_GREEN = exports.GREEN = exports.DARK_GREEN = exports.BROWN = exports.GRAY = exports.LIGHT_GRAY = exports.WHITE = exports.BLACK = void 0;
 const tslib_1 = require("tslib");
 const EditableConfigEntityState_1 = require("./Components/SharedProps/EditableConfigEntityState");
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 exports.BLACK = 'Black';
 exports.WHITE = 'White';
@@ -148,36 +147,6 @@ function getModalContainer(adaptableOptions, document) {
     return modalContainer;
 }
 exports.getModalContainer = getModalContainer;
-function getChartContainer(adaptableOptions, document, showModal) {
-    let chartContainer;
-    if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(adaptableOptions.containerOptions.chartContainer)) {
-        // they have provided one so get that
-        chartContainer = document.getElementById(adaptableOptions.containerOptions.chartContainer);
-        if (chartContainer) {
-            const chartContainerClassName = ' chart-container';
-            if (!chartContainer.className.includes(chartContainerClassName)) {
-                chartContainer.className += chartContainerClassName;
-            }
-        }
-        else {
-            LoggingHelper_1.LogAdaptableError(`Chart div called '${adaptableOptions.containerOptions.chartContainer}' not found: so creating standard div`);
-            chartContainer = document.getElementById('ad');
-        }
-    }
-    else {
-        // not provided one so return whole document if modal, or 'chart' if not
-        chartContainer = showModal ? document.body : document.getElementById('ad');
-    }
-    return chartContainer;
-}
-exports.getChartContainer = getChartContainer;
-function isValidUserChartContainer(adaptableOptions, document) {
-    if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(adaptableOptions.containerOptions.chartContainer)) {
-        return document.getElementById(adaptableOptions.containerOptions.chartContainer) != null;
-    }
-    return false;
-}
-exports.isValidUserChartContainer = isValidUserChartContainer;
 function IsEmptyStyle(style) {
     return !IsNotEmptyStyle(style);
 }
@@ -496,8 +465,6 @@ exports.UIHelper = {
     getDescriptionForDataType,
     getPlaceHolderforDataType,
     getModalContainer,
-    getChartContainer,
-    isValidUserChartContainer,
     IsEmptyStyle,
     IsNotEmptyStyle,
     getMessageTypeByStatusColour,

package/src/agGrid/Adaptable.d.ts

@@ -42,7 +42,7 @@ declare type RuntimeConfig = {
 };
 export declare class Adaptable implements IAdaptable {
     api: AdaptableApi;
-    modules: IModuleCollection;
+    adaptableModules: IModuleCollection;
     adaptableStore: IAdaptableStore;
     adaptableOptions: AdaptableOptions;
     CalculatedColumnExpressionService: ICalculatedColumnExpressionService;
@@ -54,8 +54,8 @@ export declare class Adaptable implements IAdaptable {
     QueryLanguageService: IQueryLanguageService;
     AlertService: IAlertService;
     TeamSharingService: ITeamSharingService;
-    private LicenseService;
     MetamodelService: IMetamodelService;
+    private LicenseService;
     embedColumnMenu: boolean;
     gridOptions: GridOptions;
     isInitialised: boolean;
@@ -253,7 +253,6 @@ export declare class Adaptable implements IAdaptable {
     setupColumnCellEditor({ colId, col }: ColumnSetupInfo): void;
     setupColumnCellRenderer({ col, colId, abColumn }: ColumnSetupInfo): void;
     setupColumnTooltipValueGetter({ col, colId }: ColumnSetupInfo): void;
-    setupColumnTooltipField({ col, colId, colDef }: ColumnSetupInfo): void;
     setupColumnHeader({ col, abColumn }: ColumnSetupInfo): boolean;
     getUserDefinedHeaderName(columnId: string): string;
     setupColumnFilter({ col, colDef }: ColumnSetupInfo): void;
@@ -289,8 +288,12 @@ export declare class Adaptable implements IAdaptable {
     getColumnCount(): number;
     getVisibleRowCount(): number;
     getVisibleColumnCount(): number;
-    selectColumns(columnIds: string[]): void;
-    selectColumn(columnId: string): void;
+    selectColumns(columnIds: string[], config?: {
+        keepExistingSelection?: boolean;
+    }): void;
+    selectColumn(columnId: string, config?: {
+        keepExistingSelection?: boolean;
+    }): void;
     selectAll(): void;
     deselectAll(): void;
     hideColumn(columnId: string): void;
@@ -328,6 +331,8 @@ export declare class Adaptable implements IAdaptable {
     private getConditionalStyleRowClass;
     private getConditionalStyleRowStyle;
     private getGridOptionsApi;
+    canGenerateCharts(): boolean;
+    canHaveSparklines(): boolean;
     canExportToExcel(): boolean;
     exportToExcel(reportData: ReportData, fileName: string): void;
     private setExcelStylesForExport;

package/src/agGrid/Adaptable.js

@@ -314,7 +314,7 @@ class Adaptable {
         AdaptableHelper_1.default.checkAdaptableOptions(this.adaptableOptions);
         this.runtimeConfig = runtimeConfig || {};
         this.agGridModules = this.runtimeConfig.modules || [];
-        this.gridOptions = this.adaptableOptions.agGridOptions;
+        this.gridOptions = this.adaptableOptions.gridOptions;
         if (this.hasAutogeneratedPrimaryKey() && !this.gridOptions.getRowNodeId) {
             this.gridOptions.getRowNodeId = (rowData) => {
                 var _a;
@@ -340,7 +340,8 @@ class Adaptable {
         // TODO: if  a custom 'aggFunc' property is defined (see setupColumnAggFunc()), it won't be evaluated
         if (!this.getDefaultGroupOrderComparator(this.gridOptions) &&
             this.adaptableOptions.generalOptions.autoOrderGroupedColumns) {
-            this.gridOptions.defaultGroupOrderComparator = this.agGridHelper.runAdaptableGroupComparerFunction();
+            this.gridOptions.defaultGroupOrderComparator =
+                this.agGridHelper.runAdaptableGroupComparerFunction();
         }
         // we prefer the grid to be NOT instantiated so that we can do it
         // perhaps in future we will force instantiation only?
@@ -360,8 +361,8 @@ class Adaptable {
         this.forPlugins((plugin) => plugin.afterInitServices(this));
         // Set up Modules - we set up all the Modules suitable for AG Grid
         // But users can make some hidden or readonly in their entitlements
-        this.modules = this.agGridHelper.setUpModules();
-        this.forPlugins((plugin) => plugin.afterInitModules(this, this.modules));
+        this.adaptableModules = this.agGridHelper.setUpModules();
+        this.forPlugins((plugin) => plugin.afterInitModules(this, this.adaptableModules));
         // also try to set it early, here, if the grid is initialized - needed for AdapTable tool panel
         if (this.gridOptions.api) {
             this.gridOptions.api.__adaptable = this;
@@ -476,13 +477,13 @@ class Adaptable {
             if (eventName == AdaptableStore_1.INIT_STATE) {
                 this._adaptableReady = true;
                 LoggingHelper_1.LogAdaptableInfo(`Updating obsolete configuration/state`);
-                this.modules.forEach((m) => m.updateOldConfig());
+                this.adaptableModules.forEach((m) => m.updateOldConfig());
                 // call stuff here
                 // and reset state also?
                 this.forPlugins((plugin) => plugin.onAdaptableReady(this, this.adaptableOptions));
                 this.api.eventApi.emit('AdaptableReady', {
                     adaptableApi: this.api,
-                    gridOptions: this.adaptableOptions.agGridOptions,
+                    gridOptions: this.adaptableOptions.gridOptions,
                 });
             }
         });
@@ -592,12 +593,9 @@ class Adaptable {
         }
         // now create the grid itself - it is done this way as previously when we instantiated the Grid 'properly' it got created as J.Grid
         let grid;
-        const modules = (this.adaptableOptions.agGridOptions || {}).modules || [];
+        const modules = this.adaptableOptions.modules || [];
         this.agGridModules = [...this.agGridModules, ...modules];
         const agGridContainer = this.getAgGridContainerElement();
-        if (this.gridOptions.modules) {
-            delete this.gridOptions.modules;
-        }
         grid = new all_modules_1.Grid(agGridContainer, this.gridOptions, { modules });
         // add our adaptable object to the grid options api object
         // this is VERY useful for when we need to access Adaptable inside of agGrid only functions
@@ -1950,10 +1948,8 @@ class Adaptable {
         ];
     }
     getColDefsForFreeTextColumns() {
-        const specialColumnsAreFilterable = this.api.internalApi.getAdaptableOptions().filterOptions
-            .enableFilterOnSpecialColumns;
-        const defaultFreeTextColumnSettings = ObjectFactory_1.CreateEmptyFreeTextColumn(specialColumnsAreFilterable)
-            .FreeTextColumnSettings;
+        const specialColumnsAreFilterable = this.api.internalApi.getAdaptableOptions().filterOptions.enableFilterOnSpecialColumns;
+        const defaultFreeTextColumnSettings = ObjectFactory_1.CreateEmptyFreeTextColumn(specialColumnsAreFilterable).FreeTextColumnSettings;
         return this.api.freeTextColumnApi.getAllFreeTextColumn().map((freeTextColumn) => {
             const freeTextColumnSettings = Object.assign(Object.assign({}, defaultFreeTextColumnSettings), freeTextColumn.FreeTextColumnSettings);
             const dataTypeEditor = freeTextColumn.DataType === 'Number'
@@ -1962,6 +1958,14 @@ class Adaptable {
                     ? AdaptableDateEditor_1.AdaptableDateEditor
                     : null;
             LoggingHelper_1.LogAdaptableInfo('Setting up FreeText Column: ' + freeTextColumn.ColumnId);
+            const columnTypes = [
+                GeneralConstants_1.AB_SPECIAL_COLUMN,
+                this.agGridHelper.getAgGridDataType(freeTextColumn.DataType),
+            ];
+            if (freeTextColumn.FreeTextColumnSettings &&
+                ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(freeTextColumn.FreeTextColumnSettings.ColumnTypes)) {
+                columnTypes.push(...freeTextColumn.FreeTextColumnSettings.ColumnTypes);
+            }
             return {
                 headerName: freeTextColumn.FriendlyName || freeTextColumn.ColumnId,
                 colId: freeTextColumn.ColumnId,
@@ -1980,10 +1984,7 @@ class Adaptable {
                 cellEditor: dataTypeEditor !== null && dataTypeEditor !== void 0 ? dataTypeEditor : (freeTextColumn.TextEditor && freeTextColumn.TextEditor == 'Large'
                     ? 'agLargeTextCellEditor'
                     : 'agTextCellEditor'),
-                type: [
-                    GeneralConstants_1.AB_SPECIAL_COLUMN,
-                    this.agGridHelper.getAgGridDataType(freeTextColumn.DataType),
-                ],
+                type: columnTypes,
                 valueSetter: (params) => {
                     return (params.data[freeTextColumn.ColumnId] = params.newValue);
                 },
@@ -2092,13 +2093,20 @@ class Adaptable {
             .enableFilterOnSpecialColumns
             ? this.adaptableOptions.filterOptions.enableFilterOnSpecialColumns
             : true;
-        const defaultCalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(specialColumnsAreFilterable)
-            .CalculatedColumnSettings;
+        const defaultCalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(specialColumnsAreFilterable).CalculatedColumnSettings;
         return this.api.calculatedColumnApi.getAllCalculatedColumn().map((calculatedColumn) => {
             var _a;
             const calculatedColumnSettings = Object.assign(Object.assign({}, defaultCalculatedColumnSettings), calculatedColumn.CalculatedColumnSettings);
             if (!calculatedColumnSettings.DataType) {
-                calculatedColumnSettings.DataType = this.CalculatedColumnExpressionService.GetCalculatedColumnDataType((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
+                calculatedColumnSettings.DataType =
+                    this.CalculatedColumnExpressionService.GetCalculatedColumnDataType((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
+            }
+            const columnTypes = [
+                GeneralConstants_1.AB_SPECIAL_COLUMN,
+                this.agGridHelper.getAgGridDataType(calculatedColumnSettings.DataType),
+            ];
+            if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(calculatedColumnSettings.ColumnTypes)) {
+                columnTypes.push(...calculatedColumnSettings.ColumnTypes);
             }
             const newColDef = {
                 headerName: calculatedColumn.FriendlyName
@@ -2117,10 +2125,7 @@ class Adaptable {
                 enablePivot: calculatedColumnSettings.Pivotable,
                 suppressMenu: calculatedColumnSettings.SuppressMenu,
                 suppressMovable: calculatedColumnSettings.SuppressMovable,
-                type: [
-                    GeneralConstants_1.AB_SPECIAL_COLUMN,
-                    this.agGridHelper.getAgGridDataType(calculatedColumnSettings.DataType),
-                ],
+                type: columnTypes,
                 valueGetter: (params) => {
                     var _a;
                     return this.CalculatedColumnExpressionService.ComputeExpressionValue((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression, params.node);
@@ -2474,8 +2479,7 @@ class Adaptable {
             this.onSortChanged();
             this.debouncedSetSelectedCells();
         });
-        const showGroupingTotalsAsHeader = this.adaptableOptions.generalOptions
-            .showGroupingTotalsAsHeader;
+        const showGroupingTotalsAsHeader = this.adaptableOptions.generalOptions.showGroupingTotalsAsHeader;
         /**
          * Use Case: Model has updated
          * Action: If user has set to see grouping totals as header create a pinned row (bit of a hack)
@@ -2671,7 +2675,6 @@ class Adaptable {
             this.setupColumnCellStyle(colSetupInfo);
             this.setupColumnCellClass(colSetupInfo);
             this.setupColumnTooltipValueGetter(colSetupInfo);
-            this.setupColumnTooltipField(colSetupInfo);
             this.setupColumnValueGetter(colSetupInfo);
             this.setupColumnAggFunc(colSetupInfo);
             this.setupColumnFilter(colSetupInfo);
@@ -2862,10 +2865,6 @@ class Adaptable {
                     return this.agGridHelper.createCheckboxRendererComp(abColumn.columnId, abColumn.readOnly);
                 }
             }
-            const sparkline = this.api.sparklineColumnApi.getSparklineByColumn(colId);
-            if (sparkline) {
-                return this.agGridHelper.createSparklineCellRendererComp(sparkline);
-            }
         });
     }
     setupColumnTooltipValueGetter({ col, colId }) {
@@ -2906,14 +2905,6 @@ class Adaptable {
             }
         });
     }
-    setupColumnTooltipField({ col, colId, colDef }) {
-        this.setColDefProperty(col, 'tooltipField', () => {
-            const sparkline = this.api.sparklineColumnApi.getSparklineByColumn(colId);
-            if (sparkline) {
-                return sparkline.ShowToolTip ? colDef.field : '';
-            }
-        });
-    }
     setupColumnHeader({ col, abColumn }) {
         var _a, _b;
         const previousColumnHeader = (_a = col === null || col === void 0 ? void 0 : col.getColDef()) === null || _a === void 0 ? void 0 : _a.headerName;
@@ -2922,8 +2913,7 @@ class Adaptable {
             // set the default to the AG Grid provided values
             // from https://github.com/ag-grid/ag-grid/blob/v26.1.0/community-modules/core/src/ts/columns/columnModel.ts#L2515
             let resultHeaderName = userHeaderName !== null && userHeaderName !== void 0 ? userHeaderName : StringExtensions_1.StringExtensions.CamelCaseToHumanText(col.getColDef().field);
-            const layoutCustomHeader = (_a = this.api.layoutApi.getCurrentLayout()
-                .ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[col.getColId()];
+            const layoutCustomHeader = (_a = this.api.layoutApi.getCurrentLayout().ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[col.getColId()];
             if (layoutCustomHeader) {
                 resultHeaderName = layoutCustomHeader;
             }
@@ -3410,14 +3400,28 @@ class Adaptable {
     getVisibleColumnCount() {
         return this.gridOptions.columnApi.getAllColumns().filter((c) => c.isVisible()).length;
     }
-    selectColumns(columnIds) {
-        columnIds.forEach((colId) => this.selectColumn(colId));
+    selectColumns(columnIds, config) {
+        if (!(config === null || config === void 0 ? void 0 : config.keepExistingSelection)) {
+            this.gridOptions.api.clearRangeSelection();
+        }
+        const rowCount = this.gridOptions.api.getDisplayedRowCount();
+        columnIds.forEach((colId) => {
+            const cellRangeParams = {
+                rowStartIndex: 0,
+                rowEndIndex: rowCount - 1,
+                columnStart: colId,
+                columnEnd: colId,
+            };
+            this.gridOptions.api.addCellRange(cellRangeParams);
+        });
     }
-    selectColumn(columnId) {
-        this.gridOptions.api.clearRangeSelection();
+    selectColumn(columnId, config) {
+        if (!(config === null || config === void 0 ? void 0 : config.keepExistingSelection)) {
+            this.gridOptions.api.clearRangeSelection();
+        }
         const cellRangeParams = {
             rowStartIndex: 0,
-            rowEndIndex: this.gridOptions.api.getDisplayedRowCount(),
+            rowEndIndex: this.gridOptions.api.getDisplayedRowCount() - 1,
             columnStart: columnId,
             columnEnd: columnId,
         };
@@ -3898,6 +3902,12 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
         }
         return this.gridOptions.api;
     }
+    canGenerateCharts() {
+        return this.isModulePresent('charts') && this.gridOptions.enableCharts;
+    }
+    canHaveSparklines() {
+        return this.isModulePresent('sparklines');
+    }
     canExportToExcel() {
         return this.isModulePresent('excel-export');
     }
@@ -4160,7 +4170,7 @@ class AdaptableNoCodeWizard {
      */
     constructor(adaptableOptions, extraOptions = {}) {
         const defaultInit = async ({ gridOptions, adaptableOptions }) => {
-            adaptableOptions.agGridOptions = gridOptions;
+            adaptableOptions.gridOptions = gridOptions;
             return await Adaptable.init(adaptableOptions);
         };
         this.adaptableOptions = adaptableOptions;
@@ -4194,7 +4204,7 @@ class AdaptableNoCodeWizard {
                 ReactDOM.unmountComponentAtNode(container);
                 this.init({
                     adaptableOptions,
-                    gridOptions: adaptableOptions.agGridOptions,
+                    gridOptions: adaptableOptions.gridOptions,
                 });
             } })), container);
     }

package/src/agGrid/agGridHelper.d.ts

@@ -4,7 +4,6 @@ import { AdaptableColumn, AdaptableColumnGroup } from '../PredefinedConfig/Commo
 import { AdaptableNodeComparerFunction } from '../PredefinedConfig/Common/AdaptableComparerFunction';
 import { DataType } from '../PredefinedConfig/Common/Enums';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
-import { SparklineColumn } from '../PredefinedConfig/SparklineColumnState';
 import { IModule } from '../Strategy/Interface/IModule';
 import { IPPStyle } from '../Utilities/Interface/IPPStyle';
 import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
@@ -22,7 +21,6 @@ export declare class agGridHelper {
     getAgGridDarkThemeName(): string;
     setUpModules(): Map<AdaptableModule, IModule>;
     TrySetUpNodeIds(): boolean;
-    createSparklineCellRendererComp(sparkline: SparklineColumn): ICellRendererFunc | undefined;
     createCheckboxRendererComp(columnId: string, isReadOnly: boolean): ICellRendererFunc | undefined;
     createNumericStyleRendererFunc(formatColumn: FormatColumn): ICellRendererFunc;
     getCleanValue(value: string): string | undefined;
@@ -46,6 +44,7 @@ export declare class agGridHelper {
     private getColumnPinnedPosition;
     private isColumnFixed;
     private isColumnGrouped;
+    private isColumnSparkline;
     private getColumnDataType;
     private getabColDefValue;
     getAgGridDataType(dataType: DataType): string;

package/src/agGrid/agGridHelper.js

@@ -40,6 +40,7 @@ const CheckboxRenderer_1 = require("./CheckboxRenderer");
 const DataChangeHistoryModule_1 = require("../Strategy/DataChangeHistoryModule");
 const FlashingCellModule_1 = require("../Strategy/FlashingCellModule");
 const SetingsPanelModule_1 = require("../Strategy/SetingsPanelModule");
+const ChartingModule_1 = require("../Strategy/ChartingModule");
 const tinycolor = require('tinycolor2');
 /**
  * Adaptable AG Grid implementation is getting really big and unwieldy
@@ -97,6 +98,7 @@ class agGridHelper {
         modules.set(ModuleConstants.ThemeModuleId, new ThemeModule_1.ThemeModule(api));
         modules.set(ModuleConstants.GridInfoModuleId, new GridInfoModule_1.GridInfoModule(api));
         modules.set(ModuleConstants.SettingsPanelModuleId, new SetingsPanelModule_1.SettingsPanelModule(api));
+        modules.set(ModuleConstants.ChartingModuleId, new ChartingModule_1.ChartingModule(api));
         return modules;
     }
     TrySetUpNodeIds() {
@@ -116,9 +118,6 @@ class agGridHelper {
         };
         return true;
     }
-    createSparklineCellRendererComp(sparkline) {
-        return this.adaptable.lookupPlugins('sparklineColumnRenderer', sparkline);
-    }
     createCheckboxRendererComp(columnId, isReadOnly) {
         return CheckboxRenderer_1.getCheckboxRendererForColumn(columnId, isReadOnly, this.adaptable.api);
     }
@@ -239,8 +238,8 @@ class agGridHelper {
             isGrouped: this.isColumnGrouped(colDef),
             isFixed: this.isColumnFixed(colDef),
             pinned: this.getColumnPinnedPosition(colDef),
-            isSparkline: this.adaptable.api.sparklineColumnApi.isSparklineColumn(colId),
             isExcludedFromQuickSearch: false,
+            isSparkline: this.isColumnSparkline(colDef),
         };
         if (abColumn.aggregatable) {
             abColumn.availableAggregationFunctions = this.getColumnAggregationFunctions(colDef);
@@ -438,6 +437,10 @@ class agGridHelper {
         }
         return false;
     }
+    isColumnSparkline(colDef) {
+        // see https://www.ag-grid.com/javascript-data-grid/sparklines-overview/#enabling-sparklines
+        return (colDef === null || colDef === void 0 ? void 0 : colDef.cellRenderer) === 'agSparklineCellRenderer';
+    }
     getColumnDataType(column, logWarning = true) {
         // Some columns can have no ID or Title. we return string as a consequence but it needs testing
         if (!column) {

package/src/agGrid/agGridMenuHelper.js

@@ -21,7 +21,8 @@ class agGridMenuHelper {
         let userColumnMenuItems = [];
         //First get Ag Grid Column Items
         agGridColumnMenuItems.push(...this.createAgGridColumnMenuItems(originalgetMainMenuItems, params));
-        let showAdaptableColumnMenu = this.adaptable.adaptableOptions.menuOptions.showAdaptableColumnMenu;
+        let showAdaptableColumnMenu = this.adaptable.adaptableOptions.menuOptions
+            .showAdaptableColumnMenu;
         let hasAdaptableColumnMenuItems = showAdaptableColumnMenu == null || showAdaptableColumnMenu !== false;
         if (hasAdaptableColumnMenuItems) {
             agGridColumnMenuItems.push('separator');
@@ -55,7 +56,8 @@ class agGridMenuHelper {
         let agGridContextMenuItems = [];
         let adaptableContextMenuItems = [];
         let userContextMenuItems = [];
-        let showAdaptableContextMenu = this.adaptable.adaptableOptions.menuOptions.showAdaptableContextMenu;
+        let showAdaptableContextMenu = this.adaptable.adaptableOptions.menuOptions
+            .showAdaptableContextMenu;
         let hasAdaptableContextMenuItems = showAdaptableContextMenu == null || showAdaptableContextMenu !== false;
         let userDefinedContextMenuItems = this.adaptable.adaptableOptions.menuOptions.contextMenuItems;
         let hasUserDefinedContextMenuItems = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(userDefinedContextMenuItems);
@@ -230,7 +232,7 @@ class agGridMenuHelper {
         if (adaptableColumn) {
             clickedCell = this.adaptable.getGridCellFromRowNode(params.node, adaptableColumn.columnId);
         }
-        let selectedCellInfo = this.adaptable.setSelectedCells();
+        let selectedCellInfo = this.adaptable.api.gridApi.getSelectedCellInfo();
         if (clickedCell && selectedCellInfo) {
             let matchedCell = selectedCellInfo.gridCells.find((gc) => gc != null &&
                 gc.column == clickedCell.column &&
@@ -267,7 +269,7 @@ class agGridMenuHelper {
     }
     createAdaptableContextMenuItems(menuContext) {
         let columnMenuItems = [];
-        this.adaptable.modules.forEach((s) => {
+        this.adaptable.adaptableModules.forEach((s) => {
             let menuItems = s.addContextMenuItems(menuContext);
             if (menuItems) {
                 columnMenuItems.push(...menuItems);
@@ -283,7 +285,8 @@ class agGridMenuHelper {
         // here we create agGrid Menu items based on Adaptable Menu Items
         // user has ability to decide whether to show or not
         let contextMenuItems = [];
-        let showAdaptableContextMenu = this.adaptable.adaptableOptions.menuOptions.showAdaptableContextMenu;
+        let showAdaptableContextMenu = this.adaptable.adaptableOptions.menuOptions
+            .showAdaptableContextMenu;
         if (showAdaptableContextMenu == null || showAdaptableContextMenu !== false) {
             adaptableMenuItems.forEach((adaptableMenuItem) => {
                 if (adaptableMenuItem) {
@@ -318,10 +321,11 @@ class agGridMenuHelper {
     // method to get all the Adaptable Menu Items - together with running the function where user can choose whether or not to display
     getAdaptableMenuItemsColumnHeader(adaptableColumn, menuContext) {
         const adaptableMenuItems = [];
-        let showAdaptableColumnMenu = this.adaptable.adaptableOptions.menuOptions.showAdaptableColumnMenu;
+        let showAdaptableColumnMenu = this.adaptable.adaptableOptions.menuOptions
+            .showAdaptableColumnMenu;
         let runCheck = showAdaptableColumnMenu == null || showAdaptableColumnMenu !== false;
         //  if (adaptableColumn != null) {
-        this.adaptable.modules.forEach((s) => {
+        this.adaptable.adaptableModules.forEach((s) => {
             let menuItems = s.addColumnMenuItems(adaptableColumn);
             if (menuItems) {
                 if (runCheck) {

package/src/components/ApplicationIcon.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
 import { AdaptableIcon } from '../types';
 export declare const ApplicationIcon: React.FunctionComponent<{
-    icon: AdaptableIcon;
+    icon?: AdaptableIcon;
 }>;

package/src/components/icons/column-add.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: (props: any) => JSX.Element;
+export default _default;

package/src/components/icons/column-add.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const DefaultIcon_1 = tslib_1.__importDefault(require("./DefaultIcon"));
+exports.default = (props) => (React.createElement(DefaultIcon_1.default, Object.assign({}, props),
+    React.createElement("g", { transform: "matrix(0.966625, 0, 0, 0.966625, -161.245651, -58.219734)" },
+        React.createElement("g", { transform: "matrix(1, 0, 0, 1, 167.951233, 60.368694)" },
+            React.createElement("path", { d: "M 14.67 5 L 14.67 19 L 9.33 19 L 9.33 5 L 14.67 5 Z M 15.67 19 L 21 19 L 20.99 11.456 L 15.67 11.459 L 15.67 19 Z M 8.33 19 L 8.33 5 L 3 5 L 3 19 L 8.33 19 Z" })),
+        React.createElement("path", { d: "M 188.844 62.299 L 186.844 62.299 L 186.844 65.299 L 183.844 65.299 C 183.854 65.309 183.844 67.299 183.844 67.299 L 186.844 67.299 L 186.844 70.289 C 186.854 70.299 188.844 70.289 188.844 70.289 L 188.844 67.299 L 191.844 67.299 L 191.844 65.299 L 188.844 65.299 L 188.844 62.299 Z" }))));

package/src/components/icons/index.js

@@ -47,6 +47,7 @@ const import_export_1 = tslib_1.__importDefault(require("./import-export"));
 const calculated_column_1 = tslib_1.__importDefault(require("./calculated-column"));
 const cell_summary_1 = tslib_1.__importDefault(require("./cell-summary"));
 const column_chooser_1 = tslib_1.__importDefault(require("./column-chooser"));
+const column_add_1 = tslib_1.__importDefault(require("./column-add"));
 const cell_validation_1 = tslib_1.__importDefault(require("./cell-validation"));
 const column_filter_1 = tslib_1.__importDefault(require("./column-filter"));
 const column_info_1 = tslib_1.__importDefault(require("./column-info"));
@@ -136,6 +137,7 @@ const allIcons = {
     chart: chart_1.default,
     'cell-summary': cell_summary_1.default,
     'column-chooser': column_chooser_1.default,
+    'column-add': column_add_1.default,
     'column-filter': column_filter_1.default,
     'data-source': data_source_1.default,
     export: export_1.default,