@adaptabletools/adaptable 15.0.2 → 15.1.0-canary.0

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -11,7 +11,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().Schedule;
     }
     getAllSchedule() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllSchedule', 'getSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSchedule', 'getSchedules');
         return this.getSchedules();
     }
     getSchedules() {
@@ -24,7 +24,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return allSchedules;
     }
     getAllReminderSchedule(config) {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllReminderSchedule', 'getReminderSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllReminderSchedule', 'getReminderSchedules');
         return this.getReminderSchedules(config);
     }
     getReminderSchedules(config) {
@@ -35,14 +35,14 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getSchedules().find((schedule) => (schedule === null || schedule === void 0 ? void 0 : schedule.Uuid) === id);
     }
     getAllActiveReminderSchedule() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllActiveReminderSchedule', 'getActiveReminderSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllActiveReminderSchedule', 'getActiveReminderSchedules');
         return this.getActiveReminderSchedules();
     }
     getActiveReminderSchedules() {
         return this.getReminderSchedules().filter((schedule) => !schedule.IsSuspended);
     }
     getAllSuspendedReminderSchedule() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllSuspendedReminderSchedule', 'getSuspendedReminderSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSuspendedReminderSchedule', 'getSuspendedReminderSchedules');
         return this.getSuspendedReminderSchedules();
     }
     getSuspendedReminderSchedules() {
@@ -68,7 +68,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getAllReportSchedule(config) {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllReportSchedule', 'getReportSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllReportSchedule', 'getReportSchedules');
         return this.getReportSchedules();
     }
     getReportSchedules(config) {
@@ -76,14 +76,14 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return ((_a = this.handleLayoutAssociatedObjects(this.adaptable.api.exportApi.getReportSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getAllActiveReportSchedule() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllActiveReportSchedule', 'getActiveReportSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllActiveReportSchedule', 'getActiveReportSchedules');
         return this.getActiveReportSchedules();
     }
     getActiveReportSchedules() {
         return this.getReportSchedules().filter((schedule) => !schedule.IsSuspended);
     }
     getAllSuspendedReportSchedule() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllSuspendedReportSchedule', 'getSuspendedReportSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSuspendedReportSchedule', 'getSuspendedReportSchedules');
         return this.getSuspendedReportSchedules();
     }
     getSuspendedReportSchedules() {
@@ -109,7 +109,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getAllIPushPullSchedule(config) {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllIPushPullSchedule', 'getIPushPullSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllIPushPullSchedule', 'getIPushPullSchedules');
         return this.getIPushPullSchedules();
     }
     getIPushPullSchedules(config) {
@@ -118,14 +118,14 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return ((_a = this.handleLayoutAssociatedObjects(ippApi === null || ippApi === void 0 ? void 0 : ippApi.getIPushPullSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getAllActiveIPushPullSchedule() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllActiveIPushPullSchedule', 'getActiveIPushPullSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllActiveIPushPullSchedule', 'getActiveIPushPullSchedules');
         return this.getActiveIPushPullSchedules();
     }
     getActiveIPushPullSchedules() {
         return this.getIPushPullSchedules().filter((schedule) => !schedule.IsSuspended);
     }
     getAllSuspendedIPushPullSchedule() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllSuspendedIPushPullSchedule', 'getSuspendedIPushPullSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSuspendedIPushPullSchedule', 'getSuspendedIPushPullSchedules');
         return this.getSuspendedIPushPullSchedules();
     }
     getSuspendedIPushPullSchedules() {
@@ -151,7 +151,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getAllGlue42Schedule(config) {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllGlue42Schedule', 'getGlue42Schedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllGlue42Schedule', 'getGlue42Schedules');
         return this.getGlue42Schedules();
     }
     getGlue42Schedules(config) {
@@ -160,14 +160,14 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return ((_a = this.handleLayoutAssociatedObjects(glue42Api === null || glue42Api === void 0 ? void 0 : glue42Api.getGlue42Schedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getAllActiveGlue42Schedule() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllActiveGlue42Schedule', 'getActiveGlue42Schedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllActiveGlue42Schedule', 'getActiveGlue42Schedules');
         return this.getActiveGlue42Schedules();
     }
     getActiveGlue42Schedules() {
         return this.getGlue42Schedules().filter((schedule) => !schedule.IsSuspended);
     }
     getAllSuspendedGlue42Schedule() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllSuspendedGlue42Schedule', 'getSuspendedGlue42Schedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSuspendedGlue42Schedule', 'getSuspendedGlue42Schedules');
         return this.getSuspendedGlue42Schedules();
     }
     getSuspendedGlue42Schedules() {
@@ -193,7 +193,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getAllOpenFinSchedule(config) {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllOpenFinSchedule', 'getOpenFinSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllOpenFinSchedule', 'getOpenFinSchedules');
         return this.getOpenFinSchedules();
     }
     getOpenFinSchedules(config) {
@@ -202,14 +202,14 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return ((_a = this.handleLayoutAssociatedObjects(openFinApi === null || openFinApi === void 0 ? void 0 : openFinApi.getOpenFinSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getAllActiveOpenFinSchedule() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllActiveOpenFinSchedule', 'getActiveOpenFinSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllActiveOpenFinSchedule', 'getActiveOpenFinSchedules');
         return this.getActiveOpenFinSchedules();
     }
     getActiveOpenFinSchedules() {
         return this.getOpenFinSchedules().filter((schedule) => !schedule.IsSuspended);
     }
     getAllSuspendedOpenFinSchedule() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'getAllSuspendedOpenFinSchedule', 'getSuspendedOpenFinSchedules');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSuspendedOpenFinSchedule', 'getSuspendedOpenFinSchedules');
         return this.getSuspendedOpenFinSchedules();
     }
     getSuspendedOpenFinSchedules() {
@@ -284,7 +284,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(ScheduleRedux.ScheduleJobRun(schedule, scheduleType));
     }
     showSchedulePopup() {
-        (0, logDeprecation_1.logDeprecation)('ScheduleApi', 'showSchedulePopup', 'openScheduleSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'showSchedulePopup', 'openScheduleSettingsPanel');
         this.openScheduleSettingsPanel();
     }
     openScheduleSettingsPanel() {

package/src/Api/Implementation/SettingsPanelApiImpl.js

@@ -4,23 +4,22 @@ exports.SettingsPanelApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class SettingsPanelApiImpl extends ApiBase_1.ApiBase {
     showSettingsPanel(moduleName) {
-        (0, logDeprecation_1.logDeprecation)('SettingsPanelApi', 'showSettingsPanel', 'openSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'SettingsPanelApi', 'showSettingsPanel', 'openSettingsPanel');
         this.openSettingsPanel(moduleName);
     }
     openSettingsPanel(moduleName) {
         const moduleInfo = this.adaptable.ModuleService.getModuleInfoByModule(moduleName);
         if (!moduleInfo) {
-            (0, LoggingHelper_1.LogAdaptableError)(`${moduleName} module does not exist`);
+            this.logError(`${moduleName} module does not exist`);
             return;
         }
         this.dispatchAction(PopupRedux.PopupShowScreen(moduleName, moduleInfo.Popup));
     }
     showCustomSettingsPanel(name) {
-        (0, logDeprecation_1.logDeprecation)('SettingsPanelApi', 'showCustomSettingsPanel', 'openCustomSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'SettingsPanelApi', 'showCustomSettingsPanel', 'openCustomSettingsPanel');
         this.openCustomSettingsPanel(name);
     }
     openCustomSettingsPanel(name) {

package/src/Api/Implementation/ShortcutApiImpl.js

@@ -11,7 +11,7 @@ class ShortcutApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().Shortcut;
     }
     getAllShortcut(config) {
-        (0, logDeprecation_1.logDeprecation)('ShortcutApi', 'getAllShortcut', 'getShortcuts');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ShortcutApi', 'getAllShortcut', 'getShortcuts');
         return this.getShortcuts(config);
     }
     getShortcuts(config) {
@@ -22,14 +22,14 @@ class ShortcutApiImpl extends ApiBase_1.ApiBase {
         return this.getShortcuts().find((shortcut) => (shortcut === null || shortcut === void 0 ? void 0 : shortcut.Uuid) === id);
     }
     getAllActiveShortcut() {
-        (0, logDeprecation_1.logDeprecation)('ShortcutApi', 'getAllActiveShortcut', 'getActiveShortcuts');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ShortcutApi', 'getAllActiveShortcut', 'getActiveShortcuts');
         return this.getActiveShortcuts();
     }
     getActiveShortcuts() {
         return this.getShortcuts().filter((shortcut) => !shortcut.IsSuspended);
     }
     getAllSuspendedShortcut() {
-        (0, logDeprecation_1.logDeprecation)('ShortcutApi', 'getAllSuspendedShortcut', 'getSuspendedShortcuts');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ShortcutApi', 'getAllSuspendedShortcut', 'getSuspendedShortcuts');
         return this.getSuspendedShortcuts();
     }
     getSuspendedShortcuts() {
@@ -44,7 +44,7 @@ class ShortcutApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(ShortcutRedux.ShortcutDelete(shortcut));
     }
     deleteAllShortcut() {
-        (0, logDeprecation_1.logDeprecation)('ShortcutApi', 'deleteAllShortcut', 'deleteAllShortcuts');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ShortcutApi', 'deleteAllShortcut', 'deleteAllShortcuts');
         this.deleteAllShortcuts();
     }
     deleteAllShortcuts() {
@@ -61,7 +61,7 @@ class ShortcutApiImpl extends ApiBase_1.ApiBase {
         return this.getShortcutById(shortcut.Uuid);
     }
     showShortcutPopup() {
-        (0, logDeprecation_1.logDeprecation)('ShortcutApi', 'showShortcutPopup', 'openShortcutSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ShortcutApi', 'showShortcutPopup', 'openShortcutSettingsPanel');
         this.openShortcutSettingsPanel();
     }
     openShortcutSettingsPanel() {

package/src/Api/Implementation/SmartEditApiImpl.js

@@ -21,7 +21,7 @@ class SmartEditApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().System.SmartEditValue;
     }
     showSmartEditPopup() {
-        (0, logDeprecation_1.logDeprecation)('SmartEditApi', 'showSmartEditPopup', 'openSmartEditSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'SmartEditApi', 'showSmartEditPopup', 'openSmartEditSettingsPanel');
         this.openSmartEditSettingsPanel();
     }
     openSmartEditSettingsPanel() {

package/src/Api/Implementation/StyledColumnApiImpl.js

@@ -17,7 +17,7 @@ class StyledColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().StyledColumn;
     }
     getAllStyledColumn(config) {
-        (0, logDeprecation_1.logDeprecation)('StyledColumnApi', 'getAllStyledColumn', 'getStyledColumns');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'StyledColumnApi', 'getAllStyledColumn', 'getStyledColumns');
         return this.getStyledColumns(config);
     }
     getStyledColumns(config) {
@@ -28,21 +28,21 @@ class StyledColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getStyledColumns().find((styledcolumn) => styledcolumn.Uuid === id);
     }
     getStyledColumnByColumnId(id) {
-        (0, logDeprecation_1.logDeprecation)('StyledColumnApi', 'getStyledColumnByColumnId', 'getStyledColumnForColumnId');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'StyledColumnApi', 'getStyledColumnByColumnId', 'getStyledColumnForColumnId');
         return this.getStyledColumnForColumnId(id);
     }
     getStyledColumnForColumnId(columnId) {
         return this.getStyledColumns().find((styledcolumn) => styledcolumn.ColumnId === columnId);
     }
     getAllActiveStyledColumn() {
-        (0, logDeprecation_1.logDeprecation)('StyledColumnApi', 'getAllActiveStyledColumn', 'getActiveStyledColumns');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'StyledColumnApi', 'getAllActiveStyledColumn', 'getActiveStyledColumns');
         return this.getActiveStyledColumns();
     }
     getActiveStyledColumns() {
         return this.getStyledColumns().filter((styledcolumn) => !styledcolumn.IsSuspended);
     }
     getAllSuspendedStyledColumn() {
-        (0, logDeprecation_1.logDeprecation)('StyledColumnApi', 'getAllSuspendedStyledColumn', 'getSuspendedStyledColumns');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'StyledColumnApi', 'getAllSuspendedStyledColumn', 'getSuspendedStyledColumns');
         return this.getSuspendedStyledColumns();
     }
     getSuspendedStyledColumns() {

package/src/Api/Implementation/SystemStatusApiImpl.js

@@ -77,14 +77,14 @@ class SystemStatusApiImpl extends ApiBase_1.ApiBase {
         this.setSystemStatus(statusMessage, 'Info', statusFurtherInformation);
     }
     showSystemStatusPopup() {
-        (0, logDeprecation_1.logDeprecation)('SystemStatusApi', 'showSystemStatusPopup', 'openSystemStatusSettingsPanel');
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'SystemStatusApi', 'showSystemStatusPopup', 'openSystemStatusSettingsPanel');
         this.openSystemStatusSettingsPanel();
     }
     openSystemStatusSettingsPanel() {
         this.showModulePopup(ModuleConstants.SystemStatusModuleId);
     }
     fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)('SystemStatusApi', 'fireSystemStatusMessageDisplayedEvent');
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'SystemStatusApi', 'fireSystemStatusMessageDisplayedEvent');
         this.internalApi.fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo);
     }
     getCurrentSystemStatusMessageInfo() {

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/GridInternalApi.js

@@ -6,6 +6,7 @@ const ApiBase_1 = require("../Implementation/ApiBase");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
+const NumberExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/NumberExtensions"));
 class GridInternalApi extends ApiBase_1.ApiBase {
     /**
      * Fires Grid Sorted Event
@@ -76,10 +77,19 @@ class GridInternalApi extends ApiBase_1.ApiBase {
             };
         }
         const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, showFilteredRowsOnly, filter);
+        let showValuesCount = false;
+        const showValuesCountFunction = this.getFilterOptions().showValuesCount;
+        if (showValuesCountFunction) {
+            showValuesCount = showValuesCountFunction(abColumn);
+        }
         return {
             values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
+                const label = showValuesCount
+                    ? cv.displayValue +
+                        NumberExtensions_1.default.WrapInParentheses(this.getGridApi().getCellDisplayValueCount(abColumn.columnId, cv.displayValue))
+                    : cv.displayValue;
                 return {
-                    label: cv.displayValue,
+                    label: label,
                     value: cv.normalisedValue,
                 };
             }),

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