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

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/Helpers/AdaptableHelper.js

@@ -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

@@ -280,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/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

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

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

@@ -9,6 +9,7 @@ const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const rebass_1 = require("rebass");
 const DefaultAdaptableOptions_1 = require("../../../Utilities/Defaults/DefaultAdaptableOptions");
 const ConfigurationForm = (props) => {
+    var _a;
     let abOptions = props.adaptableOptions;
     const layoutOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.layoutOptions), abOptions.layoutOptions);
     const generalOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.generalOptions), abOptions.generalOptions);
@@ -37,10 +38,12 @@ const ConfigurationForm = (props) => {
                         props.onChangeadaptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Show Quick Filter" },
-                React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.floatingFilter, onChange: (floatingFilter) => {
+                React.createElement(CheckBox_1.CheckBox, { checked: (_a = gridOptions.defaultColDef) === null || _a === void 0 ? void 0 : _a.floatingFilter, onChange: (floatingFilter) => {
                         abOptions = Object.assign({}, abOptions);
                         abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
-                        abOptions.gridOptions.floatingFilter = floatingFilter;
+                        abOptions.gridOptions.defaultColDef = {
+                            floatingFilter,
+                        };
                         props.onChangeadaptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Suppress Column Virtualisation" },

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

@@ -43,7 +43,10 @@ const ConfigurationDialog = (props) => {
         setCurrentStep(1);
     };
     const stepOne = (React.createElement(React.Fragment, null,
-        React.createElement(Panel_1.default, { header: 'Configure AdapTable', border: "none", bodyScroll: false, bodyProps: { padding: 0, style: { overflow: 'auto', display: 'flex', flexFlow: 'column' } }, borderRadius: "none", style: { fontSize: 16, flex: 1 } },
+        React.createElement(Panel_1.default, { header: 'Configure AdapTable', border: "none", bodyScroll: false, bodyProps: {
+                padding: 0,
+                style: { overflow: 'auto', display: 'flex', flexFlow: 'column' },
+            }, borderRadius: "none", style: { fontSize: 16, flex: 1 } },
             React.createElement(Panel_1.default, { border: "none" },
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "AdaptableId" },

package/src/View/AdaptableWizardView/helper.js

@@ -80,9 +80,11 @@ exports.prepareGridOptions = (dataSourceInfo) => {
         };
     });
     const gridOptions = {
+        defaultColDef: {
+            floatingFilter: true,
+        },
         rowData: dataSourceInfo.data,
         columnDefs,
-        floatingFilter: true,
         enableRangeSelection: true,
         rowSelection: 'multiple',
         rowHeight: 30,

package/src/View/Alert/Wizard/AlertButtonsEditor.d.ts

@@ -2,7 +2,7 @@
 import { AlertButton } from '../../../PredefinedConfig/AlertState';
 import { AdaptableAlert } from '../../../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
-import { AlertButtonContext } from '../../../AdaptableOptions/NotificationsOptions';
+import { AlertButtonContext } from '../../../types';
 declare type AlertButtonsEditorProps = {
     AlertButtons: AlertButton<AlertButtonContext>[];
     onChange: (buttons: AlertButton<AlertButtonContext>[]) => void;