@adaptabletools/adaptable 15.0.2 → 15.1.0-canary.0

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -21,6 +21,14 @@ const dateUtils_1 = require("./dateUtils");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const TypeExtensions_1 = require("../Extensions/TypeExtensions");
 const src_1 = require("../../parser/src");
+// useful for unary operators which expect a list of arguments
+// we extract the provided array elements into a list
+const flattenArguments = (values) => {
+    if (!Array.isArray(values)) {
+        return values;
+    }
+    return values.flat(Infinity);
+};
 const sanitizeArguments = (values, allowNaN) => {
     return values.filter((value) => value != undefined && value != null && value !== '' && (allowNaN || !isNaN(value)));
 };
@@ -113,7 +121,7 @@ exports.scalarExpressionFunctions = {
     },
     COALESCE: {
         handler(args) {
-            return args.find((arg) => !(arg === null || arg === undefined));
+            return flattenArguments(args).find((arg) => !(arg === null || arg === undefined));
         },
         description: 'Returns the first argument which is not null',
         signatures: ['COALESCE(value, value, ...value)'],
@@ -121,6 +129,16 @@ exports.scalarExpressionFunctions = {
         category: 'special',
         returnType: 'string',
     },
+    NULL: {
+        handler: () => {
+            return null;
+        },
+        description: 'Returns the NULL literal which represents the intentional absence of any object value',
+        category: 'special',
+        returnType: 'null',
+        signatures: ['NULL'],
+        examples: ['[status] = "accepted" ? 100 : NULL'],
+    },
     IS_BLANK: {
         handler(args) {
             return args[0] === undefined || args[0] === null || args[0] === '';
@@ -131,6 +149,85 @@ exports.scalarExpressionFunctions = {
         examples: ['IS_BLANK([col1])'],
         returnType: 'boolean',
     },
+    ABS: {
+        handler(args) {
+            return sanitizeNumericResult(Math.abs(args[0]));
+        },
+        isHiddenFromMenu: true,
+        description: 'Returns the absolute value of the given number',
+        signatures: ['ABS(a: number)'],
+        examples: ['ABS([columnName])'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    CEILING: {
+        handler(args) {
+            return sanitizeNumericResult(Math.ceil(args[0]));
+        },
+        isHiddenFromMenu: true,
+        description: 'Returns the smaller integer greater than or equal to the given number',
+        signatures: ['CEILING(a: number)'],
+        examples: ['CEILING([columnName])'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    FLOOR: {
+        handler(args) {
+            return sanitizeNumericResult(Math.floor(args[0]));
+        },
+        isHiddenFromMenu: true,
+        description: 'Returns the largest integer less than or equal to the given number',
+        signatures: ['FLOOR(a: number)'],
+        examples: ['FLOOR([columnName])'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    ROUND: {
+        handler(args) {
+            return sanitizeNumericResult(Math.round(args[0]));
+        },
+        isHiddenFromMenu: true,
+        description: 'Returns the value of the given number rounded to the nearest integer',
+        signatures: ['ROUND(a: number)'],
+        examples: ['ROUND([columnName])'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    MIN: {
+        handler(args) {
+            return Math.min(...sanitizeArguments(flattenArguments(args)));
+        },
+        description: 'Returns the smallest of given numbers',
+        signatures: ['MIN(number, number, ...number)'],
+        examples: ['MIN([col1], 5)'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    MAX: {
+        handler(args) {
+            return Math.max(...sanitizeArguments(flattenArguments(args)));
+        },
+        description: 'Returns the highest of given numbers',
+        signatures: ['MAX(number, number, ...number)'],
+        examples: ['MAX([col1], 5)'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    AVG: {
+        handler(args) {
+            const sanitizedArguments = sanitizeArguments(flattenArguments(args));
+            if (args.length && !sanitizedArguments.length) {
+                // expression is syntactically valid, but operates with incompatible values
+                return;
+            }
+            return sanitizedArguments.reduce((a, b) => a + b) / args.length;
+        },
+        description: 'Returns the average of inputted numbers',
+        signatures: ['AVG(number, number, ...number)'],
+        examples: ['AVG([col1], 5)'],
+        category: 'maths',
+        returnType: 'number',
+    },
     ADD: {
         handler(args) {
             const sanitizedArguments = sanitizeArguments(args, true);
@@ -196,17 +293,6 @@ exports.scalarExpressionFunctions = {
         category: 'maths',
         returnType: 'number',
     },
-    POW: {
-        handler(args) {
-            return sanitizeNumericResult(Math.pow(args[0], args[1]));
-        },
-        isHiddenFromMenu: true,
-        description: 'Returns the pow of 2 numbers',
-        signatures: ['number ^ number', 'POW(a: number, b: number)'],
-        examples: ['[col1] ^ 5', 'POW([col1], 5)'],
-        category: 'maths',
-        returnType: 'number',
-    },
     IF: {
         handler(args) {
             return args[0] ? args[1] : args[2];
@@ -255,38 +341,14 @@ exports.scalarExpressionFunctions = {
         category: 'conditional',
         returnType: 'any',
     },
-    MIN: {
-        handler(args) {
-            return Math.min(...sanitizeArguments(args));
-        },
-        description: 'Returns the smallest of inputted numbers',
-        signatures: ['MIN(number, number, ...number)'],
-        examples: ['MIN([col1], 5)'],
-        category: 'maths',
-        returnType: 'number',
-    },
-    MAX: {
-        handler(args) {
-            return Math.max(...sanitizeArguments(args));
-        },
-        description: 'Returns the highest of inputted numbers',
-        signatures: ['MAX(number, number, ...number)'],
-        examples: ['MAX([col1], 5)'],
-        category: 'maths',
-        returnType: 'number',
-    },
-    AVG: {
+    POW: {
         handler(args) {
-            const sanitizedArguments = sanitizeArguments(args);
-            if (args.length && !sanitizedArguments.length) {
-                // expression is syntactically valid, but operates with incompatible values
-                return;
-            }
-            return sanitizedArguments.reduce((a, b) => a + b) / args.length;
+            return sanitizeNumericResult(Math.pow(args[0], args[1]));
         },
-        description: 'Returns the average of inputted numbers',
-        signatures: ['AVG(number, number, ...number)'],
-        examples: ['AVG([col1], 5)'],
+        isHiddenFromMenu: true,
+        description: 'Returns the pow of 2 numbers',
+        signatures: ['number ^ number', 'POW(a: number, b: number)'],
+        examples: ['[col1] ^ 5', 'POW([col1], 5)'],
         category: 'maths',
         returnType: 'number',
     },

package/src/Utilities/Extensions/NumberExtensions.d.ts

@@ -1,5 +1,7 @@
 export declare function abbreviateNumber(numberToAbbreviate: number): string;
+export declare function WrapInParentheses(numberToWrap: number): string;
 export declare const NumberExtensions: {
     abbreviateNumber: typeof abbreviateNumber;
+    WrapInParentheses: typeof WrapInParentheses;
 };
 export default NumberExtensions;

package/src/Utilities/Extensions/NumberExtensions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NumberExtensions = exports.abbreviateNumber = void 0;
+exports.NumberExtensions = exports.WrapInParentheses = exports.abbreviateNumber = void 0;
 function abbreviateNumber(numberToAbbreviate) {
     let str = '';
     if (numberToAbbreviate >= 1000000000) {
@@ -18,7 +18,12 @@ function abbreviateNumber(numberToAbbreviate) {
     return str;
 }
 exports.abbreviateNumber = abbreviateNumber;
+function WrapInParentheses(numberToWrap) {
+    return ' (' + numberToWrap + ')';
+}
+exports.WrapInParentheses = WrapInParentheses;
 exports.NumberExtensions = {
     abbreviateNumber,
+    WrapInParentheses,
 };
 exports.default = exports.NumberExtensions;

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

package/src/Utilities/Services/AlertService.js

@@ -4,7 +4,6 @@ exports.AlertService = void 0;
 const tslib_1 = require("tslib");
 const Emitter_1 = tslib_1.__importDefault(require("../Emitter"));
 const rxjs_1 = require("rxjs");
-const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 class AlertService {
     constructor(adaptableApi) {
@@ -30,7 +29,7 @@ class AlertService {
         }
         const isValidExpression = this.adaptableApi.queryLanguageApi.isValidObservableExpression(alertDefinition.Rule.ObservableExpression, ModuleConstants_1.AlertModuleId, `Invalid Alert rule with observable expression `);
         if (!isValidExpression) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Could NOT create reactive alert due to invalid Rule definition!`, alertDefinition.Rule);
+            this.adaptableApi.logWarn(`Could NOT create reactive alert due to invalid Rule definition!`, alertDefinition.Rule);
             return;
         }
         const reactiveExpressionObservable = this.evaluateReactiveExpression(alertDefinition.Rule);

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CalculatedColumnExpressionService = void 0;
-const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 const AggregatedScalarLiveValue_1 = require("./AggregatedScalarLiveValue");
 class CalculatedColumnExpressionService {
@@ -74,7 +73,7 @@ class CalculatedColumnExpressionService {
             }
         }
         catch (e) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Invalid CalculatedColumn expression ${this.adaptableApi.queryLanguageApi.getAdaptableQueryExpression(calculatedColumnQuery)} :: ${e}`);
+            this.adaptableApi.logError(`Invalid CalculatedColumn expression ${this.adaptableApi.queryLanguageApi.getAdaptableQueryExpression(calculatedColumnQuery)} :: ${e}`);
             return 'Number';
         }
     }
@@ -118,7 +117,7 @@ class CalculatedColumnExpressionService {
             }
         }
         catch (error) {
-            (0, LoggingHelper_1.LogAdaptableError)(`Invalid CalculatedColumn expression ${(_d = (_c = calculatedColumn === null || calculatedColumn === void 0 ? void 0 : calculatedColumn.Query) === null || _c === void 0 ? void 0 : _c.ScalarExpression) !== null && _d !== void 0 ? _d : (_e = calculatedColumn === null || calculatedColumn === void 0 ? void 0 : calculatedColumn.Query) === null || _e === void 0 ? void 0 : _e.AggregatedScalarExpression} :: ${error}`);
+            this.adaptableApi.logError(`Invalid CalculatedColumn expression ${(_d = (_c = calculatedColumn === null || calculatedColumn === void 0 ? void 0 : calculatedColumn.Query) === null || _c === void 0 ? void 0 : _c.ScalarExpression) !== null && _d !== void 0 ? _d : (_e = calculatedColumn === null || calculatedColumn === void 0 ? void 0 : calculatedColumn.Query) === null || _e === void 0 ? void 0 : _e.AggregatedScalarExpression} :: ${error}`);
             return null;
         }
     }
@@ -134,7 +133,7 @@ class CalculatedColumnExpressionService {
                 this.aggregatedScalarLiveValuesMap.set(calculatedColumn.Uuid, aggregatedScalarLiveValue);
             }
             catch (e) {
-                (0, LoggingHelper_1.LogAdaptableError)(`Creating CalculatedColumn ('${(_c = calculatedColumn.Query) === null || _c === void 0 ? void 0 : _c.AggregatedScalarExpression}') failed!`, e.message);
+                this.adaptableApi.logError(`Creating CalculatedColumn ('${(_c = calculatedColumn.Query) === null || _c === void 0 ? void 0 : _c.AggregatedScalarExpression}') failed!`, e.message);
             }
         }
     }

package/src/Utilities/Services/DataService.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
 const rxjs_1 = require("rxjs");
 const Helper_1 = tslib_1.__importDefault(require("../Helpers/Helper"));
-const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 // ~ 8 hours
 const MAX_TIMEFRAME_SIZE = 86400000;
 class DataService {
@@ -50,7 +49,7 @@ class DataService {
         // why 2 and not 3 or 1? no good reason, only seems like a reasonable waiting time :)
         const UNDO_WAIT = 2000;
         const timeoutId = setTimeout(() => {
-            (0, LoggingHelper_1.LogAdaptableInfo)(`Undo change was NOT handled, this should NOT happen: PK(${change.primaryKeyValue}) Col(${change.column}) RevertedValue(${change.newValue}) NewValue(${change.oldValue})`);
+            this.adaptable.logger.warn(`Undo change was NOT handled, this should NOT happen: PK(${change.primaryKeyValue}) Col(${change.column}) RevertedValue(${change.newValue}) NewValue(${change.oldValue})`);
             this.extractUndoChange(change);
         }, UNDO_WAIT);
         this.undoChangeTimers.set(undoChangeKey, timeoutId);

package/src/Utilities/Services/LicenseService/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/SystemRedux"),s=require("../../../Redux/ActionsReducers/PopupRedux"),t=e.__importDefault(require("../../ObjectFactory")),o=require("../../Helpers/LoggingHelper"),i=e.__importDefault(require("lodash/clamp")),n=require("../../Constants/DocumentationLinkConstants"),r=require("../../license/decode"),c=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",d=10,p=864e5;var E;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(E=exports.LicenseValidityType||(exports.LicenseValidityType={}));const _=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,I=/(https):\/\/\S+(\.csb\.app)/g,O=/(https):\/\/\S+(\.adaptabletools\.com)/g,u="undefined"!=typeof window?window.location.origin:"",h=()=>{const[e,a,s]=Array.from(_.exec(u)||[]);return"https"===a&&"sandpack.codesandbox.io"===s},A=()=>{const[e,a,s]=Array.from(I.exec(u)||[]);return"https"===a&&".csb.app"===s},N=()=>{const[e,a,s]=Array.from(O.exec(u)||[]);return"https"===a&&".adaptabletools.com"===s};class L{constructor(e,a,s){this.adaptable=e,this.adaptable=e;let t=null;if(a)try{t=(0,r.decode)(a)}catch(e){t=e}h()||A()||N()||this.handleLicenseValidation(t,this.getValidityType(t,s))}getValidityType(e,a){if(!e)return E.NO_LICENSE;if(e instanceof Error)return E.INVALID_LICENSE;const s=new Date(a.publishedAt),t=new Date(e.end),o=t<new Date,i=e.trial;let n=null;return n=o?t>s?i?E.NON_PRODUCTION_EXPIRED_IN_SCOPE:E.COMMERCIAL_EXPIRED_IN_SCOPE:i?E.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:E.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?E.NON_PRODUCTION_VALID:E.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var s;const t=new Date;t.setHours(0,0,0,0);let E=0;e instanceof Error||!(null==e?void 0:e.end)||(E=Math.floor(((null===(s=null==e?void 0:e.end)||void 0===s?void 0:s.getTime())-t.getTime())/p),E=(0,i.default)(E,0,1/0));let _="",I="";!e||e instanceof Error||!e.appName||e.appName==r.GENERIC_APP_NAME||(_=e.appName,I=" for application [APP_NAME]");const O=(e,a=n.LicenseDocsLink,s=l,t=E,o=_)=>e.replace("[LINK]",a).replace("[EMAIL]",s).replace("[APP_NAME]",o).replace("[DAYS]",`${t}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":(0,o.ConsoleLogByMessageType)(O("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":(0,o.ConsoleLogByMessageType)(O("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":(0,o.ConsoleLogByMessageType)(O("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(O("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(E<=d)(0,o.ConsoleLogByMessageType)(O(`This AdapTable license${I} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,c.shouldLogThankYouMessage)()&&(0,o.ConsoleLogByMessageType)(O(`Thank you for using a valid AdapTable license${I}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(O(`This AdapTable license${I} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":(0,o.ConsoleLogByMessageType)(O(`This AdapTable license${I} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,s.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:t.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseDisablePersistence)())}destroy(){}}exports.LicenseService=L;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/SystemRedux"),t=require("../../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../../ObjectFactory")),o=e.__importDefault(require("lodash/clamp")),i=require("../../Constants/DocumentationLinkConstants"),n=require("../../license/decode"),r=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",c=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p=exports.LicenseValidityType||(exports.LicenseValidityType={}));const E=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,_=/(https):\/\/\S+(\.csb\.app)/g,h=/(https):\/\/\S+(\.adaptabletools\.com)/g,I="undefined"!=typeof window?window.location.origin:"",O=()=>{const[e,a,t]=Array.from(E.exec(I)||[]);return"https"===a&&"sandpack.codesandbox.io"===t},u=()=>{const[e,a,t]=Array.from(_.exec(I)||[]);return"https"===a&&".csb.app"===t},A=()=>{const[e,a,t]=Array.from(h.exec(I)||[]);return"https"===a&&".adaptabletools.com"===t};class N{constructor(e,a,t){this.adaptable=e,this.adaptable=e;let s=null;if(a)try{s=(0,n.decode)(a)}catch(e){s=e}O()||u()||A()||this.handleLicenseValidation(s,this.getValidityType(s,t))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),o=s<new Date,i=e.trial;let n=null;return n=o?s>t?i?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:i?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var t;const s=new Date;s.setHours(0,0,0,0);let p=0;e instanceof Error||!(null==e?void 0:e.end)||(p=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-s.getTime())/d),p=(0,o.default)(p,0,1/0));let E="",_="";!e||e instanceof Error||!e.appName||e.appName==n.GENERIC_APP_NAME||(E=e.appName,_=" for application [APP_NAME]");const h=(e,a=i.LicenseDocsLink,t=l,s=p,o=E)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",o).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(h("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":this.adaptable.logger.consoleLogByMessageType(h("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":this.adaptable.logger.consoleLogByMessageType(h("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(h("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(p<=c)this.adaptable.logger.consoleLogByMessageType(h(`This AdapTable license${_} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,r.shouldLogThankYouMessage)()&&this.adaptable.logger.consoleLogByMessageType(h(`Thank you for using a valid AdapTable license${_}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(h(`This AdapTable license${_} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(h(`This AdapTable license${_} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,t.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseDisablePersistence)())}destroy(){}}exports.LicenseService=N;

package/src/Utilities/Services/MetamodelService.js

@@ -4,9 +4,9 @@ exports.MetamodelService = void 0;
 const tslib_1 = require("tslib");
 const adaptable_metamodel_1 = require("../../metamodel/adaptable.metamodel");
 const DefaultAdaptableOptions_1 = require("../Defaults/DefaultAdaptableOptions");
-const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 const DocumentationLinkConstants_1 = require("../Constants/DocumentationLinkConstants");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
+const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 const supportedMetamodelTypes = ['s', 'n', 'b', 'a', 'f', 'R'];
 class MetamodelService {
     constructor(getAdaptableOptions) {
@@ -28,17 +28,16 @@ class MetamodelService {
     }
     validateAdaptableOptionsValues() {
         var _a;
-        (0, LoggingHelper_1.LogAdaptableInfo)('Validating Adaptable Options...');
         const adaptableOptionsValues = this.getAdaptableOptions();
         const adaptableOptionsMetamodel = this.getAdaptableOptionsMetamodel();
         const adaptableOptionsDefaultValues = this.getAdaptableOptionsDefaultValues();
         if ((_a = adaptableOptionsValues.adaptableId) === null || _a === void 0 ? void 0 : _a.includes('.')) {
-            (0, LoggingHelper_1.ConsoleLogWarning)("The 'AdaptableOptions.adaptableId' property should NOT include a '.' character.  We strongly recommend to remove it to avoid unexpected AdapTable behavior.");
+            AdaptableLogger_1.AdaptableLogger.consoleWarnBase("The 'AdaptableOptions.adaptableId' property should NOT include a '.' character.  We strongly recommend to remove it to avoid unexpected AdapTable behavior.");
         }
         const validationErrors = [];
         this.validateOptionsObject(validationErrors, 'AdaptableOptions', adaptableOptionsValues, adaptableOptionsMetamodel, adaptableOptionsDefaultValues);
         if (validationErrors.length) {
-            (0, LoggingHelper_1.LogAdaptableWarning)([
+            AdaptableLogger_1.AdaptableLogger.consoleWarnBase([
                 'AdaptableOptions validation errors:',
                 '\n',
                 ...validationErrors,

package/src/Utilities/Services/QueryLanguageService.js

@@ -4,7 +4,6 @@ exports.QueryLanguageService = void 0;
 const tslib_1 = require("tslib");
 const parser = tslib_1.__importStar(require("../../parser/src"));
 const rxjs_1 = require("rxjs");
-const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 const aggregatedScalarExpressionFunctions_1 = require("../ExpressionFunctions/aggregatedScalarExpressionFunctions");
 const aggregatedBooleanExpressionFunctions_1 = require("../ExpressionFunctions/aggregatedBooleanExpressionFunctions");
 const AggregatedScalarLiveValue_1 = require("./AggregatedScalarLiveValue");
@@ -289,7 +288,7 @@ class QueryLanguageService {
         const generalAggregatedBooleanExpressionFunctions = this.extractMappedExpressionFunctions(aggregatedBooleanExpressionFunctions_1.aggregatedBooleanExpressionFunctions, expressionOptions.systemAggregatedBooleanFunctions);
         const generalAggregatedScalarExpressionFunctions = this.extractMappedExpressionFunctions(aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions, expressionOptions.systemAggregatedScalarFunctions);
         if (!module) {
-            (0, LoggingHelper_1.LogAdaptableInfo)(`QueryLanguageService.getModuleExpressionFunctions() was called with an undefined 'module' param, this should never happen`);
+            this.adaptableApi.logWarn(`QueryLanguageService.getModuleExpressionFunctions() was called with an undefined 'module' param, this should never happen`);
             return {
                 booleanFunctions: generalBooleanExpressionFunctions,
                 scalarFunctions: generalScalarExpressionFunctions,

package/src/Utilities/logDeprecation.d.ts

@@ -1,3 +1,4 @@
-export declare const logDeprecation: <T>(typeName: string, oldProp: keyof T, newProp?: keyof T, message?: string) => void;
-export declare const logDeprecationExternal: <OLD_TYPE, NEW_TYPE>(oldTypeName: string, oldProp: keyof OLD_TYPE, newTypeName: string, newProp: keyof NEW_TYPE, message?: string) => void;
-export declare const logDeprecationInternal: <T>(typeName: string, oldProp: keyof T) => void;
+import { AdaptableLogger } from '../agGrid/AdaptableLogger';
+export declare const logDeprecation: <T>(logger: AdaptableLogger, typeName: string, oldProp: keyof T, newProp?: keyof T, message?: string) => void;
+export declare const logDeprecationExternal: <OLD_TYPE, NEW_TYPE>(logger: AdaptableLogger, oldTypeName: string, oldProp: keyof OLD_TYPE, newTypeName: string, newProp: keyof NEW_TYPE, message?: string) => void;
+export declare const logDeprecationInternal: <T>(logger: AdaptableLogger, typeName: string, oldProp: keyof T) => void;

package/src/Utilities/logDeprecation.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logDeprecationInternal = exports.logDeprecationExternal = exports.logDeprecation = void 0;
-const LoggingHelper_1 = require("./Helpers/LoggingHelper");
 const doOnceFlags = {};
 /**
  * If the key was passed before, then do NOT execute the func
@@ -13,18 +12,18 @@ const doOnce = (func, key) => {
     func();
     doOnceFlags[key] = true;
 };
-const logDeprecation = (typeName, oldProp, newProp, message) => {
+const logDeprecation = (logger, typeName, oldProp, newProp, message) => {
     const newPropMsg = newProp ? `Please use '${typeName}.${newProp}()' instead. ` : '';
-    doOnce(() => (0, LoggingHelper_1.ConsoleLogWarning)(`Adaptable: '${typeName}.${oldProp}()' is deprecated. ${newPropMsg}${message !== null && message !== void 0 ? message : ''}`), `Deprecated_${oldProp}`);
+    doOnce(() => logger.consoleWarn(`'${typeName}.${oldProp}()' is deprecated. ${newPropMsg}${message !== null && message !== void 0 ? message : ''}`), `Deprecated_${oldProp}`);
 };
 exports.logDeprecation = logDeprecation;
-const logDeprecationExternal = (oldTypeName, oldProp, newTypeName, newProp, message) => {
+const logDeprecationExternal = (logger, oldTypeName, oldProp, newTypeName, newProp, message) => {
     const newPropMsg = newProp ? `Please use '${newTypeName}.${newProp}()' instead. ` : '';
-    doOnce(() => (0, LoggingHelper_1.ConsoleLogWarning)(`Adaptable: '${oldTypeName}.${oldProp}()' is deprecated. ${newPropMsg}${message !== null && message !== void 0 ? message : ''}`), `Deprecated_${oldProp}`);
+    doOnce(() => logger.consoleWarn(`'${oldTypeName}.${oldProp}()' is deprecated. ${newPropMsg}${message !== null && message !== void 0 ? message : ''}`), `Deprecated_${oldProp}`);
 };
 exports.logDeprecationExternal = logDeprecationExternal;
-const logDeprecationInternal = (typeName, oldProp) => {
-    doOnce(() => (0, LoggingHelper_1.ConsoleLogWarning)(`Adaptable: '${typeName}.${oldProp}()' is deprecated. The method will be removed in the next major release.
+const logDeprecationInternal = (logger, typeName, oldProp) => {
+    doOnce(() => logger.consoleWarn(`'${typeName}.${oldProp}()' is deprecated. The method will be removed in the next major release.
         Please contact support if you need the missing functionality.`), `Deprecated_${oldProp}`);
 };
 exports.logDeprecationInternal = logDeprecationInternal;

package/src/View/Charting/useChartState.js

@@ -6,7 +6,6 @@ const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const useChartState = (chartDefinition) => {
     const [chartRef, setChartRef] = React.useState(null);
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -40,7 +39,7 @@ const useChartState = (chartDefinition) => {
             ? 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');
+            adaptable.logger.consoleLogByMessageType(`Chart container element not found: ${chartContainer.element}`, 'Error');
             return;
         }
         const chartRef = adaptable.api.chartingApi.getChartRef(chartDefinition.Model.chartId);

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.d.ts

@@ -25,6 +25,7 @@ export declare const AdaptableObjectListItemView: React.FunctionComponent<{
     suspendedEnabled?: boolean;
     teamSharingActivated?: boolean;
     disableDeleteConfirmation?: boolean;
+    module: IModule;
 }>;
 interface AdaptableObjectListItemProps {
     data: AdaptableObjectView;

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -56,9 +56,16 @@ const AdaptableObjectListItemView = (props) => {
                     typeof tag.view === 'function'
                         ? React.createElement(tag.view, {
                             data: props.abObject,
+                            module: props.module,
                         })
                         : tag.view,
-                    Boolean((tag === null || tag === void 0 ? void 0 : tag.values) && ((_a = tag === null || tag === void 0 ? void 0 : tag.values) === null || _a === void 0 ? void 0 : _a.length)) && (React.createElement(ValueSelector_1.ValueOptionsTags, { style: { marginRight: 0 }, readOnly: true, options: tag.values, value: tag.values, allowWrap: true, toIdentifier: (c) => c, toLabel: (c) => React.createElement(React.Fragment, null, c) })))));
+                    Boolean((tag === null || tag === void 0 ? void 0 : tag.values) && ((_a = tag === null || tag === void 0 ? void 0 : tag.values) === null || _a === void 0 ? void 0 : _a.length)) && (React.createElement(ValueSelector_1.ValueOptionsTags, { style: { marginRight: 0 }, readOnly: true, options: tag.values, value: tag.values, allowWrap: true, toIdentifier: (c) => c, toLabel: (c) => React.createElement(React.Fragment, null, c) })),
+                    typeof tag.viewAfter === 'function'
+                        ? React.createElement(tag.viewAfter, {
+                            data: props.abObject,
+                            module: props.module,
+                        })
+                        : tag.viewAfter)));
         })),
         props.showActions && (React.createElement(rebass_1.Flex, { flexDirection: "column", className: `${baseClassName}__buttons` },
             React.createElement(rebass_1.Flex, { justifyContent: "end" },
@@ -121,7 +128,7 @@ const AdaptableObjectListItem = (props) => {
     const disableDeleteConfirmationState = (0, react_redux_1.useSelector)((adaptableState) => SystemRedux.SystemDisableDeleteConfirmationSelector(adaptableState.System));
     const disableDeleteConfirmation = disableDeleteConfirmationState || ((_h = adaptableOpttions === null || adaptableOpttions === void 0 ? void 0 : adaptableOpttions.generalOptions) === null || _h === void 0 ? void 0 : _h.disableDeleteConfirmation);
     return (React.createElement(React.Fragment, null,
-        React.createElement(exports.AdaptableObjectListItemView, { disableDeleteConfirmation: disableDeleteConfirmation, abObject: props.data.abObject, accessLevel: accessLevel, actions: actions, className: itemClassName, handleOnEdit: handleOnEdit, items: props.data.items, showActions: showActions, showEditButton: showEditButton, style: props.data.style, teamSharingActivated: teamSharingActivated, onShare: (config) => adaptable.api.teamSharingApi.shareEntity(props.data.abObject, props.module.moduleInfo.ModuleName, config), entityType: entityType, deleteAction: deleteAction, deleteDisabled: props.deleteDisabled, deleteTooltip: props.deleteTooltip, editDisabled: isEditDisabled, suspendedEnabled: hasSuspend, onSuspend: () => dispatch(viewOptions.getSuspendAction(props.data.abObject)), onUnSuspend: () => dispatch(viewOptions.getUnSuspendAction(props.data.abObject)) }),
+        React.createElement(exports.AdaptableObjectListItemView, { module: props.module, disableDeleteConfirmation: disableDeleteConfirmation, abObject: props.data.abObject, accessLevel: accessLevel, actions: actions, className: itemClassName, handleOnEdit: handleOnEdit, items: props.data.items, showActions: showActions, showEditButton: showEditButton, style: props.data.style, teamSharingActivated: teamSharingActivated, onShare: (config) => adaptable.api.teamSharingApi.shareEntity(props.data.abObject, props.module.moduleInfo.ModuleName, config), entityType: entityType, deleteAction: deleteAction, deleteDisabled: props.deleteDisabled, deleteTooltip: props.deleteTooltip, editDisabled: isEditDisabled, suspendedEnabled: hasSuspend, onSuspend: () => dispatch(viewOptions.getSuspendAction(props.data.abObject)), onUnSuspend: () => dispatch(viewOptions.getUnSuspendAction(props.data.abObject)) }),
         isEditWizardVisible && EditWizard && (React.createElement(EditWizard, { defaultCurrentSectionName: wizardStepName, moduleInfo: props.module.moduleInfo, data: props.data.abObject, configEntities: null, onCloseWizard: handleCloseWizard, onFinishWizard: handleCloseWizard }))));
 };
 exports.AdaptableObjectListItem = AdaptableObjectListItem;

package/src/View/Dashboard/Dashboard.js

@@ -10,7 +10,6 @@ const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
 const DashboardRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/DashboardRedux"));
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const QuickSearchRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QuickSearchRedux"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const rebass_1 = require("rebass");
 const Dashboard_1 = require("../../components/Dashboard");
@@ -60,7 +59,7 @@ const DashboardComponent = (props) => {
                             React.createElement(ModuleToolbarWrapper_1.ModuleToolbarWrapper, { moduleInfo: moduleInfo, accessLevel: dashboardAccessLevel }, moduleToolbarElement)));
                     }
                     else {
-                        (0, LoggingHelper_1.LogAdaptableError)('Cannot find Dashboard Control for ' + visibleToolbarName);
+                        props.api.logError('Cannot find Dashboard Control for ' + visibleToolbarName);
                     }
                 }
             }

package/src/View/Layout/Wizard/sections/FilterSection.js

@@ -78,7 +78,7 @@ const FilterSection = (props) => {
                         view: (React.createElement(PredicateEditor_1.PredicateEditor, { columnId: columnFilter.ColumnId, predicate: columnFilter.Predicate, predicateDefs: predicateDefs, onChange: (predicate) => handlePredicateEdit(predicate, columnFilter), onClear: () => handlePredicateEdit(null, columnFilter) })),
                     },
                 ];
-                return (React.createElement(AdaptableObjectList_1.AdaptableObjectListItemView, { abObject: columnFilter, entityType: "Filter", showActions: true, showEditButton: false, items: items, onDelete: () => handleDelete(columnFilter), key: columnFilter.ColumnId }));
+                return (React.createElement(AdaptableObjectList_1.AdaptableObjectListItemView, { module: filterModule, abObject: columnFilter, entityType: "Filter", showActions: true, showEditButton: false, items: items, onDelete: () => handleDelete(columnFilter), key: columnFilter.ColumnId }));
             }))))));
 };
 exports.FilterSection = FilterSection;

package/src/View/StateManagement/handleExportState.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleExportState = void 0;
 const tslib_1 = require("tslib");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const handleExportState = (type, name, state) => {
     switch (type) {
         case 'Clipboard':
@@ -11,7 +10,7 @@ const handleExportState = (type, name, state) => {
             Helper_1.default.copyToClipboard(stringifiedState);
             break;
         case 'Console':
-            (0, LoggingHelper_1.ConsoleLog)(state);
+            console.log('Adaptable State: ', state);
             break;
         case 'JSON':
             const jsonFileName = name + '.json';