@adaptabletools/adaptable 13.0.0-canary.10 → 13.0.0-canary.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "13.0.0-canary.10",
+  "version": "13.0.0-canary.12",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1663591315752;
+declare const _default: 1663690672189;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1663591315752;
+exports.default = 1663690672189;

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -28,6 +28,7 @@ import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelSer
 import { ColumnValuesComparer } from '../AdaptableOptions/GeneralOptions';
 import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 import { RenderReactRootFn } from '../renderReactRoot';
+export declare type AdaptableVariant = 'vanilla' | 'react' | 'angular';
 /**
  *  The only interface for Adaptable
  *
@@ -36,6 +37,7 @@ import { RenderReactRootFn } from '../renderReactRoot';
  * Should only be used internally as all external access is via the Api
  */
 export interface IAdaptable {
+    variant: AdaptableVariant;
     supressReact18RenderWarning: boolean;
     renderReactRoot: RenderReactRootFn;
     api: AdaptableApi;
@@ -258,4 +260,5 @@ export interface IAdaptable {
     }): void;
     getAgGridColumnForColumnId(columnId: string): Column;
     isAgGridModulePresent(moduleName: ModuleNames): boolean;
+    getMinMaxCachedValueForColumn(column: AdaptableColumn, minMax: 'min' | 'max'): number | undefined;
 }

package/src/AdaptableOptions/AdaptableQLOptions.d.ts

@@ -2,7 +2,7 @@ import { ExpressionFunction } from '../parser/src/types';
 import { AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableModule, AdaptableQLModule, AdaptableQLModules } from '../PredefinedConfig/Common/Types';
 import { BaseContext } from '../PredefinedConfig/Common/BaseContext';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn, AdaptableColumnBase } from '../PredefinedConfig/Common/AdaptableColumn';
 import { BooleanFunctionName } from '../Utilities/ExpressionFunctions/booleanExpressionFunctions';
 import { ScalarFunctionName } from '../Utilities/ExpressionFunctions/scalarExpressionFunctions';
 import { ObservableFunctionName } from '../Utilities/ExpressionFunctions/observableExpressionFunctions';
@@ -108,12 +108,10 @@ export interface ExpressionOptions {
      */
     moduleExpressionFunctions?: ModuleExpressionFunctionsMap | ((context: ModuleExpressionFunctionsContext) => ModuleExpressionFunctions | undefined);
     /**
-     * Columns that can be included in AdaptableQL Expressions; leave unset to include **ALL**, provide empty array to set **NONE**
-     *
-     * @defaultValue undefined
-     * @gridInfoItem
+     * Deprecated use `isColumnQueryable` instead
      */
     queryableColumns?: string[] | (() => string[]);
+    isColumnQueryable?: (queryableColumnContext: QueryableColumnContext) => boolean;
     /**
      * Validate Expressions before they can be run or saved
      *
@@ -237,3 +235,12 @@ export interface EvaluateExpressionExternallyContext extends BaseContext {
      */
     referencedColumns?: AdaptableColumn[];
 }
+/**
+ * Context passed when evaluating Queryable Columns
+ */
+export interface QueryableColumnContext extends BaseContext {
+    /**
+     * Column - just Id, DataType and FriendlyName
+     */
+    adaptableColumn: AdaptableColumnBase;
+}

package/src/Api/ColumnApi.d.ts

@@ -253,11 +253,17 @@ export interface ColumnApi {
      */
     getDistinctVisibleDisplayValuesForColumn(columnId: string): any[];
     /**
-     * Gets all distinct raw values in Column
+     * Gets all distinct raw values in Column. Values are sorted.
      * @param columnId Column to check
      * @param skipRowNode optional RowNode which should be skipped when collecting the distinct rawValues
      */
     getDistinctRawValuesForColumn(columnId: string, skipRowNode?: RowNode): any[];
+    /**
+     * Gets all distinct raw values in Column. Values are un-sorted.
+     * @param columnId Column to check
+     * @param skipRowNode optional RowNode which should be skipped when collecting the distinct rawValues
+     */
+    getUnsortedDistinctRawValuesForColumn(columnId: string, skipRowNode?: RowNode): any[];
     /**
      * Gets all distinct visible raw values in the Column
      * @param columnId Column to check

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

@@ -61,6 +61,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getDistinctBulkUpdateDisplayValuesForColumn(columnId: string, selectedGridCells: GridCell[]): Promise<any[]>;
     getDistinctVisibleDisplayValuesForColumn(columnId: string): any[];
     getDistinctRawValuesForColumn(columnId: string, skipRowNode?: RowNode): any[];
+    getUnsortedDistinctRawValuesForColumn(columnId: string, skipRowNode?: RowNode): any[];
     getDistinctVisibleRawValuesForColumn(columnId: string): any[];
     private sortDistinctValues;
     getPrimaryKeyColumn(): AdaptableColumn;

package/src/Api/Implementation/ColumnApiImpl.js

@@ -343,11 +343,17 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, false, skipRowNode);
-        return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
+        return this.sortDistinctValues(this.getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode), abColumn).map((cv) => {
             return cv.rawValue;
         });
     }
+    getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode) {
+        const abColumn = this.getColumnFromId(columnId);
+        if (abColumn == undefined) {
+            return [];
+        }
+        return this.adaptable.getDistinctValuesForColumn(abColumn, false, skipRowNode);
+    }
     getDistinctVisibleRawValuesForColumn(columnId) {
         const abColumn = this.getColumnFromId(columnId);
         if (abColumn == undefined) {
@@ -424,15 +430,13 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         if (column.dataType !== 'Number') {
             return undefined;
         }
-        // can we cache this in some way?
-        return Math.min(...this.getDistinctRawValuesForColumn(column.columnId));
+        return this.adaptable.getMinMaxCachedValueForColumn(column, 'min');
     }
     getMaxValueForNumericColumn(column) {
         if (column.dataType !== 'Number') {
             return undefined;
         }
-        // can we cache this in some way?
-        return Math.max(...this.getDistinctRawValuesForColumn(column.columnId));
+        return this.adaptable.getMinMaxCachedValueForColumn(column, 'max');
     }
     getTypesForColumn(columnId) {
         var _a;

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -113,8 +113,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     getColumnFormatColumnsWithStyle(column) {
         const formatColumns = this.getAllFormatColumnWithStyle();
         return this.getFormatColumnInColumnScope(formatColumns, column).filter((scopedFormatColumn) => {
-            return (!this.adaptable.api.scopeApi.scopeIsAll(scopedFormatColumn.Scope) &&
-                this.adaptable.api.scopeApi.isColumnInScope(column, scopedFormatColumn.Scope));
+            return this.adaptable.api.scopeApi.isColumnInScope(column, scopedFormatColumn.Scope);
         });
     }
     getRowFormatColumnsWithStyle() {
@@ -167,8 +166,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
             .concat(this.getFormatColumnsWithAllScope(formatColumns));
     }
     getAppropriateFormatColumn(formatColumns, column) {
-        return this.getFormatColumnInColumnScope(formatColumns, column).find((scopedFormatColumn) => !this.adaptable.api.scopeApi.scopeIsAll(scopedFormatColumn.Scope) &&
-            this.adaptable.api.scopeApi.isColumnInScope(column, scopedFormatColumn.Scope));
+        return this.getFormatColumnInColumnScope(formatColumns, column).find((scopedFormatColumn) => this.adaptable.api.scopeApi.isColumnInScope(column, scopedFormatColumn.Scope));
     }
     hasStyleFormatColumns() {
         return ArrayExtensions_1.default.IsNotNullOrEmpty(this.getAllFormatColumnWithStyle());
@@ -291,7 +289,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
             return undefined;
         }
         const checkBoxFormatColumns = (_a = this.getFormatColumnState().FormatColumns) === null || _a === void 0 ? void 0 : _a.filter((fc) => { var _a; return (_a = fc.ColumnStyle) === null || _a === void 0 ? void 0 : _a.CheckBoxStyle; });
-        const formatColumn = checkBoxFormatColumns.find((fc) => this.adaptable.api.scopeApi.isColumnInScope(column, fc.Scope));
+        const formatColumn = checkBoxFormatColumns.find((fc) => this.getAdaptableApi().scopeApi.isColumnInScope(column, fc.Scope));
         return formatColumn;
     }
     isCheckBoxStyleFormatColumn(column) {

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

@@ -2,6 +2,7 @@ import { ApiBase } from './ApiBase';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { QueryLanguageApi } from '../QueryLanguageApi';
 import { AdaptableQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
+import { AdaptableColumnBase } from '../../PredefinedConfig/Common/AdaptableColumn';
 export declare class QueryLanguageApiImpl extends ApiBase implements QueryLanguageApi {
     isValidBooleanExpression(query: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
     isValidObservableExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
@@ -9,7 +10,7 @@ export declare class QueryLanguageApiImpl extends ApiBase implements QueryLangua
     isValidAggregatedScalarExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
     getASTForExpression(query: string): any;
     getColumnsFromExpression(expression: string): string[];
-    getQueryableColumnIds(): string[] | undefined;
+    isColumnQueryable(adaptableColumnBase: AdaptableColumnBase): boolean;
     getAdaptableQueryExpression(query: Partial<AdaptableQuery>): string | undefined;
     getAdaptableQueryExpressionWithColumnFriendlyNames(query: Partial<AdaptableQuery>): string | undefined;
 }

package/src/Api/Implementation/QueryLanguageApiImpl.js

@@ -4,7 +4,6 @@ exports.QueryLanguageApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const parser = tslib_1.__importStar(require("../../parser/src"));
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
     isValidBooleanExpression(query, module, validationErrorMessage) {
@@ -67,21 +66,16 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
             return [];
         }
     }
-    getQueryableColumnIds() {
-        let queryableColumns = this.getExpressionOptions().queryableColumns;
-        if (!queryableColumns) {
-            return undefined;
-        }
-        // first do the function then get hardcoded items
-        if (typeof queryableColumns === 'function') {
-            return queryableColumns();
-        }
-        else {
-            let arr = queryableColumns;
-            if (arr && ArrayExtensions_1.default.IsNotNullOrEmpty(arr)) {
-                return arr;
-            }
+    isColumnQueryable(adaptableColumnBase) {
+        let queryableColumnFn = this.getExpressionOptions().isColumnQueryable;
+        if (queryableColumnFn) {
+            const queryableColumnContext = {
+                adaptableColumn: adaptableColumnBase,
+                adaptableApi: this.getAdaptableApi(),
+            };
+            return queryableColumnFn(queryableColumnContext);
         }
+        return true;
     }
     getAdaptableQueryExpression(query) {
         var _a, _b, _c, _d;

package/src/Api/QueryLanguageApi.d.ts

@@ -1,5 +1,6 @@
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { AdaptableQuery } from '../PredefinedConfig/Common/AdaptableQuery';
+import { AdaptableColumnBase } from '../PredefinedConfig/Common/AdaptableColumn';
 /**
  * Functions related to AdapTableQL (the Adaptable Query Language)
  */
@@ -38,9 +39,9 @@ export interface QueryLanguageApi {
      */
     getColumnsFromExpression(expression: string): string[];
     /**
-     * Returns all columns that can be used in an Expression
+     * Returns whether a Column is Queryable
      */
-    getQueryableColumnIds(): string[];
+    isColumnQueryable(adaptableColumnBase: AdaptableColumnBase): boolean;
     /**
      * Runs the AST that AdapTableQL creates for an Expression - useful when evaluating remotely
      * @param expression expression to be run

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -65,7 +65,6 @@ exports.DefaultAdaptableOptions = {
             systemAggregatedBooleanFunctions: undefined,
             systemAggregatedScalarFunctions: undefined,
             moduleExpressionFunctions: undefined,
-            queryableColumns: undefined,
             performExpressionValidation: true,
             maxTimeframeSize: 28800000, // 8 hours
         },

package/src/View/Alert/Wizard/BaseAlertRulesWizardSection.js

@@ -14,15 +14,15 @@ const BaseAlertRulesWizardSection = (props) => {
             useBooleanQuery: (React.createElement(React.Fragment, null,
                 "Use an BooleanQuery if ",
                 React.createElement("i", null, "Scope"),
-                " is 'Whole Row' - so any data change may be evaluated in a complex BooleanExpression")),
+                " is 'All Columns' - so any data change may be evaluated in a complex BooleanExpression")),
             useObservableQuery: (React.createElement(React.Fragment, null,
                 "Use an ObservableQuery if ",
                 React.createElement("i", null, "Scope"),
-                " is 'Whole Row' - so any data change may be evaluated in a complex ObservableExpression")),
+                " is 'All Columns' - so any data change may be evaluated in a complex ObservableExpression")),
             useAggregationQuery: (React.createElement(React.Fragment, null,
                 "Use an AggregatedBooleanQuery if ",
                 React.createElement("i", null, "Scope"),
-                " is 'Whole Row' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
+                " is 'All Columns' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
         } }));
 };
 exports.BaseAlertRulesWizardSection = BaseAlertRulesWizardSection;

package/src/View/Alert/Wizard/BaseAlertScopeWizardSection.js

@@ -11,8 +11,8 @@ const BaseAlertScopeWizardSection = (props) => {
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     return (React.createElement(rebass_1.Flex, { flexDirection: "column", style: { height: '100%' }, padding: 2 },
         React.createElement(NewScopeComponent_1.NewScopeComponent, { descriptions: {
-                rowScope: 'Changes anywhere in the row will trigger an alert',
-                columnScope: 'Changes in selected columns will trigger an alert',
+                rowScope: 'Changes in any Column in the row will trigger an Alert',
+                columnScope: 'Changes in selected Columns will trigger an Alert',
             }, scope: data.Scope, updateScope: (Scope) => {
                 const newData = Object.assign(Object.assign({}, data), { Scope });
                 if (newData.Rule.Predicate) {
@@ -47,7 +47,7 @@ const renderBaseAlertScopeSummary = (data) => {
     return (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Box, null,
             React.createElement(rebass_1.Text, { fontSize: 2 }, scopeApi.scopeIsAll(data.Scope)
-                ? 'Changes anywhere in the row will trigger an alert'
+                ? 'Changes to any Column in the row will trigger an Alert'
                 : null)),
         React.createElement(rebass_1.Box, { style: { overflow: 'hidden' } }, 'ColumnIds' in data.Scope ? (React.createElement(React.Fragment, null,
             React.createElement(rebass_1.Text, { fontSize: 2, mb: columnsInScope.length ? 2 : 0 }, "Changes in selected columns will trigger an alert"),

package/src/View/Components/NewScopeComponent.js

@@ -130,9 +130,9 @@ const NewScopeComponent = (props) => {
     }
     return (React.createElement(Tabs_1.Tabs, { "data-name": 'scope-component', className: "ab-ScopeComponent", value: scopeChoice, style: Object.assign({ height: '100%' }, props.style), onValueChange: onScopeSelectChanged },
         props.hideWholeRow ? null : (React.createElement(Tabs_1.Tabs.Tab, { value: "Row" },
-            React.createElement(Radio_1.default, { margin: 0, checked: scopeChoice == 'All', tabIndex: -1 }, "Whole Row"))),
+            React.createElement(Radio_1.default, { margin: 0, checked: scopeChoice == 'All', tabIndex: -1 }, "All Columns"))),
         React.createElement(Tabs_1.Tabs.Tab, { value: "Column" },
-            React.createElement(Radio_1.default, { margin: 0, value: "Column", checked: scopeChoice == 'Column', tabIndex: -1 }, "Columns")),
+            React.createElement(Radio_1.default, { margin: 0, value: "Column", checked: scopeChoice == 'Column', tabIndex: -1 }, "Selected Columns")),
         React.createElement(Tabs_1.Tabs.Tab, { value: "DataType" },
             React.createElement(Radio_1.default, { margin: 0, value: "DataType", checked: scopeChoice == 'DataType', tabIndex: -1 }, "Data Types")),
         props.hideWholeRow ? null : (React.createElement(Tabs_1.Tabs.Content, { value: "Row", style: { flex: 'none' }, "data-name": "row-scope" },

package/src/View/Components/RangesComponent.d.ts

@@ -10,6 +10,10 @@ export interface RangesComponentProps extends React.ClassAttributes<RangesCompon
     showRangeDirection: boolean;
     updateRanges: (ranges: CellColorRange[]) => void;
     updateColumnComparison: (columnComparison?: ColumnComparison) => void;
+    minMaxRangeValues: {
+        min: number;
+        max: number;
+    };
 }
 export interface RangesComponentState {
     ranges: CellColorRange[];
@@ -25,6 +29,8 @@ export declare class RangesComponent extends React.Component<RangesComponentProp
     changeRangeColor(index: number, value: string): void;
     changeRangeDirectionUp(index: number, checked: boolean): void;
     removeRange(index: number): void;
+    setRangeColMin(range: CellColorRange): void;
+    setRangeColMax(range: CellColorRange): void;
     addRange(): void;
     changeColumnComparisonMinValue(event: React.FormEvent<any>): void;
     private onMinColumnSelectedChanged;

package/src/View/Components/RangesComponent.js

@@ -54,20 +54,25 @@ class RangesComponent extends React.Component {
             this.state.rangesType == 'Standard' && (React.createElement(Tabs_1.Tabs, { autoFocus: false, marginTop: 2 },
                 React.createElement(Tabs_1.Tabs.Tab, null, "Ranges"),
                 React.createElement(Tabs_1.Tabs.Content, null, (_a = this.state.ranges) === null || _a === void 0 ? void 0 :
-                    _a.map((range, index) => (React.createElement(rebass_1.Flex, { key: index, mb: 2, "data-name": "percent-bar-range" },
-                        React.createElement(Input_1.default, { type: "number", value: range.Min, onChange: (event) => {
-                                const { value } = event.target;
-                                this.changeRangeMin(index, value);
-                            }, mr: 2 }),
-                        React.createElement(Input_1.default, { type: "number", value: range.Max, onChange: (event) => {
-                                const { value } = event.target;
-                                this.changeRangeMax(index, value);
-                            }, mr: 2 }),
-                        React.createElement(ColorPicker_1.ColorPicker, { api: this.props.api, value: range.Color, onChange: (color) => {
-                                this.changeRangeColor(index, color);
-                            }, mr: 2, height: "100%" }),
-                        this.props.showRangeDirection && (React.createElement(CheckBox_1.CheckBox, { marginLeft: 2, marginRight: 2, checked: range.ReverseGradient && range.ReverseGradient == true, onChange: (checked) => this.changeRangeDirectionUp(index, checked) }, "Reverse Gradient")),
-                        React.createElement(SimpleButton_1.default, { icon: "delete", disabled: this.state.ranges && this.state.ranges.length == 1, onClick: () => this.removeRange(index) })))),
+                    _a.map((range, index, list) => (React.createElement(rebass_1.Flex, { key: index, alignItems: "end", mb: 2, "data-name": "percent-bar-range" },
+                        React.createElement(rebass_1.Flex, { flexDirection: "column" },
+                            index === 0 && (React.createElement(CheckBox_1.CheckBox, { onClick: () => this.setRangeColMin(range), checked: range.Min === 'Col-Min', mt: 0, mb: 1, fontSize: 3 }, "Col Min")),
+                            React.createElement(Input_1.default, { type: typeof range.Min == 'number' ? 'number' : 'text', disabled: range.Min === 'Col-Min', value: range.Min, onChange: (event) => {
+                                    const { value } = event.target;
+                                    this.changeRangeMin(index, value);
+                                }, mr: 2 })),
+                        React.createElement(rebass_1.Flex, { flexDirection: "column" },
+                            index === list.length - 1 && (React.createElement(CheckBox_1.CheckBox, { mt: 0, mb: 1, onClick: () => this.setRangeColMax(range), checked: range.Max === 'Col-Max', fontSize: 3 }, "Col Max")),
+                            React.createElement(Input_1.default, { value: range.Max, type: typeof range.Max == 'number' ? 'number' : 'text', disabled: range.Max === 'Col-Max', onChange: (event) => {
+                                    const { value } = event.target;
+                                    this.changeRangeMax(index, value);
+                                }, mr: 2 })),
+                        React.createElement(rebass_1.Flex, { alignItems: "center", height: "100%" },
+                            React.createElement(ColorPicker_1.ColorPicker, { api: this.props.api, value: range.Color, onChange: (color) => {
+                                    this.changeRangeColor(index, color);
+                                }, mr: 2, height: 33 })),
+                        this.props.showRangeDirection && (React.createElement(CheckBox_1.CheckBox, { checked: range.ReverseGradient && range.ReverseGradient == true, onChange: (checked) => this.changeRangeDirectionUp(index, checked) }, "Reverse Gradient")),
+                        React.createElement(SimpleButton_1.default, { ml: 2, mb: 1, icon: "delete", disabled: this.state.ranges && this.state.ranges.length == 1, onClick: () => this.removeRange(index) })))),
                     React.createElement("div", null,
                         React.createElement(SimpleButton_1.default, { variant: "raised", "data-name": "add", onClick: () => this.addRange() }, "Add New Range"))))),
             this.state.rangesType == 'ColumnComparison' && (React.createElement(Tabs_1.Tabs, { autoFocus: false, marginTop: 2 },
@@ -144,14 +149,45 @@ class RangesComponent extends React.Component {
         ranges.splice(index, 1);
         this.props.updateRanges(ranges);
     }
+    setRangeColMin(range) {
+        const newRanges = this.state.ranges.map((rangeItem) => {
+            if (rangeItem === range) {
+                let newMin = rangeItem.Min === 'Col-Min' ? this.props.minMaxRangeValues.min : 'Col-Min';
+                return Object.assign(Object.assign({}, rangeItem), { Min: newMin });
+            }
+            return rangeItem;
+        });
+        this.setState({ ranges: newRanges }, () => this.props.updateRanges(this.state.ranges));
+    }
+    setRangeColMax(range) {
+        const newRanges = this.state.ranges.map((rangeItem) => {
+            if (rangeItem === range) {
+                let newMax = rangeItem.Max === 'Col-Max' ? this.props.minMaxRangeValues.max : 'Col-Max';
+                return Object.assign(Object.assign({}, rangeItem), { Max: newMax });
+            }
+            return rangeItem;
+        });
+        this.setState({ ranges: newRanges }, () => this.props.updateRanges(this.state.ranges));
+    }
     addRange() {
         const lastRange = this.state.ranges[this.state.ranges.length - 1];
-        this.state.ranges.push({
-            Min: lastRange.Max == 'Col-Max' ? 0 : lastRange.Max,
+        let previousRange = lastRange;
+        let Min = null;
+        if (lastRange.Max === 'Col-Max') {
+            Min = this.props.minMaxRangeValues.max;
+            previousRange = Object.assign(Object.assign({}, previousRange), { Max: this.props.minMaxRangeValues.max });
+        }
+        else {
+            Min = lastRange.Max;
+        }
+        const newRange = {
+            Min,
             Max: lastRange.Max,
             Color: (0, UIHelper_1.getHexForName)(UIHelper_1.GRAY),
-        }),
-            this.props.updateRanges(this.state.ranges);
+        };
+        const newRanges = [...this.state.ranges.slice(0, -1), previousRange, newRange];
+        // this.state.ranges.push(newRange);
+        this.setState({ ranges: newRanges }, () => this.props.updateRanges(this.state.ranges));
     }
     changeColumnComparisonMinValue(event) {
         let e = event.target;

package/src/View/Components/ScopeComponent.js

@@ -32,9 +32,9 @@ class ScopeComponent extends React.Component {
                     React.createElement(HelpBlock_1.default, { marginBottom: 1 }, displayMessage),
                     ' ',
                     React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "center", padding: 2 },
-                        React.createElement(Radio_1.default, { value: "Row", checked: this.state.ScopeChoice == 'All', onChange: (checked, e) => this.onScopeSelectChanged(e) }, "Whole Row"),
+                        React.createElement(Radio_1.default, { value: "Row", checked: this.state.ScopeChoice == 'All', onChange: (checked, e) => this.onScopeSelectChanged(e) }, "All Columns"),
                         ' ',
-                        React.createElement(Radio_1.default, { marginLeft: 3, value: "Column", checked: this.state.ScopeChoice == 'Column', onChange: (checked, e) => this.onScopeSelectChanged(e) }, "Column(s)"),
+                        React.createElement(Radio_1.default, { marginLeft: 3, value: "Column", checked: this.state.ScopeChoice == 'Column', onChange: (checked, e) => this.onScopeSelectChanged(e) }, "Selected Column(s)"),
                         ' ',
                         React.createElement(Radio_1.default, { marginLeft: 3, value: "DataType", checked: this.state.ScopeChoice == 'DataType', onChange: (checked, e) => this.onScopeSelectChanged(e) }, "DataType(s)")),
                     this.state.ScopeChoice == 'Column' && (React.createElement(rebass_1.Box, { marginBottom: 2, "data-name": "column-scope" },

package/src/View/ConditionalStyle/Wizard/ConditionalStyleRuleWizardSection.js

@@ -28,15 +28,15 @@ function ConditionalStyleRuleWizardSection(props) {
                 useBooleanQuery: (React.createElement(React.Fragment, null,
                     "Use an BooleanQuery if ",
                     React.createElement("i", null, "Scope"),
-                    " is 'Whole Row' - so any data change may be evaluated in a complex BooleanExpression")),
+                    " is 'All Columns' - so any data change may be evaluated in a complex BooleanExpression")),
                 useObservableQuery: (React.createElement(React.Fragment, null,
                     "Use an ObservableQuery if ",
                     React.createElement("i", null, "Scope"),
-                    " is 'Whole Row' - so any data change may be evaluated in a complex ObservableExpression")),
+                    " is 'All Columns' - so any data change may be evaluated in a complex ObservableExpression")),
                 useAggregationQuery: (React.createElement(React.Fragment, null,
                     "Use an AggregatedBooleanQuery if ",
                     React.createElement("i", null, "Scope"),
-                    " is 'Whole Row' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
+                    " is 'All Columns' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
             } })));
 }
 exports.ConditionalStyleRuleWizardSection = ConditionalStyleRuleWizardSection;

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

@@ -36,15 +36,15 @@ const FlashingAlertRulesWizardSection = (props) => {
             useBooleanQuery: (React.createElement(React.Fragment, null,
                 "Use an BooleanQuery if ",
                 React.createElement("i", null, "Scope"),
-                " is 'Whole Row' - so any data change may be evaluated in a complex BooleanExpression")),
+                " is 'All Columns' - so any data change may be evaluated in a complex BooleanExpression")),
             useObservableQuery: (React.createElement(React.Fragment, null,
                 "Use an ObservableQuery if ",
                 React.createElement("i", null, "Scope"),
-                " is 'Whole Row' - so any data change may be evaluated in a complex ObservableExpression")),
+                " is 'All Columns' - so any data change may be evaluated in a complex ObservableExpression")),
             useAggregationQuery: (React.createElement(React.Fragment, null,
                 "Use an AggregatedBooleanQuery if ",
                 React.createElement("i", null, "Scope"),
-                " is 'Whole Row' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
+                " is 'All Columns' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
         } }));
 };
 exports.FlashingAlertRulesWizardSection = FlashingAlertRulesWizardSection;

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.js

@@ -389,7 +389,7 @@ const FormatColumnFormatWizardSection = (props) => {
         return renderStringFormat(data, update, setFormatOption, customScopedFormatters, formatColumnApi);
     }
     return (React.createElement(HelpBlock_1.default, { margin: 3 },
-        "Setting a Display Format is only available if ",
+        "Setting a Display Format is only possible if ",
         React.createElement("b", null, "all"),
         " the columns in Scope are Numeric, String or Date."));
 };

package/src/View/FormatColumn/Wizard/FormatColumnRuleWizardSection.js

@@ -15,15 +15,15 @@ function FormatColumnRuleWizardSection(props) {
             useBooleanQuery: (React.createElement(React.Fragment, null,
                 "Use an BooleanQuery if ",
                 React.createElement("i", null, "Scope"),
-                " is 'Whole Row' - so any data change may be evaluated in a complex BooleanExpression")),
+                " is 'All Columns' - so any data change may be evaluated in a complex BooleanExpression")),
             useObservableQuery: (React.createElement(React.Fragment, null,
                 "Use an ObservableQuery if ",
                 React.createElement("i", null, "Scope"),
-                " is 'Whole Row' - so any data change may be evaluated in a complex ObservableExpression")),
+                " is 'All Columns' - so any data change may be evaluated in a complex ObservableExpression")),
             useAggregationQuery: (React.createElement(React.Fragment, null,
                 "Use an AggregatedBooleanQuery if ",
                 React.createElement("i", null, "Scope"),
-                " is 'Whole Row' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
+                " is 'All Columns' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
         } }));
 }
 exports.FormatColumnRuleWizardSection = FormatColumnRuleWizardSection;

package/src/View/FormatColumn/Wizard/FormatColumnScopeWizardSection.js

@@ -17,7 +17,7 @@ exports.renderFormatColumnScopeSummary = renderFormatColumnScopeSummary;
 const FormatColumnScopeWizardSection = (props) => {
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     return (React.createElement(NewScopeComponent_1.NewScopeComponent, { descriptions: {
-            rowScope: 'Apply a style to an entire row',
+            rowScope: 'Format all columns in the row',
             columnScope: 'Select columns to format',
         }, scope: data.Scope, updateScope: (Scope) => {
             var _a;

package/src/View/FormatColumn/Wizard/FormatColumnStyleWizardSection.js

@@ -113,6 +113,20 @@ function FormatColumnStyleWizardSection(props) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const singleNumericColumn = api.scopeApi.isSingleNumericColumnScope(data.Scope);
+    const minMaxRangeValues = React.useMemo(() => {
+        if (!singleNumericColumn) {
+            return null;
+        }
+        if (!('ColumnIds' in data.Scope)) {
+            return null;
+        }
+        const [columnId] = data.Scope.ColumnIds;
+        const column = api.columnApi.getColumnFromId(columnId);
+        return {
+            min: api.columnApi.getMinValueForNumericColumn(column),
+            max: api.columnApi.getMaxValueForNumericColumn(column),
+        };
+    }, [singleNumericColumn]);
     const onlyBooleanColumnsInScope = api.scopeApi.areAllBooleanColumnsInScope(data.Scope) ||
         api.scopeApi.scopeHasOnlyBooleanDataType(data.Scope);
     const onPercentBarCellTextCellValueChanged = (checked) => {
@@ -306,9 +320,9 @@ function FormatColumnStyleWizardSection(props) {
                             "Percent Bar",
                             ' '),
                         ' '))),
-            ((_d = data.ColumnStyle) === null || _d === void 0 ? void 0 : _d.GradientStyle) && (React.createElement(RangesComponent_1.RangesComponent, { api: api, scope: data === null || data === void 0 ? void 0 : data.Scope, showRangeDirection: true, ranges: (_f = (_e = data.ColumnStyle) === null || _e === void 0 ? void 0 : _e.GradientStyle) === null || _f === void 0 ? void 0 : _f.CellRanges, columnComparison: (_h = (_g = data === null || data === void 0 ? void 0 : data.ColumnStyle) === null || _g === void 0 ? void 0 : _g.GradientStyle) === null || _h === void 0 ? void 0 : _h.ColumnComparison, updateRanges: (ranges) => onUpdateGradientStyleRanges(ranges), updateColumnComparison: (columnComparison) => onUpdateGradientStyleColumnComparison(columnComparison) })),
+            ((_d = data.ColumnStyle) === null || _d === void 0 ? void 0 : _d.GradientStyle) && (React.createElement(RangesComponent_1.RangesComponent, { minMaxRangeValues: minMaxRangeValues, api: api, scope: data === null || data === void 0 ? void 0 : data.Scope, showRangeDirection: true, ranges: (_f = (_e = data.ColumnStyle) === null || _e === void 0 ? void 0 : _e.GradientStyle) === null || _f === void 0 ? void 0 : _f.CellRanges, columnComparison: (_h = (_g = data === null || data === void 0 ? void 0 : data.ColumnStyle) === null || _g === void 0 ? void 0 : _g.GradientStyle) === null || _h === void 0 ? void 0 : _h.ColumnComparison, updateRanges: (ranges) => onUpdateGradientStyleRanges(ranges), updateColumnComparison: (columnComparison) => onUpdateGradientStyleColumnComparison(columnComparison) })),
             ((_j = data.ColumnStyle) === null || _j === void 0 ? void 0 : _j.PercentBarStyle) && (React.createElement(React.Fragment, null,
-                React.createElement(RangesComponent_1.RangesComponent, { api: api, scope: data === null || data === void 0 ? void 0 : data.Scope, showRangeDirection: false, ranges: (_l = (_k = data.ColumnStyle) === null || _k === void 0 ? void 0 : _k.PercentBarStyle) === null || _l === void 0 ? void 0 : _l.CellRanges, columnComparison: (_o = (_m = data === null || data === void 0 ? void 0 : data.ColumnStyle) === null || _m === void 0 ? void 0 : _m.PercentBarStyle) === null || _o === void 0 ? void 0 : _o.ColumnComparison, updateRanges: (ranges) => onUpdatePercentBarStyleRanges(ranges), updateColumnComparison: (columnComparison) => onUpdatePercentBarStyleColumnComparison(columnComparison) }),
+                React.createElement(RangesComponent_1.RangesComponent, { minMaxRangeValues: minMaxRangeValues, api: api, scope: data === null || data === void 0 ? void 0 : data.Scope, showRangeDirection: false, ranges: (_l = (_k = data.ColumnStyle) === null || _k === void 0 ? void 0 : _k.PercentBarStyle) === null || _l === void 0 ? void 0 : _l.CellRanges, columnComparison: (_o = (_m = data === null || data === void 0 ? void 0 : data.ColumnStyle) === null || _m === void 0 ? void 0 : _m.PercentBarStyle) === null || _o === void 0 ? void 0 : _o.ColumnComparison, updateRanges: (ranges) => onUpdatePercentBarStyleRanges(ranges), updateColumnComparison: (columnComparison) => onUpdatePercentBarStyleColumnComparison(columnComparison) }),
                 React.createElement(FormLayout_1.default, { marginLeft: 2, marginTop: 2 },
                     React.createElement(FormLayout_1.FormRow, { label: "Cell Display:" },
                         React.createElement(CheckBox_1.CheckBox, { marginLeft: 2, checked: (_r = (_q = (_p = data.ColumnStyle) === null || _p === void 0 ? void 0 : _p.PercentBarStyle) === null || _q === void 0 ? void 0 : _q.CellText) === null || _r === void 0 ? void 0 : _r.includes('CellValue'), onChange: (checked) => onPercentBarCellTextCellValueChanged(checked) }, "Cell Value"),

package/src/View/FormatColumn/Wizard/FormatColumnWizard.js

@@ -108,7 +108,7 @@ function FormatColumnWizard(props) {
     return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: formatColumn, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Scope',
-                details: 'Apply formatting to: one or more Columns or Data Types or the whole row',
+                details: 'Select which Columns will be formatted',
                 isValid: NewScopeComponent_1.isScopeValid,
                 renderSummary: FormatColumnScopeWizardSection_1.renderFormatColumnScopeSummary,
                 render: () => {
@@ -121,14 +121,14 @@ function FormatColumnWizard(props) {
                     return abObject.Rule ? (0, EntityRulesEditor_1.isRuleValid)(abObject, api, context) : true;
                 },
                 title: 'Condition',
-                details: 'Build the rules when Format column should be applied',
+                details: 'Build a Rule when the Format Column should be applied',
                 render: () => {
                     return (React.createElement(FormatColumnRuleWizardSection_1.FormatColumnRuleWizardSection, { onChange: setFormatColumn, defaultPredicateId: constants_1.DEFAULT_PREDICATE_ID_FOR_FORMAT_COLUMN }));
                 },
             },
             {
                 title: 'Style',
-                details: 'Format Column Style',
+                details: 'Create a Style for the Format Column',
                 isValid: FormatColumnStyleWizardSection_1.isFormatColumnStyleValid,
                 renderSummary: FormatColumnStyleWizardSection_1.renderFormatColumnStyleWizardSummary,
                 render: () => {

package/src/View/Layout/Wizard/sections/AggregationsSection.js

@@ -33,7 +33,7 @@ const AggregationsSectionSummary = () => {
     let content = null;
     if (entires.length) {
         content = (React.createElement(FormLayout_1.default, null, entires.map(([columnId, aggregation]) => (React.createElement(FormLayout_1.FormRow, { key: columnId, label: adaptable.api.columnApi.getFriendlyNameFromColumnId(columnId) },
-            React.createElement(Tag_1.Tag, null, aggregation /* TODO fix for Bogdan */))))));
+            React.createElement(Tag_1.Tag, null, typeof aggregation === 'object' ? aggregation.type : aggregation))))));
     }
     else {
         content = React.createElement(Tag_1.Tag, null, "No Aggregations");