@adaptabletools/adaptable 20.0.5-canary.0 → 20.0.5

package/package.json

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

package/src/AdaptableState/Common/AggregationColumns.d.ts

@@ -12,14 +12,7 @@ export type TableAggregationColumns = {
 /**
  * Defines an Aggregated Column in a Pivot Layout
  */
-export type PivotAggregationColumns = {
-    ColumnId: string;
-    AggFunc: AggregationColumnValue;
-    TotalColumn?: boolean | 'before' | 'after' | {
-        PivotColumnId: string;
-        ShowTotal?: boolean | 'before' | 'after';
-    }[];
-}[];
+export type PivotAggregationColumns = TableAggregationColumns;
 export declare const WEIGHTED_AVERAGE_AGG_FN_NAME = "weightedAvg";
 /**
  * Defines a Weighted Average Agg

package/src/AdaptableState/LayoutState.d.ts

@@ -148,18 +148,6 @@ export interface PivotLayout extends LayoutBase {
      * Row Grouped Columns Columns - must NOT be provided
      */
     RowGroupedColumns?: never;
-    /**
-     * Display Grand Total Row at the top or bottom of the Pivot Table
-     */
-    GrandTotalRow?: 'top' | 'bottom' | boolean;
-    /**
-     * Display automatically calculated Totals of all Pivot Columns, in the position specified
-     */
-    GrandTotalColumn?: 'before' | 'after' | boolean;
-    /**
-     * Display automatically calculated Totals within EACH Pivot Column Group, in the position specified
-     */
-    PivotGroupTotalColumn?: 'before' | 'after' | boolean;
 }
 /**
  * Manages how (and which) Row Group values are stored

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

@@ -11,7 +11,6 @@ export declare function generateAutoTreeSingleColumn(): AdaptableColumn;
 export declare function generateAutoRowGroupColumnForColumn(column: AdaptableColumn): AdaptableColumn;
 export declare function getFriendlyNameForPivotResultColumn(columnId: string): string;
 export declare function isPivotResultColumn(columnId: string): boolean;
-export declare function isPivotGrandTotalColumn(columnId: string): boolean;
 export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     internalApi: ColumnInternalApi;
     constructor(_adaptable: IAdaptable);

package/src/Api/Implementation/ColumnApiImpl.js

@@ -63,13 +63,6 @@ export function generateAutoRowGroupColumnForColumn(column) {
     };
 }
 export function getFriendlyNameForPivotResultColumn(columnId) {
-    if (isPivotGrandTotalColumn(columnId)) {
-        return `[Grand Total] ${columnId
-            .split('_')
-            .slice(2)
-            .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-            .join(' ')}`;
-    }
     return `[Pivot] ${columnId
         .split('_')
         .slice(1)
@@ -80,9 +73,6 @@ export function isPivotResultColumn(columnId) {
     // put this here as there might be other indicators we are not aware of?
     return columnId?.startsWith(GeneralConstants.AG_GRID_PIVOT_COLUMN);
 }
-export function isPivotGrandTotalColumn(columnId) {
-    return columnId?.startsWith(GeneralConstants.AG_GRID_PIVOT_GRAND_TOTAL_COLUMN);
-}
 export class ColumnApiImpl extends ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
@@ -146,7 +136,7 @@ export class ColumnApiImpl extends ApiBase {
         return isAutoRowGroupColumn(columnId);
     }
     isPivotResultColumn(columnId) {
-        return isPivotResultColumn(columnId) || isPivotGrandTotalColumn(columnId);
+        return isPivotResultColumn(columnId);
     }
     isAutoRowGroupColumnForSingle(columnId) {
         return columnId === GROUP_COLUMN_ID__SINGLE;

package/src/Api/Implementation/LayoutHelpers.js

@@ -197,16 +197,12 @@ export const pivotLayoutToPivotLayoutModel = (pivotLayout) => {
         ColumnPinning: pivotLayout.ColumnPinning,
         PivotColumns: pivotLayout.PivotColumns,
         PivotExpandLevel: pivotLayout.PivotExpandLevel,
-        PivotAggregationColumns: (pivotLayout.PivotAggregationColumns || []).map(({ ColumnId, AggFunc, TotalColumn }) => {
+        PivotAggregationColumns: (pivotLayout.PivotAggregationColumns || []).map(({ ColumnId, AggFunc }) => {
             return {
                 ColumnId,
                 AggFunc: toAggFunc(AggFunc),
-                TotalColumn,
             };
         }),
-        GrandTotalRow: pivotLayout.GrandTotalRow,
-        GrandTotalColumn: pivotLayout.GrandTotalColumn,
-        PivotGroupTotalColumn: pivotLayout.PivotGroupTotalColumn,
         RowGroupValues: pivotLayout.RowGroupValues
             ? pivotLayout.RowGroupValues.RowGroupDefaultBehavior === 'always-collapsed' ||
                 pivotLayout.RowGroupValues.RowGroupDefaultBehavior === 'always-expanded'
@@ -330,29 +326,10 @@ export const pivotLayoutModelToPivotLayout = (layoutModel, defaults) => {
     else {
         delete pivotLayout.RowGroupValues;
     }
-    if (layoutModel.GrandTotalRow) {
-        pivotLayout.GrandTotalRow = layoutModel.GrandTotalRow;
-    }
-    else {
-        delete pivotLayout.GrandTotalRow;
-    }
-    if (layoutModel.GrandTotalColumn) {
-        pivotLayout.GrandTotalColumn = layoutModel.GrandTotalColumn;
-    }
-    else {
-        delete pivotLayout.GrandTotalColumn;
-    }
-    if (layoutModel.PivotGroupTotalColumn) {
-        pivotLayout.PivotGroupTotalColumn = layoutModel.PivotGroupTotalColumn;
-    }
-    else {
-        delete pivotLayout.PivotGroupTotalColumn;
-    }
     if (layoutModel.PivotAggregationColumns) {
-        pivotLayout.PivotAggregationColumns = (layoutModel.PivotAggregationColumns || []).map(({ ColumnId, AggFunc, TotalColumn }) => ({
+        pivotLayout.PivotAggregationColumns = (layoutModel.PivotAggregationColumns || []).map(({ ColumnId, AggFunc }) => ({
             ColumnId,
             AggFunc: toAggregationColumnValue(AggFunc),
-            TotalColumn,
         }));
     }
     else {

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

@@ -24,7 +24,6 @@ export declare const GROUP_PATH_SEPARATOR: string;
 export declare const AG_GRID_GROUPED_COLUMN: string;
 export declare const AG_GRID_SELECTION_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
-export declare const AG_GRID_PIVOT_GRAND_TOTAL_COLUMN: string;
 export declare const AG_GRID_CHART_WINDOW = "AG Grid Window";
 export declare const ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = "(FDC3ActionColumn)";
 export declare const DEFAULT_DATE_FORMAT_PATTERN = "dd-MM-yyyy";

package/src/Utilities/Constants/GeneralConstants.js

@@ -23,7 +23,6 @@ export const GROUP_PATH_SEPARATOR = '/';
 export const AG_GRID_GROUPED_COLUMN = 'ag-Grid-AutoColumn';
 export const AG_GRID_SELECTION_COLUMN = 'ag-Grid-SelectionColumn';
 export const AG_GRID_PIVOT_COLUMN = 'pivot_';
-export const AG_GRID_PIVOT_GRAND_TOTAL_COLUMN = 'PivotRowTotal_pivot_';
 export const AG_GRID_CHART_WINDOW = 'AG Grid Window';
 export const ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = '(FDC3ActionColumn)';
 // FIXME AFL - load this from DateInputOptions

package/src/View/Components/ColumnFilter/components/ColumnFilterInput.js

@@ -100,15 +100,43 @@ export const ColumnFilterInput = ({ type, value, onChange: onChangeProp, onClear
         // autoFocus has to be FALSE because if the input receives focus in the init phase,
         // it may scroll the AG Grid header viewport into view and de-synchronize it (relative to the content viewport)
         autoFocus: false, value: liveValue ?? '', onKeyDown: onKeyDown, showClearButton: false, onChange: (e) => {
+            const prevValue = `${liveValue}`;
             const value = e.target.value;
             if (value) {
                 if (type === 'number') {
                     let numericValue = parseFloat(value);
+                    let liveValue = numericValue;
                     if (isNaN(numericValue)) {
                         numericValue = null;
+                        liveValue = null;
+                    }
+                    else {
+                        const prevValueHasSeparator = prevValue.includes('.');
+                        const newValueEndsWithSeparator = value.endsWith('.');
+                        const newValueStartsWithSeparator = value.startsWith('.');
+                        const newValueEndsWithZero = value.endsWith('0');
+                        const separatorCount = (value.match(/[.,]/g) || []).length;
+                        if (prevValueHasSeparator && separatorCount > 1) {
+                            // not a valid number
+                            return;
+                        }
+                        if (newValueEndsWithSeparator) {
+                            const valueWithoutLastChar = value.slice(0, -1);
+                            if (numericValue === parseFloat(valueWithoutLastChar)) {
+                                liveValue = value;
+                            }
+                        }
+                        if (newValueEndsWithZero) {
+                            liveValue = value;
+                        }
+                        if (newValueStartsWithSeparator) {
+                            if (numericValue === parseFloat('0' + value)) {
+                                liveValue = value;
+                            }
+                        }
                     }
                     onChange(numericValue);
-                    setLiveValue(numericValue);
+                    setLiveValue(liveValue);
                 }
                 else {
                     onChange(value);

package/src/agGrid/FilterWrapper.js

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { AdaptableColumnFilter } from '../View/Components/ColumnFilter/AdaptableColumnFilter';
 import { renderWithAdaptableContext } from '../View/renderWithAdaptableContext';
+import { getAgGridFilterNotifyModelFn } from './getAgGridFilterNotifyModelFn';
 export const FilterWrapperFactory = (adaptable) => {
     function isFilterActive(colId) {
         // we need this here
@@ -108,14 +109,15 @@ export const FilterWrapperFactory = (adaptable) => {
             this.unmountReactRoot?.();
             const columnId = this.column.getColId();
             let column = adaptable.api.columnApi.getColumnWithColumnId(columnId);
-            // for whatever reason, it works without this
-            // const notifyModel = getNotifyModel(colId, this.params.filterChangedCallback);
+            function getNotifyModel(colId, onModelChange) {
+                return getAgGridFilterNotifyModelFn(adaptable.api, colId, onModelChange);
+            }
+            const notifyModel = getNotifyModel(columnId, this.params.filterChangedCallback);
             if (column) {
                 this.unmountReactRoot = adaptable.renderReactRoot(renderWithAdaptableContext(React.createElement(AdaptableColumnFilter, {
                     columnId,
                     wrapperProps: { p: 2 },
-                    // for whatever reason, it works without this
-                    // onChange: notifyModel,
+                    onChange: notifyModel,
                 }), adaptable), 
                 // AdaptableColumnFilter(filterProps),
                 this.filterContainer);

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: 1744819271502 || Date.now(),
-    VERSION: "20.0.5-canary.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1744964803967 || Date.now(),
+    VERSION: "20.0.5" || '--current-version--',
 };

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

@@ -62,17 +62,26 @@ export type ColumnAggregationModel = {
     aggFunc: string | true;
     weightedColumnId?: string;
 };
-export type AggregationColumnsModelItem = {
+export type AggregationColumnsModel = {
     ColumnId: string;
     AggFunc: ColumnAggregationModel;
-};
-export type AggregationColumnsModel = AggregationColumnsModelItem[];
-export type PivotAggregationColumnsModel = (AggregationColumnsModelItem & {
-    TotalColumn?: boolean | 'before' | 'after' | {
-        PivotColumnId: string;
-        ShowTotal?: boolean | 'before' | 'after';
-    }[];
-})[];
+}[];
+type RowSummaryPosition = 'Top' | 'Bottom';
+export interface RowSummaryModel {
+    /**
+     * Where Row Summary appears - 'Top' or 'Bottom'
+     */
+    Position?: RowSummaryPosition;
+    /**
+     * Map of Columns with Summary Expressions
+     */
+    ColumnsMap: Record<string, string>;
+    /**
+     * Evaluates only currently filtered rows in the summary
+     * @defaultValue true
+     */
+    IncludeOnlyFilteredRows?: boolean;
+}
 export interface TableLayoutModel extends BaseLayoutModel {
     TableColumns: string[];
     /**
@@ -87,7 +96,6 @@ export interface TableLayoutModel extends BaseLayoutModel {
      * @defaultValue 'single'
      */
     RowGroupDisplayType?: 'single' | 'multi';
-    PivotAggregationColumns?: never;
     PivotColumns?: never;
     PivotGroupedColumns?: never;
     PivotExpandLevel?: never;
@@ -102,24 +110,13 @@ export interface PivotLayoutModel extends BaseLayoutModel {
     /**
      * Columns showing aggregated values in Group Rows; 1st value in record is Column name, 2nd is either aggfunc (e.g. sum, avg etc.) or 'true' (to use default aggfunc)
      */
-    PivotAggregationColumns?: PivotAggregationColumnsModel;
+    PivotAggregationColumns?: AggregationColumnsModel;
     TableAggregationColumns?: never;
     /**
      * Columns which are row-grouped when the Layout is applied
      */
     PivotGroupedColumns?: string[];
     RowGroupedColumns?: never;
-    /**
-     * Display Grand Total Row at the top or bottom of the Pivot Table
-     */
-    GrandTotalRow?: 'top' | 'bottom' | boolean;
-    /**
-     * Display Total of all Pivot Columns before or after the Pivot Columns
-     */
-    GrandTotalColumn?: 'before' | 'after' | boolean;
-    /**
-     * Display automatically calculated Totals within EACH Pivot Column Group, in the position specified
-     */
-    PivotGroupTotalColumn?: 'before' | 'after' | boolean;
 }
 export type LayoutModel = TableLayoutModel | PivotLayoutModel;
+export {};

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

@@ -1,4 +1,4 @@
-import { ColDef, ColumnState, GridApi, GridOptions, GridState } from 'ag-grid-enterprise';
+import { ColumnState, GridApi, GridOptions, GridState } from 'ag-grid-enterprise';
 import { PivotLayoutModel, TableLayoutModel } from './LayoutManagerModel';
 import { LMEmitter } from './LMEmitter';
 export type LayoutManagerOptions = {
@@ -69,24 +69,7 @@ export declare class LayoutManager<DATA_TYPE = any> extends LMEmitter {
     private computeColumnOrderAndVisibility;
     autoSizeColumns(columnIds?: string[]): false | string[];
     private applyPivotLayout;
-    applyPivotTotals(layout: PivotLayoutModel): void;
     applyPivotExpandLevel(layout: PivotLayoutModel): void;
     private withSuppressColumnAnimation;
-    private setupPivotTotals;
-    private isPivotRowTotalColDef;
-    private patchGrandTotalColumn;
-    private isPivotGroupTotalColumn;
-    private patchPivotGroupTotalColumn;
-    private patchPivotTotalColumn;
-    destructurePivotColumnId(colDef: ColDef, currentModel: {
-        pivotColIds: string[];
-        aggColIds: string[];
-    }): '!unknown!' | {
-        pivotColumnIds: string[];
-        pivotKeys: string[];
-        pivotColumnId: string;
-        aggregationColumnId?: string;
-    };
-    private getPivotTotalColumnConfig;
 }
 export {};