@adaptabletools/adaptable-cjs 19.2.4 → 20.0.0-canary.0

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

@@ -6,13 +6,15 @@ import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
 import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
-import { GridApi as AgGridApi } from '@ag-grid-community/core';
+import { GridApi as AgGridApi } from 'ag-grid-enterprise';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ColumnFilterApi, ColumnFilterOptions, ColumnOptions, CommentOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, GroupingOptions, LayoutApi, LayoutAssociatedObject, LayoutOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ColumnScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions, ColumnMenuOptions, ContextMenuOptions } from '../../types';
+import { ActionColumnApi, ActionColumnOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, FilterApi, ColumnOptions, CommentOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, LayoutApi, LayoutAssociatedObject, LayoutOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ColumnScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions, ColumnMenuOptions, ContextMenuOptions, FilterOptions, ColumnFilterApi, OptionsApi } from '../../types';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 import { AdaptableInternalApi } from '../Internal/AdaptableInternalApi';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
 import { IAdaptableStore } from '../../Redux/Store/Interface/IAdaptableStore';
+import { RowFormOptions } from '../../AdaptableOptions/RowFormOptions';
+import { RowFormApi } from '../RowFormApi';
 export declare abstract class ApiBase {
     protected _adaptable: IAdaptable;
     /**
@@ -52,13 +54,13 @@ export declare abstract class ApiBase {
      * This is a simple *getState()* call
      */
     getAdaptableState(): AdaptableState;
-    protected getAdaptableSore(): IAdaptableStore;
+    protected getAdaptableStore(): IAdaptableStore;
     protected addUidToAdaptableObject(adaptableObject: AdaptableObject): void;
     protected getModuleInfoByModuleId(module: AdaptableModule): ModuleInfo;
     protected showModulePopup(module: AdaptableModule, moduleParams?: ModuleParams): void;
     protected getOptions(): AdaptableOptions;
     protected getActionColumnOptions(): ActionColumnOptions;
-    protected getActionRowOptions(): ActionRowOptions;
+    protected getRowFormOptions(): RowFormOptions;
     protected getColumnOptions(): ColumnOptions;
     protected getCommentOptions(): CommentOptions;
     protected getNoteOptions(): NoteOptions;
@@ -72,11 +74,10 @@ export declare abstract class ApiBase {
     protected getDashboardOptions(): DashboardOptions;
     protected getEditOptions(): EditOptions;
     protected getExportOptions(): ExportOptions;
-    protected getGroupingOptions(): GroupingOptions;
     protected getLayoutOptions(): LayoutOptions;
     protected getColumnMenuOptions(): ColumnMenuOptions;
     protected getContextMenuOptions(): ContextMenuOptions;
-    protected getColumnFilterOptions(): ColumnFilterOptions;
+    protected getFilterOptions(): FilterOptions;
     protected getExpressionOptions(): ExpressionOptions;
     protected getPredicateOptions(): PredicateOptions;
     protected getQuickSearchOptions(): QuickSearchOptions;
@@ -95,7 +96,6 @@ export declare abstract class ApiBase {
     protected getAgGridApi(): AgGridApi;
     protected getAdaptableInternalApi(): AdaptableInternalApi;
     protected getActionColumnApi(): ActionColumnApi;
-    protected getActionRowApi(): ActionRowApi;
     protected getApplicationApi(): ApplicationApi;
     protected getAlertApi(): AlertApi;
     protected getFlashingCellApi(): FlashingCellApi;
@@ -118,6 +118,8 @@ export declare abstract class ApiBase {
     protected getLayoutApi(): LayoutApi;
     protected getGridFilterApi(): GridFilterApi;
     protected getColumnFilterApi(): ColumnFilterApi;
+    protected getFilterApi(): FilterApi;
+    protected getRowFormApi(): RowFormApi;
     protected getPlusMinusApi(): PlusMinusApi;
     protected getQuickSearchApi(): QuickSearchApi;
     protected getScheduleApi(): ScheduleApi;
@@ -138,6 +140,7 @@ export declare abstract class ApiBase {
     protected getChartingApi(): ChartingApi;
     protected getStatusBarApi(): StatusBarApi;
     protected getFdc3Api(): Fdc3Api;
+    protected getOptionsApi(): OptionsApi;
     destroy(): void;
 }
 /**

package/src/Api/Implementation/ApiBase.js

@@ -57,12 +57,12 @@ class ApiBase {
         return true;
     }
     handleLayoutAssociatedObjects(objectList = [], module, config) {
-        if (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) {
+        if (config?.includeLayoutNotAssociatedObjects) {
             return objectList;
         }
-        const associatedLayout = (config === null || config === void 0 ? void 0 : config.associatedWithLayout)
-            ? this._adaptable.api.layoutApi.getLayoutByName(config.associatedWithLayout)
-            : this.getAdaptableApi().layoutApi.getCurrentLayout();
+        const associatedLayout = config?.associatedWithLayout
+            ? this.getLayoutApi().getLayoutByName(config.associatedWithLayout)
+            : this.getLayoutApi().getCurrentLayout();
         return objectList.filter((objectItem) => this._adaptable.api.layoutApi.internalApi.isObjectAvailableInLayout(objectItem, module, associatedLayout));
     }
     /**
@@ -81,9 +81,9 @@ class ApiBase {
      * This is a simple *getState()* call
      */
     getAdaptableState() {
-        return this.getAdaptableSore().TheStore.getState();
+        return this.getAdaptableStore().TheStore.getState();
     }
-    getAdaptableSore() {
+    getAdaptableStore() {
         return this._adaptable.adaptableStore;
     }
     // Add the Uuid to the object if not present;
@@ -108,8 +108,8 @@ class ApiBase {
     getActionColumnOptions() {
         return this.getOptions().actionColumnOptions;
     }
-    getActionRowOptions() {
-        return this.getOptions().actionRowOptions;
+    getRowFormOptions() {
+        return this.getOptions().rowFormOptions;
     }
     getColumnOptions() {
         return this.getOptions().columnOptions;
@@ -150,9 +150,6 @@ class ApiBase {
     getExportOptions() {
         return this.getOptions().exportOptions;
     }
-    getGroupingOptions() {
-        return this.getOptions().groupingOptions;
-    }
     getLayoutOptions() {
         return this.getOptions().layoutOptions;
     }
@@ -162,8 +159,8 @@ class ApiBase {
     getContextMenuOptions() {
         return this.getOptions().contextMenuOptions;
     }
-    getColumnFilterOptions() {
-        return this.getOptions().columnFilterOptions;
+    getFilterOptions() {
+        return this.getOptions().filterOptions;
     }
     getExpressionOptions() {
         return this.getOptions().expressionOptions;
@@ -219,9 +216,6 @@ class ApiBase {
     getActionColumnApi() {
         return this.getAdaptableApi().actionColumnApi;
     }
-    getActionRowApi() {
-        return this.getAdaptableApi().actionRowApi;
-    }
     getApplicationApi() {
         return this.getAdaptableApi().applicationApi;
     }
@@ -283,10 +277,16 @@ class ApiBase {
         return this.getAdaptableApi().layoutApi;
     }
     getGridFilterApi() {
-        return this.getAdaptableApi().gridFilterApi;
+        return this.getAdaptableApi().filterApi.gridFilterApi;
     }
     getColumnFilterApi() {
-        return this.getAdaptableApi().columnFilterApi;
+        return this.getAdaptableApi().filterApi.columnFilterApi;
+    }
+    getFilterApi() {
+        return this.getAdaptableApi().filterApi;
+    }
+    getRowFormApi() {
+        return this.getAdaptableApi().rowFormApi;
     }
     getPlusMinusApi() {
         return this.getAdaptableApi().plusMinusApi;
@@ -348,6 +348,9 @@ class ApiBase {
     getFdc3Api() {
         return this.getAdaptableApi().fdc3Api;
     }
+    getOptionsApi() {
+        return this.getAdaptableApi().optionsApi;
+    }
     destroy() {
         delete this._adaptable;
     }

package/src/Api/Implementation/BulkUpdateApiImpl.js

@@ -6,7 +6,7 @@ const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 class BulkUpdateApiImpl extends ApiBase_1.ApiBase {
     getBulkUpdateValue() {
-        return this.getAdaptableState().System.BulkUpdateValue;
+        return this.getAdaptableState().Internal.BulkUpdate.BulkUpdateValue;
     }
     openBulkUpdateSettingsPanel() {
         this.showModulePopup(ModuleConstants.BulkUpdateModuleId);

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

@@ -8,6 +8,7 @@ export declare class CalculatedColumnApiImpl extends ApiBase implements Calculat
     constructor(_adaptable: IAdaptable);
     getCalculatedColumnState(): CalculatedColumnState;
     getCalculatedColumns(): CalculatedColumn[];
+    getAggregatedCalculatedColumns(): CalculatedColumn[];
     getCalculatedColumnById(id: CalculatedColumn['Uuid']): CalculatedColumn;
     addCalculatedColumn(calculatedColumn: CalculatedColumn): CalculatedColumn;
     getCalculatedColumnForColumnId(columnId: string): CalculatedColumn | undefined;

package/src/Api/Implementation/CalculatedColumnApiImpl.js

@@ -6,6 +6,7 @@ const CalculatedColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsR
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const CalculatedColumnInternalApi_1 = require("../Internal/CalculatedColumnInternalApi");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
@@ -15,11 +16,13 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().CalculatedColumn;
     }
     getCalculatedColumns() {
-        var _a;
-        return (_a = this.getCalculatedColumnState().CalculatedColumns) !== null && _a !== void 0 ? _a : [];
+        return this.getCalculatedColumnState().CalculatedColumns ?? [];
+    }
+    getAggregatedCalculatedColumns() {
+        return this.getCalculatedColumns()?.filter((calculatedColumn) => calculatedColumn.Query?.AggregatedScalarExpression);
     }
     getCalculatedColumnById(id) {
-        return this.getCalculatedColumns().find((column) => (column === null || column === void 0 ? void 0 : column.Uuid) === id);
+        return this.getCalculatedColumns().find((column) => column?.Uuid === id);
     }
     addCalculatedColumn(calculatedColumn) {
         this.addUidToAdaptableObject(calculatedColumn);
@@ -41,37 +44,38 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.CalculatedColumnModuleId);
     }
     refreshAggregatedCalculatedColumns() {
-        const aggregatedCalculatedColumns = this.getCalculatedColumns().filter((calculatedColumn) => { var _a; return (_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression; });
-        aggregatedCalculatedColumns.forEach((calculatedColumn) => {
-            this.getAdaptableApi()
-                .internalApi.getCalculatedColumnExpressionService()
-                .createAggregatedScalarLiveValue(calculatedColumn);
-        });
-        // refresh calculated columns
-        const aggCalculatedColumnIds = aggregatedCalculatedColumns.map((calculatedColumn) => calculatedColumn.ColumnId);
-        if (this.getLayoutApi().internalApi.isLayoutGrouped()) {
-            this.getGridApi().refreshGroupRowNodes();
-        }
-        else {
-            this.getGridApi().refreshCells(null, aggCalculatedColumnIds);
+        const aggregatedCalculatedColumns = this.getAggregatedCalculatedColumns();
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(aggregatedCalculatedColumns)) {
+            aggregatedCalculatedColumns.forEach((calculatedColumn) => {
+                this.getAdaptableInternalApi()
+                    .getCalculatedColumnExpressionService()
+                    .createAggregatedScalarLiveValue(calculatedColumn);
+            });
+            // refresh calculated columns
+            const aggCalculatedColumnIds = aggregatedCalculatedColumns.map((calculatedColumn) => calculatedColumn.ColumnId);
+            if (this.getLayoutApi().internalApi.isLayoutGrouped()) {
+                this.getGridApi().refreshGroupRowNodes();
+            }
+            else {
+                this.getGridApi().refreshColumns(aggCalculatedColumnIds);
+            }
         }
     }
     refreshAggregatedCalculatedColumn(columnId) {
-        var _a;
         const aggregatedCalculatedColumn = this.getCalculatedColumnForColumnId(columnId);
-        if (!((_a = aggregatedCalculatedColumn === null || aggregatedCalculatedColumn === void 0 ? void 0 : aggregatedCalculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression)) {
+        if (!aggregatedCalculatedColumn?.Query?.AggregatedScalarExpression) {
             this.logWarn(`Aggregated calculated column with ID=${columnId} was NOT found (and refreshed)!`);
             return;
         }
-        this.getAdaptableApi()
-            .internalApi.getCalculatedColumnExpressionService()
+        this.getAdaptableInternalApi()
+            .getCalculatedColumnExpressionService()
             .createAggregatedScalarLiveValue(aggregatedCalculatedColumn);
-        this.getGridApi().refreshCells(null, [columnId]);
+        this.getGridApi().refreshColumn(columnId);
         if (this.getLayoutApi().internalApi.isLayoutGrouped()) {
             this.getGridApi().refreshGroupRowNodes();
         }
         else {
-            this.getGridApi().refreshCells(null, [columnId]);
+            this.getGridApi().refreshColumn(columnId);
         }
     }
 }

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

@@ -1,11 +1,11 @@
 import { ApiBase } from './ApiBase';
 import { CellSummaryApi } from '../CellSummaryApi';
-import { CellSummaryOperation } from '../../PredefinedConfig/Common/CellSummary';
+import { CustomCellSummaryOperation } from '../../PredefinedConfig/Common/CellSummary';
 import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 export declare class CellSummaryApiImpl extends ApiBase implements CellSummaryApi {
     openCellSummaryPopupSettingsPanel(): void;
-    getCurrentCellSummaryOperation(): CellSummaryOperation | string;
-    getCellSummaryOperationDefinitions(): CellSummaryOperation[];
+    getCurrentCellSummaryOperation(): CustomCellSummaryOperation | string;
+    getCustomCellSummaryOperations(): CustomCellSummaryOperation[];
     setCurrentCellSummaryOperation(operation: SummaryOperation | string): void;
     getCellSummaryOperationValue(operation: SummaryOperation | string): any;
     getCurrentCellSummaryOperationValue(): any;

package/src/Api/Implementation/CellSummaryApiImpl.js

@@ -4,25 +4,23 @@ exports.CellSummaryApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 class CellSummaryApiImpl extends ApiBase_1.ApiBase {
     openCellSummaryPopupSettingsPanel() {
         this.showModulePopup(ModuleConstants.CellSummaryModuleId);
     }
     getCurrentCellSummaryOperation() {
-        return this.getAdaptableState().System.CellSummaryOperation;
+        return this.getAdaptableState().Internal.CellSummary.CellSummaryOperation;
     }
-    getCellSummaryOperationDefinitions() {
-        var _a;
-        let cellSummaryOperations = (_a = this.getCellSummaryOptions().cellSummaryOperations) !== null && _a !== void 0 ? _a : [];
-        return cellSummaryOperations;
+    getCustomCellSummaryOperations() {
+        return this.getCellSummaryOptions().customCellSummaryOperations ?? [];
     }
     setCurrentCellSummaryOperation(operation) {
-        this.dispatchAction(SystemRedux.SystemCellSummaryChangeOperation(operation));
+        this.dispatchAction(InternalRedux.CellSummaryChangeOperation(operation));
     }
     getCellSummaryOperationValue(operation) {
-        const cellSummary = this.getAdaptableState().Grid.CellSummary;
+        const cellSummary = this.getAdaptableState().Internal.CellSummary.CellSummaryInfo;
         if (!cellSummary) {
             return 'N/A';
         }

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

@@ -1,4 +1,4 @@
-import { ChartModel, ChartRef } from '@ag-grid-community/core';
+import { ChartModel, ChartRef } from 'ag-grid-enterprise';
 import { ChartingApi } from '../ChartingApi';
 import { ApiBase } from './ApiBase';
 import { ChartContainer, ChartDefinition } from '../../types';

package/src/Api/Implementation/ChartingApiImpl.js

@@ -5,9 +5,9 @@ const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const ChartingRedux = tslib_1.__importStar(require("./../../Redux/ActionsReducers/ChartingRedux"));
 const ChartingRedux_1 = require("./../../Redux/ActionsReducers/ChartingRedux");
-const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const ChartingInternalApi_1 = require("../Internal/ChartingInternalApi");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 class ChartingApiImpl extends ApiBase_1.ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
@@ -34,8 +34,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         return this.getChartDefinitions().map((chart) => chart.Model);
     }
     getChartDefinitions() {
-        var _a;
-        return (_a = (0, ChartingRedux_1.ChartingGetChartModels)(this.getAdaptableState())) !== null && _a !== void 0 ? _a : [];
+        return (0, ChartingRedux_1.ChartingGetChartModels)(this.getAdaptableState()) ?? [];
     }
     getChartDefinitionByUuid(uuid) {
         return this.getChartDefinitions().find((c) => c.Uuid == uuid);
@@ -59,8 +58,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         return this._adaptable.showChart(chartDefiniton, containerElement);
     }
     showChartDefinitionOnce(chartDefinition, container) {
-        var _a;
-        const chartRef = this.getAdaptableApi().chartingApi.getChartRef((_a = chartDefinition === null || chartDefinition === void 0 ? void 0 : chartDefinition.Model) === null || _a === void 0 ? void 0 : _a.chartId);
+        const chartRef = this.getChartRef(chartDefinition?.Model?.chartId);
         if (chartRef) {
             return;
         }
@@ -85,56 +83,63 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
     getChartingOpenState() {
         return {
             charts: this.getChartDefinitions().map((chartDefinition) => {
-                var _a, _b;
                 return {
                     chartDefinition,
-                    isOpen: this.getChartRef((_a = chartDefinition === null || chartDefinition === void 0 ? void 0 : chartDefinition.Model) === null || _a === void 0 ? void 0 : _a.chartId) != null,
-                    containerName: (_b = this.getOpenChartContainer(chartDefinition)) === null || _b === void 0 ? void 0 : _b.name,
+                    isOpen: this.getChartRef(chartDefinition?.Model?.chartId) != null,
+                    containerName: this.getOpenChartContainer(chartDefinition)?.name,
                 };
             }),
         };
     }
     getOpenChartContainer(chartDefinition) {
-        var _a;
         const containerOptions = this.getChartingOptions().chartContainers;
         if (!containerOptions || !containerOptions.length) {
             return null;
         }
-        return ((_a = containerOptions.find((container) => {
+        return (containerOptions.find((container) => {
             const chartRef = this.getChartRef(chartDefinition.Model.chartId);
             const containerElement = this.internalApi.getContainerElement(container);
-            if (!(chartRef === null || chartRef === void 0 ? void 0 : chartRef.chartElement) || !containerElement) {
+            if (!chartRef?.chartElement || !containerElement) {
                 return false;
             }
             return containerElement.contains(chartRef.chartElement);
-        })) !== null && _a !== void 0 ? _a : null);
+        }) ?? null);
     }
     setChartReadOnly(chartDefinition) {
-        this.dispatchAction(ChartingRedux.ChartingEditChart(Object.assign(Object.assign({}, chartDefinition), { IsReadOnly: true })));
+        this.dispatchAction(ChartingRedux.ChartingEditChart({ ...chartDefinition, IsReadOnly: true }));
     }
     setChartEditable(chartDefinition) {
-        this.dispatchAction(ChartingRedux.ChartingEditChart(Object.assign(Object.assign({}, chartDefinition), { IsReadOnly: false })));
+        this.dispatchAction(ChartingRedux.ChartingEditChart({ ...chartDefinition, IsReadOnly: false }));
     }
     addExternalChartDefinition(chartDefinition, options) {
-        var _a, _b, _c;
-        const saveChartBehaviour = (_a = options === null || options === void 0 ? void 0 : options.saveChartBehaviour) !== null && _a !== void 0 ? _a : 'manual';
+        const saveChartBehaviour = options?.saveChartBehaviour ?? 'manual';
         if (saveChartBehaviour === 'auto') {
-            this.dispatchAction(ChartingRedux.ChartingAddExternalChart(Object.assign(Object.assign({}, chartDefinition), { Name: (_b = chartDefinition.Name) !== null && _b !== void 0 ? _b : this.internalApi.getUniqueChartName() })));
+            this.dispatchAction(ChartingRedux.ChartingAddExternalChart({
+                ...chartDefinition,
+                Name: chartDefinition.Name ?? this.internalApi.getUniqueChartName(),
+            }));
         }
         else {
             const alert = {
                 alertType: 'generic',
                 header: 'Save chart',
                 message: 'Do you want to save this Chart?',
-                alertDefinition: Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyAlertDefinition()), { MessageType: 'Info', AlertProperties: {
+                alertDefinition: {
+                    ...ObjectFactory_1.default.CreateEmptyAlertDefinition(),
+                    MessageType: 'Info',
+                    AlertProperties: {
                         DisplayNotification: true,
                         NotificationDuration: 'always',
-                    }, AlertForm: {
+                    },
+                    AlertForm: {
                         Buttons: [
                             {
                                 Label: 'Save',
-                                Action: (context) => {
-                                    this.dispatchAction(ChartingRedux.ChartingAddExternalChart(Object.assign(Object.assign({}, chartDefinition), { Name: context.formData.name || this.internalApi.getUniqueChartName() })));
+                                Command: (context) => {
+                                    this.dispatchAction(ChartingRedux.ChartingAddExternalChart({
+                                        ...chartDefinition,
+                                        Name: context.formData.name || this.internalApi.getUniqueChartName(),
+                                    }));
                                 },
                                 ButtonStyle: {
                                     tone: 'info',
@@ -154,12 +159,13 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
                                 name: 'name',
                                 label: 'Name',
                                 fieldType: 'text',
-                                defaultValue: (_c = chartDefinition.Name) !== null && _c !== void 0 ? _c : '',
+                                defaultValue: chartDefinition.Name ?? '',
                             },
                         ],
-                    } }),
+                    },
+                },
             };
-            this.getAdaptableApi().alertApi.showAdaptableAlert(alert);
+            this.getAlertApi().displayAdaptableAlert(alert);
         }
     }
     editExternalChartDefinition(chartDefinition) {

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

@@ -1,17 +1,23 @@
 import { ApiBase } from './ApiBase';
 import { AdaptableColumn, AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { ColumnApi, ColumnConfig } from '../ColumnApi';
+import { Layout } from '../../types';
+import { ColumnApi } from '../ColumnApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ColumnInternalApi } from '../Internal/ColumnInternalApi';
-import { ColDef, ColGroupDef } from '@ag-grid-community/core';
+import { ColDef, ColGroupDef, Column } from 'ag-grid-enterprise';
 export declare function isAutoRowGroupColumn(columnId: string): boolean;
-export declare function isAutoPivotColumn(columnId: string): boolean;
+export declare function generateAutoRowGroupSingleColumn(): AdaptableColumn;
+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 class ColumnApiImpl extends ApiBase implements ColumnApi {
     internalApi: ColumnInternalApi;
     constructor(_adaptable: IAdaptable);
     getColumns(): AdaptableColumn[];
-    getStandardColumns(): AdaptableColumn[];
+    getSpecialColumns(): AdaptableColumn[];
     getNonSpecialColumns(): AdaptableColumn[];
+    getUIAvailableColumns(): AdaptableColumn[];
     getVisibleColumns(): AdaptableColumn[];
     selectColumn(columnId: string): void;
     selectColumns(columnIds: string[]): void;
@@ -24,20 +30,22 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     hideColumn(columnId: string): void;
     showColumn(columnId: string): void;
     isAutoRowGroupColumn(columnId: string): boolean;
-    isAutoPivotColumn(columnId: string): boolean;
-    isActionRowButtonColumn(columnId: string): boolean;
+    isPivotResultColumn(columnId: string): boolean;
+    isAutoRowGroupColumnForSingle(columnId: string): boolean;
+    isAutoRowGroupColumnForMulti(columnId: string): boolean;
     isCalculatedColumn(columnId: string): boolean;
     isFreeTextColumn(columnId: string): boolean;
     isActionColumn(columnId: string): boolean;
+    isFdc3Column(columnId: string): boolean;
     getColumnWithColumnId(columnId: string, logWarning?: boolean): AdaptableColumn | undefined;
     hasNumberDataType(columnId: string): boolean;
     hasBooleanDataType(columnId: string): boolean;
     hasArrayDataType(columnId: string): boolean;
-    hasStringArrayDataType(columnId: string): boolean;
+    hasTextArrayDataType(columnId: string): boolean;
     hasNumericArrayDataType(columnId: string): boolean;
     hasDateDataType(columnId: string): boolean;
     getColumnDataTypeForColumnId(columnId: string): AdaptableColumnDataType | undefined;
-    getFriendlyNameForColumnId(columnId: string): string;
+    getFriendlyNameForColumnId(columnId: string, layout?: Layout): string;
     doesColumnExist(columnId: string): boolean;
     getFriendlyNamesForColumnIds(columnIds: string[]): string[];
     getColumnIdForFriendlyName(friendlyName: string): string;
@@ -46,14 +54,14 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getColumnsWithColumnIds(columnIds: string[], logWarning?: boolean): AdaptableColumn[];
     isColumnInGrid(columnId: string): boolean;
     getColumnWithFriendlyName(columnFriendlyName: string, logWarning?: boolean): AdaptableColumn;
-    getColumnsOfType(dataType: AdaptableColumnDataType): AdaptableColumn[];
+    getColumnsWithDataType(dataType: AdaptableColumnDataType): AdaptableColumn[];
     getNumericColumns(): AdaptableColumn[];
     getNumericArrayColumns(): AdaptableColumn[];
     getNumberArrayColumns(): AdaptableColumn[];
     getTupleNumberArrayColumns(): AdaptableColumn[];
     getObjectNumberArrayColumns(): AdaptableColumn[];
-    getStringColumns(): AdaptableColumn[];
-    getStringArrayColumns(): AdaptableColumn[];
+    getTextColumns(): AdaptableColumn[];
+    getTextArrayColumns(): AdaptableColumn[];
     getDateColumns(): AdaptableColumn[];
     getBooleanColumns(): AdaptableColumn[];
     getArrayColumns(): AdaptableColumn[];
@@ -64,17 +72,15 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getAggregatableColumns(): AdaptableColumn[];
     getQueryableColumns(): AdaptableColumn[];
     getExportableColumns(): AdaptableColumn[];
+    getAlwaysHiddenColumns(): AdaptableColumn[];
     private logMissingColumnWarning;
     getPrimaryKeyColumn(): AdaptableColumn<any>;
     getDefaultAggFunc(columnId: string): string;
-    isSpecialColumn(columnId: string): boolean;
     openColumnInfoSettingsPanel(): void;
     getColumnTypes(): string[];
     getColumnsByColumnType(columnType: string): AdaptableColumn[];
     getRowGroupedColumns(): AdaptableColumn[];
-    getDistinctDisplayValuesForColumn(columnId: string): any[];
     setColumnCaption(columnId: string, caption: string): void;
-    updateColumnConfiguration(columnConfig: ColumnConfig): void;
-    updateColumnConfigurations(columnConfigs: ColumnConfig[]): void;
-    setColumnDefinitions(columnDefinitions: (ColDef | ColGroupDef)[]): void;
+    getAGGridColDefForColumnId(columnId: string): ColDef | ColGroupDef;
+    getAGGridColumnForColumnId(columnId: string): Column;
 }