@adaptabletools/adaptable 15.0.1 → 15.0.3-canary.0

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -6,7 +6,6 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 const ApiBase_1 = require("./ApiBase");
 const TeamSharingRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/TeamSharingRedux"));
 const TeamSharingRedux_1 = require("../../Redux/ActionsReducers/TeamSharingRedux");
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const TeamSharingInternalApi_1 = require("../Internal/TeamSharingInternalApi");
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const TeamSharingState_1 = require("../../PredefinedConfig/TeamSharingState");
@@ -17,7 +16,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
     }
     async loadSharedEntities() {
         if (!this.isTeamSharingAvailable()) {
-            (0, LoggingHelper_1.ConsoleLogWarning)('Team Sharing is not Activated so Entities cannot be loaded');
+            this.logWarn('Team Sharing is not Activated so Entities cannot be loaded');
             return [];
         }
         const teamSharingOptions = this.adaptable.adaptableOptions.teamSharingOptions;
@@ -41,12 +40,12 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         return sharedEntities;
     }
     async getSharedEntities() {
-        (0, logDeprecation_1.logDeprecation)('TeamSharingApi', 'getSharedEntities', 'loadSharedEntities');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'TeamSharingApi', 'getSharedEntities', 'loadSharedEntities');
         return this.loadSharedEntities();
     }
     async persistSharedEntities(sharedEntities) {
         if (!this.isTeamSharingAvailable()) {
-            (0, LoggingHelper_1.ConsoleLogWarning)('Team Sharing is not Activated so Entities cannot be shared');
+            this.logWarn('Team Sharing is not Activated so Entities cannot be shared');
             return false;
         }
         const teamSharingOptions = this.adaptable.adaptableOptions.teamSharingOptions;
@@ -60,7 +59,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         return true;
     }
     async setSharedEntities(sharedEntities) {
-        (0, logDeprecation_1.logDeprecation)('TeamSharingApi', 'setSharedEntities', 'persistSharedEntities');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'TeamSharingApi', 'setSharedEntities', 'persistSharedEntities');
         return this.persistSharedEntities(sharedEntities);
     }
     isTeamSharingAvailable() {
@@ -81,7 +80,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction((0, TeamSharingRedux_1.TeamSharingCheckForUpdates)());
     }
     showTeamSharingPopup() {
-        (0, logDeprecation_1.logDeprecation)('TeamSharingApi', 'showTeamSharingPopup', 'openTeamSharingSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'TeamSharingApi', 'showTeamSharingPopup', 'openTeamSharingSettingsPanel');
         return this.openTeamSharingSettingsPanel();
     }
     openTeamSharingSettingsPanel() {
@@ -89,25 +88,25 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
     }
     shareAdaptableEntity(adaptableObject, module, sharedEntityConfig) {
         if (!this.isTeamSharingAvailable()) {
-            (0, LoggingHelper_1.ConsoleLogWarning)('Team Sharing is not Activated so Entities cannot be shared');
+            this.logWarn('Team Sharing is not Activated so Entities cannot be shared');
             return;
         }
         this.dispatchAction(TeamSharingRedux.TeamSharingShare(adaptableObject, module, sharedEntityConfig));
     }
     shareCustomEntity(customObject, sharedEntityConfig) {
         if (!this.isTeamSharingAvailable()) {
-            (0, LoggingHelper_1.ConsoleLogWarning)('Team Sharing is not Activated so Entities cannot be shared');
+            this.logWarn('Team Sharing is not Activated so Entities cannot be shared');
             return;
         }
         this.dispatchAction(TeamSharingRedux.TeamSharingShareCustom(customObject, sharedEntityConfig));
     }
     shareEntity(entity, module, sharedEntityConfig) {
-        (0, logDeprecation_1.logDeprecation)('TeamSharingApi', 'shareEntity', 'shareAdaptableEntity');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'TeamSharingApi', 'shareEntity', 'shareAdaptableEntity');
         return this.shareAdaptableEntity(entity, module, sharedEntityConfig);
     }
     unshareEntity(entityId) {
         if (!this.isTeamSharingAvailable()) {
-            (0, LoggingHelper_1.ConsoleLogWarning)('Team Sharing is not Activated so Entities cannot be unshared');
+            this.logWarn('Team Sharing is not Activated so Entities cannot be unshared');
             return;
         }
         this.dispatchAction(TeamSharingRedux.TeamSharingRemoveItem(entityId));
@@ -119,7 +118,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         else {
             const customSharedEntityImportHandler = this.getAdaptableApi().optionsApi.getTeamSharingOptions().handleCustomSharedEntityImport;
             if (!customSharedEntityImportHandler) {
-                (0, LoggingHelper_1.LogAdaptableError)(`Could NOT import custom shared entity because 'TeamSharingOptions.handleCustomSharedEntityImport(...)' is NOT defined!`, sharedEntity);
+                this.logError(`Could NOT import custom shared entity because 'TeamSharingOptions.handleCustomSharedEntityImport(...)' is NOT defined!`, sharedEntity);
                 return;
             }
             customSharedEntityImportHandler(sharedEntity, {
@@ -145,7 +144,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(TeamSharingRedux.TeamSharingGet());
     }
     triggerLoadingTeamSharingEntries() {
-        (0, logDeprecation_1.logDeprecation)('TeamSharingApi', 'triggerLoadingTeamSharingEntries', 'refreshTeamSharing');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'TeamSharingApi', 'triggerLoadingTeamSharingEntries', 'refreshTeamSharing');
         this.refreshTeamSharing();
     }
 }

package/src/Api/Implementation/ThemeApiImpl.js

@@ -39,7 +39,7 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(ThemeRedux.ThemeSetUserThemes(userThemes));
     }
     getAllSystemTheme() {
-        (0, logDeprecation_1.logDeprecation)('ThemeApi', 'getAllSystemTheme', 'getSystemThemes');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ThemeApi', 'getAllSystemTheme', 'getSystemThemes');
         return this.getSystemThemes();
     }
     getSystemThemes() {
@@ -72,7 +72,7 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.api.eventApi.emit('ThemeChanged', themeChangedInfo);
     }
     getAllUserTheme() {
-        (0, logDeprecation_1.logDeprecation)('ThemeApi', 'getAllUserTheme', 'getUserThemes');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ThemeApi', 'getAllUserTheme', 'getUserThemes');
         return this.getUserThemes();
     }
     getUserThemes() {
@@ -80,14 +80,14 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         return (_a = this.getAdaptableState().Theme.UserThemes) !== null && _a !== void 0 ? _a : [];
     }
     getAllTheme() {
-        (0, logDeprecation_1.logDeprecation)('ThemeApi', 'getAllTheme', 'getThemes');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ThemeApi', 'getAllTheme', 'getThemes');
         return this.getThemes();
     }
     getThemes() {
         return [...this.getSystemThemes(), ...this.getUserThemes()];
     }
     showThemePopup() {
-        (0, logDeprecation_1.logDeprecation)('ThemeApi', 'showThemePopup', 'openThemeSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ThemeApi', 'showThemePopup', 'openThemeSettingsPanel');
         return this.openThemeSettingsPanel();
     }
     openThemeSettingsPanel() {

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -25,7 +25,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         return this.getUserInterfaceOptions().styleClassNames;
     }
     getAllPermittedValuesItems() {
-        (0, logDeprecation_1.logDeprecation)('UserInterfaceApi', 'getAllPermittedValuesItems', 'getPermittedValuesItems');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'UserInterfaceApi', 'getAllPermittedValuesItems', 'getPermittedValuesItems');
         return this.getPermittedValuesItems();
     }
     getPermittedValuesItems() {
@@ -123,7 +123,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         return this.getPermittedValuesForScope(column, allFilterPermittedValuesItems);
     }
     getAllEditLookUpItems() {
-        (0, logDeprecation_1.logDeprecation)('UserInterfaceApi', 'getAllEditLookUpItems', 'getEditLookUpItems');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'UserInterfaceApi', 'getAllEditLookUpItems', 'getEditLookUpItems');
         return this.getEditLookUpItems();
     }
     getEditLookUpItems() {

package/src/Api/Internal/AdaptableInternalApi.js

@@ -10,7 +10,6 @@ const DeadRedux = tslib_1.__importStar(require("../../Redux/DeadRedux"));
 const ApiBase_1 = require("../Implementation/ApiBase");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const waitForCondition_1 = require("../../Utilities/waitForCondition");
 const AdaptableIconComponent_1 = require("../../components/AdaptableIconComponent");
 class AdaptableInternalApi extends ApiBase_1.ApiBase {
@@ -278,7 +277,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
             catch (error) {
                 errorHandlingFn === null || errorHandlingFn === void 0 ? void 0 : errorHandlingFn();
                 this.hideProgressIndicator();
-                (0, LoggingHelper_1.LogAdaptableError)('Unexpected error while executing a function with a progress indicator', error);
+                this.adaptable.logger.error('Unexpected error while executing a function with a progress indicator', error);
             }
         }, 16);
     }

package/src/Api/Internal/ChartingInternalApi.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartingInternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class ChartingInternalApi extends ApiBase_1.ApiBase {
     getContainerElement(chartContainer) {
         const element = typeof (chartContainer === null || chartContainer === void 0 ? void 0 : chartContainer.element) === 'string'
             ? document.querySelector(chartContainer.element)
             : chartContainer === null || chartContainer === void 0 ? void 0 : chartContainer.element;
         if (!element && typeof (chartContainer === null || chartContainer === void 0 ? void 0 : chartContainer.element) === 'string') {
-            (0, LoggingHelper_1.ConsoleLogByMessageType)(`Chart container element not found: ${chartContainer.element}`, 'Error');
+            this.adaptable.logger.consoleLogByMessageType(`Chart container element not found: ${chartContainer.element}`, 'Error');
             return null;
         }
         return element;

package/src/Api/Internal/QueryInternalApi.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryInternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class QueryInternalApi extends ApiBase_1.ApiBase {
     /**
      * Returns the name of all the referenced Named Queries as an array of strings
@@ -16,7 +15,7 @@ class QueryInternalApi extends ApiBase_1.ApiBase {
         }
         catch (error) {
             // defensive programing, this should happen only if someone botched the predefined configs
-            (0, LoggingHelper_1.LogAdaptableWarning)(`QueryApi.getReferencedNamedQueryNames received an invalid expression: ${expression}
+            this.adaptable.logger.warn(`QueryApi.getReferencedNamedQueryNames received an invalid expression: ${expression}
                   Error: ${error}`);
             return [];
         }

package/src/Redux/Store/AdaptableReduxLocalStorageEngine.js

@@ -6,7 +6,7 @@ const isomorphic_fetch_1 = tslib_1.__importDefault(require("isomorphic-fetch"));
 const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
 const AdaptableReduxMerger_1 = require("./AdaptableReduxMerger");
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 const checkStatus = (response) => {
     const error = new Error(response.statusText);
     if (response.status >= 200 && response.status < 300) {
@@ -63,7 +63,7 @@ class AdaptableReduxLocalStorageEngine {
                     .then((parsedPredefinedState) => {
                     return (0, AdaptableReduxMerger_1.MergeStateFunction)(parsedPredefinedState, parsedJsonState);
                 })
-                    .catch((err) => (0, LoggingHelper_1.LogAdaptableError)(err));
+                    .catch((err) => AdaptableLogger_1.AdaptableLogger.consoleErrorBase(`AdaptableId: ${this.adaptableId}`, err));
             }
             if (predefinedConfig != null) {
                 // we have config as an object so need to merge that
@@ -71,7 +71,7 @@ class AdaptableReduxLocalStorageEngine {
                     .then((parsedPredefinedState) => {
                     return (0, AdaptableReduxMerger_1.MergeStateFunction)(parsedPredefinedState, parsedJsonState);
                 })
-                    .catch((err) => (0, LoggingHelper_1.LogAdaptableError)(err));
+                    .catch((err) => AdaptableLogger_1.AdaptableLogger.consoleErrorBase(`AdaptableId: ${this.adaptableId}`, err));
             }
             // no predefined config so nothing to merge
             return new Promise((resolve) => {
@@ -95,7 +95,7 @@ class AdaptableReduxLocalStorageEngine {
         }
         const promise = (_a = (this.persistState || persistState)(result, config)) === null || _a === void 0 ? void 0 : _a.catch(rejectWithMessage);
         if (!(promise instanceof Promise)) {
-            (0, LoggingHelper_1.ConsoleLogByMessageType)('stateOptions.persistState should return a promise, it returned', 'Error', promise);
+            AdaptableLogger_1.AdaptableLogger.consoleWarnBase(`AdaptableId: ${this.adaptableId}`, 'stateOptions.persistState should return a promise, it returned', 'Error', promise);
         }
         return promise;
     }

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -8,7 +8,6 @@ const isArray_1 = tslib_1.__importDefault(require("lodash/isArray"));
 const extend_1 = tslib_1.__importDefault(require("lodash/extend"));
 const isObject_1 = tslib_1.__importDefault(require("lodash/isObject"));
 const isAdaptableObject_1 = require("../../Utilities/isAdaptableObject");
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 function customizer(objValue, srcValue) {
     if ((0, isArray_1.default)(objValue)) {
         if (!Array.isArray(srcValue)) {
@@ -87,7 +86,7 @@ function MergeStateFunction(oldState, newState) {
     let state = newState;
     if (!state || typeof state !== 'object') {
         // in case loadState returns something different than an empty object
-        (0, LoggingHelper_1.LogAdaptableWarning)('State is something different that expected, expected object, received: ', state);
+        this.adaptable.logger.warn('State is something different that expected, expected object, received: ', state);
         state = {};
     }
     // any Module in config that doesn't exist in state will be added

package/src/Redux/Store/AdaptableStore.js

@@ -36,7 +36,6 @@ const StatusBarRedux = tslib_1.__importStar(require("../ActionsReducers/StatusBa
 const ChartingRedux = tslib_1.__importStar(require("../ActionsReducers/ChartingRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ConfigConstants = tslib_1.__importStar(require("../../Utilities/Constants/ConfigConstants"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const PreviewHelper_1 = require("../../Utilities/Helpers/PreviewHelper");
@@ -107,7 +106,7 @@ class AdaptableStore {
                 // END STATE LOAD
                 this.loadStorageInProgress = false;
             }, (e) => {
-                (0, LoggingHelper_1.LogAdaptableError)('Failed to load previous Adaptable State : ', e);
+                adaptable.logger.error('Failed to load previous Adaptable State : ', e);
                 //for now i'm still initializing Adaptable even if loading state has failed....
                 //we may revisit that later
                 this.TheStore.dispatch((0, exports.InitState)());
@@ -169,12 +168,12 @@ class AdaptableStore {
                     Object.keys(State).forEach((key) => {
                         // this check should be removed in version 12 !!!
                         if (key === 'Chart') {
-                            (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: AdapTable Charts Plugin is deprecated! AG Grid built-in charts are fully supported & integrated in AdapTable.
+                            adaptable.logger.consoleWarn(`DEPRECATED: AdapTable Charts Plugin is deprecated! AG Grid built-in charts are fully supported & integrated in AdapTable.
 
             Please contact 'support@adaptabletools.com' if you require any charting features that are not currently available.`);
                         }
                         if (key === 'SparklineColumn') {
-                            (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: AdapTable SparklineColumn is deprecated! AG Grid built-in Sparklines are fully supported & integrated in AdapTable.
+                            adaptable.logger.consoleWarn(`DEPRECATED: AdapTable SparklineColumn is deprecated! AG Grid built-in Sparklines are fully supported & integrated in AdapTable.
 
             Please contact 'support@adaptabletools.com' if you require any sparklines features that are not currently available.`);
                         }
@@ -189,7 +188,6 @@ class AdaptableStore {
         // If the user has remote storage set then we use Remote Engine, otherwise we use Local Enginge
         // not sure we can do this as we need to be backwardly compatible with existing users so need to stick with adaptable id (which should be unique)
         // const localStorageKey =  'adaptable-adaptable-state-' + adaptable.adaptableOptions.primaryKey;
-        const predefinedConfig = adaptable.adaptableOptions.predefinedConfig;
         storageEngine = (0, AdaptableReduxLocalStorageEngine_1.createEngine)({
             adaptableId: adaptable.adaptableOptions.adaptableId,
             adaptableStateKey: adaptable.adaptableOptions.adaptableStateKey,
@@ -1193,7 +1191,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingSet(sharedEntities));
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing get error : ' + error.message);
+                        adaptable.logger.error('TeamSharing get error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
                             header: 'Team Sharing',
@@ -1234,11 +1232,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     })
                         .then(() => {
                         if (shareSuccessful) {
-                            (0, LoggingHelper_1.LogAdaptableInfo)(`Custom Shared Object '${Configuration.Name}' Shared Successfully`);
+                            adaptable.logger.info(`Custom Shared Object '${Configuration.Name}' Shared Successfully`);
                         }
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing share error : ' + error.message, actionTyped.Entity);
+                        adaptable.logger.error('TeamSharing share error : ' + error.message, actionTyped.Entity);
                     });
                     return returnAction;
                 }
@@ -1291,7 +1289,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         }
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing share error : ' + error.message, actionTyped.Entity);
+                        adaptable.logger.error('TeamSharing share error : ' + error.message, actionTyped.Entity);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
                             header: 'Team Sharing',
@@ -1334,7 +1332,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         return adaptable.api.teamSharingApi.persistSharedEntities(newSharedEntities);
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing remove error : ' + error.message);
+                        adaptable.logger.error('TeamSharing remove error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
                             header: 'Team Sharing',
@@ -1391,7 +1389,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             }
                         }
                         else {
-                            (0, LoggingHelper_1.LogAdaptableError)('Team Sharing Import Error: Unknown item type', sharedEntity);
+                            adaptable.logger.error('Team Sharing Import Error: Unknown item type', sharedEntity);
                         }
                     }
                     if (activeSharedEntities.length) {
@@ -1440,7 +1438,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         return adaptable.api.teamSharingApi.persistSharedEntities(updatedSharedEntities);
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing update active item error : ' + error.message);
+                        adaptable.logger.error('TeamSharing update active item error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
                             header: 'Team Sharing',
@@ -1460,7 +1458,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         adaptable.api.internalApi.getTeamSharingService().showUpdateNotifications();
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing update error : ' + error.message);
+                        adaptable.logger.error('TeamSharing update error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
                             header: 'Team Sharing',

package/src/Strategy/CalculatedColumnModule.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const CalculatedColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/CalculatedColumnRedux"));
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const getExpressionViewItems_1 = require("./Utilities/getExpressionViewItems");
 const CalculatedColumnWizard_1 = require("../View/CalculatedColumn/Wizard/CalculatedColumnWizard");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
@@ -32,14 +31,14 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 };
                 cc.ColumnExpression = undefined;
                 oldCalculatedColumns.push(cc);
-                (0, LoggingHelper_1.LogAdaptableWarning)(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
+                this.api.logWarn(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
             }
             if (!cc.CalculatedColumnSettings) {
                 cc.CalculatedColumnSettings = {
                     DataType: 'Number',
                 };
                 oldCalculatedColumns.push(cc);
-                (0, LoggingHelper_1.LogAdaptableWarning)(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
+                this.api.logWarn(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
             }
         });
         oldCalculatedColumns.forEach((oldCalcCol) => this.api.calculatedColumnApi.editCalculatedColumn(oldCalcCol));

package/src/Strategy/DashboardModule.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const DashboardRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/DashboardRedux"));
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DashboardModuleId, ModuleConstants.DashboardFriendlyName, 'dashboard', 'DashboardPopup', 'The Dashboard - usually placed above the Grid - is designed to provide quick access to commonly required AdapTable functionalty', api);
@@ -13,7 +12,7 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     updateOldConfig() {
         let dashboardState = this.api.dashboardApi.getDashboardState();
         if (dashboardState.VisibleButtons) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Updating Obsolete VisibleButtons Config for DashboardState: [${dashboardState.VisibleButtons}]`);
+            this.api.logWarn(`Updating Obsolete VisibleButtons Config for DashboardState: [${dashboardState.VisibleButtons}]`);
             this.api.dashboardApi.setModuleButtons(dashboardState.VisibleButtons);
         }
     }

package/src/Strategy/DataChangeHistoryModule.js

@@ -7,7 +7,6 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
 const DataChangeHistoryStatusBarContent_1 = require("../View/DataChangeHistory/DataChangeHistoryStatusBarContent");
 const core_1 = require("@ag-grid-community/core");
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DataChangeHistoryModuleId, ModuleConstants.DataChangeHistoryFriendlyName, 'track-changes', 'DataChangeHistoryPopup', 'Provides an overview of all previous changes, giving the possibility to undo specific changes', api);
@@ -27,7 +26,7 @@ class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase
             .getAdaptableInstance()
             .isAgGridModulePresent(core_1.ModuleNames.ClientSideRowModelModule);
         if (isAdaptableModuleAvailable && !isAgGridModuleAvailable) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Data Change History is NOT available due to missing required AG Grid module: ${core_1.ModuleNames.ClientSideRowModelModule}`);
+            this.api.logWarn(`Data Change History is NOT available due to missing required AG Grid module: ${core_1.ModuleNames.ClientSideRowModelModule}`);
         }
         return isAdaptableModuleAvailable && isAgGridModuleAvailable;
     }

package/src/Strategy/FilterModule.js

@@ -7,7 +7,6 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const LayoutRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/LayoutRedux"));
 const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/SystemRedux"));
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const FilterStatusBarSubPanelPopover_1 = require("../View/Filter/FilterStatusBarSubPanelPopover");
 class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
@@ -29,7 +28,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const columnFilters = this.api.filterApi.getColumnFilters();
         columnFilters.forEach((cf) => {
             if (!this.api.columnApi.isColumnInGrid(cf.ColumnId)) {
-                (0, LoggingHelper_1.LogAdaptableError)('Column Filter contains missing column: ' + cf.ColumnId);
+                this.api.logError('Column Filter contains missing column: ' + cf.ColumnId);
             }
         });
     }

package/src/Strategy/FormatColumnModule.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const FormatColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/FormatColumnRedux"));
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const FormatColumnWizard_1 = require("../View/FormatColumn/Wizard/FormatColumnWizard");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const FormatColumnFormatWizardSection_1 = require("../View/FormatColumn/Wizard/FormatColumnFormatWizardSection");
@@ -94,7 +93,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!(oldConditionalStyles === null || oldConditionalStyles === void 0 ? void 0 : oldConditionalStyles.length)) {
             return;
         }
-        (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: Conditional Styles have been merged into 'Format Columns'`);
+        this.api.logWarn(`DEPRECATED: Conditional Styles have been merged into 'Format Columns'`);
         // remove conditional styles
         this.api.internalApi.deleteConditionalStyles(oldConditionalStyles);
         const transformedFormatColumns = oldConditionalStyles.map((conditionalStyle) => {

package/src/Strategy/StyledColumnModule.js

@@ -8,7 +8,6 @@ const StyledColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers
 const StyledColumnWizard_1 = require("../View/StyledColumn/Wizard/StyledColumnWizard");
 const StyledColumnWizardStyleSection_1 = require("../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
@@ -43,7 +42,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!formatColumnsWithColumnStyles.length) {
             return;
         }
-        (0, LoggingHelper_1.ConsoleLogInfo)(`Converting ${formatColumnsWithColumnStyles.length} FormatColumns Styles to Styled Columns`, formatColumnsWithColumnStyles);
+        this.api.logInfo(`Converting ${formatColumnsWithColumnStyles.length} FormatColumns Styles to Styled Columns`, formatColumnsWithColumnStyles);
         formatColumnsWithColumnStyles.forEach((formatColumn) => {
             this.api.formatColumnApi.deleteFormatColumn(formatColumn);
         });

package/src/Strategy/ToolPanelModule.js

@@ -6,7 +6,6 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const Types_1 = require("../PredefinedConfig/Common/Types");
 const ToolPanelRedux_1 = require("../Redux/ActionsReducers/ToolPanelRedux");
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ToolPanelModuleId, ModuleConstants.ToolPanelFriendlyName, 'tool-panel', 'ToolPanelPopup', 'An alternative to using the Dashboard is the AdapTable Tool Panel, the Tool Panel is the collapsible area to the right of the Grid.', api);
@@ -20,7 +19,7 @@ class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     updateOldConfig() {
         const deprecatedToolPanelConfigs = this.api.toolPanelApi.getToolPanelState().VisibleToolPanels;
         if (deprecatedToolPanelConfigs === null || deprecatedToolPanelConfigs === void 0 ? void 0 : deprecatedToolPanelConfigs.length) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Updating Obsolete VisibleToolPanels Config for ToolPanelState: [${deprecatedToolPanelConfigs}]`);
+            this.api.logWarn(`Updating Obsolete VisibleToolPanels Config for ToolPanelState: [${deprecatedToolPanelConfigs}]`);
             const migratedToolPanelConfigs = deprecatedToolPanelConfigs.map((toolPanel) => ({
                 Name: toolPanel,
                 State: 'collapsed',
@@ -29,7 +28,7 @@ class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         else if (!this.api.toolPanelApi.getToolPanelState().ToolPanels) {
             // no predefined config provided, we will display all the panels collapsed (custom & module)
-            (0, LoggingHelper_1.LogAdaptableInfo)(`No predefined ToolPanels provided, displaying all available ones (custom&system)`);
+            this.api.logInfo(`No predefined ToolPanels provided, displaying all available ones (custom&system)`);
             const defaultConfig = [];
             this.api.toolPanelApi
                 .getCustomToolPanels()

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -4,7 +4,6 @@ exports.AdaptableHelper = exports.addAdaptableObjectUuidAndSource = exports.runA
 const tslib_1 = require("tslib");
 const cloneDeepWith_1 = tslib_1.__importDefault(require("lodash/cloneDeepWith"));
 const isPlainObject_1 = tslib_1.__importDefault(require("lodash/isPlainObject"));
-const LoggingHelper_1 = require("./LoggingHelper");
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
 const DefaultAdaptableOptions_1 = require("../Defaults/DefaultAdaptableOptions");
 function assignAdaptableOptions(adaptableOptions) {
@@ -75,7 +74,7 @@ function checkValidPrimaryKey(adaptable) {
         }
         else {
             if (adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning == true) {
-                (0, LoggingHelper_1.ConsoleLogError)(errorMessage);
+                adaptable.logger.consoleError(errorMessage);
             }
         }
         return false;

package/src/Utilities/Helpers/DateHelper.js

@@ -4,8 +4,8 @@ exports.parseFilterInputDate = exports.parseDateValue = exports.parseToISO = exp
 const tslib_1 = require("tslib");
 const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
 const parse_1 = tslib_1.__importDefault(require("date-fns/parse"));
-const LoggingHelper_1 = require("./LoggingHelper");
 const FormatHelper_1 = require("./FormatHelper");
+const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 const isValidDate = (date) => {
     return date instanceof Date && !isNaN(date.getTime());
 };
@@ -57,7 +57,7 @@ const parseDateValue = (dateValue, dateFormat) => {
         }
     }
     if (!(0, exports.isValidDate)(dateInstance)) {
-        (0, LoggingHelper_1.LogAdaptableError)(`Invalid date value "${dateValue}" - cannot be converted to a Date instance. Please make sure you specify adaptableOptions.userInterfaceOptions.dateInputOptions.dateFormat correctly.`);
+        AdaptableLogger_1.AdaptableLogger.consoleWarnBase(`Invalid date value "${dateValue}" - cannot be converted to a Date instance. Please make sure you specify adaptableOptions.userInterfaceOptions.dateInputOptions.dateFormat correctly.`);
         dateInstance = undefined;
     }
     return dateInstance;

package/src/Utilities/Helpers/Helper.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Helper = exports.clamp = exports.modeNumberArray = exports.medianNumberArray = exports.meanNumberArray = exports.sumNumberArray = exports.RoundNumberTo4dp = exports.RoundNumber = exports.IsInputNotNullOrEmpty = exports.IsInputNullOrEmpty = exports.ReturnItemCount = exports.copyToClipboard = exports.createDownloadedFile = exports.convertArrayToCsv = exports.arrayToKeyMap = exports.cloneObject = exports.getStringRepresentionFromKey = exports.objectNotExists = exports.objectExists = void 0;
 const StringExtensions_1 = require("../Extensions/StringExtensions");
-const LoggingHelper_1 = require("./LoggingHelper");
+const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 function objectExists(item) {
     return item != null && item != undefined;
 }
@@ -104,14 +104,14 @@ function copyToClipboard(text) {
             return document.execCommand('copy'); // Security exception may be thrown by some browsers.
         }
         catch (ex) {
-            (0, LoggingHelper_1.LogAdaptableWarning)('Copy to clipboard failed.', ex);
+            AdaptableLogger_1.AdaptableLogger.consoleErrorBase('Copy to clipboard failed.', ex);
             return false;
         }
         finally {
             document.body.removeChild(textarea);
         }
     }
-    (0, LoggingHelper_1.LogAdaptableWarning)('Copy not available on this computer.');
+    AdaptableLogger_1.AdaptableLogger.consoleWarnBase('Copy not available on this computer.');
 }
 exports.copyToClipboard = copyToClipboard;
 function ReturnItemCount(items, itemName) {

package/src/Utilities/Helpers/StyleHelper.d.ts

@@ -1,4 +1,5 @@
 import { AdaptableStyle } from '../../types';
+export declare const AgGridCellStyleProperties: readonly ["backgroundColor", "color", "fontWeight", "fontStyle", "fontSize", "borderColor"];
 export declare const convertAdaptableStyleToCSS: (style: AdaptableStyle) => {
     [cssProperty: string]: string;
 };

package/src/Utilities/Helpers/StyleHelper.js

@@ -1,7 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVariableColor = exports.toStyle = exports.convertCSSAbsoluteFontSizeToPt = exports.convertAdaptableStyleToCSS = void 0;
+exports.getVariableColor = exports.toStyle = exports.convertCSSAbsoluteFontSizeToPt = exports.convertAdaptableStyleToCSS = exports.AgGridCellStyleProperties = void 0;
 const EnumExtensions_1 = require("../Extensions/EnumExtensions");
+// required for hacky fix for https://github.com/AdaptableTools/adaptable/issues/2119
+exports.AgGridCellStyleProperties = [
+    'backgroundColor',
+    'color',
+    'fontWeight',
+    'fontStyle',
+    'fontSize',
+    'borderColor',
+];
 const convertAdaptableStyleToCSS = (style) => {
     let result = {};
     if (style.BackColor !== undefined && style.BackColor !== null) {

package/src/Utilities/Services/AggregatedScalarLiveValue.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AggregatedScalarLiveValue = void 0;
 const scalarAggregationHelper_1 = require("../ExpressionFunctions/scalarAggregationHelper");
-const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 const doOnceFlags = {};
-const logOnce = (message) => {
+const logOnce = (message, loggingFn) => {
     if (doOnceFlags[message]) {
         return;
     }
-    (0, LoggingHelper_1.LogAdaptableWarning)(message);
+    loggingFn(message);
     doOnceFlags[message] = true;
 };
 class AggregatedScalarLiveValue {
@@ -42,7 +41,7 @@ class AggregatedScalarLiveValue {
     getAggregatedValueForRow(rowNode) {
         const aggregationValue = this.getAggregationValue(rowNode);
         if (aggregationValue == undefined) {
-            logOnce(`${this.aggregatedScalarExpression} :: aggregation value is NOT available!`);
+            logOnce(`${this.aggregatedScalarExpression} :: aggregation value is NOT available!`, this.adaptableApi.logWarn);
             return;
         }
         if (this.expressionEvaluation.rowValueGetter) {