@adaptabletools/adaptable-cjs 20.1.5 → 20.1.6

package/src/agGrid/AdaptableAgGrid.js

@@ -147,7 +147,6 @@ const adaptableInstances = {};
 const publishTimestamp = Number(EnvVars_1.ADAPTABLE_PUBLISH_TIMESTAMP);
 class AdaptableAgGrid {
     constructor(config) {
-        this.filteredOutPrimaryKeys = new Set();
         this.columnMinMaxValuesCache = {};
         this.renderReactRoot = (node, container) => (0, renderReactRoot_1.renderReactRoot)(node, container);
         /**
@@ -384,9 +383,7 @@ class AdaptableAgGrid {
             gridApi: agGridApi,
             debugId: this.adaptableOptions.adaptableId,
         });
-        this.layoutManager.silentSetCurrentLayout(layoutModel, {
-            normalize: true,
-        });
+        this.silentUpdateCurrentLayoutModel(layoutModel);
         // this shouldn't be needed
         // but AG Grid has a bug, and in pivot layout,
         // even if we provide an initial AG Grid state with
@@ -399,8 +396,7 @@ class AdaptableAgGrid {
             });
         }
         this.layoutManager.onChange((layoutModel) => {
-            const currentLayout = this.api.layoutApi.getCurrentLayout();
-            const newLayoutObject = (0, LayoutHelpers_1.layoutModelToLayoutState)(layoutModel, currentLayout);
+            const newLayoutObject = (0, LayoutHelpers_1.layoutModelToLayoutState)(layoutModel);
             this.onLayoutChange(newLayoutObject);
         });
         this.layoutManager.onColumnDefsChanged(() => {
@@ -409,7 +405,7 @@ class AdaptableAgGrid {
         this.logger.info(`Hide Loading Screen`);
         this.unmountLoadingScreen?.();
         perfInitAgGrid.end();
-        // we need to intercept several AG Grid Api methods and trigger Adaptale state changes
+        // we need to intercept several AG Grid Api methods and trigger Adaptable state changes
         this.agGridAdapter.setAgGridApi(agGridApi);
         this.agGridAdapter.monkeyPatchingGridOptionsUpdates(agGridApi);
         this.lifecycleState = 'agGridReady';
@@ -432,7 +428,6 @@ class AdaptableAgGrid {
         this.refreshHeader();
         const currentLayout = this.api.layoutApi.getCurrentLayout();
         (0, LayoutHelpers_1.checkForDuplicateColumns)(currentLayout);
-        this.layoutManager.silentSetCurrentLayout((0, LayoutHelpers_1.layoutStateToLayoutModel)(currentLayout));
         if ((0, LayoutHelpers_1.isPivotLayout)(currentLayout)) {
             // this is very very strange!
             // for some projects, if the initial layout is pivot, the columnDefs of the pivot resutl columns are NOT derived correctly from the main colDefs
@@ -552,6 +547,21 @@ You need to define at least one Layout!`);
         state.ToolPanel = toolPanelState;
         return state;
     }
+    getCurrentLayoutModel() {
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
+        if (!currentLayout) {
+            return null;
+        }
+        return (0, LayoutHelpers_1.layoutStateToLayoutModel)(currentLayout);
+    }
+    silentUpdateCurrentLayoutModel(layoutModel = this.getCurrentLayoutModel()) {
+        if (!layoutModel) {
+            return;
+        }
+        this.layoutManager.silentSetCurrentLayout(layoutModel, {
+            normalize: true,
+        });
+    }
     applyFiltering() {
         const agGridApi = this.agGridAdapter.getAgGridApi();
         this._emit('AdapTableFiltersApplied');
@@ -767,12 +777,7 @@ You need to define at least one Layout!`);
          * `doesExternalFilterPass`
          */
         this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'doesExternalFilterPass', (original_doesExternalFilterPass) => {
-            const { filteredOutPrimaryKeys } = this;
-            filteredOutPrimaryKeys.clear();
             return (node) => {
-                if (node.rowIndex === 0) {
-                    filteredOutPrimaryKeys.clear();
-                }
                 if (!this.isAvailable) {
                     return true;
                 }
@@ -804,14 +809,12 @@ You need to define at least one Layout!`);
                         // Not sure about this - what should we do with an invalid Grid Filter?
                         // Here we essentially clear the Grid for invalid Grid Filter by returning false for each row
                         if (!isCurrentGridFilterValid) {
-                            filteredOutPrimaryKeys.add(primaryKey);
                             return false;
                         }
                         const gridFilterEvaluationResult = this.api.internalApi
                             .getQueryLanguageService()
                             .evaluateBooleanExpression(currentGridFilterExpression, ModuleConstants_1.GridFilterModuleId, node);
                         if (!gridFilterEvaluationResult) {
-                            filteredOutPrimaryKeys.add(primaryKey);
                             return false;
                         }
                     }
@@ -825,7 +828,6 @@ You need to define at least one Layout!`);
                             if (evaluateColumnFilterOnClient) {
                                 const columnFilterEvaluationResult = this.api.filterApi.columnFilterApi.internalApi.evaluateColumnFilter(columnFilter, node);
                                 if (!columnFilterEvaluationResult) {
-                                    filteredOutPrimaryKeys.add(primaryKey);
                                     return false;
                                 }
                             }
@@ -834,15 +836,11 @@ You need to define at least one Layout!`);
                 }
                 catch (ex) {
                     this.logger.error(ex);
-                    filteredOutPrimaryKeys.add(primaryKey);
                     return false;
                 }
                 const result = original_doesExternalFilterPass
                     ? original_doesExternalFilterPass(node)
                     : true;
-                if (!result) {
-                    filteredOutPrimaryKeys.add(primaryKey);
-                }
                 return result;
             };
         });
@@ -1621,6 +1619,17 @@ You need to define at least one Layout!`);
         }
         return this.createGridCell(rowNode, columnId);
     }
+    isRowNodeAvailableAfterFiltering(rowNode) {
+        if (rowNode.displayed) {
+            return true;
+        }
+        const parentRowNode = rowNode.parent;
+        if (parentRowNode == null || parentRowNode.id == 'ROOT_NODE_ID') {
+            return false;
+        }
+        const foundNode = parentRowNode.childrenAfterFilter?.find((c) => c.id == rowNode.id);
+        return foundNode != null;
+    }
     /**
      * Use (lazy evaluated) getters to avoid unnecessary calculations and memoization to avoid recalculating the same values
      */
@@ -1651,7 +1660,7 @@ You need to define at least one Layout!`);
                 return getRawValue();
             },
             get visible() {
-                return self.isPrimaryKeyVisible(this.primaryKeyValue);
+                return self.isRowNodeAvailableAfterFiltering(rowNode);
             },
             get displayValue() {
                 if (_displayValue === undefined) {
@@ -2293,9 +2302,6 @@ You need to define at least one Layout!`);
             return gridCells;
         }
     }
-    isPrimaryKeyVisible(primaryKey) {
-        return !this.filteredOutPrimaryKeys.has(primaryKey);
-    }
     addDistinctColumnValue(rowNode, columnId) {
         // we do not return the values of the aggregates when in grouping mode
         // otherwise they would appear in the filter dropdown etc....
@@ -2322,29 +2328,39 @@ You need to define at least one Layout!`);
             }
             return value;
         };
+        const self = this;
+        // those are grid cells unique per primary key - so cells corresponding to this column
+        // by for every row in the grid
+        // but here we want to collapse them down to values/cells unique by the
+        // value of this column: eg - if this is country column and we have multiple rownodes
+        // in the grid with country: UK, and multiple with country: France, then the end result
+        // of the current function should be 2 cells: one for UK and one for France
         gridCells.forEach((dataItem) => {
             const value = getter(dataItem);
-            const primaryKey = dataItem.primaryKeyValue;
             if (!cache.has(value)) {
                 cache.set(value, {
                     count: 1,
                     cell: dataItem,
-                    visible: this.isPrimaryKeyVisible(primaryKey),
+                    rowNodesWithSameCellValue: [dataItem.rowNode],
                 });
             }
             else {
                 const data = cache.get(value);
                 data.count++;
-                data.visible = data.visible || this.isPrimaryKeyVisible(primaryKey);
+                data.rowNodesWithSameCellValue.push(dataItem.rowNode);
             }
         });
         const result = [];
-        cache.forEach(({ count, cell, visible }) => {
-            result.push({
-                ...cell,
-                count,
-                visible,
+        cache.forEach(({ count, cell, rowNodesWithSameCellValue }) => {
+            const cellWithCount = cell;
+            cellWithCount.count = count;
+            // the visibility of this cell is true if any of the row nodes with this value is visible
+            Object.defineProperty(cellWithCount, 'visible', {
+                get: () => {
+                    return (rowNodesWithSameCellValue.findIndex((pk) => self.isRowNodeAvailableAfterFiltering(pk) === true) !== -1);
+                },
             });
+            result.push(cellWithCount);
         });
         return result;
     }
@@ -2818,57 +2834,23 @@ You need to define at least one Layout!`);
                 config.destroyAgGrid = true;
             }
         }
-        this.__prevLayoutForOnChange = undefined;
+        this.__prevLayoutForRefresh = undefined;
         this.layoutManager?.destroy();
         this.layoutManager = null;
-        this.filteredOutPrimaryKeys?.clear();
-        if (this.agGridAdapter?.getAgGridApi() && !this.agGridAdapter.getAgGridApi().isDestroyed()) {
-            this.agGridAdapter
-                .getAgGridApi()
-                .removeEventListener('firstDataRendered', this.listenerFirstDataRendered);
-            this.agGridAdapter
-                .getAgGridApi()
-                .removeEventListener('columnPivotChanged', this.listenerPivotChanged);
-            this.agGridAdapter
-                .getAgGridApi()
-                .removeEventListener('cellEditingStarted', this.listenerCellEditingStarted);
-            this.agGridAdapter
-                .getAgGridApi()
-                .removeEventListener('columnRowGroupChanged', this.listenerColumnRowGroupChanged);
-            this.agGridAdapter
-                .getAgGridApi()
-                .removeEventListener('cellSelectionChanged', this.listenerCellSelectionChanged);
-            this.agGridAdapter
-                .getAgGridApi()
-                .removeEventListener('columnResized', this.listenerColumnResized);
-            this.agGridAdapter
-                .getAgGridApi()
-                .removeEventListener('sortChanged', this.listenerSortChanged);
-            this.agGridAdapter
-                .getAgGridApi()
-                .removeEventListener('modelUpdated', this.listenerModelUpdated);
-            this.agGridAdapter.getAgGridApi().removeGlobalListener(this.listenerGlobalSetRowSelection);
-            this.agGridAdapter
-                .getAgGridApi()
-                .removeGlobalListener(this.listenerGlobalColumnEventsThatTriggerStateChange);
-            this.agGridAdapter
-                .getAgGridApi()
-                .removeGlobalListener(this.listenerGlobalColumnEventsThatTriggerAutoLayoutSave);
-            this.agGridAdapter
-                .getAgGridApi()
-                .removeGlobalListener(this.listenerGlobalRowGroupEventsThatTriggerAutoLayoutSave);
+        const agGridApi = this.agGridAdapter?.getAgGridApi();
+        if (agGridApi && !agGridApi.isDestroyed()) {
+            agGridApi.removeEventListener('firstDataRendered', this.listenerFirstDataRendered);
+            agGridApi.removeEventListener('columnPivotChanged', this.listenerPivotChanged);
+            agGridApi.removeEventListener('cellEditingStarted', this.listenerCellEditingStarted);
+            agGridApi.removeEventListener('cellSelectionChanged', this.listenerCellSelectionChanged);
+            agGridApi.removeEventListener('sortChanged', this.listenerSortChanged);
+            agGridApi.removeGlobalListener(this.listenerGlobalSetRowSelection);
             this.listenerFirstDataRendered = null;
             this.listenerPivotChanged = null;
             this.listenerCellEditingStarted = null;
-            this.listenerColumnRowGroupChanged = null;
             this.listenerCellSelectionChanged = null;
-            this.listenerColumnResized = null;
             this.listenerGlobalSetRowSelection = null;
             this.listenerSortChanged = null;
-            this.listenerModelUpdated = null;
-            this.listenerGlobalColumnEventsThatTriggerStateChange = null;
-            this.listenerGlobalColumnEventsThatTriggerAutoLayoutSave = null;
-            this.listenerGlobalRowGroupEventsThatTriggerAutoLayoutSave = null;
             this.throttleFilterOnDataChange = null;
             const liveGridOptions = this.agGridAdapter.DANGER_getLiveGridOptions();
             if (liveGridOptions) {
@@ -3011,10 +2993,7 @@ You need to define at least one Layout!`);
     getChartRef(chartId) {
         return this.agGridAdapter.getAgGridApi().getChartRef(chartId);
     }
-    setLayout(layout) {
-        if (!layout) {
-            layout = this.api.layoutApi.getCurrentLayout();
-        }
+    updateLayoutInManagerAfterStoreHasChanged(layout = this.api.layoutApi.getCurrentLayout()) {
         (0, LayoutHelpers_1.checkForDuplicateColumns)(layout);
         const isLayoutSwitch = this._prevLayout && layout.Name != this._prevLayout.Name;
         let shouldUpdateExpandState = isLayoutSwitch;
@@ -3049,9 +3028,11 @@ You need to define at least one Layout!`);
         // and is specific to Adaptable, therefore we need to refresh it manually
         this.refreshHeader();
         const layoutModel = (0, LayoutHelpers_1.layoutStateToLayoutModel)(layout);
-        const layoutChanged = this.layoutManager?.setLayout(layoutModel, {
+        this.layoutManager?.setLayout(layoutModel, {
             skipApplyRowGroupsExpandedState: !shouldUpdateExpandState,
+            skipTriggerChange: true,
         });
+        this.refreshAdaptableAfterLayoutChange(layout);
         if (layout.AutoSizeColumns) {
             if (isPivot) {
                 requestAnimationFrame(() => {
@@ -3072,15 +3053,6 @@ You need to define at least one Layout!`);
                 plugin.afterSetLayout(this, layout);
             }
         });
-        if (!layoutChanged) {
-            // we won't get an onLayoutChange event
-            // most likely only filters have changed (column or grid filters)
-            // and because filters are not part of the layout manager
-            // there will be no change to the layout
-            // so we need to manually trigger the onLayoutChange event
-            // for other layout-related updates
-            this.onLayoutChange(layout, { skipRefresh: true });
-        }
         perfSetLayout.end();
     }
     getActiveAdaptableAggFuncForCol(columnId) {
@@ -3359,7 +3331,7 @@ You need to define at least one Layout!`);
         this.agGridAdapter.setGridOption('columnDefs', columnDefs);
         // this is needed here for when we call setAdaptableStateKey
         // and pass a new config
-        this.setLayout();
+        this.updateLayoutInManagerAfterStoreHasChanged();
         this.applyFiltering();
     }
     isRowGroupDifferentInLayout(one, other) {
@@ -3389,25 +3361,25 @@ You need to define at least one Layout!`);
         };
         return hasPivotTotals(one) || hasPivotTotals(other);
     }
-    onLayoutChange(layout, options) {
-        this.logger.info('onLayoutChange()');
-        const skipRefresh = options?.skipRefresh;
-        if (!skipRefresh) {
-            const prevOnChangeLayout = this.__prevLayoutForOnChange || this.api.layoutApi.getCurrentLayout();
-            // see #on-regroup-expect-group-column-to-be-recomputed-and-setup-properly
-            const rowGroupsChanged = this.isRowGroupDifferentInLayout(prevOnChangeLayout, layout);
-            const hasPivotTotalsInLayout = this.hasPivotTotalsInLayout(prevOnChangeLayout, layout);
-            const pivotColsChanged = JSON.stringify(layout.PivotColumns) !== JSON.stringify(prevOnChangeLayout.PivotColumns);
-            if (rowGroupsChanged || pivotColsChanged || hasPivotTotalsInLayout) {
-                this.updateColumnModelAndRefreshGrid();
-            }
-            else {
-                this.deriveAdaptableColumnStateFromAgGrid();
-            }
-        }
-        this.__prevLayoutForOnChange = layout;
+    onLayoutChange(layout) {
+        this.refreshAdaptableAfterLayoutChange(layout);
         this.api.layoutApi.createOrUpdateLayout(layout);
     }
+    refreshAdaptableAfterLayoutChange(layout) {
+        this.logger.info('refreshAdaptableAfterLayoutChange()');
+        const prevLayoutForRefresh = this.__prevLayoutForRefresh || this.api.layoutApi.getCurrentLayout();
+        // see #on-regroup-expect-group-column-to-be-recomputed-and-setup-properly
+        const rowGroupsChanged = this.isRowGroupDifferentInLayout(prevLayoutForRefresh, layout);
+        const hasPivotTotalsInLayout = this.hasPivotTotalsInLayout(prevLayoutForRefresh, layout);
+        const pivotColsChanged = JSON.stringify(layout.PivotColumns) !== JSON.stringify(prevLayoutForRefresh.PivotColumns);
+        if (rowGroupsChanged || pivotColsChanged || hasPivotTotalsInLayout) {
+            this.updateColumnModelAndRefreshGrid();
+        }
+        else {
+            this.deriveAdaptableColumnStateFromAgGrid();
+        }
+        this.__prevLayoutForRefresh = layout;
+    }
     validateColumnDefTypes(columnDefs) {
         // in Adaptable version 20 we switched from colDef.type to colDef.cellDataType
         // although we documented this change and try to infer the correct cellDataTypes, it's best to also check if the client dev forgot to adjust his colDefs

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -28,6 +28,7 @@ const filterableCategories = [
     'logical',
     'maths',
     'strings',
+    'changes',
     'comparison',
     'observable',
     'aggregation',
@@ -42,6 +43,7 @@ const getCategoryOrder = (category) => {
         strings: 5,
         maths: 6,
         dates: 7,
+        changes: 8,
     };
     return predefinedOrder[category] || 0;
 };

package/src/components/Select/Select.js

@@ -41,7 +41,12 @@ const INFINITE_COLUMNS_WITH_CHECKBOX = {
         },
         resizable: false,
         defaultSortable: false,
-        renderSelectionCheckBox: true,
+        renderSelectionCheckBox: (params) => {
+            // disable reacting to onChange
+            // as we handle selection change in the onCellClick
+            return React.createElement(infinite_react_1.components.CheckBox, { checked: params.rowInfo?.rowSelected ?? false });
+        },
+        renderHeaderSelectionCheckBox: true,
         className: 'ab-Select-CheckboxColumn',
         renderValue: ({ renderBag }) => {
             return React.createElement("div", { className: "InfiniteCell_content_value" }, renderBag.value);
@@ -347,8 +352,10 @@ const Select = function (props) {
                 setValue({ value }, 'select-option');
             }, [setValue]);
             const onCellClick = React.useCallback(({ rowIndex, api, dataSourceApi }) => {
-                const pk = dataSourceApi.getPrimaryKeyByIndex(rowIndex);
-                api.rowSelectionApi.toggleRowSelection(pk);
+                if (isMulti) {
+                    const pk = dataSourceApi.getPrimaryKeyByIndex(rowIndex);
+                    api.rowSelectionApi.toggleRowSelection(pk);
+                }
                 // see #ensure-select-closes-after-clicking-outside
                 requestAnimationFrame(() => {
                     ref.current?.focus();

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.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: 1748008344094 || Date.now(),
-    VERSION: "20.1.5" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1748524800262 || Date.now(),
+    VERSION: "20.1.6" || '--current-version--',
 };

package/src/layout-manager/src/LayoutManagerModel.d.ts

@@ -18,11 +18,38 @@ export interface BaseLayoutModel {
      * fully specified back to Adaptable, with this prop
      * set as it was when we received it from Adaptable
      */
-    ColumnFilters?: any;
+    Ignore_ColumnFilters?: any[];
     /**
      * Same as ColumnFilters, but for Grid Filter
      */
-    GridFilter?: any;
+    Ignore_GridFilter?: any;
+    /**
+     * Same as AutoSizeColumns, but for Pivot Layout
+     */
+    Ignore_AutoSizeColumns?: any;
+    /**
+     * Same as above, but for IsReadOnly
+     */
+    Ignore_IsReadOnly?: boolean;
+    /**
+     * Same as above, but for Tags
+     */
+    Ignore_Tags?: any[];
+    /**
+     * Same as RowSummaries, but for Pivot Layout
+     */
+    Ignore_RowSummaries?: any;
+    /**
+     * Same as above, but
+     */
+    Ignore_Name?: string;
+    /**
+     * Same as above, but for Column Headers
+     */
+    Ignore_ColumnHeaders?: any;
+    Ignore_Source?: string;
+    Ignore_AdaptableVersion?: string;
+    Ignore_Uuid?: string;
     ColumnVisibility?: {
         [columnId: string]: false;
     };

package/src/layout-manager/src/index.d.ts

@@ -54,8 +54,11 @@ export declare class LayoutManager<DATA_TYPE = any> extends LMEmitter {
     }): void;
     setLayout(layout: TableLayoutModel | PivotLayoutModel, options?: ApplyLayoutOptions & {
         force?: boolean;
+        skipTriggerChange?: boolean;
     }): boolean;
     isCurrentLayoutPivot(): boolean;
+    private suspendAgGridListener;
+    private resumeAgGridListener;
     private applyLayout;
     private applyTableLayout;
     private getRowGroupNodePathsAs;