@adaptabletools/adaptable 23.0.7 → 23.0.8-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "23.0.7",
+  "version": "23.0.8-canary.0",
   "description": "Powerful AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/DataChangeHistoryOptions.d.ts

@@ -29,7 +29,7 @@ export interface DataChangeHistoryOptions<TData = any> {
      */
     showLastDataChangeOnly?: boolean;
     /**
-     * How many data changes are held in State at any one time; when the limit is breached, the oldest change(s) are evicted from memory
+     * How many data changes are held in State at any one time; when limit is reached, oldest change(s) are deleted from memory
      *
      * @defaultValue undefined (all data changes are logged)
      * @noCodeItem

package/src/AdaptableState/LayoutState.d.ts

@@ -41,13 +41,13 @@ export interface LayoutState extends BaseState {
      */
     Layouts: LayoutArray;
 }
-/**
- * Base object for both Table and Pivot Layouts
- */
 /**
  * How row groups are displayed in a Layout (maps to AG Grid `groupDisplayType`).
  */
 export type RowGroupDisplayType = 'single' | 'multi' | 'groupRows';
+/**
+ * Base object for both Table and Pivot Layouts
+ */
 export interface LayoutBase extends AdaptableObject {
     /**
      * Name of the Layout as it appears in the Layout toolbar and tool panel
@@ -105,6 +105,9 @@ export interface LayoutBase extends AdaptableObject {
      * Position of the Grand Total Row in the Layout
      */
     GrandTotalRow?: 'top' | 'bottom' | 'pinnedTop' | 'pinnedBottom' | boolean;
+    /**
+     * How Row Groups are displayed: 'single' - one hierarchical group Column; 'multi' - a separate group Column per Row Grouped Column; 'groupRows' - full-width group rows (no group column); defaults to 'single'
+     */
     RowGroupDisplayType?: RowGroupDisplayType;
 }
 /**

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

@@ -36,8 +36,4 @@ export declare class LayoutInternalApi extends ApiBase {
     cloneLayout(layoutToClone: Layout): Omit<Layout, 'Name'>;
     getCurrentLayout_perfOptimized(): Layout | null;
     getCurrentLayoutRowGroupDisplayType(): LayoutBase['RowGroupDisplayType'];
-    areAllGroupedColumnsFilterable(): {
-        filter: boolean;
-        floatingFilter: boolean;
-    };
 }

package/src/Api/Internal/LayoutInternalApi.js

@@ -187,25 +187,4 @@ export class LayoutInternalApi extends ApiBase {
     getCurrentLayoutRowGroupDisplayType() {
         return this.getLayoutApi().getCurrentLayout()?.RowGroupDisplayType ?? 'single';
     }
-    areAllGroupedColumnsFilterable() {
-        const groupedAgColumns = this.getAgGridApi().getRowGroupColumns();
-        let allHaveFilter = true;
-        let allHaveFloatingFilter = true;
-        for (const column of groupedAgColumns) {
-            if (!allHaveFilter && !allHaveFloatingFilter) {
-                break;
-            }
-            const colDef = column.getColDef();
-            if (allHaveFilter && !colDef.filter) {
-                allHaveFilter = false;
-            }
-            if (allHaveFloatingFilter && !colDef.floatingFilter) {
-                allHaveFloatingFilter = false;
-            }
-        }
-        return {
-            filter: allHaveFilter,
-            floatingFilter: allHaveFloatingFilter,
-        };
-    }
 }

package/src/View/DataChangeHistory/DataChangeHistoryTable.js

@@ -46,11 +46,17 @@ export const DataChangeHistoryTable = (props) => {
             },
             oldValue: {
                 header: 'Previous',
-                valueGetter: (params) => formatChangeHistoryCellValue(getChangeHistoryRowChangeInfo(params.data)?.oldValue),
+                valueGetter: (params) => {
+                    const info = getChangeHistoryRowChangeInfo(params.data);
+                    return formatChangeHistoryCellValue(info?.oldValue, info?.column, info?.rowNode, adaptable.api);
+                },
             },
             newValue: {
                 header: 'New',
-                valueGetter: (params) => formatChangeHistoryCellValue(getChangeHistoryRowChangeInfo(params.data)?.newValue),
+                valueGetter: (params) => {
+                    const info = getChangeHistoryRowChangeInfo(params.data);
+                    return formatChangeHistoryCellValue(info?.newValue, info?.column, info?.rowNode, adaptable.api);
+                },
             },
             changedAt: {
                 header: 'Changed',

package/src/View/DataChangeHistory/dataChangeHistoryHelpers.d.ts

@@ -1,5 +1,8 @@
+import { IRowNode } from 'ag-grid-enterprise';
 import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
+import { AdaptableApi } from '../../types';
 export interface DataChangeHistoryData {
     primaryKey: string;
     changeKey: string;
@@ -12,4 +15,23 @@ export declare const getChangeTriggerLabel: (changeInfo: CellDataChangedInfo) =>
 export declare const isValidChangeHistoryLogEntry: (changeInfo: CellDataChangedInfo | undefined) => changeInfo is CellDataChangedInfo;
 export declare const mapChangeHistoryRowData: (changeHistoryLog: Record<string, CellDataChangedInfo>, mainAdaptableInstance: IAdaptable) => DataChangeHistoryData[];
 export declare const getChangeHistoryRowChangeInfo: (rowData: Partial<DataChangeHistoryData> | undefined) => CellDataChangedInfo | undefined;
-export declare const formatChangeHistoryCellValue: (value: unknown) => string;
+/**
+ * Format an old/new value for display in the Data Change History Monitor.
+ *
+ * If the changed column has a `DisplayFormat` configured (via Format Column),
+ * the value is run through the matching formatter so the History Log shows the
+ * same rendered text the user sees in the grid (e.g. a timestamp appears as
+ * `18:40:34` rather than the underlying `1751469622156`).
+ *
+ * If no `DisplayFormat` is scoped to the column, we fall back to `String(value)`
+ * — which preserves the previous behaviour for columns whose raw value already
+ * *is* the display value (e.g. plain numeric or string columns).
+ *
+ * Note: the `rowNode` passed here is the node captured when the change was
+ * recorded. Its data may have moved on since; that only matters for
+ * `CustomDisplayFormatters` that read other cells on the row — in which case
+ * the formatted value reflects the current state of that row, not the state at
+ * the time of the change. Any thrown error inside a formatter is swallowed and
+ * the raw value is shown, so the History Monitor never crashes on stale data.
+ */
+export declare const formatChangeHistoryCellValue: (value: unknown, column: AdaptableColumn | undefined, rowNode: IRowNode | null | undefined, api: AdaptableApi) => string;

package/src/View/DataChangeHistory/dataChangeHistoryHelpers.js

@@ -1,3 +1,4 @@
+import { resolveDisplayFormat } from '../../AdaptableState/Common/AdaptableFormatPresets';
 const headerMap = new Map();
 export const getColumnHeaderLabel = (columnId, mainAdaptableInstance) => {
     if (!headerMap.has(columnId)) {
@@ -29,9 +30,37 @@ export const getChangeHistoryRowChangeInfo = (rowData) => {
     }
     return rowData.changeInfo;
 };
-export const formatChangeHistoryCellValue = (value) => {
+export const formatChangeHistoryCellValue = (value, column, rowNode, api) => {
     if (value === null || value === undefined) {
         return '';
     }
-    return String(value);
+    if (!column) {
+        return String(value);
+    }
+    const formatColumns = api.formatColumnApi.internalApi.getFormatColumnsWithDisplayFormatForColumn(column, { target: 'cell' });
+    const formatColumn = formatColumns[0];
+    if (!formatColumn) {
+        return String(value);
+    }
+    const resolvedFormat = resolveDisplayFormat(formatColumn.DisplayFormat);
+    if (!resolvedFormat) {
+        return String(value);
+    }
+    const { Formatter, Options } = resolvedFormat;
+    const nodeForFormatter = (rowNode ?? null);
+    try {
+        switch (Formatter) {
+            case 'DateFormatter':
+                return api.formatColumnApi.internalApi.getDateFormattedValue(value, nodeForFormatter, column, Options);
+            case 'NumberFormatter':
+                return String(api.formatColumnApi.internalApi.getNumberFormattedValue(value, nodeForFormatter, column, Options));
+            case 'StringFormatter':
+                return api.formatColumnApi.internalApi.getStringFormattedValue(value, nodeForFormatter, column, Options);
+            default:
+                return String(value);
+        }
+    }
+    catch {
+        return String(value);
+    }
 };

package/src/agGrid/AdaptableAgGrid.js

@@ -433,6 +433,7 @@ export class AdaptableAgGrid {
             this.logger.consoleError('Failed to initialize AG Grid.');
             return Promise.reject('Failed to initialize AG Grid.');
         }
+        this.agGridAdapter.setAgGridApi(agGridApi);
         this.layoutManager = new LayoutManager({
             gridApi: agGridApi,
             debugId: this.adaptableOptions.adaptableId,
@@ -455,7 +456,6 @@ export class AdaptableAgGrid {
         this.unmountLoadingScreen?.();
         perfInitAgGrid.end();
         initAgGridMarker.end();
-        this.agGridAdapter.setAgGridApi(agGridApi);
         this.agGridAdapter.monkeyPatchingGridOptionsUpdates();
         this.agGridAdapter.monkeyPatchingAggColumnFilters();
         this.agGridAdapter.monkeyPatchingAggFuncLabels();
@@ -823,8 +823,7 @@ export class AdaptableAgGrid {
                             handler: autoGroupFilterHandlerGenerator,
                         };
                     }
-                    const groupedColumnFilterConfig = this.api.layoutApi.internalApi.areAllGroupedColumnsFilterable();
-                    if (groupedColumnFilterConfig.filter) {
+                    if (rowGroupDisplayType === 'multi') {
                         return 'agGroupColumnFilter';
                     }
                     return original_autoGroupColumnDef?.filter;
@@ -843,12 +842,6 @@ export class AdaptableAgGrid {
                         if (rowGroupDisplayType === 'single') {
                             return true;
                         }
-                        if (rowGroupDisplayType === 'multi') {
-                            const groupedColumnFilterConfig = this.api.layoutApi.internalApi.areAllGroupedColumnsFilterable();
-                            if (groupedColumnFilterConfig.floatingFilter) {
-                                return true;
-                            }
-                        }
                         return original_autoGroupColumnDef?.floatingFilter;
                     },
                     enumerable: true,

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1782993623253 || Date.now(),
-    VERSION: "23.0.7" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1783187213468 || Date.now(),
+    VERSION: "23.0.8-canary.0" || '--current-version--',
 };