@adaptabletools/adaptable 21.0.7 → 21.0.9-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "21.0.7",
+  "version": "21.0.9-canary.0",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",
@@ -53,6 +53,7 @@
     "react-select": "5.10.1",
     "react-toastify": "9.1.3",
     "rebass": "^3.2.2",
+    "@types/rebass": "^4.0.10",
     "redux": "^5.0.1",
     "rxjs": "^7.4.0",
     "sentence-case": "^3.0.4",

package/src/Redux/Store/AdaptableStore.d.ts

@@ -5,8 +5,6 @@ import { BaseState } from '../../AdaptableState/BaseState';
 import { IAdaptableStore, LoadStoreConfig } from './Interface/IAdaptableStore';
 type EmitterCallback = (data?: any) => any;
 type EmitterAnyCallback = (eventName: string, data?: any) => any;
-export declare const INIT_STATE = "INIT_STATE";
-export declare const LOAD_STATE = "LOAD_STATE";
 export interface ResetUserDataAction extends Redux.Action {
 }
 export interface InitStateAction extends Redux.Action {

package/src/Redux/Store/AdaptableStore.js

@@ -40,8 +40,8 @@ import * as ThemeRedux from '../ActionsReducers/ThemeRedux';
 import * as ToolPanelRedux from '../ActionsReducers/ToolPanelRedux';
 import { isAdaptableSharedEntity, isCustomSharedEntity, } from '../../AdaptableState/TeamSharingState';
 import { buildAdaptableStateFunctionConfig } from './buildAdaptableStateFunctionConfig';
-export const INIT_STATE = 'INIT_STATE';
-export const LOAD_STATE = 'LOAD_STATE';
+const INIT_STATE = 'INIT_STATE';
+const LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
     '@@INIT': true,
     '@@redux/init': true,

package/src/agGrid/AdaptableAgGrid.js

@@ -1098,7 +1098,11 @@ You need to define at least one Layout!`);
                 dataType: 'DateTime',
             }, {
                 id: 'numberExcelType',
-                dataType: 'Number',
+                // dataType: 'Number',
+                // AG Grid requires either dataType or numberFormat to be set for Numbers
+                numberFormat: {
+                    format: '0.###############',
+                },
             });
             this.agGridExportAdapter.originalExcelStyles = excelStyles;
             this.agGridExportAdapter.DANGER_excelStyles = this.agGridExportAdapter.originalExcelStyles;

package/src/agGrid/AgGridExportAdapter.js

@@ -617,7 +617,11 @@ export class AgGridExportAdapter {
         };
         this.excelStylesCache['numberExcelType'] = {
             id: 'numberExcelType',
-            dataType: 'Number',
+            // dataType: 'Number',
+            // AG Grid requires either dataType or numberFormat to be set for Numbers
+            numberFormat: {
+                format: '0.###############',
+            },
         };
         return Object.values(this.excelStylesCache);
     }

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: 1760446037964 || Date.now(),
-    VERSION: "21.0.7" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1761289684570 || Date.now(),
+    VERSION: "21.0.9-canary.0" || '--current-version--',
 };

package/src/layout-manager/src/index.js

@@ -94,7 +94,7 @@ function isGridLayoutSame(options) {
     if (!!gridLayout != !!layout) {
         return false;
     }
-    return isLayoutEqual(gridLayout, layout);
+    return isLayoutEqual(normalizeLayoutModel(gridLayout), normalizeLayoutModel(layout));
 }
 function getDefaultColumnSizeStateForColDef(colId, colDef, options) {
     if (!colDef) {
@@ -340,6 +340,7 @@ export class LayoutManager extends LMEmitter {
         let PivotColumns = this.gridApi.getPivotColumns().map((col) => col.getColId());
         const layout = this.getUndecidedLayoutModelFromGrid(columnState);
         let ColumnSizing = layout.ColumnSizing || {};
+        let ColumnVisibility = { ...layout.ColumnVisibility };
         //let's also include the column widths of the pivotResult columns
         pivotResultColumns.forEach((col) => {
             const colId = col.getColId();
@@ -355,6 +356,18 @@ export class LayoutManager extends LMEmitter {
         if (!Object.keys(ColumnSizing).length) {
             ColumnSizing = undefined;
         }
+        // from column visibility, let's remove all columns that are not actually in the pivot layout
+        // since having normal table columns here will break the equality check
+        // so we only want to keep the group columns and the pivot result columns
+        Object.keys(ColumnVisibility).forEach((colId) => {
+            const isInLayout = pivotResultColumnsSet.has(colId) || colId.startsWith(AUTO_GROUP_COLUMN_ID__SINGLE);
+            if (!isInLayout) {
+                delete ColumnVisibility[colId];
+            }
+        });
+        if (!Object.keys(ColumnVisibility).length) {
+            ColumnVisibility = undefined;
+        }
         delete layout.TableColumns;
         const pivotLayout = {
             Name: layout.Name,
@@ -372,7 +385,7 @@ export class LayoutManager extends LMEmitter {
             ColumnPinning: layout.ColumnPinning,
             ColumnSorts: layout.ColumnSorts,
             ColumnSizing,
-            ColumnVisibility: layout.ColumnVisibility,
+            ColumnVisibility,
             RowGroupValues: layout.RowGroupValues,
             ColumnGroupValues: layout.ColumnGroupValues,
             PivotGroupedColumns: layout.RowGroupedColumns,

package/src/layout-manager/src/normalizeLayoutModel.js

@@ -102,6 +102,11 @@ export function normalizeTableLayoutModel(layout, options) {
             };
         }
     }
+    // there might be a case where there are we have an RowGroupedColumns array, but it's empty (or it's inexistent altogether)
+    // and there is no display type specified - so default it to single
+    if (!layout.RowGroupDisplayType && layout.TableColumns) {
+        layout.RowGroupDisplayType = 'single';
+    }
     if (options?.isTree && !layout.TableColumns.includes(AUTO_GROUP_COLUMN_ID__SINGLE)) {
         layout.TableColumns.unshift(AUTO_GROUP_COLUMN_ID__SINGLE);
     }
@@ -157,9 +162,9 @@ export function normalizePivotLayoutModel(layout) {
         // make it an own property
         layout.PivotColumnTotal = undefined;
     }
-    if (layout.PivotGroupedColumns && layout.PivotGroupedColumns.length) {
-        layout.RowGroupDisplayType = layout.RowGroupDisplayType || 'single';
-    }
+    // if (layout.PivotGroupedColumns && layout.PivotGroupedColumns.length) {
+    layout.RowGroupDisplayType = layout.RowGroupDisplayType || 'single';
+    // }
     return layout;
 }
 export function normalizeLayoutModel(layout, options) {