@adaptabletools/adaptable 15.4.3 → 16.0.0-canary.0

package/src/View/CustomSort/Wizard/CustomSortColumnWizardSection.js

@@ -27,7 +27,7 @@ const CustomSortColumnWizardSection = (props) => {
     const sortableCols = React.useMemo(() => {
         const sortableColumns = api.columnApi.getSortableColumns();
         const customSorts = api.customSortApi.getCustomSorts();
-        const columnSortComparers = api.optionsApi.getGeneralOptions().customSortComparers || [];
+        const columnSortComparers = api.optionsApi.getCustomSortOptions().customSortComparers || [];
         const usedColumnIds = [
             ...customSorts.map((customSort) => customSort.ColumnId),
             ...columnSortComparers.map((comparer) => api.scopeApi.getColumnIdsInScope(comparer.scope)),

package/src/View/Dashboard/CustomDashboardButton.js

@@ -13,6 +13,8 @@ const CustomDashboardButton = (props) => {
     // with the next opportunity we should abstract it
     const dashboardContext = {
         adaptableApi: props.api,
+        userName: props.api.optionsApi.getUserName(),
+        adaptableId: props.api.optionsApi.getAdaptableId(),
         dashboardState: props.api.dashboardApi.getDashboardState(),
     };
     const buttonIcon = props.api.internalApi.getIconForButton(button, dashboardContext);

package/src/View/Dashboard/CustomToolbarWrapper.js

@@ -23,6 +23,8 @@ const CustomToolbarWrapper = (props) => {
                 visible: true,
                 element,
                 adaptableApi,
+                userName: adaptableApi.optionsApi.getUserName(),
+                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
             });
             setContentsHTML(html);
         }
@@ -33,7 +35,13 @@ const CustomToolbarWrapper = (props) => {
         // cleanup runs in a separate effect, this way it's executed only once on unmount
         return () => {
             if (props.customToolbar.render) {
-                props.customToolbar.render({ visible: false, element, adaptableApi });
+                props.customToolbar.render({
+                    visible: false,
+                    element,
+                    adaptableApi,
+                    userName: adaptableApi.optionsApi.getUserName(),
+                    adaptableId: adaptableApi.optionsApi.getAdaptableId(),
+                });
             }
         };
     }, []);
@@ -60,6 +68,8 @@ const CustomToolbarWrapper = (props) => {
             const customToolbarConfiguredInfo = {
                 adaptableApi: api,
                 customToolbar: props.customToolbar,
+                userName: api.optionsApi.getUserName(),
+                adaptableId: api.optionsApi.getAdaptableId(),
             };
             api.eventApi.emit('CustomToolbarConfigured', customToolbarConfiguredInfo);
         }, accessLevel: api.internalApi
@@ -73,6 +83,8 @@ const CustomToolbarWrapper = (props) => {
                 const dashboardContext = {
                     customToolbar: props.customToolbar,
                     adaptableApi: api,
+                    userName: api.optionsApi.getUserName(),
+                    adaptableId: api.optionsApi.getAdaptableId(),
                     dashboardState: api.dashboardApi.getDashboardState(),
                 };
                 const buttonIcon = api.internalApi.getIconForButton(button, dashboardContext);

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -64,7 +64,7 @@ const DataChangeHistoryGrid = (props) => {
         // 2. this UI will be reimplemented with Infinite Table anyway
         const addedRows = mapChangeHistoryRowData(addedChangeHistoryLogs, mainAdaptableInstance);
         const removedRows = mapChangeHistoryRowData(removedChangeHistoryLogs, mainAdaptableInstance);
-        adaptableApi.optionsApi.getAgGridOptions().api.applyTransactionAsync({
+        adaptableApi.gridApi.getAgGridInstance().api.applyTransactionAsync({
             add: addedRows,
             remove: removedRows,
         });
@@ -81,10 +81,10 @@ const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableCont
         const changeKey = rowData === null || rowData === void 0 ? void 0 : rowData['changeKey'];
         changeKey && onUndoChange(changeKey);
     };
-    const actionColumnButton = (0, buildActionColumnButton_1.buildActionColumnButton)((_a = mainAdaptableInstance.adaptableOptions) === null || _a === void 0 ? void 0 : _a.dataChangeHistoryOptions, undoRowNode);
-    let actionOptions = undefined;
+    const actionColumnButton = (0, buildActionColumnButton_1.buildActionColumnButton)((_a = mainAdaptableInstance.adaptableOptions) === null || _a === void 0 ? void 0 : _a.dataChangeHistoryOptions, mainAdaptableInstance.api, undoRowNode);
+    let actionColumnOptions = undefined;
     if (actionColumnButton) {
-        actionOptions = {
+        actionColumnOptions = {
             actionColumns: [
                 {
                     columnId: 'undoActionColumn',
@@ -116,7 +116,7 @@ const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableCont
             createDefaultLayout: false,
             autoSizeColumnsInLayout: true,
         },
-        actionOptions: actionOptions,
+        actionColumnOptions: actionColumnOptions,
         predefinedConfig: {
             Layout: {
                 Revision: Date.now(),

package/src/View/DataChangeHistory/buildActionColumnButton.d.ts

@@ -1,3 +1,3 @@
 import { IRowNode } from '@ag-grid-community/core';
-import { ActionColumnContext, AdaptableButton, DataChangeHistoryOptions } from '../../types';
-export declare const buildActionColumnButton: (options: DataChangeHistoryOptions, undoRowNode: (rowNode: IRowNode) => void) => AdaptableButton<ActionColumnContext<any>>[];
+import { ActionColumnContext, AdaptableApi, AdaptableButton, DataChangeHistoryOptions } from '../../types';
+export declare const buildActionColumnButton: (options: DataChangeHistoryOptions, parentAdapTableApi: AdaptableApi, undoRowNode: (rowNode: IRowNode) => void) => AdaptableButton<ActionColumnContext<any>>[];

package/src/View/DataChangeHistory/buildActionColumnButton.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildActionColumnButton = void 0;
-const buildActionColumnButton = (options, undoRowNode) => {
+const buildActionColumnButton = (options, parentAdapTableApi, undoRowNode) => {
     let changeHistoryButtons = options.changeHistoryButton;
     if (!changeHistoryButtons ||
         (Array.isArray(changeHistoryButtons) && changeHistoryButtons.length === 0)) {
@@ -27,7 +27,8 @@ const buildActionColumnButton = (options, undoRowNode) => {
     };
     const buildContext = (context) => {
         const dataChangedInfo = context.rowNode.data.changeInfo;
-        return Object.assign(Object.assign({}, context), { isGroupNode: isGroupNode(context), undoDataChange: () => onUndo(context), dataChangedInfo });
+        return Object.assign(Object.assign({}, context), { isGroupNode: isGroupNode(context), undoDataChange: () => onUndo(context), dataChangedInfo,
+            parentAdapTableApi });
     };
     return changeHistoryButtons.map((actionColumnOption) => ({
         label: (button, context) => {

package/src/View/Export/ExportViewPanel.js

@@ -85,7 +85,7 @@ class ExportViewPanelComponent extends React.Component {
                 React.createElement(DropdownButton_1.default, { disabled: currentReportId === constants_1.SELECT_REPORT_STRING, width: "100%", fontSize: "small", items: destinationItems, columns: ['label'], className: `ab-${elementType}__Export__export`, onClear: () => this.onSelectedDestinationChanged(null), showClearButton: !!currentDestination, variant: "outlined", marginRight: 2 }, currentDestinationId)),
             React.createElement(rebass_1.Flex, { className: (0, join_1.default)(accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__Export__controls`), style: { width: '100%' } },
                 React.createElement(ButtonExport_1.ButtonExport, { onClick: () => onApplyExport(), tooltip: "Export Report", className: `ab-${elementType}__Export__export`, disabled: currentReport == null || currentDestination == null }),
-                React.createElement(ButtonEdit_1.ButtonEdit, { onClick: () => this.props.onEditReport(this.props.moduleInfo.Popup), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null || this.props.api.exportApi.isServerReport(currentReport), accessLevel: accessLevel }),
+                React.createElement(ButtonEdit_1.ButtonEdit, { onClick: () => this.props.onEditReport(this.props.moduleInfo.Popup), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null || this.props.api.exportApi.isExternalReport(currentReport), accessLevel: accessLevel }),
                 React.createElement(ButtonNew_1.ButtonNew, { variant: "text", className: `ab-${elementType}__Export__new`, tone: "neutral", children: null, onClick: () => this.props.onNewReport(this.props.moduleInfo.Popup), tooltip: "Create New Report", accessLevel: accessLevel }),
                 React.createElement(ButtonDelete_1.ButtonDelete, { tooltip: "Delete Report", className: `ab-${elementType}__Export__delete`, disabled: currentReport == null, ConfirmAction: ExportRedux.ReportDelete(currentReport), ConfirmationMsg: deleteMessage, ConfirmationTitle: 'Delete Report', accessLevel: accessLevel }),
                 this.props.api.internalApi
@@ -103,9 +103,9 @@ class ExportViewPanelComponent extends React.Component {
             ...this.props.api.exportApi.getAvailableSystemReports(),
             ...this.props.UserReports.map((r) => r.Name),
         ];
-        const serverReports = this.props.api.exportApi.getServerReports();
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(serverReports)) {
-            reportNames.push(...serverReports.map((r) => r.name));
+        const externalReports = this.props.api.exportApi.getExternalReports();
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(externalReports)) {
+            reportNames.push(...externalReports.map((r) => r.name));
         }
         return reportNames;
     }

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

@@ -278,7 +278,9 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                                     ? (0, clamp_1.default)(Number(e.currentTarget.value), 0, 20)
                                     : undefined) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Integer Digits" },
-                            React.createElement(Input_1.default, { "data-name": "integer-digits", type: "number", min: "0", value: data.DisplayFormat.Options.IntegerDigits, onChange: (e) => setFormatOption('IntegerDigits', Number(e.currentTarget.value)) })),
+                            React.createElement(Input_1.default, { "data-name": "integer-digits", type: "number", min: "0", value: data.DisplayFormat.Options.IntegerDigits, onChange: (e) => setFormatOption('IntegerDigits', StringExtensions_1.default.IsNumeric(e.currentTarget.value)
+                                    ? (0, clamp_1.default)(Number(e.currentTarget.value), 0, 20)
+                                    : undefined) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Multiplier" },
                             React.createElement(Input_1.default, { "data-name": "multiplier", type: "number", value: data.DisplayFormat.Options.Multiplier, onChange: (e) => setFormatOption('Multiplier', Number(e.currentTarget.value)) })),
                         ' ',

package/src/View/GridInfo/GridInfoPopup.d.ts

@@ -11,7 +11,6 @@ export interface AdaptableGridInfoState {
     IsContainerOptionsMinimised: boolean;
     IsSearchOptionsMinimised: boolean;
     IsLayoutOptionsMinimised: boolean;
-    IsGeneralOptionsMinimised: boolean;
 }
 export declare const GridInfoPopup: (props: GridInfoPopupProps) => JSX.Element;
 export {};

package/src/View/GridInfo/GridInfoPopup.js

@@ -39,7 +39,6 @@ const GridInfoPopup = (props) => {
         IsContainerOptionsMinimised: true,
         IsSearchOptionsMinimised: true,
         IsLayoutOptionsMinimised: true,
-        IsGeneralOptionsMinimised: true,
     });
     const updateState = (partialState) => {
         setState((state) => {
@@ -52,7 +51,7 @@ const GridInfoPopup = (props) => {
         const calcColumns = props.api.calculatedColumnApi
             .getCalculatedColumns()
             .map((c) => c.ColumnId);
-        const actionColumns = props.api.actionApi
+        const actionColumns = props.api.actionColumnApi
             .getActionColumns()
             .map((ac) => ac.columnId);
         const freeTextColumns = props.api.freeTextColumnApi

package/src/View/GridInfo/GridOptionsComponent.js

@@ -9,7 +9,7 @@ const CheckBox_1 = require("../../components/CheckBox");
 class GridOptionsComponent extends React.Component {
     constructor(props) {
         super(props);
-        const gridOptions = props.api.internalApi.getAgGridInstance();
+        const gridOptions = props.api.gridApi.getAgGridInstance();
         this.state = {
             showTotalFooter: gridOptions.groupIncludeTotalFooter,
             showGroupFooter: gridOptions.groupIncludeFooter,

package/src/View/Layout/LayoutViewPanel.js

@@ -24,7 +24,7 @@ class LayoutViewPanelComponent extends React.Component {
         const cloneAccessLevel = this.props.accessLevel;
         const newAccessLevel = this.props.accessLevel;
         const accessLevel = AdaptableHelper_1.default.getAppropriateAccessLevel(layoutEntity, this.props.accessLevel);
-        const isManualSaveLayout = !this.props.api.layoutApi.shouldAutoSaveLayout(this.props.CurrentDraftLayout);
+        const isManualSaveLayout = !this.props.api.layoutApi.shouldAutoSaveLayouts();
         const availableLayoutOptions = this.props.Layouts.map((layout, index) => {
             return Object.assign(Object.assign({}, layout), { label: layout.Name, value: layout.Name, onClick: () => this.props.onSelectLayout(layout.Name) });
         });

package/src/View/Layout/PivotDetailsPopoup.js

@@ -28,6 +28,8 @@ const PivotDetailsPopoup = (props) => {
                 layout: layout,
                 columnId: columnId,
                 adaptableApi: adaptableApi,
+                userName: adaptableApi.optionsApi.getUserName(),
+                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
             };
             pivotPreviewExtraColumns = pivotPreviewOptionColumn(pivotPreviewColumnsContext);
         }

package/src/View/Layout/SaveLayoutButton.js

@@ -16,7 +16,7 @@ const SaveLayoutButton = () => {
         .getEntitlementAccessLevelForModule(ModuleConstants.LayoutModuleId);
     const dispatch = (0, react_redux_1.useDispatch)();
     const currentDraftLayout = (0, react_redux_1.useSelector)((state) => state.Grid.CurrentLayout);
-    const isManualSaveLayout = !adaptable.api.layoutApi.shouldAutoSaveLayout(currentDraftLayout);
+    const isManualSaveLayout = !adaptable.api.layoutApi.shouldAutoSaveLayouts();
     const handleSave = React.useCallback((layout) => {
         dispatch(LayoutRedux.LayoutSave(layout));
         dispatch(GridRedux.LayoutUpdateCurrentDraft(null));

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

@@ -37,7 +37,7 @@ const LayoutWizard = (props) => {
         }
         if (preparedLayout.SuppressAggFuncInHeader === undefined) {
             preparedLayout.SuppressAggFuncInHeader =
-                !!adaptable.api.internalApi.getAgGridInstance().suppressAggFuncInHeader;
+                !!adaptable.api.gridApi.getAgGridInstance().suppressAggFuncInHeader;
         }
         return preparedLayout;
     });

package/src/View/Query/Wizard/NamedQueryExpressionWizardSection.js

@@ -13,7 +13,7 @@ const isValidNamedQueryExpression = (data, api) => {
     if (!data.BooleanExpression) {
         return 'Expression is empty';
     }
-    const valid = api.queryLanguageApi.isValidBooleanExpression(data.BooleanExpression, ModuleConstants_1.QueryModuleId);
+    const valid = api.expressionApi.isValidBooleanExpression(data.BooleanExpression, ModuleConstants_1.QueryModuleId);
     if (!valid) {
         return 'Query is not a valid Boolean Query';
     }

package/src/View/Shortcut/Wizard/ShortcutSettingsWizard.js

@@ -62,7 +62,7 @@ const ShortcutSettingsWizard = (props) => {
         React.createElement(Tabs_1.Tabs, { autoFocus: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Shortcut Settings"),
             React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(FormLayout_1.default, { width: 800 },
+                React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, null,
                         ' ',
                         React.createElement(HelpBlock_1.default, { fontSize: 2, mb: 0 }, "Keyboard key that, when pressed, triggers the shortcut")),

package/src/View/StyledColumn/Wizard/StyledColumnBadgeSection.js

@@ -10,11 +10,11 @@ const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/Dr
 const ErrorBox_1 = tslib_1.__importDefault(require("../../../components/ErrorBox"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
-const IconSelector_1 = require("../../../components/IconSelector");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
 const Tabs_1 = require("../../../components/Tabs");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const AdaptablePopover_1 = require("../../AdaptablePopover");
+const AdaptableIconSelector_1 = require("../../Components/AdaptableIconSelector");
 const PredicateEditor_1 = require("../../Components/PredicateEditor/PredicateEditor");
 const StyleComponent_1 = require("../../Components/StyleComponent");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
@@ -51,7 +51,7 @@ const BadgeEditor = (props) => {
                     React.createElement(HelpBlock_1.default, { fontSize: 2, mb: 1, mt: 2 }, "Select (optional) Icon (and Icon position) to display in the Badge"),
                     ' ',
                     // for now, only show for system icons the
-                    !badge.Icon || 'name' in badge.Icon ? (React.createElement(IconSelector_1.IconSelector, { value: (badge === null || badge === void 0 ? void 0 : badge.Icon) && 'name' in (badge === null || badge === void 0 ? void 0 : badge.Icon) ? badge.Icon.name : undefined, onChange: (iconName) => {
+                    !badge.Icon || 'name' in badge.Icon ? (React.createElement(AdaptableIconSelector_1.AdaptableIconSelector, { value: (badge === null || badge === void 0 ? void 0 : badge.Icon) && 'name' in (badge === null || badge === void 0 ? void 0 : badge.Icon) ? badge.Icon.name : undefined, onChange: (iconName) => {
                             if (iconName) {
                                 onChange(Object.assign(Object.assign({}, badge), { Icon: {
                                         name: iconName,

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnBadgePreview.js

@@ -21,8 +21,15 @@ const StyledColumnBadgePreview = ({ data }) => {
         const predicateStr = badge.Predicate
             ? adaptable.api.predicateApi.predicateToString(badge.Predicate)
             : 'No Predicate';
+        let icon = badge.Icon;
+        const customIcon = badge.Icon &&
+            'name' in badge.Icon &&
+            adaptable.api.userInterfaceApi.getCustomIconDefinition(badge.Icon.name);
+        if (customIcon) {
+            icon = customIcon;
+        }
         return (React.createElement(rebass_1.Box, { mb: 1, key: index },
-            React.createElement(Badge_1.Badge, { icon: badge.Icon, adaptableStyle: badge.Style, iconPosition: badge.IconPosition }, value),
+            React.createElement(Badge_1.Badge, { icon: icon, adaptableStyle: badge.Style, iconPosition: badge.IconPosition }, value),
             React.createElement(Tag_1.Tag, { ml: 2 }, predicateStr)));
     })));
 };

package/src/agGrid/ActionColumnRenderer.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { ICellRendererComp, ICellRendererParams } from '@ag-grid-community/core';
-import { ActionColumn } from '../AdaptableOptions/ActionOptions';
+import { ActionColumn } from '../types';
 interface ActionColumnCellRendererParams extends ICellRendererParams {
     actionColumn?: ActionColumn;
 }

package/src/agGrid/ActionColumnRenderer.js

@@ -10,7 +10,7 @@ function getActionButtonsAndActionColumn(adaptable, actionColumn, colId) {
     var _a;
     const actionCol = actionColumn
         ? actionColumn
-        : (_a = adaptable.api.actionApi.getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((ac) => ac.columnId == colId);
+        : (_a = adaptable.api.actionColumnApi.getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((ac) => ac.columnId == colId);
     if (actionCol && actionCol.actionColumnButton) {
         let actionButtons = Array.isArray(actionCol.actionColumnButton)
             ? actionCol.actionColumnButton
@@ -71,6 +71,8 @@ const ReactActionColumnRenderer = (props) => {
         primaryKeyValue: pkValue,
         rowNode: props.node,
         adaptableApi: adaptable.api,
+        userName: adaptable.adaptableOptions.userName,
+        adaptableId: adaptable.adaptableOptions.adaptableId,
         data: props.data,
     };
     return (React.createElement("div", { className: "ab-ActionColumn" }, renderActionButtons(actionButtons, adaptable.api, buttonContext, rerender)));
@@ -98,6 +100,8 @@ class ActionColumnRenderer {
             primaryKeyValue: pkValue,
             rowNode: params.node,
             adaptableApi: adaptable.api,
+            userName: adaptable.adaptableOptions.userName,
+            adaptableId: adaptable.adaptableOptions.adaptableId,
             data: params.data,
         };
         const eGui = this.eGui;

package/src/agGrid/Adaptable.d.ts

@@ -33,7 +33,7 @@ import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLan
 import { IAlertService } from '../Utilities/Services/Interface/IAlertService';
 import { ColumnSetupInfo } from './ColumnSetupInfo';
 import { CustomSort } from '../PredefinedConfig/CustomSortState';
-import { ColumnValuesComparer } from '../AdaptableOptions/GeneralOptions';
+import { ColumnValuesComparer } from '../AdaptableOptions/CustomSortOptions';
 import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelService';
 import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 import { RenderReactRootFn } from '../renderReactRoot';
@@ -43,6 +43,7 @@ declare type RuntimeConfig = {
     supressReact18RenderWarning?: boolean;
     renderReactRoot?: RenderReactRootFn;
     variant?: AdaptableVariant;
+    agGridModules?: Module[];
 };
 export declare class Adaptable implements IAdaptable {
     api: AdaptableApi;
@@ -194,6 +195,15 @@ export declare class Adaptable implements IAdaptable {
     setColumnOrder(VisibleColumnList: string[]): void;
     private persistLayout;
     setLayout(layout?: Layout): void;
+    /**
+     * Setting layout works by modifing the column state.
+     * The column state is based on the current existing columns.
+     * At this point the column groups do not exist, and the widths from layout are not applied.
+     *
+     * After the col sate is applied and the column groups are created we need
+     * to apply the state again to update the widths of the group columns.
+     */
+    private applyGroupColumnWidth;
     updateRowGroupsExpandedState(layout?: Layout): void;
     private updateLayoutFromGrid;
     setSelectedCells(): SelectedCellInfo | undefined;
@@ -266,10 +276,10 @@ export declare class Adaptable implements IAdaptable {
      */
     private mapColumnDefs;
     private getColDefsForSpecialColumns;
-    getColDefsForFreeTextColumns(): ColDef<any>[];
+    getColDefsForFreeTextColumns(): ColDef<any, any>[];
     setupColumnValueGetter({ col }: ColumnSetupInfo): void;
     private getColDefsForRowEditColumns;
-    getColDefsForActionColumns(): ColDef<any>[];
+    getColDefsForActionColumns(): ColDef<any, any>[];
     updateColDefsForSpecialColumns(): void;
     private getColDefsForCalculatedColumns;
     private isRegularColDef;
@@ -307,6 +317,7 @@ export declare class Adaptable implements IAdaptable {
     setupAllowedAggFuncs({ col, abColumn }: ColumnSetupInfo): void;
     triggerSetupColumnKeyCreator(colId: string): void;
     setupColumnKeyCreator(columnSetupInfo: ColumnSetupInfo): void;
+    setupColumnCellDataType(columnSetupInfo: ColumnSetupInfo): void;
     setupColumnHeader({ col, abColumn }: ColumnSetupInfo): boolean;
     setupColumnFilter({ col, colDef }: ColumnSetupInfo): void;
     setupColumnFloatingFilter({ col, colDef }: ColumnSetupInfo): void;