@adaptabletools/adaptable 12.1.1 → 12.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.1.1",
+  "version": "12.1.4",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1658765730539;
+declare const _default: 1659024589656;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1658765730539;
+exports.default = 1659024589656;

package/src/Api/ColumnApi.d.ts

@@ -303,5 +303,11 @@ export interface ColumnApi {
      * @param columnId Column to Check
      */
     isActionRowButtonColumn(columnId: string): boolean;
+    /**
+     * Returns the default Aggregation Function for a Column
+     * @param columnId Column to Check
+     */
     getDefaultAggFunc(columnId: string): string;
+    getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
+    getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
 }

package/src/Api/Events/SearchChanged.d.ts

@@ -2,6 +2,7 @@ import { BaseEventInfo } from './BaseEventInfo';
 import { AdaptableSortState } from '../../types';
 import { AdaptableSearchState } from './AdaptableSearchState';
 /**
+ * Deprecated Search Changed Event - use `QueryRun` or `FilterApplied` instead
  * @deprecated Use QueryRun and or FilterApplied
  */
 export interface SearchChangedInfo extends BaseEventInfo {

package/src/Api/FormatColumnApi.d.ts

@@ -1,4 +1,4 @@
-import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison } from '../PredefinedConfig/FormatColumnState';
+import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison, CellColorRange } from '../PredefinedConfig/FormatColumnState';
 import { AdaptableColumn, AdaptableFormat } from '../types';
 import { RowNode } from '@ag-grid-community/all-modules';
 /**
@@ -156,14 +156,16 @@ export interface FormatColumnApi {
      * @param rowNode current Row Node
      * @param cellValue current Cell Value
      */
-    getNumericStyleMinValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number;
+    getNumericStyleMinValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
     /**
      * Gets the Maximum Value to display for a Numeric Style
      * @param numericStyle Numeric Style to check
      * @param rowNode current Row Node
      * @param cellValue current Cell Value
      */
-    getNumericStyleMaxValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number;
+    getNumericStyleMaxValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
+    getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
+    getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
     /**
      * Returns first Format Column that contains checkbox style
      * @param columnId column to check

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

@@ -70,4 +70,6 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     isColumnReferencedInExpression(columnId: string, expression: string): boolean;
     isActionRowButtonColumn(columnId: string): boolean;
     getDefaultAggFunc(columnId: string): string;
+    getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
+    getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -420,5 +420,19 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         const agColumn = (_b = (_a = this.getAgGridColumnForAdaptableColumn(columnId)) === null || _a === void 0 ? void 0 : _a.getColDef) === null || _b === void 0 ? void 0 : _b.call(_a);
         return (_c = agColumn === null || agColumn === void 0 ? void 0 : agColumn.defaultAggFunc) !== null && _c !== void 0 ? _c : availableAggregationFunctions[0];
     }
+    getMinValueForNumericColumn(column) {
+        if (column.dataType !== 'Number') {
+            return undefined;
+        }
+        // can we cache this in some way?
+        return Math.min(...this.getDistinctRawValuesForColumn(column.columnId));
+    }
+    getMaxValueForNumericColumn(column) {
+        if (column.dataType !== 'Number') {
+            return undefined;
+        }
+        // can we cache this in some way?
+        return Math.max(...this.getDistinctRawValuesForColumn(column.columnId));
+    }
 }
 exports.ColumnApiImpl = ColumnApiImpl;

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

@@ -1,7 +1,7 @@
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { FormatColumnApi } from '../FormatColumnApi';
-import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
+import { FormatColumnState, FormatColumn, ColumnStyle, CellColorRange, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableFormat } from '../../types';
@@ -39,8 +39,10 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getFormatColumnsWithAllScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
     getFormatColumnsWithDataTypeScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
     getFormatColumnsWithColumnScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
-    getNumericStyleMinValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number;
-    getNumericStyleMaxValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number | undefined;
+    getNumericStyleMinValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
+    getNumericStyleMaxValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number | undefined;
+    getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
+    getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
     getCheckBoxStyleFormatColumn(column: AdaptableColumn): FormatColumn | undefined;
     isCheckBoxStyleFormatColumn(column: AdaptableColumn): boolean;
     fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -180,7 +180,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     getFormatColumnsWithColumnScope(formatColumns) {
         return formatColumns.filter((fc) => this.adaptable.api.scopeApi.scopeHasColumns(fc.Scope));
     }
-    getNumericStyleMinValue(numericStyle, rowNode, cellValue) {
+    getNumericStyleMinValue(numericStyle, column, rowNode, cellValue) {
         var _a, _b;
         const columnComparison = numericStyle.GradientStyle
             ? numericStyle.GradientStyle.ColumnComparison
@@ -199,24 +199,28 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
                 }
             }
         }
-        // for percentbar we want to get the whole Ranges, for Gradident Column just range that contains cell value
+        // for Gradient Column we want just the range that contains cell value
         if (numericStyle.GradientStyle) {
             let range;
             numericStyle.GradientStyle.CellRanges.forEach((cellRange) => {
-                if (!range && cellValue >= cellRange.Min && cellValue <= cellRange.Max) {
-                    range = cellRange;
+                if (!range) {
+                    if ((cellRange.Min == 'Col-Min' || cellValue >= cellRange.Min) &&
+                        (cellRange.Max == 'Col-Max' || cellValue <= cellRange.Max)) {
+                        range = cellRange;
+                    }
                 }
             });
-            return range ? range.Min : undefined;
+            return this.getCellColorRangeMinValue(range, column);
         }
+        // for percentbar we want to get the whole Ranges
         if (numericStyle.PercentBarStyle) {
             const ranges = (_b = numericStyle.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.CellRanges;
             if (ranges) {
-                return ranges[0].Min;
+                return this.getCellColorRangeMinValue(ranges[0], column);
             }
         }
     }
-    getNumericStyleMaxValue(numericStyle, rowNode, cellValue) {
+    getNumericStyleMaxValue(numericStyle, column, rowNode, cellValue) {
         var _a, _b;
         const columnComparison = numericStyle.GradientStyle
             ? numericStyle.GradientStyle.ColumnComparison
@@ -238,19 +242,44 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         if (numericStyle.GradientStyle) {
             let range;
             numericStyle.GradientStyle.CellRanges.forEach((cellRange) => {
-                if (!range && cellValue >= cellRange.Min && cellValue <= cellRange.Max) {
-                    range = cellRange;
+                if (!range) {
+                    if ((cellRange.Min == 'Col-Min' || cellValue >= cellRange.Min) &&
+                        (cellRange.Max == 'Col-Max' || cellValue <= cellRange.Max)) {
+                        range = cellRange;
+                    }
                 }
             });
-            return range ? range.Max : undefined;
+            return this.getCellColorRangeMaxValue(range, column);
         }
         if (numericStyle.PercentBarStyle) {
             const ranges = (_b = numericStyle.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.CellRanges;
             if (ranges) {
-                return ranges[ranges.length - 1].Max;
+                return this.getCellColorRangeMaxValue(ranges[ranges.length - 1], column);
             }
         }
     }
+    getCellColorRangeMinValue(range, column) {
+        if (!range) {
+            return undefined;
+        }
+        if (range.Min == undefined) {
+            return undefined;
+        }
+        return range.Min == 'Col-Min'
+            ? this.getAdaptableApi().columnApi.getMinValueForNumericColumn(column)
+            : range.Min;
+    }
+    getCellColorRangeMaxValue(range, column) {
+        if (!range) {
+            return undefined;
+        }
+        if (range.Max == undefined) {
+            return undefined;
+        }
+        return range.Max == 'Col-Max'
+            ? this.getAdaptableApi().columnApi.getMaxValueForNumericColumn(column)
+            : range.Max;
+    }
     getCheckBoxStyleFormatColumn(column) {
         var _a;
         if (column.dataType != 'Boolean') {

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -111,11 +111,11 @@ export interface CellColorRange {
     /**
      * Start number of Range
      */
-    Min: number;
+    Min: number | 'Col-Min';
     /**
      * End number of Range
      */
-    Max: number;
+    Max: number | 'Col-Max';
     /**
      * Cell colour to use for values that fall inside Range
      */

package/src/Redux/Store/AdaptableStore.js

@@ -899,6 +899,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             }
                         }
                     }
+                    // when changing current layout via the api, the layout should update
+                    if (returnAction.type == LayoutRedux.LAYOUT_SAVE) {
+                        const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
+                        const savingLayout = returnAction.layout;
+                        if (currentLayout.Name === savingLayout.Name) {
+                            adaptable.setLayout(savingLayout);
+                        }
+                    }
                     return returnAction;
                 }
                 /*******************

package/src/Strategy/FormatColumnModule.js

@@ -247,7 +247,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Display Format',
-                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn, this.api)],
+                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn)],
                 },
                 getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems(formatColumn),
                 getObjectTagsViewItems_1.getObjectTagsViewItems(formatColumn, this.api),

package/src/Strategy/LayoutModule.js

@@ -247,8 +247,8 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     values: [layout.Name],
                 },
                 {
-                    name: 'Pivot Layout',
-                    values: [(layout === null || layout === void 0 ? void 0 : layout.EnablePivot) ? 'Yes' : 'No'],
+                    name: 'Layout Grid Type',
+                    values: [(layout === null || layout === void 0 ? void 0 : layout.EnablePivot) ? 'Pivot' : 'Table'],
                 },
                 {
                     name: 'Columns',

package/src/Utilities/Services/MetamodelService.js

@@ -46,7 +46,8 @@ class MetamodelService {
     }
     validateOptionsObject(validationErrors, optionsObjectName, optionsObject, optionsObjectMetamodel, optionsObjectDefaultValues) {
         Object.entries(optionsObject).forEach(([optionKey, optionValue]) => {
-            const optionMetamodel = optionsObjectMetamodel.properties.find((metamodelProperty) => metamodelProperty.name === optionKey);
+            var _a;
+            const optionMetamodel = (_a = optionsObjectMetamodel === null || optionsObjectMetamodel === void 0 ? void 0 : optionsObjectMetamodel.properties) === null || _a === void 0 ? void 0 : _a.find((metamodelProperty) => metamodelProperty.name === optionKey);
             if (!optionMetamodel) {
                 validationErrors.push(`${optionsObjectName}.${optionKey} (value=${optionValue}) :: unknown/unsupported property, will be ignored`);
                 return;

package/src/View/Alert/Wizard/AlertBehaviourWizardSection.d.ts

@@ -4,6 +4,7 @@ import { AdaptableApi } from '../../../types';
 declare type AlertBehaviourWizardSectionProps = {
     onChange: (data: AlertDefinition) => void;
 };
+export declare const renderAlertBehaviourWizardSummary: (alertDefinition: AlertDefinition) => JSX.Element;
 export declare const renderAlertBehaviourSummary: (alert: AlertDefinition, api: AdaptableApi, allowWrap?: boolean) => JSX.Element;
 export declare const AlertBehaviourWizardSection: (props: AlertBehaviourWizardSectionProps) => JSX.Element;
 export {};

package/src/View/Alert/Wizard/AlertBehaviourWizardSection.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AlertBehaviourWizardSection = exports.renderAlertBehaviourSummary = void 0;
+exports.AlertBehaviourWizardSection = exports.renderAlertBehaviourSummary = exports.renderAlertBehaviourWizardSummary = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const Tabs_1 = require("../../../components/Tabs");
@@ -47,7 +47,11 @@ const HighlightStyle = (props) => {
                         props.onChange(style);
                     } }))))));
 };
-// both used in wizard and list view
+const renderAlertBehaviourWizardSummary = (alertDefinition) => {
+    const { api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
+    return exports.renderAlertBehaviourSummary(alertDefinition, api);
+};
+exports.renderAlertBehaviourWizardSummary = renderAlertBehaviourWizardSummary;
 const renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
     const { AlertProperties = {} } = alert;
     const values = [

package/src/View/Alert/Wizard/AlertWizard.js

@@ -158,7 +158,7 @@ const AlertWizard = (props) => {
                 title: behaviourSpelling,
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },
                     React.createElement(AlertBehaviourWizardSection_1.AlertBehaviourWizardSection, { onChange: setAlertDefinition }))),
-                renderSummary: AlertBehaviourWizardSection_1.renderAlertBehaviourSummary,
+                renderSummary: AlertBehaviourWizardSection_1.renderAlertBehaviourWizardSummary,
             },
             {
                 details: 'Select Alert tags',

package/src/View/Components/RangesComponent.js

@@ -147,7 +147,7 @@ class RangesComponent extends React.Component {
     addRange() {
         const lastRange = this.state.ranges[this.state.ranges.length - 1];
         this.state.ranges.push({
-            Min: lastRange.Max,
+            Min: lastRange.Max == 'Col-Max' ? 0 : lastRange.Max,
             Max: lastRange.Max,
             Color: UIHelper_1.getHexForName(UIHelper_1.GRAY),
         }),

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.d.ts

@@ -10,7 +10,7 @@ export interface FormatColumnFormatWizardState {
     DisplayFormat: AdaptableFormat;
     NumericFormat?: 'Percent' | 'Thousand' | 'Million' | 'Dollar' | 'Sterling' | undefined;
 }
-export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn, api: AdaptableApi) => string;
-export declare const renderFormatColumnFormatSummary: (data: FormatColumn, api: AdaptableApi) => JSX.Element;
+export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn) => string;
+export declare const renderFormatColumnFormatSummary: (data: FormatColumn) => JSX.Element;
 export declare const getFormatDisplayTypeForScope: (scope: AdaptableScope, api: AdaptableApi) => 'Number' | 'Date' | 'String' | undefined;
 export declare const FormatColumnFormatWizardSection: (props: FormatColumnFormatWizardSectionProps) => JSX.Element;

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.js

@@ -78,7 +78,7 @@ const DateFormatPresets = [
     'yyyyMMdd',
     'HH:mm:ss',
 ];
-const getFormatColumnFormatSummaryValue = (data, api) => {
+const getFormatColumnFormatSummaryValue = (data) => {
     let content = 'N/A';
     if (!data.DisplayFormat) {
         content = 'N/A';
@@ -112,8 +112,8 @@ const renderCustomFormatter = (data, customFormatter, setFormatOption) => {
                 setFormatOption('CustomDisplayFormats', newCustomFormats);
             } })));
 };
-const renderFormatColumnFormatSummary = (data, api) => {
-    return React.createElement(Tag_1.Tag, null, exports.getFormatColumnFormatSummaryValue(data, api));
+const renderFormatColumnFormatSummary = (data) => {
+    return React.createElement(Tag_1.Tag, null, exports.getFormatColumnFormatSummaryValue(data));
 };
 exports.renderFormatColumnFormatSummary = renderFormatColumnFormatSummary;
 const getFormatDisplayTypeForScope = (scope, api) => {

package/src/View/FormatColumn/Wizard/FormatColumnStyleWizardSection.d.ts

@@ -5,6 +5,7 @@ export declare const isFormatColumnStyleValid: (data: FormatColumn, api: Adaptab
 declare type FormatColumnStyleWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
 };
+export declare const renderFormatColumnStyleWizardSummary: (data: FormatColumn) => any;
 export declare const renderFormatColumnStyleSummary: (data: FormatColumn, api: AdaptableApi) => any;
 export declare function FormatColumnStyleWizardSection(props: FormatColumnStyleWizardSectionProps): JSX.Element;
 export {};

package/src/View/FormatColumn/Wizard/FormatColumnStyleWizardSection.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormatColumnStyleWizardSection = exports.renderFormatColumnStyleSummary = exports.isFormatColumnStyleValid = void 0;
+exports.FormatColumnStyleWizardSection = exports.renderFormatColumnStyleSummary = exports.renderFormatColumnStyleWizardSummary = exports.isFormatColumnStyleValid = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
@@ -76,6 +76,11 @@ const getColumnComparison = (columnComparison, api) => {
                 ForeColor: columnComparison.Color,
             } })));
 };
+const renderFormatColumnStyleWizardSummary = (data) => {
+    const { api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
+    return exports.renderFormatColumnStyleSummary(data, api);
+};
+exports.renderFormatColumnStyleWizardSummary = renderFormatColumnStyleWizardSummary;
 const renderFormatColumnStyleSummary = (data, api) => {
     if (data.ColumnStyle) {
         if (data.ColumnStyle.CheckBoxStyle) {

package/src/View/FormatColumn/Wizard/FormatColumnWizard.js

@@ -117,7 +117,7 @@ function FormatColumnWizard(props) {
                 title: 'Style',
                 details: 'Format Column Style',
                 isValid: FormatColumnStyleWizardSection_1.isFormatColumnStyleValid,
-                renderSummary: FormatColumnStyleWizardSection_1.renderFormatColumnStyleSummary,
+                renderSummary: FormatColumnStyleWizardSection_1.renderFormatColumnStyleWizardSummary,
                 render: () => {
                     return (React.createElement(rebass_1.Box, { padding: 2 },
                         React.createElement(FormatColumnStyleWizardSection_1.FormatColumnStyleWizardSection, { onChange: setFormatColumn })));
@@ -125,7 +125,7 @@ function FormatColumnWizard(props) {
             },
             {
                 title: 'Display Format',
-                renderSummary: (data) => FormatColumnFormatWizardSection_1.renderFormatColumnFormatSummary(data, api),
+                renderSummary: (data) => FormatColumnFormatWizardSection_1.renderFormatColumnFormatSummary(data),
                 render: () => {
                     return React.createElement(FormatColumnFormatWizardSection_1.FormatColumnFormatWizardSection, { onChange: setFormatColumn });
                 },

package/src/View/Layout/Wizard/LayoutWizard.js

@@ -26,14 +26,21 @@ const LayoutWizard = (props) => {
     const initialLayout = (_a = props.data) !== null && _a !== void 0 ? _a : (_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.value;
     const [layout, setLayout] = react_1.useState(() => {
         var _a;
+        let preparedLayout = null;
         if (initialLayout) {
-            const preparedLayout = Helper_1.cloneObject(initialLayout);
+            preparedLayout = Helper_1.cloneObject(initialLayout);
             if (((_a = props === null || props === void 0 ? void 0 : props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Clone') {
                 preparedLayout.Name = '';
             }
-            return preparedLayout;
         }
-        return ObjectFactory_1.default.CreateEmptyLayout({ Name: '' });
+        else {
+            preparedLayout = ObjectFactory_1.default.CreateEmptyLayout({ Name: '' });
+        }
+        if (preparedLayout.SuppressAggFuncInHeader === undefined) {
+            preparedLayout.SuppressAggFuncInHeader =
+                !!adaptable.api.internalApi.getAgGridInstance().suppressAggFuncInHeader;
+        }
+        return preparedLayout;
     });
     const handleFinish = () => {
         var _a;
@@ -117,7 +124,7 @@ const LayoutWizard = (props) => {
             },
             {
                 title: 'Filters',
-                details: 'Column Filters',
+                details: 'View Column Filters',
                 renderSummary: () => React.createElement(FilterSection_1.FilterSectionSummary, null),
                 render: () => (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%' } },
                     React.createElement(FilterSection_1.FilterSection, { onChange: (newLayout) => setLayout(newLayout) }))),

package/src/View/Layout/Wizard/sections/AggregationsSection.js

@@ -58,7 +58,7 @@ const AggregationsSection = (props) => {
     const allColumns = adaptable.api.columnApi.getColumns();
     const sortedAggregableColumns = React.useMemo(() => {
         var _a, _b;
-        return sortWithOrder_1.sortWithOrderArray(allAggregableColumns.map((col) => col.columnId), (_b = Object.keys((_a = layout.AggregationColumns) !== null && _a !== void 0 ? _a : {})) !== null && _b !== void 0 ? _b : [], { sortUnorderedItems: true }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
+        return sortWithOrder_1.sortWithOrderArray(allAggregableColumns.map((col) => col.columnId), (_b = Object.keys((_a = layout.AggregationColumns) !== null && _a !== void 0 ? _a : {})) !== null && _b !== void 0 ? _b : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
     }, [layout, allAggregableColumns]);
     const handleColumnsSelectionChange = React.useCallback((columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { AggregationColumns: columnIds.reduce((acc, colId) => {

package/src/View/Layout/Wizard/sections/ColumnsSection.js

@@ -31,6 +31,10 @@ const ColumnsSectionSummary = () => {
     const data = React.useMemo(() => {
         return layout.Columns.map((columnId) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            if (adaptable.api.columnApi.isAutoPivotColumn(columnId) ||
+                adaptable.api.columnApi.isAutoRowGroupColumn(columnId)) {
+                return null;
+            }
             const friendlyName = adaptable.api.columnApi.getFriendlyNameFromColumnId(columnId);
             const header = (_b = (_a = layout.ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[columnId]) !== null && _b !== void 0 ? _b : '';
             const columnWidth = (_c = layout.ColumnWidthMap) === null || _c === void 0 ? void 0 : _c[columnId];
@@ -57,7 +61,7 @@ const ColumnsSectionSummary = () => {
                 grouping,
                 filter,
             };
-        });
+        }).filter(Boolean);
     }, [layout]);
     const columns = React.useMemo(() => {
         return {
@@ -187,7 +191,7 @@ const ColumnsSection = (props) => {
     const { data: layout } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const allColumns = adaptable.api.columnApi.getColumns();
     const sortedColumns = React.useMemo(() => {
-        return sortWithOrder_1.sortWithOrderArray(allColumns.map((col) => col.columnId), layout.Columns, { sortUnorderedItems: true }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
+        return sortWithOrder_1.sortWithOrderArray(allColumns.map((col) => col.columnId), layout.Columns, { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
     }, [layout, allColumns]);
     const handlePinChange = (columnId, pinning) => {
         props.onChange(Object.assign(Object.assign({}, layout), { PinnedColumnsMap: Object.assign(Object.assign({}, layout.PinnedColumnsMap), { [columnId]: pinning }) }));
@@ -214,7 +218,7 @@ const ColumnsSection = (props) => {
                 React.createElement(ColumnLabels_1.ColumnLabels, { flexDirection: "row", showBoth: false, labels: {
                         Sortable: 'Sortable',
                         Filterable: 'Filterable',
-                        Aggregatable: 'Shows Aggregations',
+                        Aggregatable: 'Aggregatable',
                         Groupable: 'Groupable',
                         Moveable: 'Moveable',
                         Pivotable: 'Pivotable',

package/src/View/Layout/Wizard/sections/PivotColumnsSection.js

@@ -12,9 +12,10 @@ const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
 const Utilities_1 = require("./Utilities");
 const PivotColumnsSectionSummary = () => {
+    var _a;
     const adaptable = AdaptableContext_1.useAdaptable();
     const { data: layout } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
-    return (React.createElement(rebass_1.Box, { p: 2, style: { borderRadius: 'var(--ab__border-radius)' }, backgroundColor: "var(--ab-color-defaultbackground)" }, layout.PivotColumns.length ? (layout.PivotColumns.map((columnId) => (React.createElement(Tag_1.Tag, { mr: 1, key: columnId }, adaptable.api.columnApi.getFriendlyNameFromColumnId(columnId))))) : (React.createElement(Tag_1.Tag, null, "No Column Pivoting"))));
+    return (React.createElement(rebass_1.Box, { p: 2, style: { borderRadius: 'var(--ab__border-radius)' }, backgroundColor: "var(--ab-color-defaultbackground)" }, ((_a = layout.PivotColumns) === null || _a === void 0 ? void 0 : _a.length) ? (layout.PivotColumns.map((columnId) => (React.createElement(Tag_1.Tag, { mr: 1, key: columnId }, adaptable.api.columnApi.getFriendlyNameFromColumnId(columnId))))) : (React.createElement(Tag_1.Tag, null, "No Column Pivoting"))));
 };
 exports.PivotColumnsSectionSummary = PivotColumnsSectionSummary;
 const PivotColumnsSection = (props) => {
@@ -24,7 +25,7 @@ const PivotColumnsSection = (props) => {
     const allPivotColumns = adaptable.api.columnApi.getPivotableColumns();
     const sortedPivotColumns = React.useMemo(() => {
         var _a;
-        return sortWithOrder_1.sortWithOrderArray(allPivotColumns.map((col) => col.columnId), (_a = layout.PivotColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: true }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
+        return sortWithOrder_1.sortWithOrderArray(allPivotColumns.map((col) => col.columnId), (_a = layout.PivotColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
     }, [layout, allPivotColumns]);
     const handleColumnsChange = (columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { PivotColumns: columnIds }));

package/src/View/Layout/Wizard/sections/RowGroupingSection.js

@@ -26,7 +26,7 @@ const RowGroupingSection = (props) => {
     const allGroupableColumns = adaptable.api.columnApi.getGroupableColumns();
     const sortedGroupableColumns = React.useMemo(() => {
         var _a;
-        return sortWithOrder_1.sortWithOrderArray(allGroupableColumns.map((col) => col.columnId), (_a = layout.RowGroupedColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: true }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
+        return sortWithOrder_1.sortWithOrderArray(allGroupableColumns.map((col) => col.columnId), (_a = layout.RowGroupedColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
     }, [layout, allGroupableColumns]);
     const handleColumnsChange = (columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { RowGroupedColumns: columnIds }));

package/src/View/Layout/Wizard/sections/SettingsSection.js

@@ -17,8 +17,8 @@ const SettingsSectionSummary = () => {
             "Layout Name: ",
             layout.Name),
         React.createElement(Tag_1.Tag, { mr: 2 },
-            "Pivot Layout: ",
-            layout.EnablePivot ? 'Yes' : 'No'),
+            "Layout Grid Type: ",
+            layout.EnablePivot ? 'Pivot' : 'Table'),
         React.createElement(Tag_1.Tag, { mr: 2 },
             "Suppress Aggregation Function in Header: ",
             layout.SuppressAggFuncInHeader ? 'Yes' : 'No')));

package/src/View/Layout/Wizard/sections/SortSection.js

@@ -38,7 +38,7 @@ const SortSection = (props) => {
     });
     const sortedSortColumns = React.useMemo(() => {
         var _a;
-        return sortWithOrder_1.sortWithOrderArray(allSortableColumns.map((col) => col.columnId), ((_a = layout.ColumnSorts) !== null && _a !== void 0 ? _a : []).map((sort) => sort.ColumnId), { sortUnorderedItems: true }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
+        return sortWithOrder_1.sortWithOrderArray(allSortableColumns.map((col) => col.columnId), ((_a = layout.ColumnSorts) !== null && _a !== void 0 ? _a : []).map((sort) => sort.ColumnId), { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
     }, [layout, allSortableColumns]);
     const handleColumnsSelectionChange = React.useCallback((columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { ColumnSorts: (columnIds || []).map((columnId) => {

package/src/View/Wizard/OnePageAdaptableWizard.d.ts

@@ -22,7 +22,7 @@ export interface OnePageAdaptableWizardSection<ENTITY> {
     isValid?: (data: ENTITY, api: AdaptableApi, context: OnePageAdaptableWizardContextType<ENTITY>) => true | string;
     isVisible?: (data: ENTITY, api: AdaptableApi, context: OnePageAdaptableWizardContextType<ENTITY>) => boolean;
     render: (data: ENTITY, index: number) => React.ReactNode;
-    renderSummary?: (data: ENTITY, api: AdaptableApi) => React.ReactNode;
+    renderSummary?: (data: ENTITY) => React.ReactNode;
 }
 export interface OnePageAdaptableWizardProps<ENTITY> {
     moduleInfo: ModuleInfo;

package/src/agGrid/Adaptable.d.ts

@@ -259,7 +259,7 @@ export declare class Adaptable implements IAdaptable {
     getExcelClassNameForCell(colId: string, primaryKeyValue: any): string;
     setupColumnCellEditor({ colId, col }: ColumnSetupInfo): void;
     setupColumnCellRenderer({ col, colId, abColumn }: ColumnSetupInfo): void;
-    setupColumnTooltipValueGetter({ col, colId }: ColumnSetupInfo): void;
+    setupColumnTooltipValueGetter({ col, colId, abColumn }: ColumnSetupInfo): void;
     setupColumnQuickFilerText({ col, abColumn }: ColumnSetupInfo): void;
     setupColumnHeader({ col, abColumn }: ColumnSetupInfo): boolean;
     setupColumnFilter({ col, colDef }: ColumnSetupInfo): void;