@adaptabletools/adaptable 23.0.6 → 23.0.8-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "23.0.6",
+  "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

@@ -28,6 +28,13 @@ export interface DataChangeHistoryOptions<TData = any> {
      * @defaultValue true
      */
     showLastDataChangeOnly?: boolean;
+    /**
+     * 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
+     */
+    maxDataChangesInStore?: number;
 }
 /**
  * Built in `undo` or `clear` data change action

package/src/AdaptableOptions/DefaultAdaptableOptions.js

@@ -83,6 +83,7 @@ const DefaultAdaptableOptions = {
         showDataChange: undefined,
         changeHistoryButton: undefined,
         showLastDataChangeOnly: true,
+        maxDataChangesInStore: undefined,
     },
     dataImportOptions: {
         fileHandlers: undefined,

package/src/AdaptableOptions/WizardOptions.d.ts

@@ -18,7 +18,6 @@ export interface WizardOptions {
     position?: WindowPosition;
     /**
      * Initial size (in pixels) of wizard (requires `popupType`: `'window'`)
-     * `'window'`).
      *
      * @defaultValue Computed default sized for wizards
      */

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/Implementation/DataChangeHistoryApiImpl.js

@@ -10,16 +10,16 @@ export class DataChangeHistoryApiImpl extends ApiBase {
         if (currentMode === 'ACTIVE' && !forceReset) {
             return;
         }
-        if (forceReset || currentMode === 'INACTIVE') {
-            this.dispatchAction(DataChangeHistoryEnable());
-        }
-        else if (currentMode === 'SUSPENDED') {
+        if (currentMode === 'SUSPENDED' && !forceReset) {
             this.dispatchAction(DataChangeHistoryResume());
         }
+        else {
+            this.dispatchAction(DataChangeHistoryEnable());
+        }
     }
     deactivateDataChangeHistory() {
-        if (this.getDataChangeHistoryMode() === 'ACTIVE' ||
-            this.getDataChangeHistoryMode() === 'SUSPENDED') {
+        const currentMode = this.getDataChangeHistoryMode();
+        if (currentMode !== 'INACTIVE') {
             this.dispatchAction(DataChangeHistoryDisable());
         }
     }
@@ -39,7 +39,8 @@ export class DataChangeHistoryApiImpl extends ApiBase {
     }
     addDataChangeHistoryEntry(dataChangeInfo) {
         const uniqueKey = this.getDataChangeHistoryKey(dataChangeInfo);
-        this.dispatchAction(DataChangeHistoryAdd(dataChangeInfo, uniqueKey));
+        const maxDataChangesInStore = this.getDataChangeHistoryOptions().maxDataChangesInStore;
+        this.dispatchAction(DataChangeHistoryAdd(dataChangeInfo, uniqueKey, maxDataChangesInStore));
     }
     undoDataChangeHistoryEntry(dataChangeInfo) {
         const uniqueKey = this.getDataChangeHistoryKey(dataChangeInfo);
@@ -65,10 +66,10 @@ export class DataChangeHistoryApiImpl extends ApiBase {
         const changedAt = dataChangeInfo.changedAt;
         const showLastDataChangeOnly = this.getDataChangeHistoryOptions().showLastDataChangeOnly;
         if (showLastDataChangeOnly) {
-            return JSON.stringify({ columnId, primaryKeyValue });
+            return `${columnId}\u0000${primaryKeyValue}`;
         }
         else {
-            return JSON.stringify({ columnId, primaryKeyValue, changedAt });
+            return `${columnId}\u0000${primaryKeyValue}\u0000${changedAt}`;
         }
     };
 }

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/Redux/ActionsReducers/InternalRedux.d.ts

@@ -247,6 +247,7 @@ export interface DataChangeHistoryAction extends Redux.Action {
     uniqueKey: string;
 }
 export interface DataChangeHistoryAddAction extends DataChangeHistoryAction {
+    maxDataChanges?: number;
 }
 export interface DataChangeHistoryUndoAction extends DataChangeHistoryAction {
 }
@@ -324,7 +325,7 @@ export declare const CachedQueryAdd: (cachedQuery: CachedQuery) => CachedQueryAd
 export declare const CellSummaryChangeOperation: (cellSummaryOperation: SummaryOperation | string) => CellSummaryChangeOperationAction;
 export declare const LicenseShowWatermark: (text: string) => LicenseShowWatermarkAction;
 export declare const LicenseDisablePersistence: () => LicenseDisablePersistenceAction;
-export declare const DataChangeHistoryAdd: (changeInfo: CellDataChangedInfo, uniqueKey: string) => DataChangeHistoryAddAction;
+export declare const DataChangeHistoryAdd: (changeInfo: CellDataChangedInfo, uniqueKey: string, maxDataChanges?: number) => DataChangeHistoryAddAction;
 export declare const DataChangeHistoryUndo: (changeInfo: CellDataChangedInfo, uniqueKey: string) => DataChangeHistoryUndoAction;
 export declare const DataChangeHistoryClearRow: (changeInfo: CellDataChangedInfo, uniqueKey: string) => DataChangeHistoryClearRowAction;
 export declare const DataChangeHistoryEnable: () => DataChangeHistoryEnableAction;

package/src/Redux/ActionsReducers/InternalRedux.js

@@ -213,10 +213,11 @@ export const LicenseShowWatermark = (text) => ({
 export const LicenseDisablePersistence = () => ({
     type: LICENSE_DISABLE_PERSISTENCE,
 });
-export const DataChangeHistoryAdd = (changeInfo, uniqueKey) => ({
+export const DataChangeHistoryAdd = (changeInfo, uniqueKey, maxDataChanges) => ({
     type: DATA_CHANGE_HISTORY_ADD,
     changeInfo,
     uniqueKey,
+    maxDataChanges,
 });
 export const DataChangeHistoryUndo = (changeInfo, uniqueKey) => ({
     type: DATA_CHANGE_HISTORY_UNDO,
@@ -372,6 +373,17 @@ const initialState = {
         inProgress: null,
     },
 };
+const removeDataChangeHistoryLog = (state, uniqueKey) => {
+    const updatedDataChangeHistoryLogs = { ...state.DataChangeHistory.logs };
+    delete updatedDataChangeHistoryLogs[uniqueKey];
+    return {
+        ...state,
+        DataChangeHistory: {
+            ...state.DataChangeHistory,
+            logs: updatedDataChangeHistoryLogs,
+        },
+    };
+};
 export const InternalReducer = (state = initialState, action) => {
     let alerts;
     let systemStatusMessages;
@@ -673,21 +685,16 @@ export const InternalReducer = (state = initialState, action) => {
             const cellDataChangedInfo = actionTypedAdd.changeInfo;
             const uniqueKey = actionTypedAdd.uniqueKey;
             const updatedDataChangeHistoryLogs = { ...state.DataChangeHistory.logs };
-            updatedDataChangeHistoryLogs[uniqueKey] = cellDataChangedInfo;
-            return {
-                ...state,
-                DataChangeHistory: {
-                    ...state.DataChangeHistory,
-                    logs: updatedDataChangeHistoryLogs,
-                },
-            };
-        }
-        case DATA_CHANGE_HISTORY_UNDO: {
-            const actionTypedUndo = action;
-            const cellDataChangedInfo = actionTypedUndo.changeInfo;
-            const uniqueKey = actionTypedUndo.uniqueKey;
-            const updatedDataChangeHistoryLogs = { ...state.DataChangeHistory.logs };
             delete updatedDataChangeHistoryLogs[uniqueKey];
+            updatedDataChangeHistoryLogs[uniqueKey] = cellDataChangedInfo;
+            const maxDataChanges = actionTypedAdd.maxDataChanges;
+            if (maxDataChanges != null && maxDataChanges >= 0) {
+                const keys = Object.keys(updatedDataChangeHistoryLogs);
+                const overflow = keys.length - maxDataChanges;
+                for (let i = 0; i < overflow; i++) {
+                    delete updatedDataChangeHistoryLogs[keys[i]];
+                }
+            }
             return {
                 ...state,
                 DataChangeHistory: {
@@ -696,19 +703,10 @@ export const InternalReducer = (state = initialState, action) => {
                 },
             };
         }
+        case DATA_CHANGE_HISTORY_UNDO:
         case DATA_CHANGE_HISTORY_CLEAR_ROW: {
-            const actionTypedClearRow = action;
-            const cellDataChangedInfo = actionTypedClearRow.changeInfo;
-            const uniqueKey = actionTypedClearRow.uniqueKey;
-            const updatedDataChangeHistoryLogs = { ...state.DataChangeHistory.logs };
-            delete updatedDataChangeHistoryLogs[uniqueKey];
-            return {
-                ...state,
-                DataChangeHistory: {
-                    ...state.DataChangeHistory,
-                    logs: updatedDataChangeHistoryLogs,
-                },
-            };
+            const { uniqueKey } = action;
+            return removeDataChangeHistoryLog(state, uniqueKey);
         }
         case DATA_CHANGE_HISTORY_ENABLE: {
             return {

package/src/Strategy/DataChangeHistoryModule.js

@@ -29,7 +29,7 @@ export class DataChangeHistoryModule extends AdaptableModuleBase {
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
-            if (this.isListeningToCellDataChanges &&
+            if (this.shouldListenToDataChanges() &&
                 this.isDataChangeLoggable(cellDataChangedInfo) &&
                 !cellDataChangedInfo.preventEdit) {
                 this.api.dataChangeHistoryApi.addDataChangeHistoryEntry(cellDataChangedInfo);

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/DataChangeHistoryViewPanel.js

@@ -21,10 +21,9 @@ export const DataChangeHistoryViewPanelControl = (props) => {
     const handleOpenPopup = React.useCallback(() => {
         adaptable.api.settingsPanelApi.openSettingsPanel('DataChangeHistory');
     }, []);
-    const dataChangeHistoryState = useSelector((state) => state.Internal.DataChangeHistory);
-    const changeHistoryMode = dataChangeHistoryState.currentMode;
-    const activationTime = dataChangeHistoryState.enableTime;
-    const suspensionTime = dataChangeHistoryState.suspendTime;
+    const changeHistoryMode = useSelector((state) => state.Internal.DataChangeHistory.currentMode);
+    const activationTime = useSelector((state) => state.Internal.DataChangeHistory.enableTime);
+    const suspensionTime = useSelector((state) => state.Internal.DataChangeHistory.suspendTime);
     const enabled = changeHistoryMode === 'ACTIVE';
     const disabled = changeHistoryMode === 'INACTIVE';
     const suspended = changeHistoryMode === 'SUSPENDED';

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)) {
@@ -21,7 +22,7 @@ export const mapChangeHistoryRowData = (changeHistoryLog = {}, mainAdaptableInst
         changedColumnLabel: getColumnHeaderLabel(changeInfo.column.columnId, mainAdaptableInstance),
         changeInfo,
     }))
-        .sort((a, b) => b.changeInfo.changedAt - a.changeInfo.changedAt);
+        .reverse();
 };
 export const getChangeHistoryRowChangeInfo = (rowData) => {
     if (!isValidChangeHistoryLogEntry(rowData?.changeInfo)) {
@@ -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/components/ui/input-group.js

@@ -1,4 +1,3 @@
-'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { cva } from 'class-variance-authority';

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: 1782917265348 || Date.now(),
-    VERSION: "23.0.6" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1783187213468 || Date.now(),
+    VERSION: "23.0.8-canary.0" || '--current-version--',
 };