@adaptabletools/adaptable 15.0.2 → 15.0.3-canary.0

package/src/Api/Implementation/LayoutApiImpl.js

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

package/src/Api/Implementation/PlusMinusApiImpl.js

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

package/src/Api/Implementation/PredicateApiImpl.js

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

package/src/Api/Implementation/QueryApiImpl.js

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

package/src/Api/Implementation/QueryLanguageApiImpl.js

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

package/src/Api/Implementation/QuickSearchApiImpl.js

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

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() {