@adaptabletools/adaptable 15.0.2 → 15.1.0-canary.0

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -16,7 +16,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().FormatColumn;
     }
     getAllFormatColumn(config) {
-        (0, logDeprecation_1.logDeprecation)('FormatColumnApi', 'getAllFormatColumn', 'getFormatColumns');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FormatColumnApi', 'getAllFormatColumn', 'getFormatColumns');
         return this.getFormatColumns(config);
     }
     getFormatColumns(config) {
@@ -27,33 +27,33 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getFormatColumns({ includeLayoutNotAssociatedObjects: true }).find((formatColumn) => formatColumn.Uuid === id);
     }
     getAllActiveFormatColumn() {
-        (0, logDeprecation_1.logDeprecation)('FormatColumnApi', 'getAllActiveFormatColumn', 'getActiveFormatColumns');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FormatColumnApi', 'getAllActiveFormatColumn', 'getActiveFormatColumns');
         return this.getActiveFormatColumns({ includeLayoutNotAssociatedObjects: true });
     }
     getActiveFormatColumns(config) {
         return this.getFormatColumns(config).filter((formatColumn) => !formatColumn.IsSuspended);
     }
     getAllSuspendedFormatColumn() {
-        (0, logDeprecation_1.logDeprecation)('FormatColumnApi', 'getAllSuspendedFormatColumn', 'getSuspendedFormatColumns');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FormatColumnApi', 'getAllSuspendedFormatColumn', 'getSuspendedFormatColumns');
         return this.getSuspendedFormatColumns({ includeLayoutNotAssociatedObjects: true });
     }
     getSuspendedFormatColumns(config) {
         return this.getFormatColumns(config).filter((formatColumn) => formatColumn.IsSuspended);
     }
     getAllFormatColumnWithStyle() {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getAllFormatColumnWithStyle');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getAllFormatColumnWithStyle');
         return this.internalApi.getAllFormatColumnWithStyle();
     }
     getAllFormatColumnWithStyleAndCellAlignment() {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getAllFormatColumnWithStyleAndCellAlignment');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getAllFormatColumnWithStyleAndCellAlignment');
         return this.internalApi.getAllFormatColumnWithStyleAndCellAlignment();
     }
     getAllFormatColumnWithDisplayFormat() {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getAllFormatColumnWithDisplayFormat');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getAllFormatColumnWithDisplayFormat');
         return this.internalApi.getAllFormatColumnWithDisplayFormat();
     }
     getAllFormatColumnWithCellAlignment() {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getAllFormatColumnWithCellAlignment');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getAllFormatColumnWithCellAlignment');
         return this.internalApi.getAllFormatColumnWithCellAlignment();
     }
     addFormatColumn(formatColumn) {
@@ -95,7 +95,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return this.internalApi.getFormatColumnWithColumnInScope(formatColumns, column);
     }
     getFormatColumnsWithStyleForColumn(column, config) {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getFormatColumnsWithStyleForColumn');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getFormatColumnsWithStyleForColumn');
         return this.internalApi.getFormatColumnsWithStyleForColumn(column, config);
     }
     getFormatColumnsForColumnId(columnId, config) {
@@ -106,15 +106,15 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getFormatColumnsForColumn(abColumn, config);
     }
     getFormatColumnWithStyleClassNameForColumn(column, config) {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getFormatColumnWithStyleClassNameForColumn');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getFormatColumnWithStyleClassNameForColumn');
         return this.internalApi.getFormatColumnWithStyleClassNameForColumn(column, config);
     }
     getFormatColumnsWithDisplayFormatForColumn(column, config) {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getFormatColumnsWithDisplayFormatForColumn');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getFormatColumnsWithDisplayFormatForColumn');
         return this.internalApi.getFormatColumnsWithDisplayFormatForColumn(column, config);
     }
     showFormatColumnPopup() {
-        (0, logDeprecation_1.logDeprecation)('FormatColumnApi', 'showFormatColumnPopup', 'openFormatColumnSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FormatColumnApi', 'showFormatColumnPopup', 'openFormatColumnSettingsPanel');
         this.openFormatColumnSettingsPanel();
     }
     openFormatColumnSettingsPanel() {
@@ -130,15 +130,15 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return formatColumns.filter((fc) => this.adaptable.api.scopeApi.scopeHasColumns(fc.Scope));
     }
     getNumberFormattedValue(value, node, abColumn, options) {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getNumberFormattedValue');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getNumberFormattedValue');
         return this.internalApi.getNumberFormattedValue(value, node, abColumn, options);
     }
     getStringFormattedValue(value, node, abColumn, options) {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getStringFormattedValue');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getStringFormattedValue');
         return this.internalApi.getStringFormattedValue(value, node, abColumn, options);
     }
     getDateFormattedValue(value, node, abColumn, options) {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getDateFormattedValue');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getDateFormattedValue');
         return this.internalApi.getDateFormattedValue(value, node, abColumn, options);
     }
     hasCustomDisplayFormatter(formatColumn) {
@@ -154,19 +154,19 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return true;
     }
     getFormatColumnDefsForScope(scope) {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getFormatColumnDefsForScope');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getFormatColumnDefsForScope');
         return this.internalApi.getFormatColumnDefsForScope(scope);
     }
     getFormatColumnsRelevantForColumn(formatColumns, column, params) {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getFormatColumnsRelevantForColumn');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getFormatColumnsRelevantForColumn');
         return this.internalApi.getFormatColumnsRelevantForColumn(formatColumns, column, params);
     }
     isFormatColumnRelevantForColumn(formatColumn, column, params) {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'isFormatColumnRelevantForColumn');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'isFormatColumnRelevantForColumn');
         return this.internalApi.isFormatColumnRelevantForColumn(formatColumn, column, params);
     }
     getFormatColumnsWithExpression() {
-        (0, logDeprecation_1.logDeprecationInternal)('FormatColumnApi', 'getFormatColumnsWithExpression');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FormatColumnApi', 'getFormatColumnsWithExpression');
         return this.internalApi.getFormatColumnsWithExpression();
     }
     incrementFormatColumnPrecedence(formatColumn) {

package/src/Api/Implementation/FreeTextColumnApiImpl.js

@@ -6,7 +6,6 @@ const FreeTextColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsRed
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const FreeTextColumnInternalApi_1 = require("../Internal/FreeTextColumnInternalApi");
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
@@ -18,7 +17,7 @@ class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().FreeTextColumn;
     }
     getAllFreeTextColumn() {
-        (0, logDeprecation_1.logDeprecation)('FreeTextColumnApi', 'getAllFreeTextColumn', 'getFreeTextColumns');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FreeTextColumnApi', 'getAllFreeTextColumn', 'getFreeTextColumns');
         return this.getFreeTextColumns();
     }
     getFreeTextColumns() {
@@ -41,20 +40,20 @@ class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getFreeTextColumnById(freeTextColumn === null || freeTextColumn === void 0 ? void 0 : freeTextColumn.Uuid);
     }
     addEditFreeTextColumnStoredValue(freeTextColumn, storedValue) {
-        (0, logDeprecation_1.logDeprecation)('FreeTextColumnApi', 'addEditFreeTextColumnStoredValue', 'setStoredValue');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FreeTextColumnApi', 'addEditFreeTextColumnStoredValue', 'setStoredValue');
         return this.setStoredValue(freeTextColumn.ColumnId, storedValue);
     }
     setStoredValue(columnId, storedValue) {
         const freeTextColumn = this.getFreeTextColumnForColumnId(columnId);
         if (!freeTextColumn) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`No FreeTextColumn with columnId=${columnId} was found!`);
+            this.logWarn(`No FreeTextColumn with columnId=${columnId} was found!`);
             return;
         }
         this.dispatchAction(FreeTextColumnRedux.FreeTextColumnAddEditStoredValue(freeTextColumn, storedValue));
         return this.getFreeTextColumnById(freeTextColumn === null || freeTextColumn === void 0 ? void 0 : freeTextColumn.Uuid);
     }
     addStoredValuesToFreeTextColumn(columnId, storedValues, replaceAction) {
-        (0, logDeprecation_1.logDeprecation)('FreeTextColumnApi', 'addStoredValuesToFreeTextColumn', 'setStoredValues');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FreeTextColumnApi', 'addStoredValuesToFreeTextColumn', 'setStoredValues');
         this.setStoredValues(columnId, storedValues, replaceAction);
     }
     setStoredValues(columnId, storedValues, replaceAction) {
@@ -99,14 +98,14 @@ class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
         }
     }
     showFreeTextColumnPopup() {
-        (0, logDeprecation_1.logDeprecation)('FreeTextColumnApi', 'showFreeTextColumnPopup', 'openFreeTextColumnSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FreeTextColumnApi', 'showFreeTextColumnPopup', 'openFreeTextColumnSettingsPanel');
         this.openFreeTextColumnSettingsPanel();
     }
     openFreeTextColumnSettingsPanel() {
         this.showModulePopup(ModuleConstants.FreeTextColumnModuleId);
     }
     getFreeTextColumnValueFromRowNode(freeTextColumn, rowNode) {
-        (0, logDeprecation_1.logDeprecation)('FreeTextColumnApi', 'getFreeTextColumnValueFromRowNode', 'getFreeTextColumnValueForRowNode');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FreeTextColumnApi', 'getFreeTextColumnValueFromRowNode', 'getFreeTextColumnValueForRowNode');
         return this.getFreeTextColumnValueForRowNode(freeTextColumn, rowNode);
     }
     getFreeTextColumnValueForRowNode(freeTextColumn, rowNode) {
@@ -124,16 +123,16 @@ class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
             return freeTextColumn.DefaultValue;
         }
         catch (e) {
-            (0, LoggingHelper_1.LogAdaptableError)(e);
+            this.logError(e);
             return null;
         }
     }
     checkFreeTextColumnForDataChange(cellDataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)('FreeTextColumnApi', 'checkFreeTextColumnForDataChange');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FreeTextColumnApi', 'checkFreeTextColumnForDataChange');
         return this.internalApi.handleFreeTextColumnDataChange(cellDataChangedInfo);
     }
     getFreeTextColumnModuleReferences(freeTextColumn) {
-        (0, logDeprecation_1.logDeprecationInternal)('FreeTextColumnApi', 'getFreeTextColumnModuleReferences');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FreeTextColumnApi', 'getFreeTextColumnModuleReferences');
         return this.internalApi.getFreeTextColumnModuleReferences(freeTextColumn);
     }
 }

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

@@ -21,9 +21,10 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     constructor(adaptable: IAdaptable);
     getGridState(): GridState;
     setGridData(dataSource: any[]): void;
+    setInitialGridData(data: any): void;
+    loadGridData(dataSource: any): void;
     getGridData(): any[];
     getFilteredData(): any[];
-    loadGridData(dataSource: any): void;
     updateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     addGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode<any>[]>;
     undoCellEdit(cellDataChangedInfo: CellDataChangedInfo): boolean;
@@ -70,7 +71,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getFirstRowNode(): IRowNode;
     getFirstDisplayedRowNode(): IRowNode;
     getVisibleRowNodes(): IRowNode[];
-    getAllRowNodes(config: {
+    getAllRowNodes(config?: {
         includeGroupRows?: boolean;
         filterFn?: (rowNode: IRowNode) => boolean;
     }): IRowNode[];
@@ -98,6 +99,10 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     isGroupRowNode(rowNode: IRowNode): boolean;
     isQuickFilterAvailable(): boolean;
     redrawGrid(): void;
+    getGridCellsForRawValue(columnId: string, rawValue: any): GridCell[] | undefined;
+    getCellRawValueCount(columnId: string, rawValue: any): number;
+    getGridCellsForDisplayValue(columnId: string, displayValue: any): GridCell[] | undefined;
+    getCellDisplayValueCount(columnId: string, displayValue: any): number;
     fireGridSortedEvent(): void;
     fireCellChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;
     fireGridDataChangedEvent(dataRows: any[], rowNodes: IRowNode[], rowTrigger: 'Add' | 'Edit' | 'Delete'): void;

package/src/Api/Implementation/GridApiImpl.js

@@ -6,7 +6,6 @@ const ApiBase_1 = require("./ApiBase");
 const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const GridInternalApi_1 = require("../Internal/GridInternalApi");
 class GridApiImpl extends ApiBase_1.ApiBase {
@@ -19,6 +18,15 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     setGridData(dataSource) {
         this.adaptable.setDataSource(dataSource);
+        const allRowNodes = this.getAllRowNodes();
+        this.internalApi.fireGridDataChangedEvent(dataSource, allRowNodes, 'Add');
+    }
+    setInitialGridData(data) {
+        this.adaptable.setDataSource(data);
+    }
+    loadGridData(dataSource) {
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'GridApi', 'loadGridData', 'setInitialGridData');
+        this.setInitialGridData(dataSource);
     }
     getGridData() {
         return this.adaptable.getGridData();
@@ -26,9 +34,6 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     getFilteredData() {
         return this.adaptable.getFilteredData();
     }
-    loadGridData(dataSource) {
-        this.adaptable.loadDataSource(dataSource);
-    }
     async updateGridData(dataRows, dataUpdateConfig) {
         const rowNodes = await this.adaptable.updateRows(dataRows, dataUpdateConfig);
         this.internalApi.fireGridDataChangedEvent(dataRows, rowNodes, 'Edit');
@@ -56,18 +61,18 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     setCellValue(columnId, newValue, primaryKeyValue) {
         const abColumn = this.adaptable.api.columnApi.getColumnWithColumnId(columnId);
         if (!abColumn) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`setCellValue() - column not found for columnId: ${columnId}`);
+            this.logWarn(`setCellValue() - column not found for columnId: ${columnId}`);
             return;
         }
         const rowNode = this.getRowNodeForPrimaryKey(primaryKeyValue);
         if (!rowNode) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`setCellValue() - rowNode not found for primaryKeyValue: ${primaryKeyValue}`);
+            this.logWarn(`setCellValue() - rowNode not found for primaryKeyValue: ${primaryKeyValue}`);
             return;
         }
         this.adaptable.setDataValue(newValue, abColumn, primaryKeyValue, rowNode);
     }
     setCellsValue(gridCells) {
-        (0, logDeprecation_1.logDeprecation)('GridApi', 'setCellsValue', 'setCellValues');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'GridApi', 'setCellsValue', 'setCellValues');
         this.setCellValues(gridCells);
     }
     setCellValues(gridCells) {
@@ -305,7 +310,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.expandAllRowGroups();
     }
     closeAllRowGroups() {
-        (0, logDeprecation_1.logDeprecation)('GridApi', 'closeAllRowGroups', 'collapseAllRowGroups');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'GridApi', 'closeAllRowGroups', 'collapseAllRowGroups');
         this.collapseAllRowGroups();
     }
     collapseAllRowGroups() {
@@ -339,16 +344,50 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.redrawBody();
         this.adaptable.redrawHeader();
     }
+    getGridCellsForRawValue(columnId, rawValue) {
+        const gridCells = this.adaptable.getGridCellsForColumn(columnId);
+        if (!gridCells) {
+            return undefined;
+        }
+        const returnValues = [];
+        gridCells.forEach((gc) => {
+            if (gc.rawValue === rawValue) {
+                returnValues.push(gc);
+            }
+        });
+        return returnValues;
+    }
+    getCellRawValueCount(columnId, rawValue) {
+        const gridCells = this.getGridCellsForRawValue(columnId, rawValue);
+        return gridCells === null || gridCells === void 0 ? void 0 : gridCells.length;
+    }
+    getGridCellsForDisplayValue(columnId, displayValue) {
+        const gridCells = this.adaptable.getGridCellsForColumn(columnId);
+        if (!gridCells) {
+            return undefined;
+        }
+        const returnValues = [];
+        gridCells.forEach((gc) => {
+            if (gc.displayValue === displayValue) {
+                returnValues.push(gc);
+            }
+        });
+        return returnValues;
+    }
+    getCellDisplayValueCount(columnId, displayValue) {
+        const gridCells = this.getGridCellsForDisplayValue(columnId, displayValue);
+        return gridCells === null || gridCells === void 0 ? void 0 : gridCells.length;
+    }
     fireGridSortedEvent() {
-        (0, logDeprecation_1.logDeprecationInternal)('GridApi', 'fireGridSortedEvent');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'GridApi', 'fireGridSortedEvent');
         this.internalApi.fireGridSortedEvent();
     }
     fireCellChangedEvent(cellDataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)('GridApi', 'fireCellChangedEvent');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'GridApi', 'fireCellChangedEvent');
         this.internalApi.fireCellChangedEvent(cellDataChangedInfo);
     }
     fireGridDataChangedEvent(dataRows, rowNodes = [], rowTrigger) {
-        (0, logDeprecation_1.logDeprecationInternal)('GridApi', 'fireGridDataChangedEvent');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'GridApi', 'fireGridDataChangedEvent');
         this.internalApi.fireGridDataChangedEvent(dataRows, rowNodes, rowTrigger);
     }
     jumpToRow(primaryKeyValue) {
@@ -428,7 +467,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         return this.adaptable.isCellEditable(gridCell.rowNode, this.adaptable.getAgGridColumnForColumnId(gridCell.column.columnId));
     }
     areCellsEditable(gridCells) {
-        (0, logDeprecation_1.logDeprecation)('GridApi', 'areCellsEditable', 'isEveryCellEditable');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'GridApi', 'areCellsEditable', 'isEveryCellEditable');
         return this.isEveryCellEditable(gridCells);
     }
     isEveryCellEditable(gridCells) {
@@ -470,7 +509,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         return this.adaptable.getAgGridContainerElement();
     }
     showGridInfoPopup() {
-        (0, logDeprecation_1.logDeprecation)('GridApi', 'showGridInfoPopup', 'openGridInfoSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'GridApi', 'showGridInfoPopup', 'openGridInfoSettingsPanel');
         this.openGridInfoSettingsPanel();
     }
     openGridInfoSettingsPanel() {

package/src/Api/Implementation/LayoutApiImpl.js

@@ -8,7 +8,6 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 const ApiBase_1 = require("./ApiBase");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
@@ -51,7 +50,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         }
     }
     fireLayoutChangedEvent(trigger, oldState, newState, skipEqualityCheck) {
-        (0, logDeprecation_1.logDeprecationInternal)('LayoutApi', 'fireLayoutChangedEvent');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'LayoutApi', 'fireLayoutChangedEvent');
         this.internalApi.fireLayoutChangedEvent(trigger, oldState, newState, skipEqualityCheck);
     }
     getCurrentLayout() {
@@ -79,7 +78,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         }
     }
     getAllLayout() {
-        (0, logDeprecation_1.logDeprecation)('LayouApi', 'getAllLayout', 'getLayouts');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'LayouApi', 'getAllLayout', 'getLayouts');
         return this.getLayouts();
     }
     getLayouts() {
@@ -116,7 +115,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
     }
     createLayout(layoutToCreate) {
         if (this.doesLayoutExist(layoutToCreate)) {
-            (0, LoggingHelper_1.LogAdaptableError)("Cannot create layout with the Name: '" + layoutToCreate.Name + "' as it already exists");
+            this.logError("Cannot create layout with the Name: '" + layoutToCreate.Name + "' as it already exists");
             return false;
         }
         const newLayout = ObjectFactory_1.default.CreateEmptyLayout(Object.assign({}, layoutToCreate));
@@ -133,7 +132,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
     }
     cloneLayout(layoutToClone, layoutName) {
         if (!this.doesLayoutExist(layoutToClone)) {
-            (0, LoggingHelper_1.LogAdaptableError)("Cannot clone layout with Name: '" + layoutName + "' as other Layout does not exist");
+            this.logError("Cannot clone layout with Name: '" + layoutName + "' as other Layout does not exist");
             return false;
         }
         const newLayout = Helper_1.default.cloneObject(layoutToClone);
@@ -159,11 +158,11 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         }
     }
     areLayoutsEqual(layout1, layout2) {
-        (0, logDeprecation_1.logDeprecationInternal)('LayoutApi', 'areLayoutsEqual');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'LayoutApi', 'areLayoutsEqual');
         return this.internalApi.areLayoutsEqual(layout1, layout2);
     }
     createDefaultLayoutIfNeeded() {
-        (0, logDeprecation_1.logDeprecationInternal)('LayoutApi', 'createDefaultLayoutIfNeeded');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'LayoutApi', 'createDefaultLayoutIfNeeded');
         return this.internalApi.createDefaultLayoutIfNeeded();
     }
     showChangeColumnCaption(column) {
@@ -176,7 +175,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         }));
     }
     showLayoutPopup() {
-        (0, logDeprecation_1.logDeprecation)('LayoutApi', 'showLayoutPopup', 'openLayoutSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'LayoutApi', 'showLayoutPopup', 'openLayoutSettingsPanel');
         this.openLayoutSettingsPanel();
     }
     openLayoutSettingsPanel() {
@@ -186,7 +185,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         let preparedAction = action;
         if (!['Edit', 'New', 'Clone'].includes(action)) {
             preparedAction = 'Edit';
-            (0, LoggingHelper_1.LogAdaptableError)(`When opening the layout editor the action must be one of: New, Clone, Edit; given: ${action}`);
+            this.logError(`When opening the layout editor the action must be one of: New, Clone, Edit; given: ${action}`);
         }
         let layout = layoutName ? this.getLayoutByName(layoutName) : this.getCurrentLayout();
         if (preparedAction === 'New') {
@@ -207,12 +206,12 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
     }
     deleteLayout(layout) {
         if (layout.Name === GeneralConstants_1.DEFAULT_LAYOUT) {
-            (0, LoggingHelper_1.LogAdaptableWarning)('The Default Layout cannot be deleted');
+            this.logWarn('The Default Layout cannot be deleted');
             return;
         }
         const layoutCount = this.getLayouts().length;
         if (layoutCount === 1) {
-            (0, LoggingHelper_1.LogAdaptableWarning)('You cannot delete the only Layout.  AdapTable always requires one layout');
+            this.logWarn('You cannot delete the only Layout.  AdapTable always requires one layout');
             return;
         }
         this.dispatchAction(LayoutRedux.LayoutDelete(layout));
@@ -220,7 +219,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
     deleteLayoutByName(layoutName) {
         const layout = this.getLayoutByName(layoutName);
         if (!layout) {
-            (0, LoggingHelper_1.LogAdaptableWarning)('No Layout exists with that name');
+            this.logWarn('No Layout exists with that name');
             return;
         }
         return this.deleteLayout(layout);

package/src/Api/Implementation/PlusMinusApiImpl.js

@@ -32,7 +32,7 @@ class PlusMinusApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(PlusMinusRedux.PlusMinusApply(gridCells));
     }
     showPlusMinusPopup() {
-        (0, logDeprecation_1.logDeprecation)('PlusMinusApi', 'showPlusMinusPopup', 'openPlusMinusSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'PlusMinusApi', 'showPlusMinusPopup', 'openPlusMinusSettingsPanel');
         this.openPlusMinusSettingsPanel();
     }
     openPlusMinusSettingsPanel() {

package/src/Api/Implementation/PredicateApiImpl.js

@@ -4,7 +4,6 @@ exports.PredicateApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const AdaptablePredicate_1 = require("../../PredefinedConfig/Common/AdaptablePredicate");
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
@@ -39,7 +38,7 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
     predicateToString(predicate) {
         const predicateDef = this.getPredicateDefById(predicate.PredicateId);
         if (!predicateDef) {
-            (0, LoggingHelper_1.LogAdaptableWarning)('Cannot find Predicate with Id:' + predicate.PredicateId);
+            this.logWarn('Cannot find Predicate with Id:' + predicate.PredicateId);
             return '[Predicate Not found]';
         }
         let strPredicate = predicateDef.hasOwnProperty('toString')
@@ -69,7 +68,7 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
             ArrayExtensions_1.default.IsNullOrEmpty(predicate.Inputs));
     }
     arePredicatesValid(predicates) {
-        (0, logDeprecation_1.logDeprecation)('PredicateApi', 'arePredicatesValid', 'isEveryPredicateValid');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'PredicateApi', 'arePredicatesValid', 'isEveryPredicateValid');
         return this.isEveryPredicateValid(predicates);
     }
     isEveryPredicateValid(predicates) {
@@ -117,27 +116,27 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
         return predicates === null || predicates === void 0 ? void 0 : predicates.every((p) => this.handlePredicate(p, params, defaultReturn));
     }
     getEqualityPredicateForDataType(dataType) {
-        (0, logDeprecation_1.logDeprecationInternal)('PredicateApi', 'getEqualityPredicateForDataType');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getEqualityPredicateForDataType');
         return this.internalApi.getEqualityPredicateForDataType(dataType);
     }
     hasPredicateValues(predicate) {
-        (0, logDeprecation_1.logDeprecationInternal)('PredicateApi', 'hasPredicateValues');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'hasPredicateValues');
         return this.internalApi.hasPredicateValues(predicate);
     }
     getFilterPredicateDefs() {
-        (0, logDeprecation_1.logDeprecationInternal)('PredicateApi', 'getFilterPredicateDefs');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFilterPredicateDefs');
         return this.internalApi.getFilterPredicateDefs();
     }
     getAlertPredicateDefs() {
-        (0, logDeprecation_1.logDeprecationInternal)('PredicateApi', 'getAlertPredicateDefs');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getAlertPredicateDefs');
         return this.internalApi.getAlertPredicateDefs();
     }
     getFormatColumnPredicateDefs() {
-        (0, logDeprecation_1.logDeprecationInternal)('PredicateApi', 'getFormatColumnPredicateDefs');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFormatColumnPredicateDefs');
         return this.internalApi.getFormatColumnPredicateDefs();
     }
     getFlashingCellPredicateDefs() {
-        (0, logDeprecation_1.logDeprecationInternal)('PredicateApi', 'getFlashingCellPredicateDefs');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFlashingCellPredicateDefs');
         return this.internalApi.getFlashingCellPredicateDefs();
     }
 }

package/src/Api/Implementation/QueryApiImpl.js

@@ -18,7 +18,7 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().Query;
     }
     getAllNamedQuery() {
-        (0, logDeprecation_1.logDeprecation)('QueryApi', 'getAllNamedQuery', 'getNamedQueries');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'QueryApi', 'getAllNamedQuery', 'getNamedQueries');
         return this.getNamedQueries();
     }
     getNamedQueries() {
@@ -42,7 +42,7 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
         return { valid: true, message: '' };
     }
     showQueryPopup() {
-        (0, logDeprecation_1.logDeprecation)('QueryApi', 'showQueryPopup', 'openQuerySettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'QueryApi', 'showQueryPopup', 'openQuerySettingsPanel');
         this.openQuerySettingsPanel();
     }
     openQuerySettingsPanel() {
@@ -58,11 +58,11 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
         return this.getQueryState().CurrentQuery;
     }
     getReferencedNamedQueryNames(expression = '') {
-        (0, logDeprecation_1.logDeprecationInternal)('QueryApi', 'getReferencedNamedQueryNames');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'QueryApi', 'getReferencedNamedQueryNames');
         return this.internalApi.getReferencedNamedQueryNames(expression);
     }
     getNamedQueryModuleReferences(namedQueryName) {
-        (0, logDeprecation_1.logDeprecationInternal)('QueryApi', 'getNamedQueryModuleReferences');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'QueryApi', 'getNamedQueryModuleReferences');
         return this.internalApi.getNamedQueryModuleReferences(namedQueryName);
     }
     expandCurrentQuery(query) {
@@ -78,7 +78,7 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
         });
     }
     fireQueryRunEvent() {
-        (0, logDeprecation_1.logDeprecationInternal)('QueryApi', 'fireQueryRunEvent');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'QueryApi', 'fireQueryRunEvent');
         this.internalApi.fireQueryRunEvent();
     }
 }

package/src/Api/Implementation/QueryLanguageApiImpl.js

@@ -4,7 +4,6 @@ exports.QueryLanguageApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const parser = tslib_1.__importStar(require("../../parser/src"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const QueryLanguageInternalApi_1 = require("../Internal/QueryLanguageInternalApi");
 class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
@@ -16,7 +15,7 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
             .getQueryLanguageService()
             .validateBoolean(query, module, { force: true });
         if (!isValid && validationErrorMessage) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`${validationErrorMessage} :: ${errorMessage}`);
+            this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
         }
         return isValid;
     }
@@ -25,7 +24,7 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
             .getQueryLanguageService()
             .validateObservable(expression, module);
         if (!isValid && validationErrorMessage) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`${validationErrorMessage} :: ${errorMessage}`);
+            this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
         }
         return isValid;
     }
@@ -34,7 +33,7 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
             .getQueryLanguageService()
             .validateAggregatedBoolean(expression, module);
         if (!isValid && validationErrorMessage) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`${validationErrorMessage} :: ${errorMessage}`);
+            this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
         }
         return isValid;
     }
@@ -43,7 +42,7 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
             .getQueryLanguageService()
             .validateAggregatedScalar(expression, module);
         if (!isValid && validationErrorMessage) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`${validationErrorMessage} :: ${errorMessage}`);
+            this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
         }
         return isValid;
     }
@@ -66,7 +65,7 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
         }
         catch (error) {
             // defensive programing, this should happen only if someone botched the predefined configs
-            (0, LoggingHelper_1.LogAdaptableWarning)(`QueryApi.getColumnsFromExpressionInvalid received an invalid expression: ${expression}
+            this.logWarn(`QueryApi.getColumnsFromExpressionInvalid received an invalid expression: ${expression}
                   Error: ${error}`);
             return [];
         }

package/src/Api/Implementation/QuickSearchApiImpl.js

@@ -26,7 +26,7 @@ class QuickSearchApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(QuickSearchRedux.QuickSearchSetStyle(style));
     }
     showQuickSearchPopup() {
-        (0, logDeprecation_1.logDeprecation)('QuickSearchApi', 'showQuickSearchPopup', 'openQuickSearchSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'QuickSearchApi', 'showQuickSearchPopup', 'openQuickSearchSettingsPanel');
         this.openQuickSearchSettingsPanel();
     }
     openQuickSearchSettingsPanel() {