@adaptabletools/adaptable 15.0.2 → 15.1.0-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "15.0.2",
+  "version": "15.1.0-canary.0",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@infinite-table/infinite-react": "1.0.0",
     "date-fns": "^2.28.0",
-    "debug": "^4.3.1",
+    "debug": "4.3.4",
     "isomorphic-fetch": "^2.2.1",
     "lodash": "^4.17.15",
     "normalize.css": "^8.0.1",
@@ -56,6 +56,6 @@
     "uuid": "^3.3.2"
   },
   "peerDependencies": {
-    "@ag-grid-community/core": ">=29.0.0"
+    "@ag-grid-community/core": ">=29.1.0"
   }
 }

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1677769748348;
+declare const _default: 1680538758496;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1677769748348;
+exports.default = 1680538758496;

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -28,6 +28,7 @@ import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelSer
 import { ColumnValuesComparer } from '../AdaptableOptions/GeneralOptions';
 import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 import { RenderReactRootFn } from '../renderReactRoot';
+import { AdaptableLogger } from '../agGrid/AdaptableLogger';
 export declare type AdaptableVariant = 'vanilla' | 'react' | 'angular';
 /**
  *  The only interface for Adaptable
@@ -37,6 +38,7 @@ export declare type AdaptableVariant = 'vanilla' | 'react' | 'angular';
  * Should only be used internally as all external access is via the Api
  */
 export interface IAdaptable {
+    logger: AdaptableLogger;
     variant: AdaptableVariant;
     supressReact18RenderWarning: boolean;
     renderReactRoot: RenderReactRootFn;
@@ -139,7 +141,6 @@ export interface 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[]>;
@@ -175,6 +176,7 @@ export interface IAdaptable {
     getDisplayValueFromRowNode(rowNode: IRowNode, columnId: string): string | undefined;
     getDisplayValueFromRawValue(rowNode: IRowNode, columnId: string, rawValue: any): string | undefined;
     getNormalisedValueFromRawValue(rawValue: any, column: AdaptableColumn): string | number | boolean | Date | unknown;
+    getGridCellsForColumn(columnId: string): GridCell[] | undefined;
     getDataRowFromRowNode(rowNode: IRowNode): any;
     getRowNodesForPrimaryKeys(primaryKeyValues: any[]): IRowNode[];
     getRowNodeForPrimaryKey(primaryKeyValue: any): IRowNode;

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -186,4 +186,11 @@ export interface FilterOptions<TData = any> {
      * @defaultValue 250
      */
     quickFilterDebounce?: number;
+    /**
+     * Show the count of each distinct item for given column in the Values (IN) Filter
+     * @defaultValue  false
+     * @gridInfoItem
+     * @noCodeItem
+     */
+    showValuesCount?: (column: AdaptableColumn<TData>) => boolean;
 }

package/src/AdaptableOptions/GeneralOptions.d.ts

@@ -100,6 +100,10 @@ export interface DataSet extends AdaptableObject {
      * Params for Data Set popup form
      */
     form?: AdaptableForm<DataSetFormContext>;
+    /**
+     * Additional info for Data Set
+     */
+    info?: Record<string, string | number | boolean | Date>;
 }
 /**
  * Used when a DataSet displays a Form

package/src/AdaptableOptions/SearchOptions.d.ts

@@ -31,4 +31,12 @@ export interface SearchOptions<TData = any> {
      * @noCodeItem
      */
     filterResultsAfterQuickSearch?: boolean;
+    /**
+     * Include Row Groups when Quick Searching (highlight only)
+     *
+     * @defaultValue false
+     * @gridInfoItem
+     * @noCodeItem
+     */
+    runQuickSearchOnRowGroups?: boolean;
 }

package/src/AdaptableOptions/TeamSharingOptions.d.ts

@@ -49,6 +49,13 @@ export interface TeamSharingOptions {
      * @gridInfoItem
      */
     updateNotification?: 'Alert' | 'AlertWithNotification' | 'SystemStatus';
+    /**
+     * Suppress warning when an Import overrides existing Config item
+     *
+     * @defaultValue false
+     * @gridInfoItem
+     */
+    suppressOverrideConfigWarning?: boolean;
 }
 /**
  * Context provided to `TeamSharingOptions.loadSharedEntities()` callback

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -28,7 +28,7 @@ export interface UserInterfaceOptions<TData = any> {
      */
     dateInputOptions?: DateInputOptions;
     /**
-     * List of values which are permitted (e.g. to show in filter)
+     * List of values which are permitted (e.g. to show in Filter, Custom Sort etc.)
      */
     permittedValues?: PermittedValues<TData>[];
     /**
@@ -118,7 +118,7 @@ export interface EditLookUpPermittedValues<TData = any> extends BasePermittedVal
     values?: any[] | ((context: EditLookUpContext<TData>) => any[]);
 }
 /**
- * Used to define values inside the floating filter and floating filter (quick filter)
+ * Used to define values inside the Filter Bar and Filter Form
  */
 export interface FilterPermittedValues<TData = any> extends BasePermittedValues {
     /**
@@ -127,7 +127,7 @@ export interface FilterPermittedValues<TData = any> extends BasePermittedValues
      */
     suppressFilterSearchBar?: boolean;
     /**
-     * Values to display in 'IN' Filter: either hardcoded list or a function that returns a list
+     * Function returning Values to display in 'IN' Filter - can be async
      */
     values: (context: FilterPermittedValuesContext<TData>) => any[] | Promise<any[]>;
 }
@@ -136,7 +136,7 @@ export interface FilterPermittedValues<TData = any> extends BasePermittedValues
  */
 export interface CustomSortPermittedValues<TData = any> extends BasePermittedValues {
     /**
-     * Values to display in Custom Sort Wizard: either hardcoded list or a function that returns a list
+     * Function returning Values to display in Custom Sort Wizard - can be async
      */
     values: (context: PermittedValuesContext<TData>) => any[] | Promise<any[]>;
 }
@@ -145,7 +145,7 @@ export interface CustomSortPermittedValues<TData = any> extends BasePermittedVal
  */
 export interface BulkUpdatePermittedValues<TData = any> extends BasePermittedValues {
     /**
-     * Values to display in Bulk Update Wizard: either hardcoded list or a function that returns a list
+     * Function returning Values to display in Bulk Update Wizard - can be async
      */
     values: (context: BulkUpdatePermittedValuesContext<TData>) => any[] | Promise<any[]>;
 }

package/src/Api/GridApi.d.ts

@@ -20,11 +20,6 @@ export interface GridApi {
      * Returns Grid section from Adaptable State
      */
     getGridState(): GridState;
-    /**
-     * Repopulates grid with given data
-     * @param data any data from any datasource that is suitable for AG Grid
-     */
-    setGridData(data: any[]): void;
     /**
      * Retrieves all data from the grid
      */
@@ -34,9 +29,18 @@ export interface GridApi {
      */
     getFilteredData(): any[];
     /**
-     * Loads grid with given data
+     * Repopulates grid with given data and fires a 'GridDataChanged' event.
+     * @param data any data from any datasource that is suitable for AG Grid
+     */
+    setGridData(data: any[]): void;
+    /**
+     * Sets the grid with the given data. It does NOT fire a 'GridDataChanged' event.
      * @param data any data from any datasource that is suitable for AG Grid
      */
+    setInitialGridData(data: any): void;
+    /**
+     * @deprecated
+     */
     loadGridData(data: any): void;
     /**
      * Updates Adaptable (and AG Grid) with rows that have changed
@@ -272,6 +276,10 @@ export interface GridApi {
      * @param columnId ColumnId to lookup
      */
     getRawValueFromRowNode(rowNode: IRowNode, columnId: string): any | undefined;
+    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;
     /**
      * Retrieves Formatted Value for a given Raw Value in given Column
      * @param columnId ColumnId to lookup

package/src/Api/Implementation/ActionApiImpl.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionApiImpl = void 0;
 const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const ApiBase_1 = require("./ApiBase");
 const ActionInternalApi_1 = require("../Internal/ActionInternalApi");
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
@@ -26,7 +25,7 @@ class ActionApiImpl extends ApiBase_1.ApiBase {
     displayEditActionRow(primaryKey) {
         const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(primaryKey);
         if (!rowNode) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
+            this.logWarn(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
         }
         const editForm = this.internalApi.buildRowEditForm(rowNode);
         this.dispatchAction((0, PopupRedux_1.PopupShowForm)({
@@ -48,7 +47,7 @@ class ActionApiImpl extends ApiBase_1.ApiBase {
     displayCloneActionRow(primaryKey) {
         const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(primaryKey);
         if (!rowNode) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Can NOT clone row: rowNode not found for primaryKey ${primaryKey}`);
+            this.logWarn(`Can NOT clone row: rowNode not found for primaryKey ${primaryKey}`);
         }
         const createForm = this.internalApi.buildRowCreateForm(rowNode);
         this.dispatchAction((0, PopupRedux_1.PopupShowForm)({
@@ -61,7 +60,7 @@ class ActionApiImpl extends ApiBase_1.ApiBase {
         }));
     }
     getAllActionColumn() {
-        (0, logDeprecation_1.logDeprecation)('ActionApi', 'getAllActionColumn', 'getActionColumns');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ActionApi', 'getAllActionColumn', 'getActionColumns');
         return this.getActionColumns();
     }
 }

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

@@ -97,4 +97,8 @@ export declare class AdaptableApiImpl implements AdaptableApi {
         destroyApi?: boolean;
     }): void;
     isDestroyed(): boolean;
+    logInfo(message: string, ...optionalParams: any[]): void;
+    logSuccess(message: string, ...optionalParams: any[]): void;
+    logWarn(message: string, ...optionalParams: any[]): void;
+    logError(message: string, ...optionalParams: any[]): void;
 }

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -149,5 +149,17 @@ class AdaptableApiImpl {
     isDestroyed() {
         return this.destroyed;
     }
+    logInfo(message, ...optionalParams) {
+        this.adaptable.logger.info(message, optionalParams);
+    }
+    logSuccess(message, ...optionalParams) {
+        this.adaptable.logger.success(message, optionalParams);
+    }
+    logWarn(message, ...optionalParams) {
+        this.adaptable.logger.warn(message, optionalParams);
+    }
+    logError(message, ...optionalParams) {
+        this.adaptable.logger.error(message, optionalParams);
+    }
 }
 exports.AdaptableApiImpl = AdaptableApiImpl;

package/src/Api/Implementation/AlertApiImpl.js

@@ -6,7 +6,6 @@ const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/Sy
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const AlertRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/AlertRedux"));
 const ApiBase_1 = require("./ApiBase");
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert");
@@ -43,7 +42,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         return this.getAlertDefinitionById(alertDefinition.Uuid);
     }
     async displayAlert(alertToShow) {
-        (0, logDeprecation_1.logDeprecation)('AlertApi', 'displayAlert', 'showAdaptableAlert');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'AlertApi', 'displayAlert', 'showAdaptableAlert');
         await this.showAdaptableAlert(alertToShow);
     }
     async showAdaptableAlert(alertToShow) {
@@ -72,7 +71,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             }
             // 2. Log to console
             if (alertProperties.LogToConsole) {
-                (0, LoggingHelper_1.ConsoleLogByMessageType)(alertToShow.header + ': ' + alertToShow.message, alertDefinition.MessageType);
+                this.adaptable.logger.consoleLogByMessageType(alertToShow.header + ': ' + alertToShow.message, alertDefinition.MessageType);
             }
             // 3. Show it in a Div (if one has been set)
             if (alertProperties.ShowInDiv) {
@@ -139,7 +138,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         }
     }
     displayMessageAlertPopup(alertToDisplayAsPopup) {
-        (0, logDeprecation_1.logDeprecation)('AlertApi', 'displayMessageAlertPopup', 'showAdaptableAlertAsToast');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'AlertApi', 'displayMessageAlertPopup', 'showAdaptableAlertAsToast');
         this.showAdaptableAlertAsToast(alertToDisplayAsPopup);
     }
     showAdaptableAlertAsToast(alert) {
@@ -166,7 +165,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.AlertModuleId);
     }
     showAlertPopup() {
-        (0, logDeprecation_1.logDeprecation)('AlertApi', 'showAlertPopup', 'openAlertSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'AlertApi', 'showAlertPopup', 'openAlertSettingsPanel');
         this.openAlertSettingsPanel();
     }
     editAlertDefinition(alertDefinition) {
@@ -259,79 +258,79 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
      *  DEPRECATED INTERNAL METHODS
      */
     executeAlertAction(actionName, details) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'executeAlertAction');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'executeAlertAction');
         this.internalApi.executeAlertAction(actionName, details);
     }
     executeAlertButton(button, context) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'executeAlertButton');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'executeAlertButton');
         this.internalApi.executeAlertButton(button, context);
     }
     getActiveNonReactiveAlertDefinitions() {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getActiveNonReactiveAlertDefinitions');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getActiveNonReactiveAlertDefinitions');
         return this.internalApi.getActiveNonReactiveAlertDefinitions();
     }
     getActiveReactiveAlertDefinitions() {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getActiveReactiveAlertDefinitions');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getActiveReactiveAlertDefinitions');
         return this.internalApi.getActiveReactiveAlertDefinitions();
     }
     getAlertDefinitionsWithAllowEdit() {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getAlertDefinitionsWithAllowEdit');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertDefinitionsWithAllowEdit');
         return this.internalApi.getAlertDefinitionsWithAllowEdit();
     }
     getAlertDefinitionsWithPreventEdit() {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getAlertDefinitionsWithPreventEdit');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertDefinitionsWithPreventEdit');
         return this.internalApi.getAlertDefinitionsWithPreventEdit();
     }
     getAlertDescription(alertDefinition, cellDataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getAlertDescription');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertDescription');
         return this.internalApi.getAlertDescription(alertDefinition, cellDataChangedInfo);
     }
     getAlertMessageTitle(alertDefinition, cellDataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getAlertMessageTitle');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertMessageTitle');
         return this.internalApi.getAlertMessageTitle(alertDefinition, cellDataChangedInfo);
     }
     getAlertPredicateDefsForScope(scope) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getAlertPredicateDefsForScope');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertPredicateDefsForScope');
         return this.internalApi.getAlertPredicateDefsForScope(scope);
     }
     getAlertRuleDescription(alertDefinition) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getAlertRuleDescription');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertRuleDescription');
         return this.internalApi.getAlertRuleDescription(alertDefinition);
     }
     getAlertTypeForAdaptableAlert(alert) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getAlertTypeForAdaptableAlert');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertTypeForAdaptableAlert');
         return this.internalApi.getAlertTypeForAdaptableAlert(alert);
     }
     getCustomAlertDescription(alertDefinition, dataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getCustomAlertDescription');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getCustomAlertDescription');
         return this.internalApi.getCustomAlertDescription(alertDefinition, dataChangedInfo);
     }
     getCustomAlertMessageTitle(alertDefinition, dataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getCustomAlertMessageTitle');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getCustomAlertMessageTitle');
         return this.internalApi.getCustomAlertMessageTitle(alertDefinition, dataChangedInfo);
     }
     getNonReactiveAlertDefinitions() {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getNonReactiveAlertDefinitions');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getNonReactiveAlertDefinitions');
         return this.internalApi.getNonReactiveAlertDefinitions();
     }
     getReactiveAlertDefinitions() {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getReactiveAlertDefinitions');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getReactiveAlertDefinitions');
         return this.internalApi.getReactiveAlertDefinitions();
     }
     isCellChangedAdaptableAlert(alert) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'isCellChangedAdaptableAlert');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'isCellChangedAdaptableAlert');
         return this.internalApi.isCellChangedAdaptableAlert(alert);
     }
     isGenericAdaptableAlert(alert) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'isGenericAdaptableAlert');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'isGenericAdaptableAlert');
         return this.internalApi.isGenericAdaptableAlert(alert);
     }
     isRowChangedAdaptableAlert(alert) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'isRowChangedAdaptableAlert');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'isRowChangedAdaptableAlert');
         return this.internalApi.isRowChangedAdaptableAlert(alert);
     }
     publishAlertFiredEvent(alertToFire) {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'publishAlertFiredEvent');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'publishAlertFiredEvent');
         return this.internalApi.publishAlertFiredEvent(alertToFire);
     }
 }

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

@@ -22,6 +22,10 @@ export declare abstract class ApiBase {
      * @param adaptable the core IAdaptable object
      */
     constructor(adaptable: IAdaptable);
+    protected logInfo(message: string, ...optionalParams: any[]): void;
+    protected logSuccess(message: string, ...optionalParams: any[]): void;
+    protected logWarn(message: string, ...optionalParams: any[]): void;
+    protected logError(message: string, ...optionalParams: any[]): void;
     /**
      * Base api helper method which ensure that Adaptable Object being used in the function is not null or undefined
      *

package/src/Api/Implementation/ApiBase.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiBase = void 0;
 const tslib_1 = require("tslib");
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
 // Base class for the Api - provides checking dispatching methods
@@ -14,6 +13,18 @@ class ApiBase {
     constructor(adaptable) {
         this.adaptable = adaptable;
     }
+    logInfo(message, ...optionalParams) {
+        this.adaptable.logger.info(message, ...optionalParams);
+    }
+    logSuccess(message, ...optionalParams) {
+        this.adaptable.logger.success(message, ...optionalParams);
+    }
+    logWarn(message, ...optionalParams) {
+        this.adaptable.logger.warn(message, ...optionalParams);
+    }
+    logError(message, ...optionalParams) {
+        this.adaptable.logger.error(message, ...optionalParams);
+    }
     /**
      * Base api helper method which ensure that Adaptable Object being used in the function is not null or undefined
      *
@@ -24,14 +35,14 @@ class ApiBase {
      */
     checkItemExists(item, name, type) {
         if (Helper_1.default.objectNotExists(item)) {
-            (0, LoggingHelper_1.LogAdaptableError)(`No ${type} found with the name: ${name}`);
+            this.logError(`No ${type} found with the name: ${name}`);
             return false;
         }
         return true;
     }
     checkArrayExists(array) {
         if (!Array.isArray(array)) {
-            (0, LoggingHelper_1.LogAdaptableError)(`Item passed to Api function was not an array`);
+            this.logError(`Item passed to Api function was not an array`);
             return false;
         }
         return true;

package/src/Api/Implementation/CalculatedColumnApiImpl.js

@@ -7,7 +7,6 @@ const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const CalculatedColumnInternalApi_1 = require("../Internal/CalculatedColumnInternalApi");
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -21,7 +20,7 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         return (_a = this.getCalculatedColumnState().CalculatedColumns) !== null && _a !== void 0 ? _a : [];
     }
     getAllCalculatedColumn() {
-        (0, logDeprecation_1.logDeprecation)('CalculatedColumnApi', 'getAllCalculatedColumn', 'getCalculatedColumns');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CalculatedColumnApi', 'getAllCalculatedColumn', 'getCalculatedColumns');
         return this.getCalculatedColumns();
     }
     getCalculatedColumnById(id) {
@@ -40,7 +39,7 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getCalculatedColumnById(calculatedColumn.Uuid);
     }
     editCalculatedColumns(calculatedColumns) {
-        (0, logDeprecation_1.logDeprecationInternal)('CalculatedColumnApi', 'editCalculatedColumns');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'CalculatedColumnApi', 'editCalculatedColumns');
         calculatedColumns.forEach((cc) => {
             this.editCalculatedColumn(cc);
         });
@@ -68,7 +67,7 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         var _a;
         const aggregatedCalculatedColumn = this.getCalculatedColumnForColumnId(columnId);
         if (!((_a = aggregatedCalculatedColumn === null || aggregatedCalculatedColumn === void 0 ? void 0 : aggregatedCalculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression)) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Aggregated calculated column with ID=${columnId} was NOT found (and refreshed)!`);
+            this.logWarn(`Aggregated calculated column with ID=${columnId} was NOT found (and refreshed)!`);
             return;
         }
         this.getAdaptableApi()
@@ -77,23 +76,23 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         this.getGridApi().refreshCells(null, [columnId]);
     }
     showCalculatedColumnPopup() {
-        (0, logDeprecation_1.logDeprecation)('CalculatedColumnApi', 'showCalculatedColumnPopup', 'openCalculatedColumnSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CalculatedColumnApi', 'showCalculatedColumnPopup', 'openCalculatedColumnSettingsPanel');
         this.showModulePopup(ModuleConstants.CalculatedColumnModuleId);
     }
     getCalculatedColumnModuleReferences(calculatedColumn) {
-        (0, logDeprecation_1.logDeprecationInternal)('CalculatedColumnApi', 'getCalculatedColumnModuleReferences');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'CalculatedColumnApi', 'getCalculatedColumnModuleReferences');
         return this.internalApi.getCalculatedColumnModuleReferences(calculatedColumn);
     }
     getCalculatedColumnsReferencingColumnId(columnId) {
-        (0, logDeprecation_1.logDeprecationInternal)('CalculatedColumnApi', 'getCalculatedColumnsReferencingColumnId');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'CalculatedColumnApi', 'getCalculatedColumnsReferencingColumnId');
         return this.internalApi.getCalculatedColumnsReferencingColumnId(columnId);
     }
     getReferencedColumnIdsForCalculatedColumn(calculatedColumn) {
-        (0, logDeprecation_1.logDeprecationInternal)('CalculatedColumnApi', 'getReferencedColumnIdsForCalculatedColumn');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'CalculatedColumnApi', 'getReferencedColumnIdsForCalculatedColumn');
         return this.internalApi.getReferencedColumnIdsForCalculatedColumn(calculatedColumn);
     }
     getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId) {
-        (0, logDeprecation_1.logDeprecationInternal)('CalculatedColumnApi', 'getReferencedColumnIdsForCalculatedColumnId');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'CalculatedColumnApi', 'getReferencedColumnIdsForCalculatedColumnId');
         return this.internalApi.getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId);
     }
 }

package/src/Api/Implementation/CellSummaryApiImpl.js

@@ -27,7 +27,7 @@ class CellSummaryApiImpl extends ApiBase_1.ApiBase {
         return cellSummaryOperations;
     }
     showCellSummaryPopup() {
-        (0, logDeprecation_1.logDeprecation)('CellSummaryApi', 'showCellSummaryPopup', 'openCellSummaryPopupSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CellSummaryApi', 'showCellSummaryPopup', 'openCellSummaryPopupSettingsPanel');
         this.openCellSummaryPopupSettingsPanel();
     }
     setCurrentCellSummaryOperation(operation) {

package/src/Api/Implementation/ChartingApiImpl.js

@@ -39,7 +39,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         return (_a = (0, ChartingRedux_1.ChartingGetChartModels)(this.getAdaptableState())) !== null && _a !== void 0 ? _a : [];
     }
     getAllChartDefinitions() {
-        (0, logDeprecation_1.logDeprecation)('ChartingApi', 'getAllChartDefinitions', 'getChartDefinitions');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ChartingApi', 'getAllChartDefinitions', 'getChartDefinitions');
         return this.getChartDefinitions();
     }
     getChartDefinitionByUuid(uuid) {