@adaptabletools/adaptable 11.0.0-canary.2 → 11.0.0-canary.6

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

@@ -55,8 +55,8 @@ class AlertService {
     isValidExpression(rule) {
         return rule.ObservableExpression
             ? this.adaptable.api.queryLanguageApi.isValidObservableExpression(rule.ObservableExpression, ModuleConstants_1.AlertModuleId, `Invalid Alert rule with observable expression `)
-            : rule.AggregationExpression
-                ? this.adaptable.api.queryLanguageApi.isValidAggregationExpression(rule.AggregationExpression, ModuleConstants_1.AlertModuleId, `Invalid Alert rule with aggregation expression `)
+            : rule.AggregatedBooleanExpression
+                ? this.adaptable.api.queryLanguageApi.isValidAggregatedBooleanExpression(rule.AggregatedBooleanExpression, ModuleConstants_1.AlertModuleId, `Invalid Alert rule with aggregation expression `)
                 : false;
     }
     evaluateReactiveExpression(rule) {
@@ -66,7 +66,7 @@ class AlertService {
                 .evaluateObservableExpression(rule.ObservableExpression, ModuleConstants_1.AlertModuleId)
             : this.adaptable.api.internalApi
                 .getQueryLanguageService()
-                .evaluateAggregationExpression(rule.AggregationExpression, ModuleConstants_1.AlertModuleId);
+                .evaluateAggregatedBooleanExpression(rule.AggregatedBooleanExpression, ModuleConstants_1.AlertModuleId);
     }
 }
 exports.AlertService = AlertService;

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/Interface/IQueryLanguageService.d.ts

@@ -8,7 +8,7 @@ export interface IQueryLanguageService extends IAdaptableService {
     evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: RowNode): boolean;
     evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: RowNode): any;
     evaluateObservableExpression(expression: string, module: AdaptableModule): Observable<DataChangedInfo>;
-    evaluateAggregationExpression(expression: string, module: AdaptableModule): Observable<DataChangedInfo>;
+    evaluateAggregatedBooleanExpression(expression: string, module: AdaptableModule): Observable<DataChangedInfo>;
     validateBoolean(expression: string, module: AdaptableModule, config?: {
         force?: boolean;
     }): {
@@ -19,7 +19,7 @@ export interface IQueryLanguageService extends IAdaptableService {
         isValid: boolean;
         errorMessage: string;
     };
-    validateAggregation(expression: string, module: AdaptableModule): {
+    validateAggregatedBoolean(expression: string, module: AdaptableModule): {
         isValid: boolean;
         errorMessage: string;
     };

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.d.ts

@@ -15,7 +15,7 @@ export declare class QueryLanguageService implements IQueryLanguageService {
     evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: any): any;
     evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: RowNode): any;
     evaluateObservableExpression(reactiveExpression: string, module: AdaptableModule): Observable<DataChangedInfo>;
-    evaluateAggregationExpression(aggregationExpression: string, module: AdaptableModule): Observable<DataChangedInfo>;
+    evaluateAggregatedBooleanExpression(aggregationExpression: string, module: AdaptableModule): Observable<DataChangedInfo>;
     validateBoolean(expressionInput: string, module: AdaptableModule, config?: {
         force?: boolean;
     }): {
@@ -26,7 +26,7 @@ export declare class QueryLanguageService implements IQueryLanguageService {
         isValid: boolean;
         errorMessage: string;
     };
-    validateAggregation(expressionInput: string, module: AdaptableModule): {
+    validateAggregatedBoolean(expressionInput: string, module: AdaptableModule): {
         isValid: boolean;
         errorMessage: string;
     };

package/src/Utilities/Services/QueryLanguageService.js

@@ -37,13 +37,13 @@ class QueryLanguageService {
         });
         return reactiveExpression$;
     }
-    evaluateAggregationExpression(aggregationExpression, module) {
+    evaluateAggregatedBooleanExpression(aggregationExpression, module) {
         const moduleExpressionFunctions = this.getModuleExpressionFunctions(module);
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         const aggregationExpression$ = parser.evaluate(aggregationExpression, {
             node: aggregationExpression,
             api: this.adaptable.api,
-            functions: moduleExpressionFunctions.aggregationFunctions,
+            functions: moduleExpressionFunctions.aggregatedBooleanFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
         });
         return aggregationExpression$;
@@ -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;
         }
@@ -140,19 +146,22 @@ class QueryLanguageService {
             return result;
         }
     }
-    validateAggregation(expressionInput = '', module) {
+    validateAggregatedBoolean(expressionInput = '', module) {
         const cacheKey = this.getExpressionCacheKey(expressionInput, module);
         if (this.cacheAggregationValidation.has(cacheKey)) {
             return this.cacheAggregationValidation.get(cacheKey);
         }
         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;
         }
         try {
-            const aggregationExpression = this.evaluateAggregationExpression(expression, module);
+            const aggregationExpression = this.evaluateAggregatedBooleanExpression(expression, module);
             if (!rxjs_1.isObservable(aggregationExpression)) {
                 const result = {
                     isValid: false,
@@ -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,
+                aggregatedBooleanFunctions: this.adaptable.adaptableOptions.queryLanguageOptions.defaultAggregatedBooleanFunctions,
             };
         }
         let cachedResult = this.cacheModuleSpecificExpressionFunctions.get(module);
@@ -206,7 +211,7 @@ class QueryLanguageService {
             booleanFunctions: (_c = moduleSpecificOptions.booleanFunctions) !== null && _c !== void 0 ? _c : this.adaptable.adaptableOptions.queryLanguageOptions.defaultBooleanFunctions,
             scalarFunctions: (_d = moduleSpecificOptions.scalarFunctions) !== null && _d !== void 0 ? _d : this.adaptable.adaptableOptions.queryLanguageOptions.defaultScalarFunctions,
             observableFunctions: (_e = moduleSpecificOptions.observableFunctions) !== null && _e !== void 0 ? _e : this.adaptable.adaptableOptions.queryLanguageOptions.defaultObservableFunctions,
-            aggregationFunctions: (_f = moduleSpecificOptions.aggregationFunctions) !== null && _f !== void 0 ? _f : this.adaptable.adaptableOptions.queryLanguageOptions.defaultAggregationFunctions,
+            aggregatedBooleanFunctions: (_f = moduleSpecificOptions.aggregatedBooleanFunctions) !== null && _f !== void 0 ? _f : this.adaptable.adaptableOptions.queryLanguageOptions.defaultAggregatedBooleanFunctions,
         };
         this.cacheModuleSpecificExpressionFunctions.set(module, moduleSpecificFunctions);
         return moduleSpecificFunctions;

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')

package/src/View/AdaptablePopover/index.js

@@ -17,7 +17,12 @@ class AdaptablePopover extends React.Component {
         const title = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.props.headerText)
             ? this.props.headerText
             : '';
-        const popoverClickRootClose = (React.createElement(rebass_1.Box, { className: "ab-Popover", style: { margin: '0px', padding: '0px', minWidth: popoverMinWidth, maxWidth: 300 } },
+        const popoverClickRootClose = (React.createElement(rebass_1.Box, { className: "ab-Popover", style: {
+                margin: '0px',
+                padding: '0px',
+                minWidth: popoverMinWidth,
+                maxWidth: 300,
+            } },
             title ? (React.createElement(rebass_1.Text, { fontSize: 2, padding: 2 },
                 React.createElement("b", null, title))) : null,
             React.createElement(rebass_1.Box, { padding: 2 }, this.props.bodyText.map((textOrHTML, index) => (React.createElement("span", { key: index }, textOrHTML))))));

package/src/View/AdaptableView.js

@@ -22,7 +22,7 @@ class AdaptableView extends React.Component {
         return (React.createElement("div", null,
             this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard_1.Dashboard, { api: this.props.AdaptableApi })),
             React.createElement(AdaptableLoadingScreen_1.AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup }),
-            React.createElement(AdaptablePopupPrompt_1.AdaptablePopupPrompt, { message: this.props.PopupState.PromptPopup.Message, header: this.props.PopupState.PromptPopup.Header, onClose: this.props.onClosePromptPopup, onConfirm: this.props.onConfirmPromptPopup, showPopup: this.props.PopupState.PromptPopup.ShowPromptPopup }),
+            this.props.PopupState.PromptPopup.ShowPromptPopup && (React.createElement(AdaptablePopupPrompt_1.AdaptablePopupPrompt, { message: this.props.PopupState.PromptPopup.Message, header: this.props.PopupState.PromptPopup.Header, onClose: this.props.onClosePromptPopup, onConfirm: this.props.onConfirmPromptPopup, onConfirmActionCreator: this.props.PopupState.PromptPopup.ConfirmActionCreator, defaultValue: this.props.PopupState.PromptPopup.DefaultValue })),
             React.createElement(AdaptablePopupConfirmation_1.AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi }),
             Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && (React.createElement(AdaptablePopup_1.AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })),
             React.createElement(ExportCustomDestinationFormPopups_1.ExportCustomDestinationFormPopups, { api: this.props.AdaptableApi }),

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ColumnsList.js

@@ -26,7 +26,11 @@ const dataTypes = [
         label: 'Boolean',
     },
 ];
-const inputStyle = { width: '100%', minWidth: 50, textAlign: 'start' };
+const inputStyle = {
+    width: '100%',
+    minWidth: 50,
+    textAlign: 'start',
+};
 const useForceRender = () => {
     const [, setNow] = react_1.useState(Date.now());
     return () => {