@adaptabletools/adaptable 15.0.2 → 15.1.0-canary.0

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

@@ -13,7 +13,6 @@ const Tabs_1 = require("../../../components/Tabs");
 const Tag_1 = require("../../../components/Tag");
 const ObjectExtensions_1 = require("../../../Utilities/Extensions/ObjectExtensions");
 const StringExtensions_1 = require("../../../Utilities/Extensions/StringExtensions");
-const LoggingHelper_1 = require("../../../Utilities/Helpers/LoggingHelper");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../Components/AdaptableInput"));
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const CommonProperties = (props) => {
@@ -228,7 +227,7 @@ const SparklineObjectNumberArrayProperties = (props) => {
             }
         }
         catch (e) {
-            (0, LoggingHelper_1.ConsoleLogError)('Error parsing sparkline data', e);
+            api.logError('Error parsing sparkline data', e);
         }
     }, [data]);
     return (React.createElement(React.Fragment, null,

package/src/View/TeamSharing/SharedEntityObjectView.d.ts

@@ -1,9 +1,12 @@
+/// <reference types="node" />
 import * as React from 'react';
 import { AdaptableSharedEntity } from '../../../types';
+import { IModule } from '../../Strategy/Interface/IModule';
 export declare const SharedEntityTypeItemView: React.FunctionComponent<{
     data: AdaptableSharedEntity;
 }>;
 export declare const getSharedEntityActiveStatusObjectView: (isDependency: boolean) => (props: {
     data: AdaptableSharedEntity;
+    module?: IModule;
 }) => JSX.Element;
 export declare const getSharedEntityStaleDepsItemView: (staleDependencies: AdaptableSharedEntity[]) => () => JSX.Element;

package/src/View/Theme/ThemePopup.d.ts

@@ -11,7 +11,7 @@ interface ThemePopupProps extends ModuleViewPopupProps<ThemePopupComponent> {
 declare class ThemePopupComponent extends React.Component<ThemePopupProps, {}> {
     render(): JSX.Element;
     onChangeTheme(value: string): void;
-    handleCreateNewTheme: () => void;
+    handleCreateNewTheme: (variant: 'dark' | 'light') => void;
 }
 export declare let ThemePopup: import("react-redux").ConnectedComponent<typeof ThemePopupComponent, any>;
 export {};

package/src/View/Theme/ThemePopup.js

@@ -10,13 +10,13 @@ const FormLayout_1 = tslib_1.__importStar(require("../../components/FormLayout")
 const DropdownButton_1 = tslib_1.__importDefault(require("../../components/DropdownButton"));
 const ThemeEditor_1 = require("./ThemeEditor");
 const rebass_1 = require("rebass");
-const ButtonNew_1 = require("../Components/Buttons/ButtonNew");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const icons_1 = require("../../components/icons");
 class ThemePopupComponent extends React.Component {
     constructor() {
         super(...arguments);
-        this.handleCreateNewTheme = () => {
+        this.handleCreateNewTheme = (variant) => {
             let nthItem = this.props.UserThemes.length + 1;
             let name = 'Custom-Theme-' + nthItem;
             // make sure it is unique
@@ -25,6 +25,7 @@ class ThemePopupComponent extends React.Component {
                 name = 'Custom-Theme-' + nthItem;
             }
             const newTheme = ObjectFactory_1.default.CreateEmptyTheme(name);
+            newTheme.Variant = variant;
             this.props.api.themeApi.addUserTheme(newTheme);
             this.props.api.themeApi.loadTheme(newTheme.Name);
         };
@@ -50,11 +51,24 @@ class ThemePopupComponent extends React.Component {
         const isCustomTheme = this.props.api.themeApi
             .getUserThemes()
             .some((theme) => theme.Name === this.props.CurrentTheme);
+        const disabled = this.props.accessLevel === 'ReadOnly';
+        const newButton = (React.createElement(DropdownButton_1.default, { ml: 2, disabled: disabled, tone: "accent", variant: "raised", columns: ['label'], items: [
+                {
+                    label: 'Dark',
+                    onClick: () => this.handleCreateNewTheme('dark'),
+                },
+                {
+                    label: 'Light',
+                    onClick: () => this.handleCreateNewTheme('light'),
+                },
+            ] },
+            React.createElement(icons_1.Icon, { name: "plus" }),
+            " New"));
         return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), button: React.createElement(React.Fragment, null,
                 !this.props.hideShowInWindow && (React.createElement(SimpleButton_1.default, { icon: "open-in-new", onClick: () => {
                         this.props.api.themeApi.internalApi.openInWindow();
                     } })),
-                React.createElement(ButtonNew_1.ButtonNew, { ml: 2, onClick: this.handleCreateNewTheme, accessLevel: this.props.accessLevel })) },
+                newButton) },
             React.createElement(FormLayout_1.default, null,
                 React.createElement(FormLayout_1.FormRow, { label: "Current Theme:" },
                     React.createElement(DropdownButton_1.default, { "data-name": "select-theme-dropdown", columns: ['label'], style: { width: '50%', minWidth: 200 }, placeholder: "Select theme", value: this.props.CurrentTheme, items: optionThemes, accessLevel: this.props.accessLevel }, currentThemeDescription))),

package/src/agGrid/Adaptable.d.ts

@@ -37,6 +37,7 @@ import { ColumnValuesComparer } from '../AdaptableOptions/GeneralOptions';
 import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelService';
 import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 import { RenderReactRootFn } from '../renderReactRoot';
+import { AdaptableLogger } from './AdaptableLogger';
 declare type RuntimeConfig = {
     waitForAgGrid?: boolean;
     supressReact18RenderWarning?: boolean;
@@ -48,6 +49,7 @@ export declare class Adaptable implements IAdaptable {
     adaptableModules: IModuleCollection;
     adaptableStore: IAdaptableStore;
     adaptableOptions: AdaptableOptions;
+    logger: AdaptableLogger;
     CalculatedColumnExpressionService: ICalculatedColumnExpressionService;
     DataService: IDataService;
     EntitlementService: IEntitlementService;
@@ -194,6 +196,7 @@ export declare class Adaptable implements IAdaptable {
     setCellValue(cellDataChangedInfo: CellDataChangedInfo): void;
     cancelEdit(): void;
     isCellEditable(rowNode: IRowNode, column: Column): boolean;
+    getGridCellsForColumn(columnId: string): GridCell[] | undefined;
     getDistinctValuesForColumn(column: AdaptableColumn, visibleRowsOnly: boolean, skipRowNode?: IRowNode, permittedValues?: any[]): GridCell[];
     getDistinctFilterValuesForColumn(column: AdaptableColumn, visibleRowsOnly: boolean, filter: string, skipRowNode?: IRowNode): Promise<{
         suppressClientSideFilter?: boolean;
@@ -345,7 +348,6 @@ export declare class Adaptable implements IAdaptable {
     setDataSource(dataSource: any[]): void;
     getGridData(): any[];
     getFilteredData(): any[];
-    loadDataSource(dataSource: any[]): void;
     updateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     addRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     deleteRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;

package/src/agGrid/Adaptable.js

@@ -25,7 +25,6 @@ const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
 const getScrollbarSize_1 = tslib_1.__importDefault(require("../Utilities/getScrollbarSize"));
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/AdaptableHelper"));
 const Helper_1 = require("../Utilities/Helpers/Helper");
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const ObjectFactory_1 = require("../Utilities/ObjectFactory");
 // services
 const CalculatedColumnExpressionService_1 = require("../Utilities/Services/CalculatedColumnExpressionService");
@@ -66,10 +65,11 @@ const AggregationColumns_1 = require("../PredefinedConfig/Common/AggregationColu
 const renderReactRoot_1 = require("../renderReactRoot");
 const ChartingService_1 = require("../Utilities/Services/ChartingService");
 const ThemeService_1 = require("../Utilities/Services/ThemeService");
+const AdaptableLogger_1 = require("./AdaptableLogger");
 const tinycolor = require('tinycolor2');
 const GROUP_PATH_SEPARATOR = '/';
 // IMPORTANT - we need colId to be set in order for safeSetColDefs to work correctly
-const assignColId = (colDef) => {
+const assignColId = (colDef, logger) => {
     if (!colDef) {
         return;
     }
@@ -77,11 +77,11 @@ const assignColId = (colDef) => {
         colDef.colId = colDef.field;
     }
     if (colDef.children) {
-        colDef.children.forEach(assignColId);
+        colDef.children.forEach((colDef) => assignColId(colDef, logger));
     }
     else {
         if (!colDef.colId) {
-            (0, LoggingHelper_1.LogAdaptableWarning)('A column is missing the colId - please check ', colDef, 'Either pass a "field" property or a "colId" property.');
+            logger.warn('A column is missing the colId - please check ', colDef, 'Either pass a "field" property or a "colId" property.');
         }
     }
 };
@@ -109,7 +109,7 @@ RowNodeProto.dispatchLocalEvent = function (event) {
         // starting with AG Grid 26.1.0 the gridApi is wrapped in a Beans property
         const rowNodeApi = (_a = rowNode === null || rowNode === void 0 ? void 0 : rowNode.beans) === null || _a === void 0 ? void 0 : _a.gridApi;
         if (!rowNodeApi) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`No GridAPI found in passed RowNode, this should never happen!`, rowNode);
+            AdaptableLogger_1.AdaptableLogger.consoleErrorBase(`No GridAPI found in passed RowNode, this should never happen!`, rowNode);
         }
         return rowNodeApi;
     };
@@ -283,7 +283,7 @@ class Adaptable {
     static init(adaptableOptions, runtimeConfig) {
         var _a;
         if (!((_a = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.agGridModules) === null || _a === void 0 ? void 0 : _a.length)) {
-            (0, LoggingHelper_1.ConsoleLogWarning)(`No AG Grid modules were provided, thus limiting AdapTables features significantly!\n\nRead further info here:${DocumentationLinkConstants_1.AgGridModulesDocsLink}`);
+            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);
@@ -353,6 +353,8 @@ class Adaptable {
     // this is still used internally but should not be used externally as a preference
     async init(adaptableOptions, runtimeConfig, _staticInit) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        this.logger = new AdaptableLogger_1.AdaptableLogger(adaptableOptions.adaptableId || String(Date.now()));
+        const perfAdaptableInit = this.logger.beginPerf(`Adaptable init()`);
         if (runtimeConfig) {
             this.supressReact18RenderWarning = !!runtimeConfig.supressReact18RenderWarning;
             if (runtimeConfig.renderReactRoot) {
@@ -378,7 +380,7 @@ class Adaptable {
             }
         }
         if (!_staticInit) {
-            (0, LoggingHelper_1.ConsoleLogWarning)(`
+            this.logger.warn(`
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!! You should not use the "Adaptable" constructor directly, as it was deprecated in v6 and removed in v7!
 !!!!!!!
@@ -389,7 +391,8 @@ class Adaptable {
         // we create AdaptableOptions by merging the values provided by the user with the defaults (where no value has been set)
         this.adaptableOptions = AdaptableHelper_1.default.assignAdaptableOptions(adaptableOptions);
         if (this.hasAutogeneratedPrimaryKey()) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Autogenerated primary key (adaptableOptions.autogeneratedPrimaryKey = TRUE) should be used only as a last resort,
+            this.logger
+                .warn(`Autogenerated primary key (adaptableOptions.autogeneratedPrimaryKey = TRUE) should be used only as a last resort,
       when no unique column is available, as it limits some Adaptable functionalities!
 
       For more details see: ${DocumentationLinkConstants_1.PrimaryKeyDocsLink}`);
@@ -477,10 +480,10 @@ class Adaptable {
         return this.initializeAgGrid().then((initialized) => {
             if (!initialized) {
                 // we have no grid, we can't do anything
-                (0, LoggingHelper_1.ConsoleLogError)('Unable to set up AG Grid');
+                this.logger.error('Unable to set up AG Grid');
                 return this.api;
             }
-            (0, LoggingHelper_1.LogAdaptableInfo)(`Registered AG Grid modules: `, this.getAgGridRegisteredModules().sort());
+            this.logger.info(`Registered AG Grid modules: `, this.getAgGridRegisteredModules().sort());
             let self = this;
             // 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
@@ -496,14 +499,18 @@ class Adaptable {
                 };
             }
             // Load the store
+            const perfAdaptableStoreLoad = this.logger.beginPerf('AdaptableStore.Load');
             this.adaptableStore.Load.then(() => {
                 if (this.isDestroyed) {
                     return;
                 }
+                perfAdaptableStoreLoad.end();
+                const perfInitInternalGridLogic = this.logger.beginPerf('InitInternalGridLogic');
                 this.initInternalGridLogic();
+                perfInitInternalGridLogic.end();
                 AdaptableHelper_1.default.checkValidPrimaryKey(this);
             }, (e) => {
-                (0, LoggingHelper_1.ConsoleLogError)('Failed to Init Modules : ', e);
+                this.logger.error('Failed to Init Modules : ', e);
                 // for now we initialize the grid even if initialising Modules has failed (perhaps revisit this?)
                 this.initInternalGridLogic();
                 this.api.internalApi.hideLoadingScreen(); // doesnt really help but at least clears the screen
@@ -530,6 +537,7 @@ class Adaptable {
                 trailing: true,
                 leading: false,
             });
+            perfAdaptableInit.end();
             return this.api;
         });
     }
@@ -569,24 +577,29 @@ class Adaptable {
         return undefined;
     }
     initStore() {
-        (0, LoggingHelper_1.LogAdaptableInfo)(`Initialising AdaptableStore`);
+        const perfNewAdaptableStore = this.logger.beginPerf(`new AdaptableStore()`);
         this.adaptableStore = new AdaptableStore_1.AdaptableStore(this, this.isAgGridReady());
+        perfNewAdaptableStore.end();
         this.adaptableStore.onAny((eventName, data) => {
             this.performAudit(data.action, data.state, data.newState);
             this.forPlugins((plugin) => plugin.onStoreEvent(eventName, data, this.adaptableStore));
             if (eventName == AdaptableStore_1.INIT_STATE) {
-                (0, LoggingHelper_1.LogAdaptableInfo)(`Updating obsolete configuration/state`);
+                const perfInitState = this.logger.beginPerf('InitState');
+                const perfUpdateOldConfig = this.logger.beginPerf('updateOldConfig()');
                 this.adaptableModules.forEach((m) => m.updateOldConfig());
+                perfUpdateOldConfig.end();
                 // call stuff here
                 // and reset state also?
                 this.forPlugins((plugin) => plugin.onAdaptableReady(this, this.adaptableOptions));
                 this._adaptableReady = true;
                 // setTimeout(() => {
+                this.logger.info('emit AdaptableReady');
                 this.api.eventApi.emit('AdaptableReady', {
                     adaptableApi: this.api,
                     gridOptions: this.adaptableOptions.gridOptions,
                 });
                 // }, 0);
+                perfInitState.end();
             }
         });
     }
@@ -607,12 +620,12 @@ class Adaptable {
         }
     }
     initializeAgGrid() {
-        (0, LoggingHelper_1.LogAdaptableInfo)(`Initializing AG Grid...`);
+        const perfInitializeAgGrid = this.logger.beginPerf('initializeAgGrid()');
         // 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());
         if (Array.isArray(this.gridOptions.columnDefs)) {
-            this.gridOptions.columnDefs.forEach(assignColId);
+            this.gridOptions.columnDefs.forEach((colDef) => assignColId(colDef, this.logger));
         }
         const adaptableSideBarDef = this.createAdaptableSideBarDef();
         if (!!adaptableSideBarDef) {
@@ -631,7 +644,7 @@ class Adaptable {
             if (!agGridContainer) {
                 agGridContainer = this.initAgGridContainerFromInitializedAgGrid();
                 if (!agGridContainer) {
-                    (0, LoggingHelper_1.ConsoleLogError)('You must provide an element id in `containerOptions.agGridContainer`');
+                    this.logger.consoleError('You must provide an element id in `containerOptions.agGridContainer`');
                     return false;
                 }
             }
@@ -640,34 +653,44 @@ class Adaptable {
         const isGridInstantiated = this.gridOptions.api && typeof this.gridOptions.api.getValue === 'function';
         if (isGridInstantiated) {
             if (!checkAgGridContainer()) {
+                perfInitializeAgGrid.end('isGridInstantiated=TRUE, checkAgGridContainer=FALSE');
                 return Promise.resolve(false);
             }
+            perfInitializeAgGrid.end('isGridInstantiated=TRUE, checkAgGridContainer=TRUE');
             return Promise.resolve(true);
         }
         if (this.runtimeConfig.waitForAgGrid) {
             return this.isAgGridReady().then(() => {
+                const perfInitAgGridContainer = this.logger.beginPerf('initAgGridContainerFromInitializedAgGrid');
                 this.initAgGridContainerFromInitializedAgGrid();
+                perfInitAgGridContainer.end();
+                perfInitializeAgGrid.end('waitForAgGrid=TRUE');
                 return Promise.resolve(true);
             }, () => {
-                (0, LoggingHelper_1.ConsoleLogError)(`Could not find any AG Grid instance rendered. Could not find reference to AG Grid api. Make sure you pass the same gridOptions object reference both to Adaptable and AG Grid`);
+                this.logger.consoleError(`Could not find any AG Grid instance rendered. Could not find reference to AG Grid api. Make sure you pass the same gridOptions object reference both to Adaptable and AG Grid`);
+                perfInitializeAgGrid.end('waitForAgGrid=TRUE, ERROR!');
                 return Promise.reject(false);
             });
         }
         else {
             if (!checkAgGridContainer()) {
+                perfInitializeAgGrid.end('waitForAgGrid=FALSE, checkAgGridContainer=FALSE!');
                 return Promise.resolve(false);
             }
         }
         // now create the grid itself - it is done this way as previously when we instantiated the Grid 'properly' it got created as J.Grid
         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);
+        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
         if (this.gridOptions.api) {
             this.gridOptions.api.__adaptable = this;
         }
+        perfInitializeAgGrid.end('AG Grid instantiation');
         return Promise.resolve(grid != null);
     }
     initAgGridContainerFromInitializedAgGrid() {
@@ -700,7 +723,7 @@ class Adaptable {
             }
         }
         if (!agGridContainer) {
-            (0, LoggingHelper_1.ConsoleLogError)(`Could not find the AG Grid Container. This will probably break some AdapTable functionality.`);
+            this.logger.consoleError(`Could not find the AG Grid Container. This will probably break some AdapTable functionality.`);
         }
         return (this.adaptableOptions.containerOptions.agGridContainer = agGridContainer);
     }
@@ -1192,7 +1215,10 @@ class Adaptable {
         if (abColumn.isExcludedFromQuickSearch) {
             return false;
         }
-        if (!params.node || params.node.group) {
+        if (!params.node) {
+            return false;
+        }
+        if (!this.api.optionsApi.getSearchOptions().runQuickSearchOnRowGroups && params.node.group) {
             return false;
         }
         let quickSearchValue = this.api.quickSearchApi.getQuickSearchValue();
@@ -1286,6 +1312,7 @@ class Adaptable {
         if (!layout) {
             layout = this.api.layoutApi.getCurrentLayout();
         }
+        const perfSetLayout = this.logger.beginPerf(`setLayout(${layout.Name})`);
         layout.Columns = layout.Columns || [];
         const rowEditActionColumn = this.getColDefsForRowEditColumns()[0];
         if (rowEditActionColumn) {
@@ -1460,10 +1487,12 @@ class Adaptable {
             if (shouldUpdatePivoted) {
                 this.gridOptions.columnApi.setPivotMode(pivoted);
             }
+            const perfApplyColumnState = this.logger.beginPerf('applyColumnState (layout.isChanged)');
             this.gridOptions.columnApi.applyColumnState({
                 state: newColumnsState,
                 applyOrder: true,
             });
+            perfApplyColumnState.end();
             this.api.gridApi.setColumnSorts(layout.ColumnSorts);
             this.gridOptions.columnApi.setPivotColumns(layout.PivotColumns || []);
             // aggrid 25.1.0 introduced a bug such that a layout that has a grouped column, if the column has enableRowGroup: true but not rowGroup: true
@@ -1471,7 +1500,9 @@ class Adaptable {
             // see the test in layout/layout-switch/"should be able to switch from grouped to non-grouped and back"
             // so we figured out the following line fixes the issue
             // this.gridOptions.api.setColumnDefs(this.gridOptions.api.getColumnDefs()); //TODO find a solution for weighted averages - column floating filters are not showing
+            const perfSetColumnDefs = this.logger.beginPerf('GridApi_setColumnDefs');
             GridApi_setColumnDefs.call(this.gridOptions.api, this.gridOptions.api.getColumnDefs());
+            perfSetColumnDefs.end();
             // these updates need to be at the end, the methods are based on the grid state/col defs
             // the layout needs to be applied for them to work
             this.updateRowGroupsExpandedState(layout);
@@ -1502,6 +1533,7 @@ class Adaptable {
                 plugin.afterSetLayout(this, layout);
             }
         });
+        perfSetLayout.end();
     }
     updateRowGroupsExpandedState(layout) {
         if (!layout) {
@@ -1521,6 +1553,11 @@ class Adaptable {
     updateLayoutFromGrid() {
         var _a, _b;
         const currentLayout = this.api.layoutApi.getCurrentLayout();
+        if (currentLayout.IsReadOnly) {
+            // reaply the layout so the grid is reverted
+            this.setLayout();
+            return;
+        }
         const layout = Object.assign({}, currentLayout);
         let columnOrder = [];
         const columnFlexes = {};
@@ -1623,7 +1660,7 @@ class Adaptable {
                         if (isEndRowPin) {
                             shouldIncludeRange = false;
                         }
-                        (0, LoggingHelper_1.ConsoleLogWarning)('Cannot select pinned rows in AG Grid.');
+                        this.logger.consoleWarn('Cannot select pinned rows in AG Grid.');
                     }
                     if (shouldIncludeRange) {
                         const y1 = Math.min(rangeSelection.startRow.rowIndex, rangeSelection.endRow.rowIndex);
@@ -1737,6 +1774,16 @@ class Adaptable {
         // it's safe to rely on the AG Grid implementation because we override the colDef.editable property, which is in this case the single source of truth
         return column === null || column === void 0 ? void 0 : column.isCellEditable(rowNode);
     }
+    getGridCellsForColumn(columnId) {
+        let returnValues = [];
+        this.gridOptions.api.forEachNode((rowNode) => {
+            const gridCell = this.getGridCellFromRowNode(rowNode, columnId);
+            if (gridCell && gridCell.rawValue != undefined) {
+                returnValues.push(gridCell);
+            }
+        });
+        return returnValues;
+    }
     getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, permittedValues) {
         let returnValues = [];
         // this function does NOT look up for server values but actually it should...
@@ -1792,7 +1839,7 @@ class Adaptable {
             preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(filterPermittedValuesParams));
         }
         catch (error) {
-            (0, LoggingHelper_1.ConsoleLogError)(`Failed to load filter permitted values`, column, filter, error);
+            this.logger.consoleError(`Failed to load filter permitted values`, column, filter, error);
         }
         return {
             suppressClientSideFilter: permittedValues.suppressFilterSearchBar,
@@ -1810,7 +1857,7 @@ class Adaptable {
             preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(permittedValuesParams));
         }
         catch (error) {
-            (0, LoggingHelper_1.ConsoleLogError)(`Failed to load custom sort permitted values`, column, error);
+            this.logger.consoleError(`Failed to load custom sort permitted values`, column, error);
         }
         return this.getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, preparedPermittedValues);
     }
@@ -1826,7 +1873,7 @@ class Adaptable {
             preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(bulkUpdatePermittedValuesParams));
         }
         catch (error) {
-            (0, LoggingHelper_1.ConsoleLogError)(`Failed to load bulk permitted values`, error, column, selectedGridCells);
+            this.logger.consoleError(`Failed to load bulk permitted values`, error, column, selectedGridCells);
         }
         return this.getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, preparedPermittedValues);
     }
@@ -2097,14 +2144,14 @@ class Adaptable {
     }
     selectNode(rowNode, clearSelection) {
         if (!rowNode) {
-            (0, LoggingHelper_1.LogAdaptableError)('No node to select');
+            this.logger.error('No node to select');
             return;
         }
         rowNode.setSelected(true, clearSelection);
     }
     deSelectNode(rowNode, clearSelection) {
         if (!rowNode) {
-            (0, LoggingHelper_1.LogAdaptableError)('No node to deselect');
+            this.logger.error('No node to deselect');
             return;
         }
         rowNode.setSelected(false, clearSelection);
@@ -2151,7 +2198,7 @@ class Adaptable {
             this.gridOptions.api.redrawRows(redrawRowsParams);
         }
         catch (ex) {
-            (0, LoggingHelper_1.ConsoleLogError)('AG Grid redrawRows was unable to find some row nodes. Tried to redraw row nodes: ', rowNodes, ex);
+            this.logger.consoleError('AG Grid redrawRows was unable to find some row nodes. Tried to redraw row nodes: ', rowNodes, ex);
         }
     }
     refreshCells(rowNodes, columns, forceUpdate, suppressFlash = false) {
@@ -2236,7 +2283,7 @@ class Adaptable {
             if (freeTextColumnSettings.HeaderToolTip) {
                 newColDef.headerTooltip = freeTextColumnSettings.HeaderToolTip;
             }
-            (0, LoggingHelper_1.LogAdaptableInfo)('Setting up FreeText Column: ' + freeTextColumn.ColumnId);
+            this.logger.info('Setting up FreeText Column: ' + freeTextColumn.ColumnId);
             return newColDef;
         });
     }
@@ -2370,7 +2417,7 @@ class Adaptable {
                 cellRenderer: this.variant === 'react' ? ActionColumnRenderer_1.ReactActionColumnRenderer : ActionColumnRenderer_1.ActionColumnRenderer,
                 type: [GeneralConstants_1.AB_SPECIAL_COLUMN, 'abColDefObject'],
             };
-            (0, LoggingHelper_1.LogAdaptableInfo)('Setting up Action Column: ' + actionColumn.columnId);
+            this.logger.info('Setting up Action Column: ' + actionColumn.columnId);
             return newColDef;
         });
     }
@@ -2487,7 +2534,7 @@ class Adaptable {
             if (calculatedColumnSettings.HeaderToolTip) {
                 newColDef.headerTooltip = calculatedColumnSettings.HeaderToolTip;
             }
-            (0, LoggingHelper_1.LogAdaptableInfo)('Setting up Calculated Column: ' + calculatedColumn.ColumnId);
+            this.logger.info('Setting up Calculated Column: ' + calculatedColumn.ColumnId);
             return newColDef;
         });
     }
@@ -2686,7 +2733,7 @@ class Adaptable {
             if (!this.abContainerElement) {
                 let oldContainer = document.getElementById('adaptableBlotter');
                 if (oldContainer) {
-                    (0, LoggingHelper_1.LogAdaptableWarning)(`
+                    this.logger.warn(`
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!! The old default container element for Adaptable was "#adaptableBlotter", configured via 'containerOptions.adaptableContainer="adaptableBlotter"'.
 !!!!! Seems like you haven't updated your html container selector, so we're falling back to using that one.
@@ -2710,16 +2757,15 @@ class Adaptable {
         return this.gridContainerElement;
     }
     initInternalGridLogic() {
-        (0, LoggingHelper_1.LogAdaptableInfo)(`Initializing InternalGridLogic...`);
         if (this.abContainerElement == null) {
             this.abContainerElement = this.getAdaptableContainerElement();
         }
         if (this.abContainerElement == null) {
             if (typeof this.adaptableOptions.containerOptions.adaptableContainer === 'string') {
-                (0, LoggingHelper_1.ConsoleLogError)(`There is no DIV with id="${this.adaptableOptions.containerOptions.adaptableContainer}" so cannot render Adaptable`);
+                this.logger.consoleError(`There is no DIV with id="${this.adaptableOptions.containerOptions.adaptableContainer}" so cannot render Adaptable`);
             }
             else {
-                (0, LoggingHelper_1.ConsoleLogError)(`No valid adaptableContainer found to render Adaptable`, this.adaptableOptions.containerOptions.adaptableContainer);
+                this.logger.consoleError(`No valid adaptableContainer found to render Adaptable`, this.adaptableOptions.containerOptions.adaptableContainer);
             }
             return;
         }
@@ -2999,7 +3045,7 @@ class Adaptable {
                     }
                 }
                 catch (ex) {
-                    (0, LoggingHelper_1.LogAdaptableError)(ex);
+                    this.logger.error(ex);
                     return false;
                 }
                 return originalDoesExternalFilterPass ? originalDoesExternalFilterPass(node) : true;
@@ -3054,7 +3100,7 @@ class Adaptable {
         return this.agGridMenuHelper.buildStandaloneColumnHeader(adaptableColumn);
     }
     prepareGrid() {
-        (0, LoggingHelper_1.LogAdaptableInfo)('Preparing grid...');
+        const perfPrepareGrid = this.logger.beginPerf('prepareGrid()');
         // add any special renderers, display formats, custom sorts and apply the theme
         // then do any final rendering required, filter the grid and - to be on the safe set - redraw
         try {
@@ -3064,13 +3110,15 @@ class Adaptable {
             this.applyGridFiltering();
         }
         catch (ex) {
-            (0, LoggingHelper_1.ConsoleLogError)('AgGrid setup failed');
-            (0, LoggingHelper_1.ConsoleLogError)(ex);
+            this.logger.consoleError('AgGrid setup failed');
+            this.logger.consoleError(ex);
         }
+        perfPrepareGrid.end();
     }
     setupColumns() {
+        const perfSetupColumns = this.logger.beginPerf('setupColumns()');
         const cols = this.gridOptions.columnApi.getColumns();
-        cols.map((c) => c.getColDef()).forEach(assignColId);
+        cols.map((c) => c.getColDef()).forEach((colDef) => assignColId(colDef, this.logger));
         // this needs to be here, before the other setup below
         // so the setup methods below reference the correct columns in adaptable store
         this.updateColumnsIntoStore();
@@ -3108,6 +3156,7 @@ class Adaptable {
         //this.setupAggregationColumnHeaders();
         this.redrawBody();
         this.redrawHeader();
+        perfSetupColumns.end();
     }
     revertGridOptionsPropertiesToUserValue(propertyNames) {
         for (const propertyName of propertyNames) {
@@ -3712,7 +3761,7 @@ class Adaptable {
         }
         cellDataChangedInfos.forEach((cellDataChangedInfo) => {
             if (cellDataChangedInfo.trigger === 'undo') {
-                (0, LoggingHelper_1.LogAdaptableInfo)(`Undo data change: PK(${cellDataChangedInfo.primaryKeyValue}) Col(${cellDataChangedInfo.column}) RevertedValue(${cellDataChangedInfo.oldValue}) OriginalValue(${cellDataChangedInfo.newValue})`);
+                this.logger.info(`Undo data change: PK(${cellDataChangedInfo.primaryKeyValue}) Col(${cellDataChangedInfo.column}) RevertedValue(${cellDataChangedInfo.oldValue}) OriginalValue(${cellDataChangedInfo.newValue})`);
             }
             if (cellDataChangedInfo.trigger === 'edit' || cellDataChangedInfo.trigger === 'undo') {
                 this.checkChangedCellCurrentlySelected(cellDataChangedInfo);
@@ -4068,12 +4117,6 @@ class Adaptable {
         });
         return data;
     }
-    loadDataSource(dataSource) {
-        if (this.hasAutogeneratedPrimaryKey()) {
-            this.addSyntheticPrimaryKey(dataSource);
-        }
-        this.setDataSource(dataSource);
-    }
     updateRows(dataRows, dataUpdateConfig) {
         if (this.hasAutogeneratedPrimaryKey()) {
             this.addSyntheticPrimaryKeyIfMissing(dataRows);
@@ -4417,11 +4460,12 @@ class Adaptable {
             return val;
         });
         if (abLoaded !== '777') {
-            (0, LoggingHelper_1.ConsoleLogError)('Please import Adaptable styles from "@adaptabletools/adaptable/index.css"');
+            this.logger.consoleError('Please import Adaptable styles from "@adaptabletools/adaptable/index.css"');
         }
         // every theme should define a custom css variable: --ab-theme-loaded: <themeName> defined on the document element.
         if (abThemeLoaded !== themeName) {
-            (0, LoggingHelper_1.ConsoleLogWarning)(`Theme "${themeName}" doesn't seem to be loaded! Make sure you import the css file for the "${themeName}" theme!
+            this.logger
+                .consoleWarn(`Theme "${themeName}" doesn't seem to be loaded! Make sure you import the css file for the "${themeName}" theme!
 
 If it's a default theme, try
 
@@ -4465,7 +4509,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
     }
     getGridOptionsApi() {
         if (!this.gridOptions.api) {
-            (0, LoggingHelper_1.ConsoleLogError)('There is a problem with your instance of AG Grid - it has no gridApi object.  Please contact Support.');
+            this.logger.consoleError('There is a problem with your instance of AG Grid - it has no gridApi object.  Please contact Support.');
             return;
         }
         return this.gridOptions.api;
@@ -4825,7 +4869,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
     }
     showChart(chartDefinition, container) {
         if (!this.gridOptions.api) {
-            (0, LoggingHelper_1.ConsoleLogError)('Adaptable must be instantiated before calling showChart');
+            this.logger.consoleError('Adaptable must be instantiated before calling showChart');
             return null;
         }
         /**
@@ -4844,7 +4888,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
     }
     getChartModels() {
         if (!this.gridOptions.api) {
-            (0, LoggingHelper_1.ConsoleLogError)('Adaptable must be instantiated before calling getChartModels');
+            this.logger.consoleError('Adaptable must be instantiated before calling getChartModels');
             return [];
         }
         return this.gridOptions.api.getChartModels();