@adaptabletools/adaptable 13.1.0 → 13.1.1

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

@@ -2,7 +2,7 @@ import { AdaptableObject } from './AdaptableObject';
 /**
  * Type of data stored in an Adaptable Column
  */
-export declare type AdaptableColumnDataType = 'String' | 'Number' | 'Boolean' | 'Date' | 'Object' | 'Unknown';
+export declare type AdaptableColumnDataType = 'String' | 'Number' | 'Boolean' | 'Date' | 'Object' | 'NumberArray' | 'TupleNumberArray' | 'ObjectNumberArray' | 'Unknown';
 /**
  * Base class for Adaptable Column containing most important properties
  */

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

@@ -219,9 +219,9 @@ export interface CountryContext extends FDC3Context {
  */
 export interface AdaptableFDC3EventInfo extends BaseEventInfo {
     /**
-     * Type of Event: `RaiseIntent` or `BroadcastMessage`
+     * Type of Event: `RaiseIntent`, `RaiseIntentForContext` or `BroadcastMessage`
      */
-    eventType: 'RaiseIntent' | 'BroadcastMessage';
+    eventType: 'RaiseIntent' | 'RaiseIntentForContext' | 'BroadcastMessage';
     /**
      * The FDC3 Intent which caused Event to fire (if type is `RaiseIntent`)
      */

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

@@ -36,4 +36,4 @@ export declare type TypeHint<Base, Literals> = (Base & {
 }) | Literals;
 export declare type AdaptableQLModules = AdaptableQLModule[];
 export declare type AdaptableQLModule = 'CalculatedColumn' | 'Filter' | 'Query';
-export declare type AdaptableColumnType = 'abColDefBoolean' | 'abColDefDate' | 'abColDefNumber' | 'abColDefString' | 'abColDefObject' | 'abColDefCustom' | 'abSpecialColumn';
+export declare type AdaptableColumnType = 'abColDefBoolean' | 'abColDefDate' | 'abColDefNumber' | 'abColDefString' | 'abColDefObject' | 'abColDefNumberArray' | 'abColDefTupleNumberArray' | 'abColDefObjectNumberArray' | 'abColDefCustom' | 'abSpecialColumn';

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -1,5 +1,6 @@
 import { ConfigState } from './ConfigState';
 import { SuspendableObject } from './Common/SuspendableObject';
+import { SparklineOptions } from '@ag-grid-community/core';
 /**
  * Predefined Configuration for Styled Column Module
  */
@@ -29,6 +30,7 @@ export interface StyledColumn extends SuspendableObject {
      * Renders a Checkbox in a boolean column
      */
     CheckBoxStyle?: boolean;
+    SparkLineStyle?: SparkLineStyle;
     /**
      * Includes the Styled Column in Grouped Rows
      * @defaultValue false
@@ -123,3 +125,6 @@ export declare type CellTextOption = 'CellValue' | 'PercentageValue';
  * Whether the Range is Number or Percent based
  */
 export declare type RangeValueType = 'Number' | 'Percentage';
+export declare type SparkLineStyle = {
+    options?: SparklineOptions;
+};

package/src/PredefinedConfig/SystemState.d.ts

@@ -80,6 +80,13 @@ export interface SystemState extends InternalState, IPushPullState, Glue42State,
     Charting: {
         currentChartModels: ChartModel[];
     };
+    /**
+     * Keeps session relevant information
+     * currently it holds the previous location of a grouped column.
+     */
+    Layout: {
+        previousGroupedColumns: Record<string, Record<string, number>>;
+    };
 }
 export interface ProgressIndicator {
     active: boolean;

package/src/Redux/ActionsReducers/QuickSearchRedux.d.ts

@@ -4,7 +4,7 @@ import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 /**
  * @ReduxAction Runs Quick Search
  */
-export declare const QUICK_SEARCH_RUN = "QUICK_SEARCH_APPLY";
+export declare const QUICK_SEARCH_RUN = "QUICK_SEARCH_RUN";
 /**
  * @ReduxAction Sets Quick Search style
  */

package/src/Redux/ActionsReducers/QuickSearchRedux.js

@@ -5,7 +5,7 @@ const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants")
 /**
  * @ReduxAction Runs Quick Search
  */
-exports.QUICK_SEARCH_RUN = 'QUICK_SEARCH_APPLY';
+exports.QUICK_SEARCH_RUN = 'QUICK_SEARCH_RUN';
 /**
  * @ReduxAction Sets Quick Search style
  */

package/src/Redux/ActionsReducers/SystemRedux.d.ts

@@ -68,6 +68,7 @@ export declare const SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = "SYSTEM_LAYOUT_
 export declare const DASHBOARD_REFRESH = "DASHBOARD_REFRESH";
 export declare const SYSTEM_DATA_SET_SELECT = "SYSTEM_DATA_SET_SELECT";
 export declare const SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = "SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS";
+export declare const SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX = "SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX";
 export interface SystemHighlightCellAddAction extends Redux.Action {
     cellHighlightInfo: CellHighlightInfo;
 }
@@ -230,6 +231,11 @@ export interface SystemDataSetSelectAction extends Redux.Action {
 export interface SystemChartingSetCurrentChartModelsAction extends Redux.Action {
     chartModels: ChartModel[];
 }
+export interface SystemSetPreviousGroupedColumnIndexAction extends Redux.Action {
+    layoutId: string;
+    columnId: string;
+    columnIndex: number;
+}
 export declare const SystemHighlightCellAdd: (cellHighlightInfo: CellHighlightInfo) => SystemHighlightCellAddAction;
 export declare const SystemHighlightCellDelete: (primaryKeyValue: CellHighlightInfo['primaryKeyValue'], columnId: CellHighlightInfo['columnId']) => SystemHighlightCellDeleteAction;
 export declare const SystemHighlightCellDeleteAll: () => SystemHighlightCellDeleteAllAction;
@@ -281,4 +287,6 @@ export declare const SystemDashboardRefresh: () => SystemDashboardRefreshAction;
 export declare const SystemDataSetSelect: (dataSet: DataSet) => SystemDataSetSelectAction;
 export declare const SystemChartingSetCurrentChartModels: (chartModels: ChartModel[]) => SystemChartingSetCurrentChartModelsAction;
 export declare const SystemChartingCurrentChartModelsSelector: (state: SystemState) => ChartModel[];
+export declare const SystemSetPreviousGroupedColumnsIndex: (layoutId: string, columnId: string, columnIndex: number) => SystemSetPreviousGroupedColumnIndexAction;
+export declare const SystemPreviousGroupedColumnsSelector: (state: SystemState) => Record<string, Record<string, number>>;
 export declare const SystemReducer: Redux.Reducer<SystemState>;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DASHBOARD_REFRESH = exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = exports.SYSTEM_FILTER_FORM_HIDE = exports.SYSTEM_QUICK_FILTER_BAR_HIDE = exports.SYSTEM_QUICK_FILTER_BAR_SHOW = exports.SYSTEM_SETTINGS_PANEL_SET = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROWS_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROWS_ADD = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_CELL_DELETE_ALL = exports.SYSTEM_FLASHING_CELL_DELETE = exports.SYSTEM_FLASHING_CELL_ADD = exports.SYSTEM_ALERT_REMOVE_ROW_HIGHLIGHT = exports.SYSTEM_ALERT_REMOVE_CELL_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_CELL_ROW_KEY = void 0;
-exports.SystemDashboardRefresh = exports.SystemLayoutShowNotAssociatedObjects = exports.SystemFilterFormHide = exports.SystemQuickFilterBarHide = exports.SystemQuickFilterBarShow = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveRowHighlight = exports.SystemAlertRemoveCellHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = exports.SYSTEM_DATA_SET_SELECT = void 0;
-exports.SystemReducer = exports.SystemChartingCurrentChartModelsSelector = exports.SystemChartingSetCurrentChartModels = exports.SystemDataSetSelect = void 0;
+exports.SystemLayoutShowNotAssociatedObjects = exports.SystemFilterFormHide = exports.SystemQuickFilterBarHide = exports.SystemQuickFilterBarShow = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveRowHighlight = exports.SystemAlertRemoveCellHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX = exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = exports.SYSTEM_DATA_SET_SELECT = void 0;
+exports.SystemReducer = exports.SystemPreviousGroupedColumnsSelector = exports.SystemSetPreviousGroupedColumnsIndex = exports.SystemChartingCurrentChartModelsSelector = exports.SystemChartingSetCurrentChartModels = exports.SystemDataSetSelect = exports.SystemDashboardRefresh = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
@@ -81,6 +81,8 @@ exports.DASHBOARD_REFRESH = 'DASHBOARD_REFRESH';
 exports.SYSTEM_DATA_SET_SELECT = 'SYSTEM_DATA_SET_SELECT';
 // Charting
 exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = 'SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS';
+// Layout
+exports.SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX = 'SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX';
 const SystemHighlightCellAdd = (cellHighlightInfo) => ({
     type: exports.SYSTEM_HIGHLIGHT_CELL_ADD,
     cellHighlightInfo: cellHighlightInfo,
@@ -323,6 +325,17 @@ const SystemChartingCurrentChartModelsSelector = (state) => {
     return state.Charting.currentChartModels;
 };
 exports.SystemChartingCurrentChartModelsSelector = SystemChartingCurrentChartModelsSelector;
+const SystemSetPreviousGroupedColumnsIndex = (layoutId, columnId, columnIndex) => ({
+    type: exports.SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX,
+    layoutId,
+    columnId,
+    columnIndex,
+});
+exports.SystemSetPreviousGroupedColumnsIndex = SystemSetPreviousGroupedColumnsIndex;
+const SystemPreviousGroupedColumnsSelector = (state) => {
+    return state.Layout.previousGroupedColumns;
+};
+exports.SystemPreviousGroupedColumnsSelector = SystemPreviousGroupedColumnsSelector;
 const initialState = {
     AdaptableAlerts: GeneralConstants_1.EMPTY_ARRAY,
     AdaptableFlashingCells: {},
@@ -361,6 +374,9 @@ const initialState = {
     Charting: {
         currentChartModels: [],
     },
+    Layout: {
+        previousGroupedColumns: {},
+    },
 };
 const SystemReducer = (state = initialState, action) => {
     let alerts;
@@ -664,6 +680,20 @@ const SystemReducer = (state = initialState, action) => {
             const typedAction = action;
             return Object.assign(Object.assign({}, state), { Charting: Object.assign(Object.assign({}, state.Charting), { currentChartModels: typedAction.chartModels }) });
         }
+        case exports.SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX: {
+            const typedAction = action;
+            const newLayoutMap = Object.assign({}, state.Layout.previousGroupedColumns[typedAction.layoutId]);
+            if (typedAction.columnIndex !== null) {
+                newLayoutMap[typedAction.columnId] = typedAction.columnIndex;
+            }
+            else if (newLayoutMap[typedAction.columnId] !== undefined) {
+                newLayoutMap === null || newLayoutMap === void 0 ? true : delete newLayoutMap[typedAction.columnId];
+            }
+            const previousGroupedColumns = {
+                [typedAction.layoutId]: newLayoutMap,
+            };
+            return Object.assign(Object.assign({}, state), { Layout: Object.assign(Object.assign({}, state.Layout), { previousGroupedColumns }) });
+        }
         default:
             return state;
     }

package/src/Strategy/AlertModule.js

@@ -172,7 +172,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     showAlertForDefinitions(cellDataChangedInfo, alertDefinitions = []) {
         alertDefinitions.forEach((alertDefinition) => {
-            const alert = ObjectFactory_1.default.CreateCellChangedAlert(cellDataChangedInfo.column.friendlyName, this.api.alertApi.getAlertDescription(alertDefinition, cellDataChangedInfo), alertDefinition, cellDataChangedInfo);
+            const alert = ObjectFactory_1.default.CreateCellChangedAlert(this.api.alertApi.getAlertMessageTitle(alertDefinition, cellDataChangedInfo), this.api.alertApi.getAlertDescription(alertDefinition, cellDataChangedInfo), alertDefinition, cellDataChangedInfo);
             this.api.alertApi.displayAlert(alert);
         });
     }

package/src/Strategy/FlashingCellModule.js

@@ -96,7 +96,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 const flashingCellForCell = this.api.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
                 if (flashingCellForRow) {
                     if (flashingCellForRow.flashTarget === 'row' ||
-                        (Array.isArray(flashingCellForRow.flashTarget) &&
+                        (Array.isArray(flashingCellForRow === null || flashingCellForRow === void 0 ? void 0 : flashingCellForRow.flashTarget) &&
                             flashingCellForRow.flashTarget.includes('row'))) {
                         items.push(this.createColumnMenuItemReduxAction('Clear Flashing Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForRow)));
                     }

package/src/Strategy/StyledColumnModule.js

@@ -125,9 +125,12 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (styledColumn.PercentBarStyle) {
             type = 'Percent Bar';
         }
-        else {
+        else if (styledColumn.CheckBoxStyle) {
             type = 'Check Box';
         }
+        else if (styledColumn.SparkLineStyle) {
+            type = 'Spark Line';
+        }
         return {
             abObject: styledColumn,
             items: [
@@ -139,7 +142,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     name: 'Column',
                     values: [this.api.columnApi.getFriendlyNameFromColumnId(styledColumn.ColumnId)],
                 },
-                {
+                !styledColumn.SparkLineStyle && {
                     name: 'Style',
                     view: () => {
                         return (0, StyledColumnWizardStyleSection_1.renderStyledColumnStyleSummary)(styledColumn, this.api);

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -154,6 +154,7 @@ exports.DefaultAdaptableOptions = {
         customSortComparers: undefined,
         englishVariant: 'GB',
         unbalancedGroupsKey: undefined,
+        keepGroupedColumnIndex: false,
     },
     layoutOptions: {
         includeExpandedRowGroups: false,

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.d.ts

@@ -23,10 +23,6 @@ export interface WeightParameter extends BaseParameter<'operand', 'WEIGHT'> {
 export interface AggregatedScalarExpressionEvaluation {
     aggregationParams: AggregateParams<any, string | number>;
     rowValueGetter?: (rowNode: RowNode, aggregatedValue: any) => string | number | Date | boolean;
-    /**
-     * @deprecated remove this
-     */
-    columnDependencies: string[];
     context?: {
         weightParam?: WeightParameter;
     };

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -32,6 +32,14 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const aggregationParameter = (0, expressionFunctionUtils_1.extractParameter)('CUMUL', 'aggregationScalar', ['SUM', 'PERCENTAGE', 'AVG', 'MIN', 'MAX'], args);
             const overColumnParameter = (0, expressionFunctionUtils_1.extractParameter)('CUMUL', 'operand', ['OVER'], args);
+            const groupByParameter = (0, expressionFunctionUtils_1.extractParameter)('MAX', 'operand', ['GROUP_BY'], args, {
+                isOptional: true,
+            });
+            if (!!groupByParameter) {
+                // ensure the GROUP_BY is NOT on the CUMUL function
+                // it should be on the AGGREGATION function
+                throw new ExpressionEvaluationError_1.ExpressionEvaluationError('GROUP_BY', `should be passed as an argument to the '${aggregationParameter.name}' aggregation function!`);
+            }
             const cumulationExpressionEvaluation = mapAggregationToCumulation(aggregationParameter, overColumnParameter, context);
             const result = {
                 name: 'CUMUL',
@@ -73,7 +81,6 @@ exports.aggregatedScalarExpressionFunctions = {
                     },
                 },
                 rowFilterFn: context.filterFn,
-                columnDependencies: [sumColumnName],
             };
             addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
@@ -135,7 +142,6 @@ exports.aggregatedScalarExpressionFunctions = {
                         100);
                 },
                 rowFilterFn: context.filterFn,
-                columnDependencies: [...new Set([percentageColumnName, sumAggregationColumnName])],
             };
             addGroupByParams(groupByColumnNames, aggregationExpressionEvaluation);
             const result = {
@@ -209,7 +215,6 @@ exports.aggregatedScalarExpressionFunctions = {
                     },
                 },
                 rowFilterFn: context.filterFn,
-                columnDependencies: [avgColumnName],
             };
             addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             if (weightParameter) {
@@ -264,7 +269,6 @@ exports.aggregatedScalarExpressionFunctions = {
                     },
                 },
                 rowFilterFn: context.filterFn,
-                columnDependencies: [minColumnName],
             };
             addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
@@ -314,7 +318,6 @@ exports.aggregatedScalarExpressionFunctions = {
                     },
                 },
                 rowFilterFn: context.filterFn,
-                columnDependencies: [maxColumnName],
             };
             addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
@@ -443,7 +446,6 @@ exports.aggregatedScalarExpressionFunctions = {
                     }
                     return rowBucketMap[rowValue];
                 },
-                columnDependencies: [quantileColumnName],
             };
             addGroupByParams(groupByOperand === null || groupByOperand === void 0 ? void 0 : groupByOperand.value, aggregationExpressionEvaluation);
             const result = {
@@ -643,9 +645,6 @@ const mapAggregationToCumulation = (aggregationParameter, overColumnParameter, c
             groupBy: aggregationEvaluation.aggregationParams.groupBy,
         },
         rowValueGetter,
-        columnDependencies: [
-            ...new Set([...aggregationEvaluation.columnDependencies, overColumnParameter.value]),
-        ],
         rowFilterFn: aggregationEvaluation.rowFilterFn,
     };
     return cumulationExpressionEvaluation;
@@ -657,7 +656,6 @@ const addGroupByParams = (groupByColumnNames, expressionEvaluation) => {
         expressionEvaluation.aggregationParams.groupBy = groupByColumnNames.map((columnName) => ({
             field: columnName,
         }));
-        expressionEvaluation.columnDependencies.push(...groupByColumnNames);
     }
 };
 const isUndefinedValue = (input) => {

package/src/Utilities/Extensions/ObjectExtensions.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Returns a new object with the property updated.
+ * The property is identified by the path.
+ *
+ * @param obj Object
+ * @param path path to the property
+ * @param value new property value
+ * @returns
+ */
+export declare function setInPath<T>(obj: any, path: string[], value: any): T;

package/src/Utilities/Extensions/ObjectExtensions.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setInPath = void 0;
+/**
+ * Returns a new object with the property updated.
+ * The property is identified by the path.
+ *
+ * @param obj Object
+ * @param path path to the property
+ * @param value new property value
+ * @returns
+ */
+function setInPath(obj, path, value) {
+    var _a;
+    if (path.length === 1) {
+        return Object.assign(Object.assign({}, obj), { [path[0]]: value });
+    }
+    return Object.assign(Object.assign({}, obj), { [path[0]]: setInPath((_a = obj === null || obj === void 0 ? void 0 : obj[path[0]]) !== null && _a !== void 0 ? _a : {}, path.slice(1), value) });
+}
+exports.setInPath = setInPath;

package/src/Utilities/Helpers/FormatHelper.d.ts

@@ -1,7 +1,7 @@
 import { NumberFormatterOptions, DateFormatterOptions, AdaptableFormat, StringFormatterOptions } from '../../PredefinedConfig/Common/AdaptableFormat';
 export declare function Format(input: any, format: AdaptableFormat): string;
 export declare function NumberFormatter(input: number | string, options?: NumberFormatterOptions): string;
-export declare function DateFormatter(input: number | Date | string, options: DateFormatterOptions): string | undefined;
+export declare function DateFormatter(input: number | Date | string, options: DateFormatterOptions, strictFormatting?: boolean): string | undefined;
 export declare function StringFormatter(input: string, options?: StringFormatterOptions): string;
 declare const _default: {
     NumberFormatter: typeof NumberFormatter;

package/src/Utilities/Helpers/FormatHelper.js

@@ -71,7 +71,7 @@ function NumberFormatter(input, options = {}) {
     return s;
 }
 exports.NumberFormatter = NumberFormatter;
-function DateFormatter(input, options) {
+function DateFormatter(input, options, strictFormatting = false) {
     if (input == null || input == undefined || input == 'Invalid Date') {
         return undefined;
     }
@@ -83,6 +83,12 @@ function DateFormatter(input, options) {
         return (0, format_1.default)(input, (options === null || options === void 0 ? void 0 : options.Pattern) || GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN);
     }
     catch (error) {
+        if (strictFormatting) {
+            return `Invalid date formatting pattern`;
+        }
+        if (typeof input !== 'string') {
+            return String(input);
+        }
         return input;
     }
 }

package/src/Utilities/Services/LicenseService/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/SystemRedux"),s=require("../../../Redux/ActionsReducers/PopupRedux"),t=e.__importDefault(require("../../ObjectFactory")),o=require("../../Helpers/LoggingHelper"),i=e.__importDefault(require("lodash/clamp")),n=require("../../Constants/DocumentationLinkConstants"),r=require("../../license/decode"),c=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",d=10,p=864e5;var E;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(E=exports.LicenseValidityType||(exports.LicenseValidityType={}));const _=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,I=/(https):\/\/\S+(\.csb\.app)/g,O=/(https):\/\/\S+(\.adaptabletools\.com)/g,u="undefined"!=typeof window?window.location.origin:"",h=()=>{const[e,a,s]=Array.from(_.exec(u)||[]);return"https"===a&&"sandpack.codesandbox.io"===s},A=()=>{const[e,a,s]=Array.from(I.exec(u)||[]);return"https"===a&&".csb.app"===s},N=()=>{const[e,a,s]=Array.from(O.exec(u)||[]);return"https"===a&&".adaptabletools.com"===s};class L{constructor(e,a,s){this.adaptable=e,this.adaptable=e;let t=null;if(a)try{t=(0,r.decode)(a)}catch(e){t=e}h()||A()||N()||this.handleLicenseValidation(t,this.getValidityType(t,s))}getValidityType(e,a){if(!e)return E.NO_LICENSE;if(e instanceof Error)return E.INVALID_LICENSE;const s=new Date(a.publishedAt),t=new Date(e.end),o=t<new Date,i=e.trial;let n=null;return n=o?t>s?i?E.NON_PRODUCTION_EXPIRED_IN_SCOPE:E.COMMERCIAL_EXPIRED_IN_SCOPE:i?E.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:E.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?E.NON_PRODUCTION_VALID:E.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var s;const t=new Date;t.setHours(0,0,0,0);let d=0;e instanceof Error||!(null==e?void 0:e.end)||(d=Math.floor(((null===(s=null==e?void 0:e.end)||void 0===s?void 0:s.getTime())-t.getTime())/864e5),d=(0,i.default)(d,0,1/0));let p="",E="";!e||e instanceof Error||!e.appName||e.appName==r.GENERIC_APP_NAME||(p=e.appName,E=" for application [APP_NAME]");const _=(e,a=n.LicenseDocsLink,s=l,t=d,o=p)=>e.replace("[LINK]",a).replace("[EMAIL]",s).replace("[APP_NAME]",o).replace("[DAYS]",`${t}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":(0,o.ConsoleLogByMessageType)(_("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":(0,o.ConsoleLogByMessageType)(_("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":(0,o.ConsoleLogByMessageType)(_("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(_("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(d<=10)(0,o.ConsoleLogByMessageType)(_(`This AdapTable license${E} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,c.shouldLogThankYouMessage)()&&(0,o.ConsoleLogByMessageType)(_(`Thank you for using a valid AdapTable license${E}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(_(`This AdapTable license${E} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":(0,o.ConsoleLogByMessageType)(_(`This AdapTable license${E} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,s.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:t.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseDisablePersistence)())}destroy(){}}exports.LicenseService=L;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/SystemRedux"),s=require("../../../Redux/ActionsReducers/PopupRedux"),t=e.__importDefault(require("../../ObjectFactory")),o=require("../../Helpers/LoggingHelper"),i=e.__importDefault(require("lodash/clamp")),n=require("../../Constants/DocumentationLinkConstants"),r=require("../../license/decode"),c=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",d=10,p=864e5;var E;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(E=exports.LicenseValidityType||(exports.LicenseValidityType={}));const _=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,I=/(https):\/\/\S+(\.csb\.app)/g,O=/(https):\/\/\S+(\.adaptabletools\.com)/g,u="undefined"!=typeof window?window.location.origin:"",h=()=>{const[e,a,s]=Array.from(_.exec(u)||[]);return"https"===a&&"sandpack.codesandbox.io"===s},A=()=>{const[e,a,s]=Array.from(I.exec(u)||[]);return"https"===a&&".csb.app"===s},N=()=>{const[e,a,s]=Array.from(O.exec(u)||[]);return"https"===a&&".adaptabletools.com"===s};class L{constructor(e,a,s){this.adaptable=e,this.adaptable=e;let t=null;if(a)try{t=(0,r.decode)(a)}catch(e){t=e}h()||A()||N()||this.handleLicenseValidation(t,this.getValidityType(t,s))}getValidityType(e,a){if(!e)return E.NO_LICENSE;if(e instanceof Error)return E.INVALID_LICENSE;const s=new Date(a.publishedAt),t=new Date(e.end),o=t<new Date,i=e.trial;let n=null;return n=o?t>s?i?E.NON_PRODUCTION_EXPIRED_IN_SCOPE:E.COMMERCIAL_EXPIRED_IN_SCOPE:i?E.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:E.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?E.NON_PRODUCTION_VALID:E.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var s;const t=new Date;t.setHours(0,0,0,0);let E=0;e instanceof Error||!(null==e?void 0:e.end)||(E=Math.floor(((null===(s=null==e?void 0:e.end)||void 0===s?void 0:s.getTime())-t.getTime())/p),E=(0,i.default)(E,0,1/0));let _="",I="";!e||e instanceof Error||!e.appName||e.appName==r.GENERIC_APP_NAME||(_=e.appName,I=" for application [APP_NAME]");const O=(e,a=n.LicenseDocsLink,s=l,t=E,o=_)=>e.replace("[LINK]",a).replace("[EMAIL]",s).replace("[APP_NAME]",o).replace("[DAYS]",`${t}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":(0,o.ConsoleLogByMessageType)(O("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":(0,o.ConsoleLogByMessageType)(O("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":(0,o.ConsoleLogByMessageType)(O("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(O("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(E<=d)(0,o.ConsoleLogByMessageType)(O(`This AdapTable license${I} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,c.shouldLogThankYouMessage)()&&(0,o.ConsoleLogByMessageType)(O(`Thank you for using a valid AdapTable license${I}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(O(`This AdapTable license${I} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":(0,o.ConsoleLogByMessageType)(O(`This AdapTable license${I} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,s.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:t.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseDisablePersistence)())}destroy(){}}exports.LicenseService=L;

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

@@ -13,6 +13,7 @@ const AlertButtonsEditor_1 = require("./AlertButtonsEditor");
 const CodeBlock_1 = require("../../../components/CodeBlock");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../Components/AdaptableInput"));
 const join_1 = tslib_1.__importDefault(require("../../../components/utils/join"));
+const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const DEFAULT_BUTTONS = [
     {
         Label: 'OK',
@@ -48,7 +49,7 @@ const AlertPreview = (_a) => {
         const Buttons = (((_a = alertForm === null || alertForm === void 0 ? void 0 : alertForm.Buttons) === null || _a === void 0 ? void 0 : _a.length) ? alertForm.Buttons : DEFAULT_BUTTONS).map(mapButtons);
         const result = {
             alertType: 'generic',
-            header: alertDefinition.MessageType,
+            header: api.alertApi.getAlertMessageTitle(alertDefinition),
             message: api.alertApi.getAlertDescription(alertDefinition),
             alertDefinition: Object.assign(Object.assign({}, alertDefinition), { AlertForm: Object.assign(Object.assign({}, alertForm), { Buttons }) }),
         };
@@ -59,10 +60,11 @@ const AlertPreview = (_a) => {
 };
 exports.AlertPreview = AlertPreview;
 const AlertDisplayWizardSection = (props) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const messageType = data.MessageType;
     const messageText = api.alertApi.getAlertDescription(data);
+    const messageHeader = (_a = data.MessageHeader) !== null && _a !== void 0 ? _a : '';
     const adaptableAlert = {
         alertType: 'generic',
         header: data.MessageType,
@@ -73,6 +75,10 @@ const AlertDisplayWizardSection = (props) => {
         const { value } = e.target;
         props.onChange(Object.assign(Object.assign({}, data), { MessageText: value }));
     };
+    const onMessageHeaderChange = (e) => {
+        const { value } = e.target;
+        props.onChange(Object.assign(Object.assign({}, data), { MessageHeader: value }));
+    };
     return (React.createElement(React.Fragment, null,
         React.createElement(Tabs_1.Tabs, { "data-name": "message-type" },
             React.createElement(Tabs_1.Tabs.Tab, null, "Message Type"),
@@ -89,23 +95,25 @@ const AlertDisplayWizardSection = (props) => {
             React.createElement(Tabs_1.Tabs.Content, null,
                 React.createElement(rebass_1.Text, { fontSize: 2, mt: 3, mb: 2 }, "The text to display as the Alert Message (leave blank to show automated Message based on Trigger and Condition)"),
                 ' ',
-                React.createElement(AdaptableInput_1.default, { marginTop: 2, type: 'text', autoFocus: false, value: messageText, 
-                    // onChange={(e: any) => onPredicateInputChange(e, index)}
-                    onChange: (e) => onMessageTextChange(e) }))),
+                React.createElement(FormLayout_1.default, null,
+                    React.createElement(FormLayout_1.FormRow, { label: "Header" },
+                        React.createElement(AdaptableInput_1.default, { marginTop: 2, type: 'text', autoFocus: false, value: messageHeader, onChange: (e) => onMessageHeaderChange(e) })),
+                    React.createElement(FormLayout_1.FormRow, { label: "Message" },
+                        React.createElement(AdaptableInput_1.default, { marginTop: 2, type: 'text', autoFocus: false, value: messageText, onChange: (e) => onMessageTextChange(e) }))))),
         React.createElement(Tabs_1.Tabs, { "data-name": "display-options", mt: 2, mb: 3, autoFocus: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Display options"),
             React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(CheckBox_1.CheckBox, { checked: (_a = data.AlertProperties) === null || _a === void 0 ? void 0 : _a.DisplayNotification, onChange: (DisplayNotification) => {
+                React.createElement(CheckBox_1.CheckBox, { checked: (_b = data.AlertProperties) === null || _b === void 0 ? void 0 : _b.DisplayNotification, onChange: (DisplayNotification) => {
                         const newAlertDefinition = Object.assign(Object.assign({}, data), { AlertProperties: Object.assign(Object.assign({}, data.AlertProperties), { DisplayNotification }) });
                         if (!DisplayNotification && typeof newAlertDefinition.AlertForm === 'object') {
                             delete newAlertDefinition.AlertForm.Buttons;
                         }
                         props.onChange(newAlertDefinition);
                     } }, "Show a Notification when Alert is triggered (with action buttons)"),
-                ((_b = data.AlertProperties) === null || _b === void 0 ? void 0 : _b.DisplayNotification) ? (typeof data.AlertForm === 'string' ? (React.createElement(rebass_1.Text, { fontSize: 2 }, "Alert buttons cannot be customized because form is dynamically driven")) : (React.createElement(AlertButtonsEditor_1.AlertButtonsEditor, { AlertButtons: ((_c = data.AlertForm) === null || _c === void 0 ? void 0 : _c.Buttons) || DEFAULT_BUTTONS, api: api, adaptableAlert: adaptableAlert, onChange: (buttons) => {
+                ((_c = data.AlertProperties) === null || _c === void 0 ? void 0 : _c.DisplayNotification) ? (typeof data.AlertForm === 'string' ? (React.createElement(rebass_1.Text, { fontSize: 2 }, "Alert buttons cannot be customized because form is dynamically driven")) : (React.createElement(AlertButtonsEditor_1.AlertButtonsEditor, { AlertButtons: ((_d = data.AlertForm) === null || _d === void 0 ? void 0 : _d.Buttons) || DEFAULT_BUTTONS, api: api, adaptableAlert: adaptableAlert, onChange: (buttons) => {
                         props.onChange(Object.assign(Object.assign({}, data), { AlertForm: Object.assign(Object.assign({}, data.AlertForm), { Buttons: buttons }) }));
                     } }))) : null)),
-        ((_d = data.AlertProperties) === null || _d === void 0 ? void 0 : _d.DisplayNotification) ? (React.createElement(Tabs_1.Tabs, { "data-name": "alert-preview", autoFocus: false },
+        ((_e = data.AlertProperties) === null || _e === void 0 ? void 0 : _e.DisplayNotification) ? (React.createElement(Tabs_1.Tabs, { "data-name": "alert-preview", autoFocus: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Alert preview"),
             React.createElement(Tabs_1.Tabs.Content, null, typeof data.AlertForm === 'string' ? (React.createElement(rebass_1.Text, { fontSize: 2 }, "Preview not available because form is dynamically driven")) : (React.createElement(exports.AlertPreview, { alertDefinition: data, api: api }))))) : null));
 };

package/src/View/Components/Charting/ChartingViewPanel.js

@@ -55,15 +55,17 @@ const ChartingViewPanel = (props) => {
                 setSelectedContainer(null);
             },
         },
-        ...chartContainers.map((contianerDef) => ({
-            label: contianerDef.name,
-            onClick: () => {
-                setSelectedContainer(contianerDef);
-            },
-        })),
+        ...(chartContainers
+            ? chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.map((contianerDef) => ({
+                label: contianerDef.name,
+                onClick: () => {
+                    setSelectedContainer(contianerDef);
+                },
+            }))
+            : []),
     ];
     const chartSelector = (React.createElement(DropdownButton_1.default, { width: "100%", columns: ['label'], className: `ab-${elementType}__Chart__select`, items: options, disabled: !hasCharts }, content));
-    const containerSelector = Boolean(chartContainers.length) && (React.createElement(DropdownButton_1.default, { width: "100%", columns: ['label'], items: containerOptions, disabled: !isSelectedChart }, (selectedContainer === null || selectedContainer === void 0 ? void 0 : selectedContainer.name) || 'Ag Grid Window'));
+    const containerSelector = Boolean(chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.length) && (React.createElement(DropdownButton_1.default, { width: "100%", columns: ['label'], items: containerOptions, disabled: !isSelectedChart }, (selectedContainer === null || selectedContainer === void 0 ? void 0 : selectedContainer.name) || 'Ag Grid Window'));
     const chartButton = (React.createElement(SimpleButton_1.default, { onClick: () => (isOpen ? closeChart() : showChart(selectedContainer)), disabled: !Boolean(selectedChart), variant: 'outlined', tone: 'neutral' }, isOpen ? 'Close' : 'Open'));
     if (elementType === 'DashboardToolbar') {
         return (React.createElement(rebass_1.Flex, { width: "100%", alignItems: "center" },

package/src/View/Components/Charting/ShowChartButton.js

@@ -25,12 +25,12 @@ const ShowChartButton = (props) => {
                 showChart(null);
             },
         },
-        ...chartContainers.map((contianerDef) => ({
-            label: contianerDef.name,
-            onClick: () => {
-                showChart(contianerDef);
-            },
-        })),
+        ...(chartContainers
+            ? chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.map((contianerDef) => ({
+                label: contianerDef.name,
+                onClick: () => showChart(contianerDef),
+            }))
+            : []),
     ];
     return (React.createElement(DropdownButton_1.default, { "data-name": "show-chart-dropdown", variant: "text", columns: ['label'], items: containerOptions },
         React.createElement(SimpleButton_1.default, { variant: "raised", tone: "success" }, "Open")));

package/src/View/Components/FilterForm/ListBoxFilterForm.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn, AdaptableColumnDataType } from '../../../PredefinedConfig/Common/AdaptableColumn';
 import { ListGroupProps } from '../../../components/List/ListGroup';
 export interface ListBoxFilterFormProps extends ListGroupProps {
     currentColumn: AdaptableColumn;
@@ -11,7 +11,7 @@ export interface ListBoxFilterFormProps extends ListGroupProps {
     }[];
     uiSelectedColumnValues: Array<string>;
     onColumnValueSelectedChange: (SelectedValues: Array<any>) => void;
-    dataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown';
+    dataType: AdaptableColumnDataType;
     isLoading?: boolean;
     suppressClientSideFilter?: boolean;
     onFilterChange?: (filter: string) => void;

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -142,7 +142,7 @@ class QuickFilterFormComponent extends React.Component {
             showQuickFilterInput = !hideQuickFilterInputFunction(this.props.currentColumn);
         }
         return (React.createElement(React.Fragment, null,
-            showQuickFilterDropdown && (React.createElement(OverlayTrigger_1.default, { className: "ab-QuickFilter", showEvent: showEvent, hideEvent: hideEvent, preventPortalEventPropagation: showEvent === 'click', alignHorizontal: "left", targetOffset: 10, hideDelay: 300, "data-name": "quick-filter-overlay", render: () => (React.createElement(rebass_1.Flex, { flexDirection: "column", "data-name": "quick-filter" },
+            showQuickFilterDropdown && (React.createElement(OverlayTrigger_1.default, { className: "ab-QuickFilter", showEvent: showEvent, hideEvent: hideEvent, preventPortalEventPropagation: showEvent === 'click', targetOffset: 10, hideDelay: 300, "data-name": "quick-filter-overlay", render: () => (React.createElement(rebass_1.Flex, { flexDirection: "column", "data-name": "quick-filter" },
                     (filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId) && (React.createElement(SimpleButton_1.default, { p: 2, variant: "text", onClick: () => this.clearFilter() },
                         React.createElement("span", { style: { width: 20, marginRight: 10 } },
                             React.createElement(icons_1.Icon, { name: "delete" })),
@@ -247,7 +247,7 @@ class QuickFilterFormComponent extends React.Component {
                 return label !== null && label !== void 0 ? label : input;
             }).join(', ');
         }
-        return (React.createElement(OverlayTrigger_1.default, { alignHorizontal: "left", showEvent: showEvent, 
+        return (React.createElement(OverlayTrigger_1.default, { showEvent: showEvent, 
             // cannot hide on blur, because the form input receives the input when this is opened
             hideEvent: "mouseleave", hideDelay: 300, ref: (api) => {
                 this.valuesDropdown = api;

package/src/View/Components/RangesComponent.js

@@ -80,7 +80,7 @@ class RangesComponent extends React.Component {
                             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, { disabled: this.props.disabled, checked: range.ReverseGradient && range.ReverseGradient == true, onChange: (checked) => this.changeRangeDirectionUp(index, checked) }, "Reverse Gradient")),
+                        this.props.showRangeDirection && (React.createElement(CheckBox_1.CheckBox, { disabled: this.props.disabled, checked: range.ReverseGradient && range.ReverseGradient == true, onChange: (checked) => this.changeRangeDirectionUp(index, checked), ml: 2 }, "Reverse Gradient")),
                         React.createElement(SimpleButton_1.default, { ml: 2, mb: 1, icon: "delete", disabled: this.props.disabled || (this.props.ranges && this.props.ranges.length == 1), onClick: () => this.removeRange(index) })))),
                     React.createElement("div", null,
                         React.createElement(SimpleButton_1.default, { disabled: this.props.disabled, variant: "raised", "data-name": "add", onClick: () => this.addRange() }, "Add New Range"))))),