@adaptabletools/adaptable-cjs 20.0.0-canary.15 → 20.0.0-canary.17

package/src/View/Note/NotePopup.js

@@ -6,11 +6,11 @@ const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const InfiniteTable_1 = require("../../components/InfiniteTable");
 const NoteRedux_1 = require("../../Redux/ActionsReducers/NoteRedux");
-const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
+const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 const tableDOMProps = {
     style: {
         height: '100%',
@@ -25,6 +25,9 @@ const NotePopup = (props) => {
         : StringExtensions_1.default.Humanize(adaptable.adaptableOptions.primaryKey);
     const allNotes = (0, react_redux_1.useSelector)((state) => (0, NoteRedux_1.GetAllNotesSelector)(state.Note));
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';
+    const formatDate = (date, format) => {
+        return FormatHelper_1.default.DateFormatter(date, { Pattern: format });
+    };
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -47,7 +50,7 @@ const NotePopup = (props) => {
             timestamp: {
                 field: 'Timestamp',
                 valueGetter: (params) => {
-                    return (0, format_1.default)(params.data.Timestamp, adaptable.api.noteApi.internalApi.getNotesDateFormat());
+                    return formatDate(params.data.Timestamp, adaptable.api.noteApi.internalApi.getNotesDateFormat());
                 },
             },
             delete: {

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -333,5 +333,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     refreshLayout(): void;
     private isRowGroupDifferentInLayout;
     private onLayoutChange;
+    private validateColumnDefTypes;
 }
 export {};

package/src/agGrid/AdaptableAgGrid.js

@@ -100,6 +100,7 @@ const isPivotLayoutModel_1 = require("../layout-manager/src/isPivotLayoutModel")
 const AdaptableColumn_1 = require("../PredefinedConfig/Common/AdaptableColumn");
 const agGridDataTypeDefinitions_1 = require("./agGridDataTypeDefinitions");
 const AgGridThemeAdapter_1 = require("./AgGridThemeAdapter");
+const VersionUpgrade20_1 = require("../migration/VersionUpgrade20");
 const LocalEventService_Prototype = ag_grid_enterprise_1.LocalEventService.prototype;
 const LocalEventService_dispatchEvent = LocalEventService_Prototype.dispatchEvent;
 LocalEventService_Prototype.dispatchEvent = function (event) {
@@ -360,6 +361,7 @@ class AdaptableAgGrid {
         // AG Grid evaluates early on the floatingFilter params, so we need to "suppres" the floating filter temporarily
         // we will reset it once Adaptable is ready
         this.agGridColumnAdapter.setupColumnFloatingFilterTemporarily(gridOptions);
+        this.validateColumnDefTypes(gridOptions.columnDefs);
         const agGridApi = await this.initializeAgGrid(gridOptions, config.modules, config.renderAgGridFrameworkComponent);
         if (agGridApi === false) {
             this.midwayDestroy();
@@ -3292,5 +3294,25 @@ You need to define at least one Layout!`);
         this.__prevLayoutForOnChange = layout;
         this.api.layoutApi.createOrUpdateLayout(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
+        columnDefs.forEach((colDef) => {
+            if (colDef.children?.length) {
+                this.validateColumnDefTypes(colDef.children);
+            }
+            const columnDefinition = colDef;
+            const colDefType = columnDefinition.type;
+            const colDefTypes = typeof colDefType === 'string' ? [colDefType] : colDefType || [];
+            colDefTypes
+                .filter((colType) => colType.startsWith('abColDef'))
+                .forEach((colType) => {
+                const newValidCellDataType = (0, VersionUpgrade20_1.mapOldTypeToDataType)(colType);
+                if (newValidCellDataType) {
+                    this.logger.consoleWarn(`Column ${columnDefinition.colId ?? columnDefinition.field} has a type of ${colType} which is no longer in use${newValidCellDataType !== 'unknown' ? `. Please use 'colDef.cellDataType' instead: ${newValidCellDataType}` : ''}`);
+                }
+            });
+        });
+    }
 }
 exports.AdaptableAgGrid = AdaptableAgGrid;

package/src/agGrid/editors/AdaptableDateEditor/InternalAdaptableDateEditor.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InternalAdaptableDateEditor = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
+const date_fns_1 = require("date-fns");
 const useProperty_1 = tslib_1.__importDefault(require("../../../components/utils/useProperty"));
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../../View/Components/AdaptableInput"));
 const DatepickerContext_1 = require("../../../components/Datepicker/DatepickerContext");
@@ -42,7 +42,7 @@ exports.InternalAdaptableDateEditor = React.forwardRef((props, ref) => {
                 props.onValueChange?.(null);
             }
             else {
-                const date = typeof value === 'string' ? (0, parseISO_1.default)(value) : new Date(value);
+                const date = typeof value === 'string' ? (0, date_fns_1.parseISO)(value) : new Date(value);
                 props.onValueChange?.(date);
             }
         },

package/src/components/Datepicker/DatepickerContext.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { Locale } from 'date-fns';
 export declare const DatepickerContext: React.Context<{
     onHide?: (keyboardEventKey?: string) => void;
     onShow?: VoidFunction;

package/src/components/Datepicker/index.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { BoxProps } from 'rebass';
 import { DatepickerButton } from '../../AdaptableOptions/DateInputOptions';
+import { Locale } from 'date-fns';
 export type DatepickerProps = Omit<BoxProps, 'value' | 'onChange' | 'defaultValue'> & {
     value: Date | undefined;
     defaultValue?: Date | undefined;

package/src/components/Select/Select.js

@@ -39,7 +39,7 @@ const INFINITE_COLUMNS_WITH_CHECKBOX = {
         renderHeader: (headerParams) => {
             return (React.createElement(React.Fragment, null,
                 headerParams.renderBag.selectionCheckBox,
-                headerParams.allRowsSelected ? 'Deselect All' : 'Select All'));
+                headerParams.allRowsSelected ? '(Deselect All)' : '(Select All)'));
         },
         renderMenuIcon: false,
     },
@@ -99,7 +99,7 @@ const Select = function (props) {
     };
     const renderMultipleValues = props.renderMultipleValues;
     const isMulti = props.isMulti ?? Array.isArray(props.value);
-    const showHeaderSelectionCheckbox = props.showHeaderSelectionCheckbox ?? false;
+    const showHeaderSelectionCheckbox = isMulti && (props.showHeaderSelectionCheckbox ?? false);
     let selectedOption = null;
     if (isMulti) {
         selectedOption =
@@ -339,7 +339,7 @@ const Select = function (props) {
                     zIndex: 999999,
                     boxShadow: 'var(--ab-cmp-select-menu__box-shadow)',
                     minWidth: `var(--ab-cmp-select-menu__min-width)`,
-                    '--ab-cmp-select-menu__min-height': `min(${(props.options || []).length * ROW_HEIGHT}px, 20rem)`,
+                    '--ab-cmp-select-menu__min-height': `min(${((props.options || []).length + (showHeaderSelectionCheckbox ? 1 : 0)) * ROW_HEIGHT}px, 20rem)`,
                     ...commonStyles(state),
                     ...props.menuStyle,
                 };

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: 1741795405265 || Date.now(),
-    VERSION: "20.0.0-canary.15" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1741946447730 || Date.now(),
+    VERSION: "20.0.0-canary.17" || '--current-version--',
 };

package/src/migration/VersionUpgrade20.d.ts

@@ -1,5 +1,7 @@
 import { VersionUpgrade } from './VersionUpgrade';
 import { AdaptableState } from '../PredefinedConfig/AdaptableState';
+import { AdaptableColumnDataType } from '../PredefinedConfig/Common/AdaptableColumn';
+export declare function mapOldTypeToDataType(previousType: string): AdaptableColumnDataType;
 export declare class VersionUpgrade20 extends VersionUpgrade {
     migrateState(state: AdaptableState): AdaptableState;
     private migrateLayoutState;

package/src/migration/VersionUpgrade20.js

@@ -1,25 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VersionUpgrade20 = void 0;
+exports.VersionUpgrade20 = exports.mapOldTypeToDataType = void 0;
 const VersionUpgrade_1 = require("./VersionUpgrade");
 const agGridDataTypeDefinitions_1 = require("../agGrid/agGridDataTypeDefinitions");
 function transition_pre_20(layout) {
     const l = layout;
-    if (l.AggregationColumns && !Array.isArray(l.AggregationColumns)) {
-        const oldAggs = l.AggregationColumns || {};
-        const newAggs = Object.entries(oldAggs).map(([colId, aggFunc]) => ({
-            ColumnId: colId,
-            AggFunc: aggFunc,
-        }));
-        layout.TableAggregationColumns = newAggs;
-    }
-    if (l.Columns) {
+    if (l.Columns && !l.EnablePivot) {
         layout.TableColumns = l.Columns;
         delete l.Columns;
         delete layout.PivotColumns;
     }
     if (l.PinnedColumnsMap) {
-        layout.ColumnPinning = l.PinnedColumnsMap;
+        layout.ColumnPinning = { ...l.PinnedColumnsMap };
         delete l.PinnedColumnsMap;
     }
     if (l.ColumnHeadersMap) {
@@ -32,11 +24,42 @@ function transition_pre_20(layout) {
     }
     if (l.EnablePivot) {
         layout.PivotColumns = l.PivotColumns || [];
+        delete l.Columns;
         delete layout.TableColumns;
+        delete l.EnablePivot;
         if (l.AggregationColumns) {
-            layout.PivotAggregationColumns = layout.TableAggregationColumns;
+            layout.PivotAggregationColumns = (Object.entries(l.AggregationColumns) || []).map(([ColumnId, AggFunc]) => {
+                return {
+                    ColumnId,
+                    AggFunc,
+                };
+            });
+            delete layout.TableAggregationColumns;
+            delete l.AggregationColumns;
+        }
+        if (l.RowGroupedColumns) {
+            layout.PivotGroupedColumns = l.RowGroupedColumns;
+            delete l.RowGroupedColumns;
         }
     }
+    else {
+        if (l.AggregationColumns && !Array.isArray(l.AggregationColumns)) {
+            const oldAggs = l.AggregationColumns || {};
+            const newAggs = Object.entries(oldAggs).map(([ColumnId, AggFunc]) => ({
+                ColumnId,
+                AggFunc,
+            }));
+            layout.TableAggregationColumns = newAggs;
+            delete l.AggregationColumns;
+        }
+    }
+    if (l.ExpandedRowGroupValues) {
+        layout.RowGroupValues = {
+            RowGroupDefaultBehavior: 'collapsed',
+            ExceptionGroupKeys: l.ExpandedRowGroupValues,
+        };
+        delete l.ExpandedRowGroupValues;
+    }
     if (Array.isArray(l.ColumnFilters)) {
         layout.ColumnFilters = l.ColumnFilters.map((columnFilter) => {
             const filter = {
@@ -112,6 +135,7 @@ function mapOldTypeToDataType(previousType) {
             return 'unknown';
     }
 }
+exports.mapOldTypeToDataType = mapOldTypeToDataType;
 class VersionUpgrade20 extends VersionUpgrade_1.VersionUpgrade {
     migrateState(state) {
         this.migrateLayoutState(state);