@adaptabletools/adaptable 11.0.0-canary.1 → 11.0.0-canary.5

package/src/Utilities/ExpressionFunctions/aggregationExpressionFunctions.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.aggregationExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const rxjs_1 = require("rxjs");
-const parseInt_1 = tslib_1.__importDefault(require("lodash-es/parseInt"));
+const parseInt_1 = tslib_1.__importDefault(require("lodash/parseInt"));
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const operators_1 = require("rxjs/operators");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");

package/src/Utilities/ExpressionFunctions/dateUtils.d.ts

@@ -0,0 +1 @@
+export declare const normalizeDateParams: (args: [string | number | Date, string | number | Date]) => [number | Date, number | Date];

package/src/Utilities/ExpressionFunctions/dateUtils.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeDateParams = void 0;
+exports.normalizeDateParams = (args) => {
+    let [first, second] = args;
+    if (typeof first === 'string') {
+        first = new Date(first);
+    }
+    if (typeof second === 'string') {
+        second = new Date(second);
+    }
+    return [first, second];
+};

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const operators_1 = require("rxjs/operators");
-const toNumber_1 = tslib_1.__importDefault(require("lodash-es/toNumber"));
+const toNumber_1 = tslib_1.__importDefault(require("lodash/toNumber"));
 const evaluator_1 = require("../../parser/src/evaluator");
 // string functions may be case (in)sensitive, see internalApi.isTextComparisonCaseSensitive()
 // if case is insensitive, we convert ALL involved strings to lower case

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -4,7 +4,7 @@ exports.observableExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const parseInt_1 = tslib_1.__importDefault(require("lodash-es/parseInt"));
+const parseInt_1 = tslib_1.__importDefault(require("lodash/parseInt"));
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 // numeric value(digits) followed by a single 's', 'm' or 'h' letter (case insensitive)
@@ -417,8 +417,7 @@ const getSlidingTimeframe$ = (source$, timeframeDuration, onTimeframeEnter, onTi
     }));
 };
 const getMaxTimeframeSize = (expressionValue, context) => {
-    let maxTimeframeSize = context.api.internalApi.getAdaptableOptions().queryLanguageOptions
-        .maxTimeframeSize;
+    let maxTimeframeSize = context.api.internalApi.getAdaptableOptions().queryLanguageOptions.maxTimeframeSize;
     if (maxTimeframeSize > SYSTEM_MAX_TIMEFRAME_SIZE) {
         maxTimeframeSize = SYSTEM_MAX_TIMEFRAME_SIZE;
     }

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -17,6 +17,7 @@ const differenceInWeeks_1 = tslib_1.__importDefault(require("date-fns/difference
 const differenceInMonths_1 = tslib_1.__importDefault(require("date-fns/differenceInMonths"));
 const differenceInYears_1 = tslib_1.__importDefault(require("date-fns/differenceInYears"));
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
+const dateUtils_1 = require("./dateUtils");
 exports.scalarExpressionFunctions = {
     ADD: {
         handler(args) {
@@ -222,7 +223,9 @@ exports.scalarExpressionFunctions = {
     },
     DIFF_DAYS: {
         handler(args) {
-            return differenceInDays_1.default(args[0], args[1]);
+            const [first, second] = dateUtils_1.normalizeDateParams(args);
+            const result = differenceInDays_1.default(first, second);
+            return isNaN(result) ? '' : result;
         },
         description: 'Returns the difference in days between 2 dates',
         signatures: ['DIFF_DAYS(a: date, b: date)'],
@@ -230,7 +233,9 @@ exports.scalarExpressionFunctions = {
     },
     DIFF_WEEKS: {
         handler(args) {
-            return differenceInWeeks_1.default(args[0], args[1]);
+            const [first, second] = dateUtils_1.normalizeDateParams(args);
+            const result = differenceInWeeks_1.default(first, second);
+            return isNaN(result) ? '' : result;
         },
         description: 'Returns the difference in weeks between 2 dates',
         signatures: ['DIFF_WEEKS(a: date, b: date)'],
@@ -238,7 +243,9 @@ exports.scalarExpressionFunctions = {
     },
     DIFF_MONTHS: {
         handler(args) {
-            return differenceInMonths_1.default(args[0], args[1]);
+            const [first, second] = dateUtils_1.normalizeDateParams(args);
+            const result = differenceInMonths_1.default(first, second);
+            return isNaN(result) ? '' : result;
         },
         description: 'Returns the difference in months between 2 dates',
         signatures: ['DIFF_MONTHS(a: date, b: date)'],
@@ -246,7 +253,9 @@ exports.scalarExpressionFunctions = {
     },
     DIFF_YEARS: {
         handler(args) {
-            return differenceInYears_1.default(args[0], args[1]);
+            const [first, second] = dateUtils_1.normalizeDateParams(args);
+            const result = differenceInYears_1.default(first, second);
+            return isNaN(result) ? '' : result;
         },
         description: 'Returns the difference in years between 2 dates',
         signatures: ['DIFF_YEARS(a: date, b: date)'],

package/src/Utilities/Extensions/StringExtensions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringExtensions = exports.IsNumeric = exports.ReplaceEmptySpacesWithUnderscore = exports.Humanize = exports.CapitaliseFirstLetter = exports.AbbreviateString = exports.NotIncludes = exports.Includes = exports.ToLowerCase = exports.RemoveTrailingComma = exports.CamelCaseToHumanText = exports.IsNotNullOrEmptyOrWhiteSpace = exports.IsNullOrEmptyOrWhiteSpace = exports.IsNotNullOrEmpty = exports.IsNullOrEmpty = exports.IsNotEmpty = exports.IsEmpty = exports.IsNotNull = exports.IsNull = void 0;
 const tslib_1 = require("tslib");
-const startCase_1 = tslib_1.__importDefault(require("lodash-es/startCase"));
+const startCase_1 = tslib_1.__importDefault(require("lodash/startCase"));
 function IsNull(stringToCheck) {
     return stringToCheck == null || stringToCheck == undefined;
 }

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableHelper = exports.addAdaptableObjectUuidAndSource = exports.runAdaptableComparerFunction = exports.checkAdaptableOptions = exports.getAppropriateAccessLevel = exports.AdaptableObjectExistsInState = exports.checkValidPrimaryKey = exports.initPredefinedConfigWithUuids = exports.assignAdaptableOptions = void 0;
 const tslib_1 = require("tslib");
-const cloneDeepWith_1 = tslib_1.__importDefault(require("lodash-es/cloneDeepWith"));
-const isPlainObject_1 = tslib_1.__importDefault(require("lodash-es/isPlainObject"));
+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");
@@ -13,6 +13,7 @@ function assignAdaptableOptions(adaptableOptions) {
     returnedAdaptableOptions.adaptableStateKey = (_a = returnedAdaptableOptions.adaptableStateKey) !== null && _a !== void 0 ? _a : returnedAdaptableOptions.adaptableId;
     returnedAdaptableOptions.layoutOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.layoutOptions, adaptableOptions.layoutOptions);
     returnedAdaptableOptions.notificationsOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.notificationsOptions, adaptableOptions.notificationsOptions);
+    returnedAdaptableOptions.alertOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.alertOptions, adaptableOptions.alertOptions);
     returnedAdaptableOptions.flashingCellOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.flashingCellOptions, adaptableOptions.flashingCellOptions);
     returnedAdaptableOptions.entitlementOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.entitlementOptions, adaptableOptions.entitlementOptions);
     returnedAdaptableOptions.dashboardOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dashboardOptions, adaptableOptions.dashboardOptions);

package/src/Utilities/Helpers/CalendarHelper.js

@@ -12,95 +12,260 @@ function getAvailableCalendars() {
             Name: 'United Kingdom',
             YearName: 2020,
             CalendarEntries: [
-                { HolidayName: "New Year's Day", HolidayDate: new Date('January 01, 2020').toJSON() },
-                { HolidayName: 'Good Friday', HolidayDate: new Date('April 10, 2020').toJSON() },
-                { HolidayName: 'Easter Monday', HolidayDate: new Date('April 13, 2020').toJSON() },
-                { HolidayName: 'Early May Bank Holiday', HolidayDate: new Date('May 8 2020').toJSON() },
-                { HolidayName: 'Spring Bank Holiday', HolidayDate: new Date('May 25, 2020').toJSON() },
-                { HolidayName: 'Summer Bank Holiday', HolidayDate: new Date('August 31, 2020').toJSON() },
-                { HolidayName: 'Christmas Day', HolidayDate: new Date('December 25, 2020').toJSON() },
-                { HolidayName: 'Boxing Day', HolidayDate: new Date('December 28, 2020').toJSON() },
+                {
+                    HolidayName: "New Year's Day",
+                    HolidayDate: new Date('January 01, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Good Friday',
+                    HolidayDate: new Date('April 10, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Easter Monday',
+                    HolidayDate: new Date('April 13, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Early May Bank Holiday',
+                    HolidayDate: new Date('May 8 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Spring Bank Holiday',
+                    HolidayDate: new Date('May 25, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Summer Bank Holiday',
+                    HolidayDate: new Date('August 31, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Christmas Day',
+                    HolidayDate: new Date('December 25, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Boxing Day',
+                    HolidayDate: new Date('December 28, 2020').toJSON(),
+                },
             ],
         },
         {
             Name: 'Germany',
             YearName: 2020,
             CalendarEntries: [
-                { HolidayName: "New Year's Day", HolidayDate: new Date('January 01, 2020').toJSON() },
-                { HolidayName: 'Good Friday', HolidayDate: new Date('April 10, 2020').toJSON() },
-                { HolidayName: 'Easter Monday', HolidayDate: new Date('April 13, 2020').toJSON() },
-                { HolidayName: 'Labour Day', HolidayDate: new Date('May 01 2020').toJSON() },
-                { HolidayName: 'Ascension Day', HolidayDate: new Date('May 21 2020').toJSON() },
-                { HolidayName: 'Whit Monday', HolidayDate: new Date('June 01, 2020').toJSON() },
-                { HolidayName: 'German Unity Day', HolidayDate: new Date('October 03, 2020').toJSON() },
-                { HolidayName: 'Christmas Day', HolidayDate: new Date('December 25, 2020').toJSON() },
-                { HolidayName: "St Stephen's Day", HolidayDate: new Date('December 26, 2020').toJSON() },
+                {
+                    HolidayName: "New Year's Day",
+                    HolidayDate: new Date('January 01, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Good Friday',
+                    HolidayDate: new Date('April 10, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Easter Monday',
+                    HolidayDate: new Date('April 13, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Labour Day',
+                    HolidayDate: new Date('May 01 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Ascension Day',
+                    HolidayDate: new Date('May 21 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Whit Monday',
+                    HolidayDate: new Date('June 01, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'German Unity Day',
+                    HolidayDate: new Date('October 03, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Christmas Day',
+                    HolidayDate: new Date('December 25, 2020').toJSON(),
+                },
+                {
+                    HolidayName: "St Stephen's Day",
+                    HolidayDate: new Date('December 26, 2020').toJSON(),
+                },
             ],
         },
         {
             Name: 'France',
             YearName: 2020,
             CalendarEntries: [
-                { HolidayName: 'New Years Day', HolidayDate: new Date('January 01, 2020').toJSON() },
-                { HolidayName: 'Easter Monday', HolidayDate: new Date('April 13, 2020').toJSON() },
-                { HolidayName: 'Labour Day', HolidayDate: new Date('May 01, 2020').toJSON() },
-                { HolidayName: 'VE Day', HolidayDate: new Date('May 08, 2020').toJSON() },
-                { HolidayName: 'Ascension Day', HolidayDate: new Date('May 21, 2020').toJSON() },
-                { HolidayName: 'Whitmonday', HolidayDate: new Date('June 01, 2020').toJSON() },
-                { HolidayName: 'Bastille Day', HolidayDate: new Date('July 14, 2020').toJSON() },
-                { HolidayName: 'Assumption Day', HolidayDate: new Date('August 15, 2020').toJSON() },
-                { HolidayName: 'All Saints Day', HolidayDate: new Date('November 01, 2020').toJSON() },
-                { HolidayName: 'Armistice Day', HolidayDate: new Date('November 11, 2020').toJSON() },
-                { HolidayName: 'Christmas Day', HolidayDate: new Date('December 25, 2020').toJSON() },
+                {
+                    HolidayName: 'New Years Day',
+                    HolidayDate: new Date('January 01, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Easter Monday',
+                    HolidayDate: new Date('April 13, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Labour Day',
+                    HolidayDate: new Date('May 01, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'VE Day',
+                    HolidayDate: new Date('May 08, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Ascension Day',
+                    HolidayDate: new Date('May 21, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Whitmonday',
+                    HolidayDate: new Date('June 01, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Bastille Day',
+                    HolidayDate: new Date('July 14, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Assumption Day',
+                    HolidayDate: new Date('August 15, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'All Saints Day',
+                    HolidayDate: new Date('November 01, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Armistice Day',
+                    HolidayDate: new Date('November 11, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Christmas Day',
+                    HolidayDate: new Date('December 25, 2020').toJSON(),
+                },
             ],
         },
         {
             Name: 'United States',
             YearName: 2020,
             CalendarEntries: [
-                { HolidayName: 'New Years Day', HolidayDate: new Date('January 01, 2020').toJSON() },
+                {
+                    HolidayName: 'New Years Day',
+                    HolidayDate: new Date('January 01, 2020').toJSON(),
+                },
                 {
                     HolidayName: 'Martin Luther King Day',
                     HolidayDate: new Date('January 20, 2020').toJSON(),
                 },
-                { HolidayName: 'Presidents Day', HolidayDate: new Date('February 17, 2020').toJSON() },
-                { HolidayName: 'Memorial Day', HolidayDate: new Date('May 25, 2020').toJSON() },
-                { HolidayName: 'Independence Day', HolidayDate: new Date('July 03, 2020').toJSON() },
-                { HolidayName: 'Labour Day', HolidayDate: new Date('September 07, 2020').toJSON() },
-                { HolidayName: 'Columbus Day', HolidayDate: new Date('October 12, 2020').toJSON() },
-                { HolidayName: 'Veterans Day', HolidayDate: new Date('November 11, 2020').toJSON() },
-                { HolidayName: 'Thanksgiving Day', HolidayDate: new Date('November 26, 2020').toJSON() },
-                { HolidayName: 'Christmas Day', HolidayDate: new Date('December 25, 2020').toJSON() },
+                {
+                    HolidayName: 'Presidents Day',
+                    HolidayDate: new Date('February 17, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Memorial Day',
+                    HolidayDate: new Date('May 25, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Independence Day',
+                    HolidayDate: new Date('July 03, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Labour Day',
+                    HolidayDate: new Date('September 07, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Columbus Day',
+                    HolidayDate: new Date('October 12, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Veterans Day',
+                    HolidayDate: new Date('November 11, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Thanksgiving Day',
+                    HolidayDate: new Date('November 26, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Christmas Day',
+                    HolidayDate: new Date('December 25, 2020').toJSON(),
+                },
             ],
         },
         {
             Name: 'Canada',
             YearName: 2020,
             CalendarEntries: [
-                { HolidayName: 'New Years Day', HolidayDate: new Date('January 01, 2020').toJSON() },
-                { HolidayName: 'Good Friday', HolidayDate: new Date('April 10, 2020').toJSON() },
-                { HolidayName: 'Victoria Day', HolidayDate: new Date('May 18, 2020').toJSON() },
-                { HolidayName: 'Canada Day', HolidayDate: new Date('July 01, 2020').toJSON() },
-                { HolidayName: 'Labour Day', HolidayDate: new Date('September 07, 2020').toJSON() },
-                { HolidayName: 'Thanksgiving', HolidayDate: new Date('October 12, 2020').toJSON() },
-                { HolidayName: 'Rememberance Day', HolidayDate: new Date('November 11, 2020').toJSON() },
-                { HolidayName: 'Christmas Day', HolidayDate: new Date('December 25, 2020').toJSON() },
-                { HolidayName: 'Boxing Day', HolidayDate: new Date('December 26, 2020').toJSON() },
+                {
+                    HolidayName: 'New Years Day',
+                    HolidayDate: new Date('January 01, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Good Friday',
+                    HolidayDate: new Date('April 10, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Victoria Day',
+                    HolidayDate: new Date('May 18, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Canada Day',
+                    HolidayDate: new Date('July 01, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Labour Day',
+                    HolidayDate: new Date('September 07, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Thanksgiving',
+                    HolidayDate: new Date('October 12, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Rememberance Day',
+                    HolidayDate: new Date('November 11, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Christmas Day',
+                    HolidayDate: new Date('December 25, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Boxing Day',
+                    HolidayDate: new Date('December 26, 2020').toJSON(),
+                },
             ],
         },
         {
             Name: 'Singapore',
             YearName: 2020,
             CalendarEntries: [
-                { HolidayName: 'New Years Day', HolidayDate: new Date('January 01, 2020').toJSON() },
-                { HolidayName: 'Chinese New Year', HolidayDate: new Date('January 25, 2020').toJSON() },
-                { HolidayName: 'Good Friday', HolidayDate: new Date('April 10, 2020').toJSON() },
-                { HolidayName: 'Labour Day', HolidayDate: new Date('May 01, 2020').toJSON() },
-                { HolidayName: 'Vesak Day', HolidayDate: new Date('May 07, 2020').toJSON() },
-                { HolidayName: 'National Day', HolidayDate: new Date('August 09, 2020').toJSON() },
-                { HolidayName: 'Hari Raya Haji', HolidayDate: new Date('August 10, 2020').toJSON() },
-                { HolidayName: 'Deewali', HolidayDate: new Date('November 14, 2020').toJSON() },
-                { HolidayName: 'Christmas Day', HolidayDate: new Date('December 25, 2020').toJSON() },
+                {
+                    HolidayName: 'New Years Day',
+                    HolidayDate: new Date('January 01, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Chinese New Year',
+                    HolidayDate: new Date('January 25, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Good Friday',
+                    HolidayDate: new Date('April 10, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Labour Day',
+                    HolidayDate: new Date('May 01, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Vesak Day',
+                    HolidayDate: new Date('May 07, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'National Day',
+                    HolidayDate: new Date('August 09, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Hari Raya Haji',
+                    HolidayDate: new Date('August 10, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Deewali',
+                    HolidayDate: new Date('November 14, 2020').toJSON(),
+                },
+                {
+                    HolidayName: 'Christmas Day',
+                    HolidayDate: new Date('December 25, 2020').toJSON(),
+                },
             ],
         },
     ];

package/src/Utilities/Interface/MessagePopups.d.ts

@@ -19,7 +19,9 @@ export interface InputAction extends Action {
 export interface UIPrompt {
     Header: string;
     Msg: string;
-    ConfirmAction: InputAction;
+    DefaultValue?: string;
+    ConfirmAction?: InputAction;
+    ConfirmActionCreator?: (inputText: string) => Action;
 }
 export interface ScreenPopup {
     ShowScreenPopup: boolean;
@@ -52,5 +54,7 @@ export interface PromptPopup {
     ShowPromptPopup: boolean;
     Header: string;
     Message: string;
-    ConfirmAction: InputAction;
+    ConfirmAction?: InputAction;
+    DefaultValue?: string;
+    ConfirmActionCreator?: (inputText: string) => Action;
 }

package/src/Utilities/ObjectFactory.js

@@ -85,9 +85,11 @@ exports.CreateEmptyAlertDefinition = CreateEmptyAlertDefinition;
 function CreateEmptyFlashingCellDefinition() {
     return {
         Uuid: Uuid_1.createUuid(),
-        Scope: { All: true },
+        Scope: { ColumnIds: [] },
         Rule: {
-            Predicate: undefined,
+            Predicate: {
+                PredicateId: 'Any',
+            },
         },
     };
 }
@@ -278,6 +280,7 @@ function CreateEmptyFreeTextColumn(isFilterable) {
         DefaultValue: GeneralConstants_1.EMPTY_STRING,
         FreeTextStoredValues: [],
         TextEditor: 'Inline',
+        DataType: 'String',
         FreeTextColumnSettings: {
             Filterable: isFilterable,
             Resizable: true,

package/src/Utilities/Services/DataService.js

@@ -58,7 +58,12 @@ class DataService {
         return result;
     }
     getUndoChangeKey(primaryKeyValue, columnId, previousValue, newValue) {
-        return JSON.stringify({ primaryKeyValue, columnId, previousValue, newValue });
+        return JSON.stringify({
+            primaryKeyValue,
+            columnId,
+            previousValue,
+            newValue,
+        });
     }
     logDataChange(dataChangedInfo) {
         const dataChangeLogEntry = this.extractDataChangeLogEntry(dataChangedInfo);

package/src/Utilities/Services/LicenseService.js

@@ -6,7 +6,7 @@ const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../ObjectFactory"));
 const LoggingHelper_1 = require("../Helpers/LoggingHelper");
-const clamp_1 = tslib_1.__importDefault(require("lodash-es/clamp"));
+const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
 const DocumentationLinkConstants_1 = require("../Constants/DocumentationLinkConstants");
 const decode_1 = require("../license/decode");
 const EMAIL = 'sales@adaptabletools.com';

package/src/Utilities/Services/QueryLanguageService.js

@@ -57,7 +57,10 @@ class QueryLanguageService {
             }
             const expression = expressionInput.trim();
             if (expression === '') {
-                const result = { isValid: false, errorMessage: 'empty boolean expression' };
+                const result = {
+                    isValid: false,
+                    errorMessage: 'empty boolean expression',
+                };
                 this.cacheBooleanValidation.set(cacheKey, result);
                 return result;
             }
@@ -113,7 +116,10 @@ class QueryLanguageService {
         }
         const expression = expressionInput.trim();
         if (expression === '') {
-            const result = { isValid: false, errorMessage: 'empty observable expression' };
+            const result = {
+                isValid: false,
+                errorMessage: 'empty observable expression',
+            };
             this.cacheObservableValidation.set(cacheKey, result);
             return result;
         }
@@ -147,7 +153,10 @@ class QueryLanguageService {
         }
         const expression = expressionInput.trim();
         if (expression === '') {
-            const result = { isValid: false, errorMessage: 'empty aggregation expression' };
+            const result = {
+                isValid: false,
+                errorMessage: 'empty aggregation expression',
+            };
             this.cacheAggregationValidation.set(cacheKey, result);
             return result;
         }
@@ -187,14 +196,10 @@ class QueryLanguageService {
         if (!module) {
             LoggingHelper_1.LogAdaptableInfo(`QueryLanguageService.getModuleExpressionFunctions() was called with an undefined 'module' param, this should never happen`);
             return {
-                booleanFunctions: this.adaptable.adaptableOptions.queryLanguageOptions
-                    .defaultBooleanFunctions,
-                scalarFunctions: this.adaptable.adaptableOptions.queryLanguageOptions
-                    .defaultScalarFunctions,
-                observableFunctions: this.adaptable.adaptableOptions.queryLanguageOptions
-                    .defaultObservableFunctions,
-                aggregationFunctions: this.adaptable.adaptableOptions.queryLanguageOptions
-                    .defaultAggregationFunctions,
+                booleanFunctions: this.adaptable.adaptableOptions.queryLanguageOptions.defaultBooleanFunctions,
+                scalarFunctions: this.adaptable.adaptableOptions.queryLanguageOptions.defaultScalarFunctions,
+                observableFunctions: this.adaptable.adaptableOptions.queryLanguageOptions.defaultObservableFunctions,
+                aggregationFunctions: this.adaptable.adaptableOptions.queryLanguageOptions.defaultAggregationFunctions,
             };
         }
         let cachedResult = this.cacheModuleSpecificExpressionFunctions.get(module);

package/src/Utilities/Services/ReportService.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReportService = void 0;
 const tslib_1 = require("tslib");
-const groupBy_1 = tslib_1.__importDefault(require("lodash-es/groupBy"));
+const groupBy_1 = tslib_1.__importDefault(require("lodash/groupBy"));
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
 const GeneralConstants_1 = require("../Constants/GeneralConstants");
@@ -305,7 +305,9 @@ class ReportService {
         // if this is a date column and there is a custom export date format provided, that will take precedence
         if (columnType === 'Date' && !!this.getCustomExportDateFormat()) {
             const exportDateFormat = this.getCustomExportDateFormat();
-            return FormatHelper_1.default.DateFormatter(cellRawValue, { Pattern: exportDateFormat });
+            return FormatHelper_1.default.DateFormatter(cellRawValue, {
+                Pattern: exportDateFormat,
+            });
         }
         // otherwise check the general export format types
         let cellExportFormat = this.computeCellExportValueFormat(columnType);
@@ -314,7 +316,9 @@ class ReportService {
     getReportFileName(reportName) {
         let fileName = StringExtensions_1.default.ReplaceEmptySpacesWithUnderscore(reportName);
         if (this.adaptable.adaptableOptions.exportOptions.appendFileTimestamp) {
-            fileName = `${fileName}_${FormatHelper_1.DateFormatter(new Date(), { Pattern: 'yyyyMMdd_HHmmss' })}`;
+            fileName = `${fileName}_${FormatHelper_1.DateFormatter(new Date(), {
+                Pattern: 'yyyyMMdd_HHmmss',
+            })}`;
         }
         return fileName;
     }

package/src/Utilities/Services/TeamSharingService.js

@@ -45,7 +45,10 @@ class TeamSharingService {
             .includes(reference.Reference.Uuid));
         const newSharedEntityDependencies = [];
         freshReferences.forEach((reference) => {
-            this.createSharedEntity(reference.Reference, reference.Module, { description: activeSharedEntity.Description, type: activeSharedEntity.Type }, activeSharedEntity.UserName, Date.now(), newSharedEntityDependencies);
+            this.createSharedEntity(reference.Reference, reference.Module, {
+                description: activeSharedEntity.Description,
+                type: activeSharedEntity.Type,
+            }, activeSharedEntity.UserName, Date.now(), newSharedEntityDependencies);
         });
         updatedEntityDependencyIds.push(...newSharedEntityDependencies.map((sharedEntity) => sharedEntity.Uuid));
         activeSharedEntity.EntityDependencyIds = updatedEntityDependencyIds;
@@ -84,8 +87,7 @@ class TeamSharingService {
     }
     getStaleActiveSharedEntities() {
         const sharedEntities = this.adaptable.api.teamSharingApi.getSharedEntities();
-        const activeEntities = this.adaptable.api.teamSharingApi.getTeamSharingState()
-            .ActiveSharedEntityMap;
+        const activeEntities = this.adaptable.api.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap;
         const result = {};
         sharedEntities
             .filter((sharedEntity) => sharedEntity.Type === 'Active')