@adaptabletools/adaptable 22.0.9 → 22.0.11

package/package.json

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

package/src/Api/DataChangeHistoryApi.d.ts

@@ -37,11 +37,16 @@ export interface DataChangeHistoryApi {
      */
     addDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
     /**
-     * Reverts the provided data change to its previous value
+     * Reverts provided data change to its previous value and returns GridCell that was undone
      *
      * @param dataChangeInfo the change to be undone
      */
-    undoDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
+    undoDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): GridCell | undefined;
+    /**
+     * Reverts all data changes to previous values and returns GridCells that were undone
+     *
+     */
+    undoAllDataChangeHistoryEntries(): GridCell[];
     /**
      * Clears a Row in Data Change Grid
      *

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

@@ -10,7 +10,8 @@ export declare class DataChangeHistoryApiImpl extends ApiBase implements DataCha
     getDataChangeHistoryLog(): CellDataChangedInfo[];
     getDataChangeForGridCell(gridCell: GridCell): CellDataChangedInfo | undefined;
     addDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
-    undoDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
+    undoDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): GridCell | undefined;
+    undoAllDataChangeHistoryEntries(): GridCell[];
     clearDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
     openDataChangeHistorySettingsPanel(): void;
     private getDataChangeHistoryKey;

package/src/Api/Implementation/DataChangeHistoryApiImpl.js

@@ -44,6 +44,13 @@ export class DataChangeHistoryApiImpl extends ApiBase {
     undoDataChangeHistoryEntry(dataChangeInfo) {
         const uniqueKey = this.getDataChangeHistoryKey(dataChangeInfo);
         this.dispatchAction(DataChangeHistoryUndo(dataChangeInfo, uniqueKey));
+        return this.getGridApi().getGridCellFromRowNode(dataChangeInfo.rowNode, dataChangeInfo.column.columnId);
+    }
+    undoAllDataChangeHistoryEntries() {
+        const allChanges = this.getDataChangeHistoryLog();
+        return allChanges
+            .map((dataChange) => this.undoDataChangeHistoryEntry(dataChange))
+            .filter((gridCell) => gridCell != null);
     }
     clearDataChangeHistoryEntry(dataChangeInfo) {
         const uniqueKey = this.getDataChangeHistoryKey(dataChangeInfo);

package/src/agGrid/AdaptableAgGrid.js

@@ -503,6 +503,7 @@ export class AdaptableAgGrid {
         this.agGridAdapter.setAgGridApi(agGridApi);
         this.agGridAdapter.monkeyPatchingGridOptionsUpdates();
         this.agGridAdapter.monkeyPatchingAggColumnFilters();
+        this.agGridAdapter.monkeyPatchingAggFuncLabels();
         this.lifecycleState = 'agGridReady';
         this.api.entitlementApi.internalApi.setModulesAgGridDepsInfos();
         this.ModuleService.logMissingAgGridDepsInfos();

package/src/agGrid/AgGridAdapter.d.ts

@@ -11,6 +11,7 @@ export declare class AgGridAdapter {
     private DANGER_updateGridOptionsMonkeyPatcher;
     private DANGER_doFiltersPassMonkeyPatcher;
     private DANGER_isAggFilterPresentMonkeyPatcher;
+    private DANGER_getDefaultFuncLabelMonkeyPatcher;
     private activePivotColumnFilters_MEMO;
     initialGridOptions: GridOptions;
     private _agGridId;
@@ -28,6 +29,7 @@ export declare class AgGridAdapter {
     getAgGridApi(skipLogging?: boolean): GridApi | undefined;
     monkeyPatchingGridOptionsUpdates(): void;
     monkeyPatchingAggColumnFilters(): void;
+    monkeyPatchingAggFuncLabels(): void;
     private DANGER_getPrivateAgGridBeans;
     DANGER_getLiveGridOptions(): GridOptions<any>;
     getAgGridRootElement(): HTMLElement;

package/src/agGrid/AgGridAdapter.js

@@ -21,6 +21,8 @@ export class AgGridAdapter {
     // see #aggColumnFilters_monkey_patch
     DANGER_doFiltersPassMonkeyPatcher;
     DANGER_isAggFilterPresentMonkeyPatcher;
+    // see #aggFuncLabels_monkey_patch
+    DANGER_getDefaultFuncLabelMonkeyPatcher;
     activePivotColumnFilters_MEMO = new WeakMap();
     initialGridOptions;
     _agGridId;
@@ -51,6 +53,7 @@ export class AgGridAdapter {
         this.DANGER_updateGridOptionsMonkeyPatcher = null;
         this.DANGER_doFiltersPassMonkeyPatcher = null;
         this.DANGER_isAggFilterPresentMonkeyPatcher = null;
+        this.DANGER_getDefaultFuncLabelMonkeyPatcher = null;
         this.activePivotColumnFilters_MEMO = null;
         this._adaptableInstance = null;
     }
@@ -208,6 +211,27 @@ export class AgGridAdapter {
         };
         agGridColumnFilterService.isAggFilterPresent = this.DANGER_isAggFilterPresentMonkeyPatcher;
     }
+    // #aggFuncLabels_monkey_patch
+    monkeyPatchingAggFuncLabels() {
+        const agGridAggFuncService = this.DANGER_getPrivateAgGridBeans()?.aggFuncSvc;
+        if (!agGridAggFuncService) {
+            return;
+        }
+        const original_getDefaultFuncLabel = agGridAggFuncService.getDefaultFuncLabel;
+        if (typeof original_getDefaultFuncLabel !== 'function') {
+            return;
+        }
+        this.DANGER_getDefaultFuncLabelMonkeyPatcher = function (fctName) {
+            if (fctName === 'only') {
+                return 'Only';
+            }
+            if (fctName === 'weightedAvg') {
+                return 'Weighted Average';
+            }
+            return original_getDefaultFuncLabel.call(this, fctName);
+        };
+        agGridAggFuncService.getDefaultFuncLabel = this.DANGER_getDefaultFuncLabelMonkeyPatcher;
+    }
     DANGER_getPrivateAgGridBeans() {
         const beans = DANGER_AG_GRID_BEANS_MAP[this._agGridId];
         if (!beans) {
@@ -655,9 +679,14 @@ export class AgGridAdapter {
         return false;
     }
     getColumnAggregationFunctions(colDef) {
-        let result = [].concat(colDef.allowedAggFuncs || ['sum', 'min', 'max', 'count', 'avg', 'first', 'last']); // those are the default fns aggrid supports out-of-the-box
+        const defaultAggFuncs = ['sum', 'min', 'max', 'count', 'avg', 'first', 'last'];
+        const hasAllowedAggFuncs = Array.isArray(colDef.allowedAggFuncs);
+        let result = hasAllowedAggFuncs ? [...colDef.allowedAggFuncs] : [...defaultAggFuncs];
         const gridOptionsAggFuncs = this.adaptableApi.agGridApi.getGridOption('aggFuncs') || {};
-        result.push(...Object.keys(gridOptionsAggFuncs));
+        const gridOptionsAggFuncNames = Object.keys(gridOptionsAggFuncs);
+        if (!hasAllowedAggFuncs) {
+            result.push(...gridOptionsAggFuncNames);
+        }
         result = result.filter((func) => !isWeightedAverageAggFuncName(func));
         return [...new Set(result)];
     }

package/src/agGrid/AgGridColumnAdapter.js

@@ -17,7 +17,7 @@ import { AdaptableFilterHandler } from './AdaptableFilterHandler';
 import { AgGridFilterAdapterFactory } from './AgGridFilterAdapter';
 import { AgGridFloatingFilterAdapterFactory } from './AgGridFloatingFilterAdapter';
 import { errorOnce } from './AdaptableLogger';
-import { isWeightedAverageAggFuncName } from '../AdaptableState/Common/AggregationColumns';
+import { isWeightedAverageAggFuncName, } from '../AdaptableState/Common/AggregationColumns';
 export function getEditorForColumnDataType(columnDataType, variant) {
     if (columnDataType === 'number') {
         return variant === 'react' ? AdaptableReactNumberEditor : AdaptableNumberEditor;
@@ -571,6 +571,7 @@ export class AgGridColumnAdapter {
                 return undefined;
             }
             return abColumn.availableAggregationFunctions.filter((func) => !isWeightedAverageAggFuncName(func));
+            // .filter((func) => func !== ONLY_AGG_FN_NAME);
         });
     }
     setupColumnType(columnSetupInfo) {

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: 1775641544194 || Date.now(),
-    VERSION: "22.0.9" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1775828182886 || Date.now(),
+    VERSION: "22.0.11" || '--current-version--',
 };