@adaptabletools/adaptable 15.4.3 → 16.0.0-canary.0

package/src/agGrid/Adaptable.js

@@ -287,11 +287,9 @@ class Adaptable {
         if (!((_a = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.agGridModules) === null || _a === void 0 ? void 0 : _a.length)) {
             AdaptableLogger_1.AdaptableLogger.consoleErrorBase(`No AG Grid modules were provided, thus limiting AdapTables features significantly!\n\nRead further info here:${DocumentationLinkConstants_1.AgGridModulesDocsLink}`);
         }
-        else {
-            core_1.ModuleRegistry.registerModules(runtimeConfig.agGridModules);
-        }
         return Adaptable.initInternal(adaptableOptions, {
             supressReact18RenderWarning: true,
+            agGridModules: runtimeConfig.agGridModules,
         });
     }
     /**
@@ -610,7 +608,28 @@ class Adaptable {
         }
     }
     initializeAgGrid() {
+        var _a;
         const perfInitializeAgGrid = this.logger.beginPerf('initializeAgGrid()');
+        this.setGridOptionsProperty('dataTypeDefinitions', () => {
+            // temporary workaround until https://github.com/AdaptableTools/adaptable/issues/2230
+            const revertedDateTypeDefinitions = {
+                date: {
+                    baseDataType: 'date',
+                    extendsDataType: 'date',
+                    valueParser: null,
+                    valueFormatter: null,
+                    suppressDefaultProperties: true,
+                },
+                dateString: {
+                    baseDataType: 'dateString',
+                    extendsDataType: 'dateString',
+                    valueParser: null,
+                    valueFormatter: null,
+                    suppressDefaultProperties: true,
+                },
+            };
+            return revertedDateTypeDefinitions;
+        });
         // set up whether we use the getRowNode method or loop when finding a rowNode (former is preferable)
         // can only do that here as the gridOptions not yet set up
         this.useRowNodeLookUp = this.agGridHelper.TrySetUpNodeIds(this.hasAutogeneratedPrimaryKey());
@@ -672,8 +691,11 @@ class Adaptable {
         let grid;
         const agGridContainer = this.getAgGridContainerElement();
         const perfAgGridInstance = this.logger.beginPerf('new AgGrid()');
-        // the AG Grid modules are already registered, see the init() method
-        grid = new core_1.Grid(agGridContainer, this.gridOptions);
+        let gridParams;
+        if ((_a = this.runtimeConfig.agGridModules) === null || _a === void 0 ? void 0 : _a.length) {
+            gridParams = { modules: this.runtimeConfig.agGridModules };
+        }
+        grid = new core_1.Grid(agGridContainer, this.gridOptions, gridParams);
         perfAgGridInstance.end();
         // add our adaptable object to the grid options api object
         // this is VERY useful for when we need to access Adaptable inside of agGrid only functions
@@ -1316,7 +1338,7 @@ class Adaptable {
         this.updateColumnsIntoStore();
     }
     persistLayout(layout) {
-        if (this.api.layoutApi.shouldAutoSaveLayout(layout)) {
+        if (this.api.layoutApi.shouldAutoSaveLayouts()) {
             this.api.layoutApi.createOrUpdateLayout(layout);
         }
         else {
@@ -1508,6 +1530,7 @@ class Adaptable {
                 state: newColumnsState,
                 applyOrder: true,
             });
+            this.applyGroupColumnWidth(layout);
             perfApplyColumnState.end();
             this.api.gridApi.setColumnSorts(layout.ColumnSorts);
             this.gridOptions.columnApi.setPivotColumns(layout.PivotColumns || []);
@@ -1551,6 +1574,37 @@ class Adaptable {
         });
         perfSetLayout.end();
     }
+    /**
+     * 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.
+     */
+    applyGroupColumnWidth(layout) {
+        if (!layout.RowGroupedColumns || !layout.RowGroupedColumns.length) {
+            return;
+        }
+        const groupColumnWithDifferentWidths = this.gridOptions
+            .columnApi.getColumnState()
+            .reduce((acc, col) => {
+            var _a;
+            if (col.colId === (GeneralConstants === null || GeneralConstants === void 0 ? void 0 : GeneralConstants.AG_GRID_GROUPED_COLUMN)) {
+                const widthInLayout = (_a = layout.ColumnWidthMap) === null || _a === void 0 ? void 0 : _a[col.colId];
+                if (widthInLayout && widthInLayout !== col.width) {
+                    acc.push(Object.assign(Object.assign({}, col), { width: widthInLayout }));
+                }
+            }
+            return acc;
+        }, []);
+        if (groupColumnWithDifferentWidths.length === 0) {
+            return;
+        }
+        this.gridOptions.columnApi.applyColumnState({
+            state: groupColumnWithDifferentWidths,
+        });
+    }
     updateRowGroupsExpandedState(layout) {
         if (!layout) {
             layout = this.api.layoutApi.getCurrentLayout();
@@ -1625,7 +1679,7 @@ class Adaptable {
         });
         groupedColumns = groupedColumns.filter((x) => !!x);
         pivotedColumns = pivotedColumns.filter((x) => !!x);
-        if ((_b = (_a = this.adaptableOptions) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.restoreUngroupedColumns) {
+        if ((_b = (_a = this.adaptableOptions) === null || _a === void 0 ? void 0 : _a.groupingOptions) === null || _b === void 0 ? void 0 : _b.restoreUngroupedColumns) {
             columnOrder = this.restoreUnGroupColumnOrder({
                 columnOrder,
                 newGroupColumns: groupedColumns,
@@ -1833,7 +1887,13 @@ class Adaptable {
                 });
             }
         }
-        const uniqueVals = (0, uniqBy_1.default)(returnValues, 'rawValue');
+        const uniqueVals = (0, uniqBy_1.default)(returnValues, (dataItem) => {
+            const value = dataItem.rawValue;
+            if (value instanceof Date) {
+                return value.toISOString();
+            }
+            return value;
+        });
         return uniqueVals.slice(0, this.adaptableOptions.filterOptions.maxFilterValuesToDisplay);
     }
     async getDistinctFilterValuesForColumn(column, visibleRowsOnly, filter, skipRowNode) {
@@ -1846,6 +1906,8 @@ class Adaptable {
         try {
             const filterPermittedValuesParams = {
                 adaptableApi: this.api,
+                userName: this.adaptableOptions.userName,
+                adaptableId: this.adaptableOptions.adaptableId,
                 column: column,
                 searchFilter: filter,
             };
@@ -1865,6 +1927,8 @@ class Adaptable {
         try {
             const permittedValuesParams = {
                 adaptableApi: this.api,
+                userName: this.adaptableOptions.userName,
+                adaptableId: this.adaptableOptions.adaptableId,
                 column: column,
             };
             preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(permittedValuesParams));
@@ -1882,6 +1946,8 @@ class Adaptable {
                 adaptableApi: this.api,
                 column: column,
                 gridCells: selectedGridCells,
+                userName: this.adaptableOptions.userName,
+                adaptableId: this.adaptableOptions.adaptableId,
             };
             preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(bulkUpdatePermittedValuesParams));
         }
@@ -2321,7 +2387,7 @@ class Adaptable {
         });
     }
     getColDefsForRowEditColumns() {
-        const actionRowButtons = this.api.actionApi.getActionRowButtons();
+        const actionRowButtons = this.api.actionRowApi.getActionRowButtons();
         if (!(actionRowButtons === null || actionRowButtons === void 0 ? void 0 : actionRowButtons.length)) {
             return [];
         }
@@ -2332,7 +2398,7 @@ class Adaptable {
                 },
                 tooltip: 'Create',
                 onClick: () => {
-                    this.api.actionApi.displayCreateActionRow();
+                    this.api.actionRowApi.displayCreateActionRow();
                 },
             },
             edit: {
@@ -2341,7 +2407,7 @@ class Adaptable {
                 },
                 tooltip: 'Edit',
                 onClick: (button, context) => {
-                    this.api.actionApi.displayEditActionRow(context.primaryKeyValue);
+                    this.api.actionRowApi.displayEditActionRow(context.primaryKeyValue);
                 },
             },
             clone: {
@@ -2350,7 +2416,7 @@ class Adaptable {
                 },
                 tooltip: 'Clone',
                 onClick: (button, context) => {
-                    this.api.actionApi.displayCloneActionRow(context.primaryKeyValue);
+                    this.api.actionRowApi.displayCloneActionRow(context.primaryKeyValue);
                 },
             },
             delete: {
@@ -2364,9 +2430,11 @@ class Adaptable {
                         type: 'rowDeleted',
                         rowNode: context.rowNode,
                         adaptableApi: context.adaptableApi,
+                        userName: context.userName,
+                        adaptableId: context.adaptableId,
                     };
                     this.api.eventApi.emit('ActionRowSubmitted', eventInfo);
-                    (_b = (_a = this.adaptableOptions.actionOptions.actionRowButtonOptions.actionRowFormOptions).onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
+                    (_b = (_a = this.adaptableOptions.actionRowOptions.actionRowFormOptions).onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
                 },
             },
         };
@@ -2378,9 +2446,11 @@ class Adaptable {
                 // should NOT happen unless the user sent some invalid button type in the predefined config
                 return;
             }
-            const customButtonConfig = (_b = (_a = this.adaptableOptions.actionOptions.actionRowButtonOptions).customConfiguration) === null || _b === void 0 ? void 0 : _b.call(_a, {
+            const customButtonConfig = (_b = (_a = this.adaptableOptions.actionRowOptions.actionRowButtonOptions).customConfiguration) === null || _b === void 0 ? void 0 : _b.call(_a, {
                 adaptableApi: this.api,
                 actionRowButtonType,
+                userName: this.adaptableOptions.userName,
+                adaptableId: this.adaptableOptions.adaptableId,
             });
             if (!customButtonConfig) {
                 return defaultButtonConfig;
@@ -2412,7 +2482,7 @@ class Adaptable {
                 filter: false,
                 sortable: false,
                 enableRowGroup: false,
-                pinned: this.adaptableOptions.actionOptions.actionRowButtonOptions.position === 'pinnedRight'
+                pinned: this.adaptableOptions.actionRowOptions.actionRowButtonOptions.position === 'pinnedRight'
                     ? 'right'
                     : 'left',
                 cellRenderer: this.variant === 'react' ? ActionColumnRenderer_1.ReactActionColumnRenderer : ActionColumnRenderer_1.ActionColumnRenderer,
@@ -2430,7 +2500,7 @@ class Adaptable {
             suppressMenu: false,
             suppressMovable: false,
         };
-        return this.api.actionApi.getActionColumns().map((actionColumn) => {
+        return this.api.actionColumnApi.getActionColumns().map((actionColumn) => {
             const actionColumnSettings = Object.assign(Object.assign({}, defaultActionColumnSettings), actionColumn.actionColumnSettings);
             const newColDef = {
                 headerName: actionColumn.friendlyName ? actionColumn.friendlyName : actionColumn.columnId,
@@ -2528,7 +2598,7 @@ class Adaptable {
             if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(calculatedColumnSettings.ColumnTypes)) {
                 columnTypes.push(...calculatedColumnSettings.ColumnTypes);
             }
-            const isExternalEvaluation = !this.api.queryLanguageApi.internalApi.evaluateExpressionInAdaptableQL('CalculatedColumn', calculatedColumn, this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query));
+            const isExternalEvaluation = !this.api.expressionApi.internalApi.evaluateExpressionInAdaptableQL('CalculatedColumn', calculatedColumn, this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query));
             const newColDef = {
                 headerName: calculatedColumn.FriendlyName
                     ? calculatedColumn.FriendlyName
@@ -2833,8 +2903,8 @@ class Adaptable {
          * Action: Stop editing
          */
         this.gridOptions.api.addEventListener(core_1.Events.EVENT_CELL_EDITING_STARTED, (this.listenerCellEditingStarted = () => {
-            var _a, _b;
-            if ((_b = (_a = this.adaptableOptions.actionOptions) === null || _a === void 0 ? void 0 : _a.actionRowButtonOptions) === null || _b === void 0 ? void 0 : _b.disableInlineEditing)
+            var _a;
+            if ((_a = this.adaptableOptions.actionRowOptions) === null || _a === void 0 ? void 0 : _a.disableInlineEditing)
                 this.gridOptions.api.stopEditing();
         }));
         /**
@@ -2921,7 +2991,7 @@ class Adaptable {
             if (this.api.internalApi.isGridInPivotMode()) {
                 return;
             }
-            if ((_b = (_a = this.adaptableOptions) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.restoreUngroupedColumns) {
+            if ((_b = (_a = this.adaptableOptions) === null || _a === void 0 ? void 0 : _a.groupingOptions) === null || _b === void 0 ? void 0 : _b.restoreUngroupedColumns) {
                 this.persistColumnIndexBeforeGrouping(params);
             }
         }));
@@ -2967,7 +3037,7 @@ class Adaptable {
             this.onSortChanged();
             this.debouncedSetSelectedCells();
         }));
-        const showGroupingTotalsAsHeader = this.adaptableOptions.generalOptions.showGroupingTotalsAsHeader;
+        const showGroupingTotalsAsHeader = this.adaptableOptions.groupingOptions.showGroupingTotalsAsHeader;
         /**
          * Use Case: Model has updated
          * Action: If user has set to see grouping totals as header create a pinned row (bit of a hack)
@@ -3051,9 +3121,9 @@ class Adaptable {
                 if (!this.isGroupRowNode(node)) {
                     const currentQuery = this.api.queryApi.getCurrentQuery();
                     if (currentQuery) {
-                        const evaluateQueryOnClient = this.api.queryLanguageApi.internalApi.evaluateExpressionInAdaptableQL('Query', undefined, currentQuery);
+                        const evaluateQueryOnClient = this.api.expressionApi.internalApi.evaluateExpressionInAdaptableQL('Query', undefined, currentQuery);
                         if (evaluateQueryOnClient) {
-                            const isCurrentQueryValid = this.api.queryLanguageApi.isValidBooleanExpression(currentQuery, ModuleConstants_1.QueryModuleId, `Invalid CurrentQuery '${currentQuery}'`);
+                            const isCurrentQueryValid = this.api.expressionApi.isValidBooleanExpression(currentQuery, ModuleConstants_1.QueryModuleId, `Invalid CurrentQuery '${currentQuery}'`);
                             if (!isCurrentQueryValid ||
                                 !this.api.internalApi
                                     .getQueryLanguageService()
@@ -3067,7 +3137,7 @@ class Adaptable {
                 try {
                     if (columnFilters.length > 0) {
                         for (const columnFilter of columnFilters) {
-                            const evaluateFilterOnClient = this.api.queryLanguageApi.internalApi.evaluatePredicatesInAdaptableQL('Filter', columnFilter, [columnFilter.Predicate]);
+                            const evaluateFilterOnClient = this.api.expressionApi.internalApi.evaluatePredicatesInAdaptableQL('Filter', columnFilter, [columnFilter.Predicate]);
                             if (evaluateFilterOnClient) {
                                 // we then assess filters (if running locally)
                                 if (!this.api.filterApi.internalApi.evaluateColumnFilter(columnFilter, node)) {
@@ -3181,6 +3251,9 @@ class Adaptable {
             this.setupColumnQuickFilerText(colSetupInfo);
             this.setupAllowedAggFuncs(colSetupInfo);
             this.setupColumnKeyCreator(colSetupInfo);
+            // this is just to make sure that AG Grid does NOT infer the cellDataType
+            // https://github.com/AdaptableTools/adaptable/issues/2230 should render it obsolete
+            this.setupColumnCellDataType(colSetupInfo);
         });
         this.setupRowStyling();
         // setupAggregationColumnHeaders() is executed on every setLayout()
@@ -3462,13 +3535,15 @@ class Adaptable {
                     return userPropertyValue(params);
                 }
                 const value = params.value;
-                const unbalancedGroupsKey = (_a = adaptableOptions.generalOptions) === null || _a === void 0 ? void 0 : _a.unbalancedGroupsKey;
+                const unbalancedGroupsKey = (_a = adaptableOptions.groupingOptions) === null || _a === void 0 ? void 0 : _a.unbalancedGroupsKey;
                 if (!unbalancedGroupsKey) {
                     return value;
                 }
                 let groupUnbalancedGroupsUnderKeyValue = typeof unbalancedGroupsKey === 'function'
                     ? unbalancedGroupsKey({
                         adaptableApi: adaptableApi,
+                        userName: this.adaptableOptions.userName,
+                        adaptableId: this.adaptableOptions.adaptableId,
                         adaptableColumn: abColumn,
                         params,
                     })
@@ -3477,6 +3552,14 @@ class Adaptable {
             };
         });
     }
+    setupColumnCellDataType(columnSetupInfo) {
+        const { col } = columnSetupInfo;
+        // AG Grid introduced since v30.x an inferred cellDataType
+        // the problem is that it breaks the default value formatter and/or editor (especially for Date columns)
+        this.setColDefProperty(col, 'cellDataType', () => {
+            return false;
+        });
+    }
     setupColumnHeader({ col, abColumn }) {
         var _a, _b;
         const previousColumnHeader = (_a = col === null || col === void 0 ? void 0 : col.getColDef()) === null || _a === void 0 ? void 0 : _a.headerName;
@@ -3527,7 +3610,7 @@ class Adaptable {
         });
     }
     setupColumnValueFormatter({ col, abColumn }) {
-        this.setColDefProperty(col, 'valueFormatter', (params) => {
+        this.setColDefProperty(col, 'valueFormatter', (userPropertyValue) => {
             const activeFormatColumnsWithDisplayFormat = this.api.formatColumnApi.internalApi.getFormatColumnsWithDisplayFormatForColumn(abColumn);
             if (!activeFormatColumnsWithDisplayFormat.length) {
                 return;
@@ -3578,6 +3661,8 @@ class Adaptable {
                 const cellEditableContext = {
                     gridCell,
                     adaptableApi: this.api,
+                    userName: this.adaptableOptions.userName,
+                    adaptableId: this.adaptableOptions.adaptableId,
                 };
                 return cellEditableFn(cellEditableContext);
             };
@@ -3680,10 +3765,23 @@ class Adaptable {
         this.agGridHelper.checkShouldClearExistingFiltersOrSearches();
     }
     isAgGridModulePresent(moduleName) {
-        return core_1.ModuleRegistry.isRegistered(moduleName);
+        const standardAgGridRegistrationCheck = core_1.ModuleRegistry.__isRegistered(moduleName, this.gridOptions.gridId);
+        if (standardAgGridRegistrationCheck) {
+            return true;
+        }
+        // as of AG Grid 30.0.3 the ModuleRegistry gets an dynamic grid ID for the framework versions
+        // because of that we have to check ALL grid IDs to see if the module is registered
+        // TODO AFL: we should recheck this later, it seems AG Grid is already refactoring this faulty registration process
+        // @ts-ignore
+        const gridModulesMap = core_1.ModuleRegistry.gridModulesMap;
+        let allGridModulesMap = {};
+        Object.keys(gridModulesMap).forEach((gridId) => {
+            allGridModulesMap = Object.assign(Object.assign({}, allGridModulesMap), gridModulesMap[gridId]);
+        });
+        return !!allGridModulesMap[moduleName];
     }
     getAgGridRegisteredModules() {
-        return core_1.ModuleRegistry.getRegisteredModules().map((module) => module.moduleName);
+        return core_1.ModuleRegistry.__getRegisteredModules(this.gridOptions.gridId).map((module) => module.moduleName);
     }
     onRowDataChanged({ rowNode, oldData, newData, }) {
         if (oldData == null || oldData == undefined) {
@@ -3824,7 +3922,7 @@ class Adaptable {
             if (!dataChangedScope.wholeRow) {
                 formatColumnsWithExpression.forEach((styleModule) => {
                     if (!dataChangedScope.wholeRow) {
-                        const columnIds = this.api.queryLanguageApi.getColumnsFromExpression(styleModule.Rule.BooleanExpression);
+                        const columnIds = this.api.expressionApi.getColumnsFromExpression(styleModule.Rule.BooleanExpression);
                         if (columnIds.includes(cellDataChangedInfo.column.columnId)) {
                             if (this.api.scopeApi.scopeIsAll(styleModule.Scope)) {
                                 dataChangedScope.wholeRow = true;
@@ -5033,6 +5131,7 @@ class AdaptableNoCodeWizard {
      * @param adaptableOptions
      */
     constructor(adaptableOptions, extraOptions = {}) {
+        var _a;
         const defaultInit = async ({ gridOptions, adaptableOptions, agGridModules, }) => {
             adaptableOptions.gridOptions = gridOptions;
             return await Adaptable.init(adaptableOptions, { agGridModules: agGridModules });
@@ -5040,7 +5139,7 @@ class AdaptableNoCodeWizard {
         this.adaptableOptions = adaptableOptions;
         this.init = extraOptions.onInit || defaultInit;
         this.extraOptions = extraOptions;
-        this.agGridModules = core_1.ModuleRegistry.getRegisteredModules();
+        this.agGridModules = core_1.ModuleRegistry.__getRegisteredModules((_a = this.adaptableOptions.gridOptions) === null || _a === void 0 ? void 0 : _a.gridId);
         this.render();
     }
     render(container) {

package/src/agGrid/BadgeRenderer.js

@@ -8,7 +8,7 @@ const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
     }
     return class BadgetRenderer {
         init(params) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f;
             this.eGui = document.createElement('div');
             this.eGui.className = 'ab-Badge__wrapper';
             const formattedValue = (_c = (_b = (_a = params.formatValue) === null || _a === void 0 ? void 0 : _a.call(params, params.value)) !== null && _b !== void 0 ? _b : params.value) !== null && _c !== void 0 ? _c : '';
@@ -36,11 +36,19 @@ const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
             if (icon && 'name' in icon && icon.size === undefined) {
                 icon.size = 14;
             }
+            const userInterfaceOptions = (_d = api.optionsApi.getAdaptableOptions()) === null || _d === void 0 ? void 0 : _d.userInterfaceOptions;
+            const customDefinedIcons = (_e = userInterfaceOptions.customIcons) !== null && _e !== void 0 ? _e : [];
+            let customIcon = badge.Icon && 'name' in badge.Icon
+                ? api.userInterfaceApi.getCustomIconDefinition(badge.Icon.name)
+                : null;
+            if (customIcon) {
+                icon = customIcon;
+            }
             this.unmountReactRoot = api.internalApi.getAdaptableInstance().renderReactRoot((0, Badge_1.Badge)({
                 adaptableStyle: badge.Style,
                 children: formattedValue,
                 icon,
-                iconPosition: (_d = badge.IconPosition) !== null && _d !== void 0 ? _d : 'start',
+                iconPosition: (_f = badge.IconPosition) !== null && _f !== void 0 ? _f : 'start',
             }), this.eGui);
         }
         getGui() {

package/src/agGrid/CheckboxRenderer.d.ts

@@ -1,6 +1,5 @@
-import { ICellRendererFunc } from '@ag-grid-community/core';
+import { ICellEditorComp, ICellEditorParams, ICellRendererFunc } from '@ag-grid-community/core';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { ICellEditorComp, ICellEditorParams } from '@ag-grid-community/core/dist/cjs/es5/interfaces/iCellEditor';
 export declare const getCheckboxRendererForColumn: (columnId: string, isColumnReadOnly: boolean, api: AdaptableApi) => ICellRendererFunc;
 export declare class CheckboxEditor implements ICellEditorComp {
     private eGui;

package/src/agGrid/agGridHelper.js

@@ -111,10 +111,7 @@ class agGridHelper {
             // if no valid pk then always false
             return false;
         }
-        if (Helper_1.Helper.objectExists(this.gridOptions.getRowNodeId) ||
-            Helper_1.Helper.objectExists(this.gridOptions.getRowId)) {
-            // if the user provided a getRowNodeId/getRowId then we don't need to do anything
-            // Note: starting with 27.1.0 'getRowNodeId' method is deprecated and will be removed in future versions
+        if (Helper_1.Helper.objectExists(this.gridOptions.getRowId)) {
             return true;
         }
         const primaryKey = this.adaptable.adaptableOptions.primaryKey;
@@ -274,6 +271,8 @@ class agGridHelper {
             adaptableApi: this.adaptable.api,
             selectedCellInfo: this.adaptable.api.gridApi.getGridState().SelectedCellInfo,
             selectedRowInfo: this.adaptable.api.gridApi.getGridState().SelectedRowInfo,
+            userName: this.adaptable.api.optionsApi.getUserName(),
+            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
         };
         this.adaptable.api.eventApi.emit('SelectionChanged', selectionChangedInfo);
     }
@@ -336,7 +335,7 @@ class agGridHelper {
             friendlyName: friendlyName,
             dataType: datatype,
         };
-        return this.adaptable.api.queryLanguageApi.isColumnQueryable(abColumnBase);
+        return this.adaptable.api.expressionApi.isColumnQueryable(abColumnBase);
     }
     isColumnExportable(colDef, columnId, friendlyName, datatype) {
         if (!colDef) {

package/src/agGrid/agGridMenuHelper.js

@@ -237,6 +237,8 @@ class agGridMenuHelper {
             adaptableColumn: adaptableColumn,
             agGridColumn: agGridColumn,
             adaptableApi: this.adaptable.api,
+            userName: this.adaptable.adaptableOptions.userName,
+            adaptableId: this.adaptable.adaptableOptions.adaptableId,
             isRowGroupColumn: this.adaptable.api.columnApi.isAutoRowGroupColumn(agGridColumn.getColId()),
         };
     }
@@ -276,6 +278,8 @@ class agGridMenuHelper {
             isSingleSelectedCell: isSelectedCell && (selectedCellInfo === null || selectedCellInfo === void 0 ? void 0 : selectedCellInfo.gridCells.length) == 1,
             primaryKeyValue: clickedCell ? clickedCell.primaryKeyValue : undefined,
             adaptableApi: this.adaptable.api,
+            userName: this.adaptable.adaptableOptions.userName,
+            adaptableId: this.adaptable.adaptableOptions.adaptableId,
             selectedCellInfo: selectedCellInfo,
             selectedRowInfo: selectedRowInfo,
             isRowGroupColumn: this.adaptable.api.columnApi.isAutoRowGroupColumn(params.column.getColId()),

package/src/agGrid/attachAddaptableColumnTypes.d.ts

@@ -1,15 +1,15 @@
 import { GridOptions } from '@ag-grid-community/core';
 export declare const attachColumnTypes: (gridOptions: GridOptions) => {
-    [key: string]: import("@ag-grid-community/core").ColDef<any>;
+    [key: string]: import("@ag-grid-community/core").ColDef<any, any>;
 } & {
-    [x: string]: import("@ag-grid-community/core").ColDef<any>;
-    abColDefNumber: import("@ag-grid-community/core").ColDef<any>;
-    abColDefString: import("@ag-grid-community/core").ColDef<any>;
-    abColDefBoolean: import("@ag-grid-community/core").ColDef<any>;
-    abColDefDate: import("@ag-grid-community/core").ColDef<any>;
-    abColDefObject: import("@ag-grid-community/core").ColDef<any>;
-    abColDefCustom: import("@ag-grid-community/core").ColDef<any>;
-    abColDefNumberArray: import("@ag-grid-community/core").ColDef<any>;
-    abColDefTupleNumberArray: import("@ag-grid-community/core").ColDef<any>;
-    abColDefObjectNumberArray: import("@ag-grid-community/core").ColDef<any>;
+    [x: string]: import("@ag-grid-community/core").ColDef<any, any>;
+    abColDefNumber: import("@ag-grid-community/core").ColDef<any, any>;
+    abColDefString: import("@ag-grid-community/core").ColDef<any, any>;
+    abColDefBoolean: import("@ag-grid-community/core").ColDef<any, any>;
+    abColDefDate: import("@ag-grid-community/core").ColDef<any, any>;
+    abColDefObject: import("@ag-grid-community/core").ColDef<any, any>;
+    abColDefCustom: import("@ag-grid-community/core").ColDef<any, any>;
+    abColDefNumberArray: import("@ag-grid-community/core").ColDef<any, any>;
+    abColDefTupleNumberArray: import("@ag-grid-community/core").ColDef<any, any>;
+    abColDefObjectNumberArray: import("@ag-grid-community/core").ColDef<any, any>;
 };

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

@@ -60,6 +60,7 @@ exports.ReactAdaptableDateEditor = (0, react_1.forwardRef)((props, ref) => {
                             Pattern,
                         });
                     } });
+                // @ts-ignore it will be fixed with https://github.com/AdaptableTools/adaptable/issues/2230
                 valueRef.current = valueParser(params);
             }
             else {
@@ -159,6 +160,7 @@ class AdaptableDateEditor {
                                 Pattern,
                             });
                         } });
+                    // @ts-ignore it will be fixed with https://github.com/AdaptableTools/adaptable/issues/2230
                     this.value = this.valueParser(params);
                 }
                 else {

package/src/agGrid/editors/AdaptableNumberEditor/index.js

@@ -19,8 +19,8 @@ function getStartValue(params) {
     if (shouldClearExistingValue(params)) {
         return '';
     }
-    if (params.charPress && isValidChar(params.charPress)) {
-        return params.charPress;
+    if (params.eventKey && isValidChar(params.eventKey)) {
+        return params.eventKey;
     }
     return params.value;
 }

package/src/components/AdaptableFormComponent/AdaptableFormComponent.js

@@ -18,9 +18,12 @@ function AdaptableFormComponentButtons({ formDef, onClick, defaultTone, disabled
             height: 15,
             width: 15,
         });
-        let buttonStyle = api.internalApi.getStyleForButton(button, context ? context : { adaptableApi: api });
-        let buttonLabel = api.internalApi.getLabelForButton(button, context ? context : { adaptableApi: api });
-        let buttonTooltip = api.internalApi.getTooltipForButton(button, context ? context : { adaptableApi: api });
+        let buttonStyle = api.internalApi.getStyleForButton(button, context ? context : { adaptableApi: api, userName: this.getOptions().userName,
+            adaptableId: this.getOptions().adaptableId, });
+        let buttonLabel = api.internalApi.getLabelForButton(button, context ? context : { adaptableApi: api, userName: this.getOptions().userName,
+            adaptableId: this.getOptions().adaptableId, });
+        let buttonTooltip = api.internalApi.getTooltipForButton(button, context ? context : { adaptableApi: api, userName: this.getOptions().userName,
+            adaptableId: this.getOptions().adaptableId, });
         return (React.createElement(SimpleButton_1.default, { autoFocus: focusFirstButton && index === 0, disabled: disabledButtons[index], key: index, tooltip: buttonTooltip, icon: buttonIcon, tone: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _a !== void 0 ? _a : defaultTone, variant: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant, "data-text": buttonLabel, className: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className, marginLeft: index ? 2 : 0, onClick: () => {
                 onClick(button);
             } }, buttonLabel));

package/src/components/AdaptableIconComponent/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAdaptableIcon = exports.isAdaptableElementIcon = exports.isAdaptableExternalIcon = exports.isAdaptableInternalIcon = exports.AdaptableIconComponent = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const icons_1 = require("../icons");
+const icons_1 = tslib_1.__importStar(require("../icons"));
 const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const react_1 = require("react");
 const AdaptableIconComponent = (props) => {
@@ -26,6 +26,9 @@ const AdaptableIconComponent = (props) => {
             }
             else {
                 htmlElement = icon.element;
+                // THe element neets to be cloned.
+                // when it is used in more than one plce the element is removed from the DOM
+                htmlElement = htmlElement.cloneNode(true);
             }
             divRef.current.insertAdjacentElement('afterend', htmlElement);
         }
@@ -35,8 +38,8 @@ const AdaptableIconComponent = (props) => {
             }
         };
     }, [icon]);
-    if ((0, exports.isAdaptableInternalIcon)(icon)) {
-        return React.createElement(icons_1.Icon, { name: icon.name, size: icon.size, style: icon.style, className: className });
+    if ((0, exports.isAdaptableInternalIcon)(icon) && icon.name in icons_1.default) {
+        return (React.createElement(icons_1.Icon, { name: icon.name, size: icon.size, style: icon.style, className: className }));
     }
     if ((0, exports.isAdaptableExternalIcon)(icon)) {
         let width = (_b = (_a = icon.style) === null || _a === void 0 ? void 0 : _a.width) !== null && _b !== void 0 ? _b : 'var(--ab-cmp-icon__width)';

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -195,6 +195,8 @@ function BaseEditorInput(props) {
                 // we need a fully-fledged rowNode as Adaptable accesses internal methods of it
                 node: testRowNode,
                 adaptableApi: props.api,
+                userName: props.api.optionsApi.getUserName(),
+                adaptableId: props.api.optionsApi.getAdaptableId(),
                 functions: expressionFunctions,
                 evaluateCustomQueryVariable: props.api.internalApi.getQueryLanguageService().evaluateCustomQueryVariable,
             });

package/src/components/ExpressionEditor/index.js

@@ -112,7 +112,7 @@ function ExpressionEditor(props) {
                     padding: 5,
                 } }, showColumnIds
                 ? namedQuery.BooleanExpression
-                : props.api.queryLanguageApi.getAdaptableQueryExpressionWithColumnFriendlyNames(namedQuery)))))));
+                : props.api.expressionApi.getAdaptableQueryExpressionWithColumnFriendlyNames(namedQuery)))))));
     const showDocumentationLinks = props.api.internalApi.isDocumentationLinksDisplayed();
     const queryDocumentationLink = queryDocumentationLinks[type];
     return (React.createElement(EditorContext_1.ExpressionEditorContext.Provider, { value: {

package/src/components/IconSelector/IconSelector.d.ts

@@ -1,5 +1,7 @@
 import { FunctionComponent } from 'react';
+import { UserInterfaceOptions } from '../../types';
 export interface IconSelectorProps {
+    customIcons?: UserInterfaceOptions['customIcons'];
     value?: string;
     onChange: (iconName: string) => void;
     clearable?: boolean;