@adaptabletools/adaptable-cjs 21.0.7 → 21.0.9-canary.0

package/package.json

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableStore = exports.LoadState = exports.InitState = exports.LOAD_STATE = exports.INIT_STATE = void 0;
+exports.AdaptableStore = exports.LoadState = exports.InitState = void 0;
 const tslib_1 = require("tslib");
 const Redux = tslib_1.__importStar(require("redux"));
 const PluginsRedux = tslib_1.__importStar(require("../ActionsReducers/PluginsRedux"));
@@ -44,13 +44,13 @@ const ThemeRedux = tslib_1.__importStar(require("../ActionsReducers/ThemeRedux")
 const ToolPanelRedux = tslib_1.__importStar(require("../ActionsReducers/ToolPanelRedux"));
 const TeamSharingState_1 = require("../../AdaptableState/TeamSharingState");
 const buildAdaptableStateFunctionConfig_1 = require("./buildAdaptableStateFunctionConfig");
-exports.INIT_STATE = 'INIT_STATE';
-exports.LOAD_STATE = 'LOAD_STATE';
+const INIT_STATE = 'INIT_STATE';
+const LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
     '@@INIT': true,
     '@@redux/init': true,
-    [exports.LOAD_STATE]: true,
-    [exports.INIT_STATE]: true,
+    [LOAD_STATE]: true,
+    [INIT_STATE]: true,
     // progress indicators should NOT interfere with state management as it may lead to race conditions due to load/persist state being async
     [PopupRedux_1.PROGRESS_INDICATOR_SHOW]: true,
     [PopupRedux_1.PROGRESS_INDICATOR_HIDE]: true,
@@ -62,11 +62,11 @@ const NON_PERSISTENT_STORE_KEYS = [
     'Plugins',
 ];
 const InitState = () => ({
-    type: exports.INIT_STATE,
+    type: INIT_STATE,
 });
 exports.InitState = InitState;
 const LoadState = (State) => ({
-    type: exports.LOAD_STATE,
+    type: LOAD_STATE,
     State,
 });
 exports.LoadState = LoadState;
@@ -167,7 +167,7 @@ class AdaptableStore {
         Redux.combineReducers(rootReducerObject);
         const rootReducerWithResetManagement = (state, action) => {
             switch (action.type) {
-                case exports.LOAD_STATE:
+                case LOAD_STATE:
                     const { State } = action;
                     Object.keys(State).forEach((key) => {
                         state[key] = State[key];
@@ -199,7 +199,7 @@ class AdaptableStore {
             });
         };
         // this is now VERY BADLY NAMED!
-        let rootReducer = (0, AdaptableReduxMerger_1.mergeReducer)(rootReducerWithResetManagement, exports.LOAD_STATE);
+        let rootReducer = (0, AdaptableReduxMerger_1.mergeReducer)(rootReducerWithResetManagement, LOAD_STATE);
         const composeEnhancers = (x) => x;
         const persistedReducer = (state, action) => {
             if (adaptable.isDestroyed) {
@@ -1507,7 +1507,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 /*******************
                  * MANAGING STATE ACTIONS
                  *******************/
-                case exports.INIT_STATE: {
+                case INIT_STATE: {
                     let returnAction = next(action);
                     if (adaptable.isReady) {
                         // we need this here for when the state key is changed

package/src/agGrid/AdaptableAgGrid.js

@@ -1102,7 +1102,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

@@ -621,7 +621,11 @@ 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

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

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

@@ -97,7 +97,7 @@ function isGridLayoutSame(options) {
     if (!!gridLayout != !!layout) {
         return false;
     }
-    return (0, isLayoutEqual_1.isLayoutEqual)(gridLayout, layout);
+    return (0, isLayoutEqual_1.isLayoutEqual)((0, normalizeLayoutModel_1.normalizeLayoutModel)(gridLayout), (0, normalizeLayoutModel_1.normalizeLayoutModel)(layout));
 }
 function getDefaultColumnSizeStateForColDef(colId, colDef, options) {
     if (!colDef) {
@@ -343,6 +343,7 @@ class LayoutManager extends LMEmitter_1.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();
@@ -358,6 +359,18 @@ class LayoutManager extends LMEmitter_1.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(normalizeLayoutModel_1.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,
@@ -375,7 +388,7 @@ class LayoutManager extends LMEmitter_1.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

@@ -105,6 +105,11 @@ 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(exports.AUTO_GROUP_COLUMN_ID__SINGLE)) {
         layout.TableColumns.unshift(exports.AUTO_GROUP_COLUMN_ID__SINGLE);
     }
@@ -161,9 +166,9 @@ 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;
 }
 exports.normalizePivotLayoutModel = normalizePivotLayoutModel;