@adaptabletools/adaptable 18.1.7 → 18.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "18.1.7",
+  "version": "18.1.9",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -177,7 +177,8 @@ export interface IAdaptable {
     getDisplayValueFromRowNode(rowNode: IRowNode, columnId: string): string | undefined;
     getDisplayValueFromRawValue(rowNode: IRowNode, columnId: string, rawValue: any): string | undefined;
     getNormalisedValueFromRawValue(rawValue: any, column: AdaptableColumn): string | number | boolean | Date | unknown;
-    getGridCellsForColumn(columnId: string, includeBlanks?: boolean, onlyVisibleRows?: boolean): GridCell[] | undefined;
+    getGridCellsForColumn(columnId: string, onlyVisibleRows?: boolean): GridCell[] | undefined;
+    getGridCellsForColumnTemp(columnId: string, onlyVisibleRows?: boolean): GridCell[] | undefined;
     getRowNodesForPrimaryKeys(primaryKeyValues: any[]): IRowNode[];
     getRowNodeForPrimaryKey(primaryKeyValue: any): IRowNode;
     getRowNodeByIndex(index: number): IRowNode;

package/src/AdaptableOptions/DataChangeHistoryOptions.d.ts

@@ -25,6 +25,10 @@ export interface DataChangeHistoryOptions<TData = any> {
      * @defaultValue undefined
      */
     changeHistoryButton?: DataChangeHistoryButton<TData> | DataChangeHistoryButton<TData>[];
+    /**
+     * Whether to show all changes for each cell or just the last one
+     */
+    showLastDataChangeOnly?: boolean;
 }
 /**
  * Built in `undo` or `clear` data change action

package/src/Api/DataChangeHistoryApi.d.ts

@@ -25,6 +25,12 @@ export interface DataChangeHistoryApi {
      * Retrieves all data changes which are currently available
      */
     getDataChangeHistoryLog(): CellDataChangedInfo[];
+    /**
+     * Adds item to Data Change History log
+     *
+     * @param dataChangeInfo the change to log
+     */
+    addDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
     /**
      * Reverts the provided data change to its previous value
      *

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

@@ -7,7 +7,9 @@ export declare class DataChangeHistoryApiImpl extends ApiBase implements DataCha
     deactivateDataChangeHistory(): void;
     suspendDataChangeHistory(): void;
     getDataChangeHistoryLog(): CellDataChangedInfo[];
+    addDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
     undoDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
     clearDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
     openDataChangeHistorySettingsPanel(): void;
+    private getDataChangeHistoryKey;
 }

package/src/Api/Implementation/DataChangeHistoryApiImpl.js

@@ -1,7 +1,22 @@
 import { ApiBase } from './ApiBase';
-import { SystemDataChangeHistoryClearRow, SystemDataChangeHistoryDisable, SystemDataChangeHistoryEnable, SystemDataChangeHistoryResume, SystemDataChangeHistorySuspend, SystemDataChangeHistoryUndo, } from '../../Redux/ActionsReducers/SystemRedux';
+import { SystemDataChangeHistoryClearRow, SystemDataChangeHistoryDisable, SystemDataChangeHistoryEnable, SystemDataChangeHistoryResume, SystemDataChangeHistorySuspend, SystemDataChangeHistoryUndo, SystemDataChangeHistoryAdd, } from '../../Redux/ActionsReducers/SystemRedux';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 export class DataChangeHistoryApiImpl extends ApiBase {
+    constructor() {
+        super(...arguments);
+        this.getDataChangeHistoryKey = (dataChangeInfo) => {
+            const columnId = dataChangeInfo.column.columnId;
+            const primaryKeyValue = dataChangeInfo.primaryKeyValue;
+            const changedAt = dataChangeInfo.changedAt;
+            const showLastDataChangeOnly = this.getAdaptableApi().optionsApi.getDataChangeHistoryOptions().showLastDataChangeOnly;
+            if (showLastDataChangeOnly) {
+                return JSON.stringify({ columnId, primaryKeyValue });
+            }
+            else {
+                return JSON.stringify({ columnId, primaryKeyValue, changedAt });
+            }
+        };
+    }
     getDataChangeHistoryMode() {
         return this.getAdaptableState().System.DataChangeHistory.currentMode;
     }
@@ -33,11 +48,17 @@ export class DataChangeHistoryApiImpl extends ApiBase {
         const changeLog = (_a = this.getAdaptableState().System.DataChangeHistory.logs) !== null && _a !== void 0 ? _a : {};
         return Object.values(changeLog);
     }
+    addDataChangeHistoryEntry(dataChangeInfo) {
+        const uniqueKey = this.getDataChangeHistoryKey(dataChangeInfo);
+        this.dispatchAction(SystemDataChangeHistoryAdd(dataChangeInfo, uniqueKey));
+    }
     undoDataChangeHistoryEntry(dataChangeInfo) {
-        this.dispatchAction(SystemDataChangeHistoryUndo(dataChangeInfo));
+        const uniqueKey = this.getDataChangeHistoryKey(dataChangeInfo);
+        this.dispatchAction(SystemDataChangeHistoryUndo(dataChangeInfo, uniqueKey));
     }
     clearDataChangeHistoryEntry(dataChangeInfo) {
-        this.dispatchAction(SystemDataChangeHistoryClearRow(dataChangeInfo));
+        const uniqueKey = this.getDataChangeHistoryKey(dataChangeInfo);
+        this.dispatchAction(SystemDataChangeHistoryClearRow(dataChangeInfo, uniqueKey));
     }
     openDataChangeHistorySettingsPanel() {
         this.showModulePopup(ModuleConstants.DataChangeHistoryModuleId);

package/src/Api/Internal/AlertInternalApi.d.ts

@@ -156,7 +156,4 @@ export declare class AlertInternalApi extends ApiBase {
      * - trigger -> [trigger]
      */
     private annotateAlertText;
-    private replaceAll;
-    private extractColsFromText;
-    private extractContextKeysFromText;
 }

package/src/Api/Internal/AlertInternalApi.js

@@ -5,6 +5,7 @@ import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { AlertModuleId } from '../../Utilities/Constants/ModuleConstants';
 import { isCellDataChangedInfo } from '../../Utilities/Services/Interface/IAlertService';
 import ObjectFactory from '../../Utilities/ObjectFactory';
+import Helper from '../../Utilities/Helpers/Helper';
 export class AlertInternalApi extends ApiBase {
     getExpressionForAlertRule(alertRule) {
         var expression;
@@ -631,19 +632,19 @@ export class AlertInternalApi extends ApiBase {
             return text;
         }
         if (context === null || context === void 0 ? void 0 : context.newValue) {
-            text = this.replaceAll(text, '[newValue]', context.newValue);
+            text = Helper.replaceAll(text, '[newValue]', context.newValue);
         }
         if (context === null || context === void 0 ? void 0 : context.oldValue) {
-            text = this.replaceAll(text, '[oldValue]', context.oldValue);
+            text = Helper.replaceAll(text, '[oldValue]', context.oldValue);
         }
         if (context === null || context === void 0 ? void 0 : context.primaryKeyValue) {
-            text = this.replaceAll(text, '[primaryKeyValue]', context.primaryKeyValue);
+            text = Helper.replaceAll(text, '[primaryKeyValue]', context.primaryKeyValue);
         }
         if (context === null || context === void 0 ? void 0 : context.timestamp) {
-            text = this.replaceAll(text, '[timestamp]', context.timestamp + '');
+            text = Helper.replaceAll(text, '[timestamp]', context.timestamp + '');
         }
         if (context === null || context === void 0 ? void 0 : context.numberOfRows) {
-            text = this.replaceAll(text, '[numberOfRows]', context.numberOfRows + '');
+            text = Helper.replaceAll(text, '[numberOfRows]', context.numberOfRows + '');
         }
         if (context === null || context === void 0 ? void 0 : context.trigger) {
             const dataChangeTriggerMap = {
@@ -661,56 +662,28 @@ export class AlertInternalApi extends ApiBase {
             const mappedTrigger = 
             // @ts-ignore
             (_a = (dataChangeTriggerMap[context.trigger] || rowChangeTriggerMap[context.trigger])) !== null && _a !== void 0 ? _a : context.trigger;
-            text = this.replaceAll(text, '[trigger]', mappedTrigger);
+            text = Helper.replaceAll(text, '[trigger]', mappedTrigger);
         }
         if (context === null || context === void 0 ? void 0 : context.column) {
-            text = this.replaceAll(text, '[column]', this.getColumnApi().getFriendlyNameForColumnId(context.column.columnId));
+            text = Helper.replaceAll(text, '[column]', this.getColumnApi().getFriendlyNameForColumnId(context.column.columnId));
         }
         if (context === null || context === void 0 ? void 0 : context.rowNode) {
-            const columns = this.extractColsFromText(text);
+            const columns = Helper.extractColsFromText(text);
             for (const column of columns) {
                 if (this.getColumnApi().getColumnWithColumnId(column)) {
-                    text = this.replaceAll(text, `[rowData.${column}]`, this.getGridApi().getRawValueFromRowNode(context.rowNode, column));
+                    text = Helper.replaceAll(text, `[rowData.${column}]`, this.getGridApi().getRawValueFromRowNode(context.rowNode, column));
                 }
             }
         }
         if (text.indexOf('[context') !== -1) {
             const agGridContext = (_c = (_b = this.adaptable.agGridAdapter).getGridOption) === null || _c === void 0 ? void 0 : _c.call(_b, 'context');
-            const agGridContextKeys = this.extractContextKeysFromText(text);
+            const agGridContextKeys = Helper.extractContextKeysFromText(text);
             for (const key of agGridContextKeys) {
                 if (agGridContext[key]) {
-                    text = this.replaceAll(text, `[context.${key}]`, agGridContext[key]);
+                    text = Helper.replaceAll(text, `[context.${key}]`, agGridContext[key]);
                 }
             }
         }
         return text;
     }
-    replaceAll(text, toReplace, replaceWith) {
-        if (!text) {
-            return text;
-        }
-        // fails for []
-        toReplace = toReplace.replace('[', '\\[').replace(']', '\\]');
-        return text.replace(new RegExp(toReplace, 'g'), replaceWith);
-    }
-    extractColsFromText(text) {
-        // rowData.columnName => columnName
-        const regex = /\[rowData\.(.*?)\]/g;
-        let m;
-        const cols = [];
-        while ((m = regex.exec(text)) !== null) {
-            cols.push(m[1]);
-        }
-        return cols;
-    }
-    extractContextKeysFromText(text) {
-        // context.columnName => columnName
-        const regex = /\[context\.(.*?)\]/g;
-        let m;
-        const contextKeys = [];
-        while ((m = regex.exec(text)) !== null) {
-            contextKeys.push(m[1]);
-        }
-        return contextKeys;
-    }
 }

package/src/Api/Internal/FormatColumnInternalApi.d.ts

@@ -56,14 +56,14 @@ export declare class FormatColumnInternalApi extends ApiBase {
      * @param customDisplayFormatterContext context that includes value to format
      * @param options formatter options
      */
-    getNumberFormattedValue(value: any, node: IRowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): any;
+    getNumberFormattedValue(value: any, node: IRowNode, column: AdaptableColumn, options: AdaptableFormat['Options']): any;
     /**
      * Format value according to format options.
      *
      * @param value  context that includes value to format
      * @param options formatter options
      */
-    getStringFormattedValue(value: any, node: IRowNode, abColumn: AdaptableColumn, options: StringFormatterOptions): string;
+    getStringFormattedValue(value: any, node: IRowNode, column: AdaptableColumn, options: StringFormatterOptions): string;
     /**
      * Format value according to format options.
      *

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -91,9 +91,9 @@ export class FormatColumnInternalApi extends ApiBase {
      * @param customDisplayFormatterContext context that includes value to format
      * @param options formatter options
      */
-    getNumberFormattedValue(value, node, abColumn, options) {
-        const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
-        return FormatHelper.NumberFormatter(preparedValue, options);
+    getNumberFormattedValue(value, node, column, options) {
+        const preparedValue = this.applyCustomFormatters(value, node, column, options);
+        return FormatHelper.NumberFormatter(preparedValue, options, node, column, this.getAdaptableApi());
     }
     /**
      * Format value according to format options.
@@ -101,9 +101,9 @@ export class FormatColumnInternalApi extends ApiBase {
      * @param value  context that includes value to format
      * @param options formatter options
      */
-    getStringFormattedValue(value, node, abColumn, options) {
-        const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
-        return FormatHelper.StringFormatter(preparedValue, options);
+    getStringFormattedValue(value, node, column, options) {
+        const preparedValue = this.applyCustomFormatters(value, node, column, options);
+        return FormatHelper.StringFormatter(preparedValue, options, node, column, this.getAdaptableApi());
     }
     /**
      * Format value according to format options.

package/src/Api/Internal/GridInternalApi.js

@@ -84,7 +84,7 @@ export class GridInternalApi extends ApiBase {
         const shouldShowValuesCount = this.shouldShowValuesCount(abColumn);
         let valueOptions = [];
         if (shouldShowValuesCount) {
-            const allGridCells = this.adaptable.getGridCellsForColumn(columnId, false, this.getColumnFilterOptions().valuesFilterOptions.showCurrentlyFilteredValuesCount);
+            const allGridCells = this.adaptable.getGridCellsForColumn(columnId, this.getColumnFilterOptions().valuesFilterOptions.showCurrentlyFilteredValuesCount);
             const allGridValues = allGridCells.map((gc) => gc.displayValue);
             const newsortedDistinctValues = sortedDistinctValues.filter((gc) => gc.displayValue != undefined && gc.displayValue != '' && gc.displayValue != null);
             valueOptions = newsortedDistinctValues.map((cv) => {
@@ -111,17 +111,17 @@ export class GridInternalApi extends ApiBase {
     }
     shouldShowValuesCount(column) {
         const showValuesCount = this.getColumnFilterOptions().valuesFilterOptions.showValuesCount;
-        let shouldShowValuesCount = false;
+        let returnValue = false;
         if (showValuesCount) {
             if (typeof showValuesCount === 'function') {
                 const columnFilterContext = Object.assign({ column }, this.getAdaptableApi().internalApi.buildBaseContext());
-                shouldShowValuesCount = showValuesCount(columnFilterContext);
+                returnValue = showValuesCount(columnFilterContext);
             }
             else {
-                shouldShowValuesCount = showValuesCount;
+                returnValue = showValuesCount;
             }
         }
-        return shouldShowValuesCount;
+        return returnValue;
     }
     async getDistinctFilterDisplayValuesForColumnForFiltersUI(columnId, filter, showFilteredRowsOnly) {
         const abColumn = this.getColumnApi().getColumnWithColumnId(columnId);
@@ -144,7 +144,13 @@ export class GridInternalApi extends ApiBase {
     addPredicateValues(params) {
         var _a, _b, _c, _d;
         const { valueOptions, column, shouldShowValuesCount, visibleRowsOnly } = params;
-        const allGridCells = this.adaptable.getGridCellsForColumn(column.columnId, true, visibleRowsOnly);
+        const visibleGridCells = this.adaptable.getGridCellsForColumnTemp(column.columnId, visibleRowsOnly);
+        let allGridCells;
+        if (shouldShowValuesCount) {
+            allGridCells = visibleRowsOnly
+                ? visibleGridCells
+                : this.adaptable.getGridCellsForColumnTemp(column.columnId, this.getColumnFilterOptions().valuesFilterOptions.showCurrentlyFilteredValuesCount);
+        }
         const adaptableApi = this.getAdaptableApi();
         const predicateIds = adaptableApi.columnFilterApi.internalApi.getValuesFitlerPredicateIds(column);
         if (ArrayExtensions.IsNullOrEmpty(predicateIds)) {
@@ -157,7 +163,7 @@ export class GridInternalApi extends ApiBase {
             if (!visibleRowsOnly) {
                 return true;
             }
-            return this.isPredicateInVisibleCellValues(predicateId, allGridCells);
+            return this.isPredicateInVisibleCellValues(predicateId, visibleGridCells);
         })
             .map((predicateId) => {
             var _a;

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

@@ -35,19 +35,19 @@ export interface NumberFormatterOptions extends BaseFormatterOptions {
      */
     IntegerSeparator?: string;
     /**
-     * Prefix to use before the number
+     * Prefix to use before cell value
      */
     Prefix?: string;
     /**
-     * Suffix to use after the number
+     * Suffix to use after cell value
      */
     Suffix?: string;
     /**
-     * Replaces cell value with supplied value
+     * Replaces cell value with supplied value (that can contain placeholders)
      */
     Content?: string | number;
     /**
-     * Multiplier to use on the number
+     * Multiplier to use on cell value
      */
     Multiplier?: number;
     /**
@@ -55,23 +55,23 @@ export interface NumberFormatterOptions extends BaseFormatterOptions {
      */
     Parentheses?: boolean;
     /**
-     * Truncates a number
+     * Truncates cell value
      */
     Truncate?: boolean;
     /**
-     * Returns absolute value of a number
+     * Returns absolute value of cell value
      */
     Abs?: boolean;
     /**
-     * Returns smallest integer > number
+     * Returns smallest integer greater than cell value
      */
     Ceiling?: boolean;
     /**
-     * Returns largest intger < number
+     * Returns largest integer cell value
      */
     Floor?: boolean;
     /**
-     * Rounds a Number
+     * Rounds cell value
      */
     Round?: boolean;
 }

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

@@ -210,14 +210,15 @@ export interface SystemLicenseShowWatermarkAction extends Redux.Action {
 }
 export interface SystemLicenseDisablePersistenceAction extends Redux.Action {
 }
-export interface SystemDataChangeHistoryAddAction extends Redux.Action {
+export interface SystemDataChangeHistoryAction extends Redux.Action {
     changeInfo: CellDataChangedInfo;
+    uniqueKey: string;
 }
-export interface SystemDataChangeHistoryUndoAction extends Redux.Action {
-    changeInfo: CellDataChangedInfo;
+export interface SystemDataChangeHistoryAddAction extends SystemDataChangeHistoryAction {
 }
-export interface SystemDataChangeHistoryClearRowAction extends Redux.Action {
-    changeInfo: CellDataChangedInfo;
+export interface SystemDataChangeHistoryUndoAction extends SystemDataChangeHistoryAction {
+}
+export interface SystemDataChangeHistoryClearRowAction extends SystemDataChangeHistoryAction {
 }
 export interface SystemDataChangeHistoryEnableAction extends Redux.Action {
 }
@@ -307,9 +308,9 @@ export declare const SystemProgressIndicatorShow: (progressIndicatorConfig: Prog
 export declare const SystemProgressIndicatorHide: () => SystemProgressIndicatorHideAction;
 export declare const SystemLicenseShowWatermark: (text: string) => SystemLicenseShowWatermarkAction;
 export declare const SystemLicenseDisablePersistence: () => SystemLicenseDisablePersistenceAction;
-export declare const SystemDataChangeHistoryAdd: (changeInfo: CellDataChangedInfo) => SystemDataChangeHistoryAddAction;
-export declare const SystemDataChangeHistoryUndo: (changeInfo: CellDataChangedInfo) => SystemDataChangeHistoryUndoAction;
-export declare const SystemDataChangeHistoryClearRow: (changeInfo: CellDataChangedInfo) => SystemDataChangeHistoryClearRowAction;
+export declare const SystemDataChangeHistoryAdd: (changeInfo: CellDataChangedInfo, uniqueKey: string) => SystemDataChangeHistoryAddAction;
+export declare const SystemDataChangeHistoryUndo: (changeInfo: CellDataChangedInfo, uniqueKey: string) => SystemDataChangeHistoryUndoAction;
+export declare const SystemDataChangeHistoryClearRow: (changeInfo: CellDataChangedInfo, uniqueKey: string) => SystemDataChangeHistoryClearRowAction;
 export declare const SystemDataChangeHistoryEnable: () => SystemDataChangeHistoryEnableAction;
 export declare const SystemDataChangeHistoryDisable: () => SystemDataChangeHistoryDisableAction;
 export declare const SystemDataChangeHistorySuspend: () => SystemDataChangeHistorySuspendAction;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -234,17 +234,20 @@ export const SystemLicenseShowWatermark = (text) => ({
 export const SystemLicenseDisablePersistence = () => ({
     type: SYSTEM_LICENSE_DISABLE_PERSISTENCE,
 });
-export const SystemDataChangeHistoryAdd = (changeInfo) => ({
+export const SystemDataChangeHistoryAdd = (changeInfo, uniqueKey) => ({
     type: SYSTEM_DATA_CHANGE_HISTORY_ADD,
     changeInfo,
+    uniqueKey,
 });
-export const SystemDataChangeHistoryUndo = (changeInfo) => ({
+export const SystemDataChangeHistoryUndo = (changeInfo, uniqueKey) => ({
     type: SYSTEM_DATA_CHANGE_HISTORY_UNDO,
     changeInfo,
+    uniqueKey,
 });
-export const SystemDataChangeHistoryClearRow = (changeInfo) => ({
+export const SystemDataChangeHistoryClearRow = (changeInfo, uniqueKey) => ({
     type: SYSTEM_DATA_CHANGE_HISTORY_CLEAR_ROW,
     changeInfo,
+    uniqueKey,
 });
 export const SystemDataChangeHistoryEnable = () => ({
     type: SYSTEM_DATA_CHANGE_HISTORY_ENABLE,
@@ -654,7 +657,7 @@ export const SystemReducer = (state = initialState, action) => {
         case SYSTEM_DATA_CHANGE_HISTORY_ADD: {
             const actionTypedAdd = action;
             const cellDataChangedInfo = actionTypedAdd.changeInfo;
-            const uniqueKey = getDataChangeHistoryKey(cellDataChangedInfo);
+            const uniqueKey = actionTypedAdd.uniqueKey;
             const updatedDataChangeHistoryLogs = Object.assign({}, state.DataChangeHistory.logs);
             updatedDataChangeHistoryLogs[uniqueKey] = cellDataChangedInfo;
             return Object.assign(Object.assign({}, state), { DataChangeHistory: Object.assign(Object.assign({}, state.DataChangeHistory), { logs: updatedDataChangeHistoryLogs }) });
@@ -662,15 +665,15 @@ export const SystemReducer = (state = initialState, action) => {
         case SYSTEM_DATA_CHANGE_HISTORY_UNDO: {
             const actionTypedUndo = action;
             const cellDataChangedInfo = actionTypedUndo.changeInfo;
-            const uniqueKey = getDataChangeHistoryKey(cellDataChangedInfo);
+            const uniqueKey = actionTypedUndo.uniqueKey;
             const updatedDataChangeHistoryLogs = Object.assign({}, state.DataChangeHistory.logs);
             delete updatedDataChangeHistoryLogs[uniqueKey];
             return Object.assign(Object.assign({}, state), { DataChangeHistory: Object.assign(Object.assign({}, state.DataChangeHistory), { logs: updatedDataChangeHistoryLogs }) });
         }
         case SYSTEM_DATA_CHANGE_HISTORY_CLEAR_ROW: {
-            const actionTypedUndo = action;
-            const cellDataChangedInfo = actionTypedUndo.changeInfo;
-            const uniqueKey = getDataChangeHistoryKey(cellDataChangedInfo);
+            const actionTypedClearRow = action;
+            const cellDataChangedInfo = actionTypedClearRow.changeInfo;
+            const uniqueKey = actionTypedClearRow.uniqueKey;
             const updatedDataChangeHistoryLogs = Object.assign({}, state.DataChangeHistory.logs);
             delete updatedDataChangeHistoryLogs[uniqueKey];
             return Object.assign(Object.assign({}, state), { DataChangeHistory: Object.assign(Object.assign({}, state.DataChangeHistory), { logs: updatedDataChangeHistoryLogs }) });
@@ -775,6 +778,3 @@ export const SystemReducer = (state = initialState, action) => {
             return state;
     }
 };
-const getDataChangeHistoryKey = ({ column: columnId, primaryKeyValue, }) => {
-    return JSON.stringify({ columnId, primaryKeyValue });
-};

package/src/Strategy/DataChangeHistoryModule.js

@@ -1,6 +1,5 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-import { SystemDataChangeHistoryAdd } from '../Redux/ActionsReducers/SystemRedux';
 import { DataChangeHistoryStatusBarContent } from '../View/DataChangeHistory/DataChangeHistoryStatusBarContent';
 import { ModuleNames } from '@ag-grid-community/core';
 export class DataChangeHistoryModule extends AdaptableModuleBase {
@@ -13,7 +12,7 @@ export class DataChangeHistoryModule extends AdaptableModuleBase {
             .on('CellDataChanged', (cellDataChangedInfo) => {
             if (cellDataChangedInfo.trigger !== 'undo' && cellDataChangedInfo.trigger !== 'aggChange') {
                 if (this.shouldLogDataChange(cellDataChangedInfo)) {
-                    this.api.internalApi.dispatchReduxAction(SystemDataChangeHistoryAdd(cellDataChangedInfo));
+                    this.api.dataChangeHistoryApi.addDataChangeHistoryEntry(cellDataChangedInfo);
                 }
             }
         });

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

@@ -13,3 +13,4 @@ export declare const LicenseDocsLink: string;
 export declare const AdaptableOptionsDocsLink: string;
 export declare const AgGridModulesDocsLink: string;
 export declare const AlertMessageDocsLink: string;
+export declare const FormatColumnPlaceholderDocsLink: string;

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -14,3 +14,4 @@ export const LicenseDocsLink = `${HOST_URL_DOCS}/guide/licensing`;
 export const AdaptableOptionsDocsLink = `${HOST_URL_DOCS}/guide/reference-options-overview`;
 export const AgGridModulesDocsLink = `${HOST_URL_DOCS}/guide/dev-guide-aggrid-modules-overview`;
 export const AlertMessageDocsLink = `${HOST_URL_DOCS}/guide/handbook-alerting-message`;
+export const FormatColumnPlaceholderDocsLink = `${HOST_URL_DOCS}/guide/handbook-column-formatting-display-format-placeholder`;

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

@@ -0,0 +1,22 @@
+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;
+}
+/**
+ * Supported tokens:
+ * - column -> [column]
+ * - input -> [value]
+ * - rowData.colId -> [rowData.colId]
+ */
+export declare function resolvePlaceholders(text: string, context: DisplayFormatPlaceholderContext): string;
+export declare const FormatContentHelper: {
+    resolvePlaceholders: typeof resolvePlaceholders;
+};
+export default FormatContentHelper;

package/src/Utilities/Helpers/FormatContentHelper.js

@@ -0,0 +1,34 @@
+import Helper from '../../Utilities/Helpers/Helper';
+/**
+ * Supported tokens:
+ * - column -> [column]
+ * - input -> [value]
+ * - rowData.colId -> [rowData.colId]
+ */
+export function resolvePlaceholders(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 const FormatContentHelper = {
+    resolvePlaceholders,
+};
+export default FormatContentHelper;

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

@@ -1,8 +1,9 @@
-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;
+import { NumberFormatterOptions, DateFormatterOptions, StringFormatterOptions } from '../../PredefinedConfig/Common/AdaptableFormat';
+import { IRowNode } from '@ag-grid-community/core';
+import { AdaptableApi, AdaptableColumn } from '../../types';
+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): string;
+export declare function StringFormatter(input: string, options?: StringFormatterOptions, rowNode?: IRowNode, column?: AdaptableColumn, api?: AdaptableApi): string;
 declare const _default: {
     NumberFormatter: typeof NumberFormatter;
     DateFormatter: typeof DateFormatter;

package/src/Utilities/Helpers/FormatHelper.js

@@ -3,18 +3,33 @@
 import dateFnsFormat from 'date-fns/format';
 import { sentenceCase } from 'sentence-case';
 import { DEFAULT_DATE_FORMAT_PATTERN } from '../Constants/GeneralConstants';
-export function Format(input, format) {
-    if (format.Formatter === 'NumberFormatter') {
-        return NumberFormatter(input, format.Options);
+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');
+}
+*/
+export function NumberFormatter(input, options = {}, rowNode, column, api) {
+    var _a;
+    let preparedInput;
+    if (options.Content) {
+        const context = {
+            column,
+            rowNode,
+            input,
+            api,
+        };
+        preparedInput = FormatContentHelper.resolvePlaceholders(options.Content.toString(), context);
     }
-    if (format.Formatter === 'DateFormatter') {
-        return DateFormatter(input, format.Options);
+    else {
+        preparedInput = input;
     }
-    throw new Error('Unknown formatter');
-}
-export function NumberFormatter(input, options = {}) {
-    var _a, _b;
-    let preparedInput = (_a = options.Content) !== null && _a !== void 0 ? _a : input;
     if (preparedInput == null || preparedInput == undefined) {
         return undefined;
     }
@@ -66,7 +81,7 @@ export function NumberFormatter(input, options = {}) {
         digitsToUse = options.FractionDigits;
     }
     else {
-        let decimalCount = Math.floor(n) === n ? 0 : ((_b = n.toString().split(fractionsSepatator)[1]) === null || _b === void 0 ? void 0 : _b.length) || 0;
+        let decimalCount = Math.floor(n) === n ? 0 : ((_a = n.toString().split(fractionsSepatator)[1]) === null || _a === void 0 ? void 0 : _a.length) || 0;
         digitsToUse = decimalCount;
     }
     s = n.toLocaleString('en-US', {
@@ -107,8 +122,20 @@ export function DateFormatter(input, options, strictFormatting = false) {
         return input;
     }
 }
-export function StringFormatter(input, options = {}) {
-    let preparedInput = options.Content ? options.Content : input;
+export function StringFormatter(input, options = {}, rowNode, column, api) {
+    let preparedInput;
+    if (options.Content) {
+        const context = {
+            column,
+            rowNode,
+            input,
+            api,
+        };
+        preparedInput = FormatContentHelper.resolvePlaceholders(options.Content, context);
+    }
+    else {
+        preparedInput = input;
+    }
     if (preparedInput == null || preparedInput == undefined) {
         return undefined;
     }