@adaptabletools/adaptable 18.1.13 → 18.1.15-canary.0

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -1,7 +1,15 @@
 import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { AdaptableTheme } from '../../PredefinedConfig/ThemeState';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
-import { AdaptableColumnType } from '../../PredefinedConfig/Common/Types';
+import { AdaptableColumnType, AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
+import { DataChangeDetectionPolicy } from '../../AdaptableOptions/AlertOptions';
+import { ToastPositions, ToastTransitions } from '../../AdaptableOptions/NotificationsOptions';
+import { FlashTarget } from '../../AdaptableOptions/FlashingCellOptions';
+import { DashboardButtonsLocation } from '../../AdaptableOptions/DashboardOptions';
+import { PopupType } from '../../AdaptableOptions/SettingsPanelOptions';
+import { SaveChartBehaviour } from '../../AdaptableOptions/ChartingOptions';
+import { DisplayRowGroups } from '../../AdaptableOptions/LayoutOptions';
 export declare const AUTOGENERATED_PK_COLUMN: string;
 export declare const MISSING_COLUMN: string;
 export declare const DEFAULT_LAYOUT: string;
@@ -11,6 +19,8 @@ export declare const OS_THEME: string;
 export declare const USER_NAME: string;
 export declare const ADAPTABLE_ID: string;
 export declare const ADAPTABLE: string;
+export declare const ADAPTABLE_CONTAINER_ID: string;
+export declare const AG_GRID_CONTAINER_ID: string;
 export declare const ADAPTABLE_TOOLPANEL_ID: string;
 export declare const ADAPTABLE_TOOLPANEL_COMPONENT: string;
 export declare const AGGRID_TOOLPANEL_FILTERS: string;
@@ -18,9 +28,6 @@ export declare const AGGRID_TOOLPANEL_COLUMNS: string;
 export declare const MENU_PREFIX: string;
 export declare const READ_ONLY_STYLE: string;
 export declare const ALL_COLUMN_VALUES: string;
-export declare const FILTER_ALWAYS: 'Always' | 'Never' | 'Throttle';
-export declare const FILTER_NEVER: 'Always' | 'Never' | 'Throttle';
-export declare const FILTER_THROTTLE: 'Always' | 'Never' | 'Throttle';
 export declare const EMPTY_STRING: string;
 export declare const EMPTY_ARRAY: any[];
 export declare const AB_SPECIAL_COLUMN: AdaptableColumnType;
@@ -40,6 +47,36 @@ export declare const BLANK_DISTINCT_COLUMN_VALUE = "[BLANKS]";
 export declare const DEFAULT_STRING_DISPLAY_VALUE = "Hello World";
 export declare const DEFAULT_INTEGER_DISPLAY_VALUE = 12345;
 export declare const DEFAULT_DOUBLE_DISPLAY_VALUE = 12345.6789;
+export declare const RAW_VALUE_DATA_CHANGE_DETECTION_POLICY: DataChangeDetectionPolicy;
+export declare const TOAST_POSITIONS_BOTTOM_RIGHT: ToastPositions;
+export declare const TOAST_TRANSITIONS_SLIDE: ToastTransitions;
+export declare const NOTIFICATION_DURATION = 3000;
+export declare const NOTIFICATION_MAX_SYSTEM_MESSAGES = 100;
+export declare const QUICK_SEARCH_PLACEHOLDER = "Search";
+export declare const DASHBOARD_BUTTONS_LOCATION_LEFT: DashboardButtonsLocation;
+export declare const DASHBOARD_BUTTONS_LOCATION_RIGHT: DashboardButtonsLocation;
+export declare const ENGLISH_VARIANT = "GB";
+export declare const LOADING_SCREEN_DELAY = 200;
+export declare const LOADING_SCREEN_TITLE = "Initialising Grid";
+export declare const LOADING_SCREEN_TEXT = "Retrieving your settings and setting up the grid...";
+export declare const DATE_INPUT_DATE_FORMAT = "yyyy-MM-dd";
+export declare const FLASHING_TARGET_CELL: FlashTarget;
+export declare const FLASHING_TARGET_ROW: FlashTarget;
+export declare const ICON_CONFIGURATION = "ConfigurationIcon";
+export declare const POPUP_TYPE_MODAL: PopupType;
+export declare const POPUP_TYPE_WINDOW: PopupType;
+export declare const SAVE_CHART_BEHAVIOUR_AUTO: SaveChartBehaviour;
+export declare const SAVE_CHART_BEHAVIOUR_MANUAL: SaveChartBehaviour;
+export declare const SAVE_CHART_BEHAVIOUR_NONE: SaveChartBehaviour;
+export declare const DISPLAY_ROW_GROUPS_DYNAMIC: DisplayRowGroups;
+export declare const DISPLAY_ROW_GROUPS_EXPANDED: DisplayRowGroups;
+export declare const DISPLAY_ROW_GROUPS_CLOSED: DisplayRowGroups;
+export declare const FDC3_ACTION_COLUMN_DEFAULT_COLUMN_ID = "fdc3ActionColumn";
+export declare const FDC3_ACTION_COLUMN_DEFAULT_HEADER_NAME = "FDC3 Actions";
+export declare const ACCESS_LEVEL_READONLY: AccessLevel;
+export declare const ACCESS_LEVEL_HIDDEN: AccessLevel;
+export declare const ACCESS_LEVEL_FULL: AccessLevel;
+export declare const STANDALONE_MODULE_POPUPS: AdaptableModule[];
 export declare const SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE: number;
 export declare const QUICK_SEARCH_DEFAULT_BACK_COLOR: string;
 export declare const QUICK_SEARCH_DEFAULT_FORE_COLOR: string;

package/src/Utilities/Constants/GeneralConstants.js

@@ -9,6 +9,8 @@ export const OS_THEME = 'os';
 export const USER_NAME = 'anonymous';
 export const ADAPTABLE_ID = 'adaptable_id';
 export const ADAPTABLE = 'AdapTable';
+export const ADAPTABLE_CONTAINER_ID = 'adaptable';
+export const AG_GRID_CONTAINER_ID = 'grid';
 export const ADAPTABLE_TOOLPANEL_ID = 'adaptable';
 export const ADAPTABLE_TOOLPANEL_COMPONENT = 'AdaptableToolPanel';
 // from https://www.ag-grid.com/javascript-data-grid/side-bar/#string-configuration
@@ -17,9 +19,6 @@ export const AGGRID_TOOLPANEL_COLUMNS = 'columns';
 export const MENU_PREFIX = 'ab_';
 export const READ_ONLY_STYLE = 'ab_readonly';
 export const ALL_COLUMN_VALUES = 'ALL_COLUMN_VALUES';
-export const FILTER_ALWAYS = 'Always';
-export const FILTER_NEVER = 'Never';
-export const FILTER_THROTTLE = 'Throttle';
 export const EMPTY_STRING = '';
 export const EMPTY_ARRAY = [];
 export const AB_SPECIAL_COLUMN = 'abSpecialColumn';
@@ -39,6 +38,46 @@ export const BLANK_DISTINCT_COLUMN_VALUE = '[BLANKS]';
 export const DEFAULT_STRING_DISPLAY_VALUE = 'Hello World';
 export const DEFAULT_INTEGER_DISPLAY_VALUE = 12345;
 export const DEFAULT_DOUBLE_DISPLAY_VALUE = 12345.6789;
+export const RAW_VALUE_DATA_CHANGE_DETECTION_POLICY = 'rawValue';
+export const TOAST_POSITIONS_BOTTOM_RIGHT = 'BottomRight';
+export const TOAST_TRANSITIONS_SLIDE = 'Slide';
+export const NOTIFICATION_DURATION = 3000;
+export const NOTIFICATION_MAX_SYSTEM_MESSAGES = 100;
+export const QUICK_SEARCH_PLACEHOLDER = 'Search';
+export const DASHBOARD_BUTTONS_LOCATION_LEFT = 'left';
+export const DASHBOARD_BUTTONS_LOCATION_RIGHT = 'right';
+// User Interface
+export const ENGLISH_VARIANT = 'GB';
+export const LOADING_SCREEN_DELAY = 200;
+export const LOADING_SCREEN_TITLE = 'Initialising Grid';
+export const LOADING_SCREEN_TEXT = 'Retrieving your settings and setting up the grid...';
+export const DATE_INPUT_DATE_FORMAT = 'yyyy-MM-dd';
+// Flashing Cell
+export const FLASHING_TARGET_CELL = 'cell';
+export const FLASHING_TARGET_ROW = 'row';
+export const ICON_CONFIGURATION = 'ConfigurationIcon';
+export const POPUP_TYPE_MODAL = 'modal';
+export const POPUP_TYPE_WINDOW = 'window';
+export const SAVE_CHART_BEHAVIOUR_AUTO = 'auto';
+export const SAVE_CHART_BEHAVIOUR_MANUAL = 'manual';
+export const SAVE_CHART_BEHAVIOUR_NONE = 'none';
+// Layout
+export const DISPLAY_ROW_GROUPS_DYNAMIC = 'dynamic';
+export const DISPLAY_ROW_GROUPS_EXPANDED = 'expanded';
+export const DISPLAY_ROW_GROUPS_CLOSED = 'closed';
+// FDC3 defaults
+export const FDC3_ACTION_COLUMN_DEFAULT_COLUMN_ID = 'fdc3ActionColumn';
+export const FDC3_ACTION_COLUMN_DEFAULT_HEADER_NAME = 'FDC3 Actions';
+// Entitlement Defaults
+export const ACCESS_LEVEL_READONLY = 'ReadOnly';
+export const ACCESS_LEVEL_HIDDEN = 'Hidden';
+export const ACCESS_LEVEL_FULL = 'Full';
+// Standalone Popups
+export const STANDALONE_MODULE_POPUPS = [
+    'BulkUpdate',
+    'SmartEdit',
+    'CellSummary',
+];
 /*
 Redux / State Defaults
 Try to put all our Redux / State defaults here and ONLY reference from here - avoid magic numbers / strings.

package/src/Utilities/Defaults/DefaultSettingsPanel.d.ts

@@ -1,6 +1,4 @@
 import { AdaptableSettingsPanel } from '../../PredefinedConfig/Common/Types';
-import { AdaptableModule } from '../../types';
-export declare const STANDALONE_MODULE_POPUPS: AdaptableModule[];
 /**
  * This constants determines the order and the items that appear in the navigation.
  */

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -1,8 +1,3 @@
-export const STANDALONE_MODULE_POPUPS = [
-    'BulkUpdate',
-    'SmartEdit',
-    'CellSummary',
-];
 /**
  * This constants determines the order and the items that appear in the navigation.
  */

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

@@ -33,6 +33,18 @@ export declare function sortCellValueArrayDates(cellValues: GridCell[], sortOrde
 export declare function groupArrayBy(array: Array<any>, prop: string): Array<any>;
 export declare function createCommaSeparatedString(values: any[]): string;
 export declare function SumArray(array: (number | undefined)[]): number;
+export declare function reorderArray(array: any[], startIndex: number, endIndex: number): any[];
+export declare function sortArrayWithOrder<T>(array: T[], order: T[], 
+/**
+ *
+ * The array can contain items which are not listed in the order array.
+ * So sortUnorderedItems decides whether to leave these items untouched
+ * in the current order in which they are in the array (sortUnorderedItems: false)
+ * or to sort them using normal comparison rules
+ */
+{ sortUnorderedItems: sortUnorderedItems }: {
+    sortUnorderedItems: boolean;
+}): T[];
 export declare const ArrayExtensions: {
     GetLength: typeof GetLength;
     CorrectLength: typeof CorrectLength;
@@ -67,5 +79,7 @@ export declare const ArrayExtensions: {
     sortArrayWithProperty: typeof sortArrayWithProperty;
     createCommaSeparatedString: typeof createCommaSeparatedString;
     SumArray: typeof SumArray;
+    reorderArray: typeof reorderArray;
+    sortArrayWithOrder: typeof sortArrayWithOrder;
 };
 export default ArrayExtensions;

package/src/Utilities/Extensions/ArrayExtensions.js

@@ -257,6 +257,69 @@ export function createCommaSeparatedString(values) {
 export function SumArray(array) {
     return array.filter((num) => typeof num === 'number' && !isNaN(num)).reduce((a, b) => a + b, 0);
 }
+export function reorderArray(array, startIndex, endIndex) {
+    const result = [...array];
+    if (startIndex > array.length - 1) {
+        // not much that we can do if the dragged item is out of bounds...
+        return result;
+    }
+    if (endIndex > array.length - 1) {
+        endIndex = array.length - 1;
+    }
+    const [removed] = result.splice(startIndex, 1);
+    result.splice(endIndex, 0, removed);
+    return result;
+}
+export function sortArrayWithOrder(array, order, 
+/**
+ *
+ * The array can contain items which are not listed in the order array.
+ * So sortUnorderedItems decides whether to leave these items untouched
+ * in the current order in which they are in the array (sortUnorderedItems: false)
+ * or to sort them using normal comparison rules
+ */
+{ sortUnorderedItems: sortUnorderedItems }) {
+    const itemsToIndex = array.reduce((acc, x, i) => {
+        acc.set(x, i);
+        return acc;
+    }, new Map());
+    const orderItemsToIndex = order.reduce((acc, x, i) => {
+        acc.set(x, i);
+        return acc;
+    }, new Map());
+    function compareItemsOfCustomSort(valueA, valueB) {
+        const orderContainsFirstElement = orderItemsToIndex.has(valueA);
+        const indexInOrderOfFirstElement = orderContainsFirstElement
+            ? orderItemsToIndex.get(valueA)
+            : -1;
+        const orderContainsSecondElement = orderItemsToIndex.has(valueB);
+        const indexInOrderSecondElement = orderContainsSecondElement
+            ? orderItemsToIndex.get(valueB)
+            : -1;
+        //if none of the element are in the order list we just return normal compare
+        if (!orderContainsFirstElement && !orderContainsSecondElement) {
+            if (!sortUnorderedItems) {
+                // keep the original order
+                return itemsToIndex.get(valueA) - itemsToIndex.get(valueB);
+            }
+            if (valueA == valueB) {
+                return 0;
+            }
+            return valueA < valueB ? -1 : 1;
+        }
+        //if first item not in the list make sure we put it after the second item
+        if (!orderContainsFirstElement) {
+            return 1;
+        }
+        //if second item not in the list make sure we put it after the first item
+        if (!orderContainsSecondElement) {
+            return -1;
+        }
+        //return the comparison from the list if the two items are in the list
+        return indexInOrderOfFirstElement - indexInOrderSecondElement;
+    }
+    return [].concat(array).sort(compareItemsOfCustomSort);
+}
 export const ArrayExtensions = {
     GetLength,
     CorrectLength,
@@ -291,5 +354,7 @@ export const ArrayExtensions = {
     sortArrayWithProperty,
     createCommaSeparatedString,
     SumArray,
+    reorderArray,
+    sortArrayWithOrder
 };
 export default ArrayExtensions;

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

@@ -1,11 +1,7 @@
 export declare function getNames(e: any): string[];
-export declare function getValues<T extends number>(e: any): T[];
-export declare function getObjValues(e: any): (number | string)[];
 export declare function getCssFontSizeFromFontSizeEnum(fontSize: any): string;
 export declare const EnumExtensions: {
     getNames: typeof getNames;
-    getValues: typeof getValues;
-    getObjValues: typeof getObjValues;
     getCssFontSizeFromFontSizeEnum: typeof getCssFontSizeFromFontSizeEnum;
 };
 export default EnumExtensions;

package/src/Utilities/Extensions/EnumExtensions.js

@@ -1,15 +1,7 @@
 import { FontSize } from '../../PredefinedConfig/Common/Enums';
-// export function getNamesAndValues<T extends number>(e: any) {
-//     return EnumExtensions.getNames(e).map(n => ({ name: n, value: e[n] as T }));
-// }
 export function getNames(e) {
-    return EnumExtensions.getObjValues(e).filter((v) => typeof v === 'string');
-}
-export function getValues(e) {
-    return EnumExtensions.getObjValues(e).filter((v) => typeof v === 'number');
-}
-export function getObjValues(e) {
-    return Object.keys(e).map((k) => e[k]);
+    const vals = Object.keys(e).map((k) => e[k]);
+    return vals.filter((v) => typeof v === 'string');
 }
 export function getCssFontSizeFromFontSizeEnum(fontSize) {
     switch (fontSize) {
@@ -27,8 +19,6 @@ export function getCssFontSizeFromFontSizeEnum(fontSize) {
 }
 export const EnumExtensions = {
     getNames,
-    getValues,
-    getObjValues,
     getCssFontSizeFromFontSizeEnum,
 };
 export default EnumExtensions;

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

@@ -1,22 +1,16 @@
 import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { AdaptableComparerFunction } from '../../PredefinedConfig/Common/AdaptableComparerFunction';
 import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
 import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
 export declare function initPredefinedConfigWithUuids(predefinedConfig: PredefinedConfig): PredefinedConfig;
-export declare function checkValidPrimaryKey(adaptable: IAdaptable): boolean;
-export declare function AdaptableObjectExistsInState(array: AdaptableObject[], itemToCheck: AdaptableObject): boolean;
-export declare function getAppropriateAccessLevel(adaptableObject: AdaptableObject, moduleAccessLevel: AccessLevel): AccessLevel;
-export declare function runAdaptableComparerFunction(columnId: string, columnValues: any[], adaptable: IAdaptable): AdaptableComparerFunction;
+export declare function getAccessLevelForObject(adaptableObject: AdaptableObject, moduleAccessLevel: AccessLevel): AccessLevel;
 export declare function addUuidAndSource<T extends AdaptableObject>(adaptableObject: T): T;
 export declare function removeUuidAndSource<T extends AdaptableObject>(adaptableObject: T): T;
+export declare function isAdaptableObject(object: unknown): object is AdaptableObject;
 export declare const AdaptableHelper: {
     initPredefinedConfigWithUuids: typeof initPredefinedConfigWithUuids;
-    checkValidPrimaryKey: typeof checkValidPrimaryKey;
-    AdaptableObjectExistsInState: typeof AdaptableObjectExistsInState;
-    runAdaptableComparerFunction: typeof runAdaptableComparerFunction;
-    getAppropriateAccessLevel: typeof getAppropriateAccessLevel;
+    getAccessLevelForObject: typeof getAccessLevelForObject;
     addUuidAndSource: typeof addUuidAndSource;
     removeUuidAndSource: typeof removeUuidAndSource;
+    isAdaptableObject: typeof isAdaptableObject;
 };
 export default AdaptableHelper;

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -14,30 +14,7 @@ export function initPredefinedConfigWithUuids(predefinedConfig) {
     };
     return cloneDeepWith(predefinedConfig, customizer);
 }
-export function checkValidPrimaryKey(adaptable) {
-    const pkColumn = adaptable.api.columnApi.getColumnWithColumnId(adaptable.adaptableOptions.primaryKey);
-    if (pkColumn == undefined && !adaptable.adaptableOptions.autogeneratePrimaryKey) {
-        const errorMessage = `The Primary Key Column '${adaptable.adaptableOptions.primaryKey}' does not exist.  This will affect many functions in Adaptable.`;
-        if (adaptable.adaptableOptions.alertOptions.showMissingPrimaryKeyAlert == true) {
-            // show an alert if that is the option
-            adaptable.api.alertApi.showAlertError('No Primary Key', errorMessage);
-        }
-        else {
-            if (adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning == true) {
-                adaptable.logger.consoleError(errorMessage);
-            }
-        }
-        return false;
-    }
-    return true;
-}
-export function AdaptableObjectExistsInState(array, itemToCheck) {
-    if (array == null) {
-        return false;
-    }
-    return array.findIndex((abObject) => abObject.Uuid == itemToCheck.Uuid) > -1;
-}
-export function getAppropriateAccessLevel(adaptableObject, moduleAccessLevel) {
+export function getAccessLevelForObject(adaptableObject, moduleAccessLevel) {
     // we always return the Module Access Level unless the following condition is met:
     // the object prpoerty has been set and set to true and the Module entitlement is full
     if (moduleAccessLevel == 'Full' &&
@@ -48,37 +25,6 @@ export function getAppropriateAccessLevel(adaptableObject, moduleAccessLevel) {
     }
     return moduleAccessLevel;
 }
-export function runAdaptableComparerFunction(columnId, columnValues, adaptable) {
-    return function compareItemsOfCustomSort(valueA, valueB, nodeA, nodeB) {
-        let firstElementValueString = nodeA
-            ? adaptable.getDisplayValueFromRowNode(nodeA, columnId)
-            : valueA;
-        let secondElementValueString = nodeB
-            ? adaptable.getDisplayValueFromRowNode(nodeB, columnId)
-            : valueB;
-        let indexFirstElement = columnValues.indexOf(firstElementValueString);
-        let containsFirstElement = indexFirstElement >= 0;
-        let indexSecondElement = columnValues.indexOf(secondElementValueString);
-        let containsSecondElement = indexSecondElement >= 0;
-        //if none of the element are in the list we jsut return normal compare
-        if (!containsFirstElement && !containsSecondElement) {
-            if (valueA == valueB) {
-                return 0;
-            }
-            return valueA < valueB ? -1 : 1;
-        }
-        //if first item not in the list make sure we put it after the second item
-        if (!containsFirstElement) {
-            return 1;
-        }
-        //if second item not in the list make sure we put it after the first item
-        if (!containsSecondElement) {
-            return -1;
-        }
-        //return the comparison from the list if the two items are in the list
-        return indexFirstElement - indexSecondElement;
-    };
-}
 export function addUuidAndSource(adaptableObject) {
     if (!adaptableObject.Uuid) {
         adaptableObject.Uuid = createUuid();
@@ -104,13 +50,15 @@ export function removeUuidAndSource(adaptableObject) {
     sanitiseObject(clonedObject);
     return clonedObject;
 }
+// pretty primitive type guard for AdaptableObject, but currently there is no better/safer way
+export function isAdaptableObject(object) {
+    return object != undefined && typeof object['Uuid'] === 'string';
+}
 export const AdaptableHelper = {
     initPredefinedConfigWithUuids,
-    checkValidPrimaryKey,
-    AdaptableObjectExistsInState,
-    runAdaptableComparerFunction,
-    getAppropriateAccessLevel,
+    getAccessLevelForObject,
     addUuidAndSource,
     removeUuidAndSource,
+    isAdaptableObject,
 };
 export default AdaptableHelper;

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

@@ -1,6 +1,15 @@
 import { NumberFormatterOptions, DateFormatterOptions, StringFormatterOptions } from '../../PredefinedConfig/Common/AdaptableFormat';
 import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableApi, AdaptableColumn } from '../../types';
+/**
+ * Context used for Placeholders in Display Format
+ */
+export interface DisplayFormatPlaceholderContext {
+    column: AdaptableColumn;
+    rowNode: IRowNode;
+    input: any;
+    api: AdaptableApi;
+}
 export declare function NumberFormatter(input: number, options?: NumberFormatterOptions, rowNode?: IRowNode, column?: AdaptableColumn, api?: AdaptableApi): string;
 export declare function DateFormatter(input: number | Date | string, options: DateFormatterOptions, strictFormatting?: boolean): string | undefined;
 export declare function StringFormatter(input: string, options?: StringFormatterOptions, rowNode?: IRowNode, column?: AdaptableColumn, api?: AdaptableApi): string;

package/src/Utilities/Helpers/FormatHelper.js

@@ -3,18 +3,7 @@
 import dateFnsFormat from 'date-fns/format';
 import { sentenceCase } from 'sentence-case';
 import { DEFAULT_DATE_FORMAT_PATTERN } from '../Constants/GeneralConstants';
-import FormatContentHelper from './FormatContentHelper';
-/*
-export function Format(input: any, format: AdaptableFormat) {
-  if (format.Formatter === 'NumberFormatter') {
-    return NumberFormatter(input, format.Options);
-  }
-  if (format.Formatter === 'DateFormatter') {
-    return DateFormatter(input, format.Options);
-  }
-  throw new Error('Unknown formatter');
-}
-*/
+import Helper from './Helper';
 export function NumberFormatter(input, options = {}, rowNode, column, api) {
     var _a;
     let preparedInput;
@@ -25,7 +14,7 @@ export function NumberFormatter(input, options = {}, rowNode, column, api) {
             input,
             api,
         };
-        preparedInput = FormatContentHelper.resolvePlaceholders(options.Content.toString(), context);
+        preparedInput = formatPlaceholder(options.Content.toString(), context);
     }
     else {
         preparedInput = input;
@@ -131,7 +120,7 @@ export function StringFormatter(input, options = {}, rowNode, column, api) {
             input,
             api,
         };
-        preparedInput = FormatContentHelper.resolvePlaceholders(options.Content, context);
+        preparedInput = formatPlaceholder(options.Content, context);
     }
     else {
         preparedInput = input;
@@ -165,4 +154,27 @@ export function StringFormatter(input, options = {}, rowNode, column, api) {
     }
     return s;
 }
+function formatPlaceholder(text, context) {
+    if (!text) {
+        return text;
+    }
+    if (!context) {
+        return text;
+    }
+    if (context === null || context === void 0 ? void 0 : context.input) {
+        text = Helper.replaceAll(text, '[value]', context.input);
+    }
+    if (context === null || context === void 0 ? void 0 : context.column) {
+        text = Helper.replaceAll(text, '[column]', context.api.columnApi.getFriendlyNameForColumnId(context.column.columnId));
+    }
+    if (context === null || context === void 0 ? void 0 : context.rowNode) {
+        const columns = Helper.extractColsFromText(text);
+        for (const column of columns) {
+            if (context.api.columnApi.getColumnWithColumnId(column)) {
+                text = Helper.replaceAll(text, `[rowData.${column}]`, context.api.gridApi.getRawValueFromRowNode(context.rowNode, column));
+            }
+        }
+    }
+    return text;
+}
 export default { NumberFormatter, DateFormatter, StringFormatter };

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

@@ -12,11 +12,6 @@ export declare function isInputNullOrEmpty(itemToCheck: any): boolean;
 export declare function isInputNotNullOrEmpty(itemToCheck: any): boolean;
 export declare function roundNumber(numberToRound: any, decimalPlaces: number): number;
 export declare function roundNumberTo4dp(numberToRound: any): number;
-export declare function sumNumberArray(numericValues: number[]): number;
-export declare function standardDeviationNumberArray(numericValues: number[]): number;
-export declare function meanNumberArray(numericValues: number[]): number;
-export declare function medianNumberArray(numericValues: number[]): number;
-export declare function modeNumberArray(numbers: number[]): number;
 export declare function clamp(value: any, boundOne: number, boundTwo: number): number;
 export declare function extractColsFromText(text: string): string[];
 export declare function replaceAll(text: string, toReplace: string, replaceWith: string): string;
@@ -35,11 +30,6 @@ export declare const Helper: {
     isInputNotNullOrEmpty: typeof isInputNotNullOrEmpty;
     roundNumber: typeof roundNumber;
     roundNumberTo4dp: typeof roundNumberTo4dp;
-    standardDeviationNumberArray: typeof standardDeviationNumberArray;
-    sumNumberArray: typeof sumNumberArray;
-    meanNumberArray: typeof meanNumberArray;
-    medianNumberArray: typeof medianNumberArray;
-    modeNumberArray: typeof modeNumberArray;
     clamp: typeof clamp;
     extractColsFromText: typeof extractColsFromText;
     replaceAll: typeof replaceAll;

package/src/Utilities/Helpers/Helper.js

@@ -149,71 +149,6 @@ export function roundNumber(numberToRound, decimalPlaces) {
 export function roundNumberTo4dp(numberToRound) {
     return roundNumber(numberToRound, 4);
 }
-export function sumNumberArray(numericValues) {
-    return numericValues.length
-        ? numericValues.reduce(function (a, b) {
-            return a + b;
-        })
-        : 0;
-}
-export function standardDeviationNumberArray(numericValues) {
-    if (numericValues.length) {
-        const count = numericValues.length;
-        const mean = sumNumberArray(numericValues) / count;
-        return Math.sqrt(sumNumberArray(numericValues.map((val) => {
-            return Math.pow(val - mean, 2);
-        })) / count);
-    }
-    else {
-        return 0;
-    }
-}
-export function meanNumberArray(numericValues) {
-    // dividing by 0 will return Infinity
-    // arr must contain at least 1 element to use reduce
-    if (numericValues.length) {
-        let sum = sumNumberArray(numericValues);
-        return sum / numericValues.length;
-    }
-    else {
-        return 0;
-    }
-}
-export function medianNumberArray(numericValues) {
-    numericValues.sort(function (a, b) {
-        return a - b;
-    });
-    const middle = Math.floor((numericValues.length - 1) / 2); // NB: operator precedence
-    if (numericValues.length % 2) {
-        return numericValues[middle];
-    }
-    else {
-        return (numericValues[middle] + numericValues[middle + 1]) / 2.0;
-    }
-}
-export function modeNumberArray(numbers) {
-    if (numbers.length === 0) {
-        return 0;
-    }
-    const m = numbers
-        .reduce((items, current) => {
-        const item = items.length === 0 ? null : items.find((x) => x.value === current);
-        item ? item.occurrence++ : items.push({ value: current, occurrence: 1 });
-        return items;
-    }, [])
-        .sort((a, b) => {
-        if (a.occurrence < b.occurrence) {
-            return 1;
-        }
-        else if (a.occurrence > b.occurrence || a.value < b.value) {
-            return -1;
-        }
-        else {
-            return a.value === b.value ? 0 : 1;
-        }
-    });
-    return m[0].value;
-}
 // putting this here to remove lodash clamp which seems to cause an issue
 export function clamp(value, boundOne, boundTwo) {
     if (!boundTwo) {
@@ -269,11 +204,6 @@ export const Helper = {
     isInputNotNullOrEmpty,
     roundNumber,
     roundNumberTo4dp,
-    standardDeviationNumberArray,
-    sumNumberArray,
-    meanNumberArray,
-    medianNumberArray,
-    modeNumberArray,
     clamp,
     extractColsFromText,
     replaceAll,

package/src/Utilities/Services/ChartingService.d.ts

@@ -1,10 +1,10 @@
-import { ChartModel } from '@ag-grid-community/core';
+import { AgEventType, ChartModel } from '@ag-grid-community/core';
 import { AdaptableApi } from '../../types';
 import { IChartingService } from './Interface/IChartingService';
 export declare class ChartingService implements IChartingService {
     private api;
     constructor(api: AdaptableApi);
-    onChartModelChange(models: ChartModel[], eventType: string, params: any): void;
+    onChartModelChange(models: ChartModel[], eventType: AgEventType, params: any): void;
     /**
      * Emit events only for adaptable charting definition changes
      * - an adaptable chart opens