@adaptabletools/adaptable 10.0.4-canary.5 → 11.0.0-canary.0

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_DATA_SOURCE_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.CURRENT_CHART_NAME_STATE_PROPERTY = exports.ALERT_DEFAULT_LOG_TO_CONSOLE = exports.ALERT_DEFAULT_HIGHLIGHT_ROW = exports.ALERT_DEFAULT_HIGHLIGHT_CELL = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.ALERT_DEFAULT_RANGE_OPERAND_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.CHART_DEFAULT_YAXIS_TOTAL = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.SYSTEM_DEFAULT_CHART_VISIBILITY = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.CHART_DEFAULT_REFRESH_RATE = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_DATA_SOURCE_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
-const ChartEnums_1 = require("../../PredefinedConfig/Common/ChartEnums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
 exports.MISSING_COLUMN = ' [MISSING]';
@@ -30,16 +29,12 @@ Please!!!
 */
 //System Status
 exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = 100;
-// Charts
-exports.CHART_DEFAULT_REFRESH_RATE = 3; // refresh the chart every 3 seconds if stuff chnanges
 // Quick Search
 exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = UIHelper_1.getHexForName(UIHelper_1.LIGHT_YELLOW);
 exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = UIHelper_1.getHexForName(UIHelper_1.BLACK);
 exports.QUICK_SEARCH_DEBOUNCE_TIME = 350;
 // Cells Summary
 exports.CELL_SUMMARY_DEFAULT_OPERATION = Enums_1.SummaryOperation.Sum;
-// system
-exports.SYSTEM_DEFAULT_CHART_VISIBILITY = ChartEnums_1.ChartVisibility.Hidden;
 // export const SYSTEM_DEFAULT_SYSTEM_STATUS_COLOUR: 'Red' | 'Amber' | 'Green' | 'Blue' =
 //  StatusColour.Green;
 exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = 'Info';
@@ -50,18 +45,12 @@ exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = 2000;
 /**
  * Object Factory
  */
-exports.CHART_DEFAULT_YAXIS_TOTAL = ChartEnums_1.AxisTotal.Sum;
 exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = 1;
-exports.ALERT_DEFAULT_RANGE_OPERAND_TYPE = 'Column';
 exports.ALERT_DEFAULT_MESSAGE_TYPE = 'Error';
 exports.ALERT_DEFAULT_SHOW_POPUP = true;
-exports.ALERT_DEFAULT_HIGHLIGHT_CELL = true;
-exports.ALERT_DEFAULT_HIGHLIGHT_ROW = true;
-exports.ALERT_DEFAULT_LOG_TO_CONSOLE = true;
 /**
  * Constants for State (primarily for audit property events) - good idea?
  */
-exports.CURRENT_CHART_NAME_STATE_PROPERTY = 'CurrentChartName';
 exports.SUMMARY_OPERATION_STATE_PROPERTY = 'SummaryOperation';
 exports.CURRENT_LAYOUT_STATE_PROPERTY = 'CurrentLayout';
 exports.CURRENT_DATA_SOURCE_STATE_PROPERTY = 'CurrentDataSource';

package/src/Utilities/Constants/ModuleConstants.d.ts

@@ -4,7 +4,7 @@ export declare const FlashingCellModuleId: ModuleConstants;
 export declare const BulkUpdateModuleId: ModuleConstants;
 export declare const CalculatedColumnModuleId: ModuleConstants;
 export declare const CellSummaryModuleId: ModuleConstants;
-export declare const ChartModuleId: ModuleConstants;
+export declare const ChartingModuleId: ModuleConstants;
 export declare const ConditionalStyleModuleId: ModuleConstants;
 export declare const CustomSortModuleId: ModuleConstants;
 export declare const DashboardModuleId: ModuleConstants;
@@ -25,7 +25,6 @@ export declare const QuickSearchModuleId: ModuleConstants;
 export declare const ScheduleModuleId: ModuleConstants;
 export declare const ShortcutModuleId: ModuleConstants;
 export declare const SmartEditModuleId: ModuleConstants;
-export declare const SparklineColumnModuleId: ModuleConstants;
 export declare const StateManagementModuleId: ModuleConstants;
 export declare const SystemStatusModuleId: ModuleConstants;
 export declare const TeamSharingModuleId: ModuleConstants;

package/src/Utilities/Constants/ModuleConstants.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SettingsPanelModuleId = exports.ToolPanelModuleId = exports.ThemeModuleId = exports.TeamSharingModuleId = exports.SystemStatusModuleId = exports.StateManagementModuleId = exports.SparklineColumnModuleId = exports.SmartEditModuleId = exports.ShortcutModuleId = exports.ScheduleModuleId = exports.QuickSearchModuleId = exports.QueryModuleId = exports.PlusMinusModuleId = exports.OpenFinModuleId = exports.LayoutModuleId = exports.IPushPullModuleId = exports.GridInfoModuleId = exports.Glue42ModuleId = exports.FreeTextColumnModuleId = exports.FormatColumnModuleId = exports.FilterModuleId = exports.ExportModuleId = exports.DataSourceModuleId = exports.DataChangeHistoryModuleId = exports.DashboardModuleId = exports.CustomSortModuleId = exports.ConditionalStyleModuleId = exports.ChartModuleId = exports.CellSummaryModuleId = exports.CalculatedColumnModuleId = exports.BulkUpdateModuleId = exports.FlashingCellModuleId = exports.AlertModuleId = void 0;
+exports.SettingsPanelModuleId = exports.ToolPanelModuleId = exports.ThemeModuleId = exports.TeamSharingModuleId = exports.SystemStatusModuleId = exports.StateManagementModuleId = exports.SmartEditModuleId = exports.ShortcutModuleId = exports.ScheduleModuleId = exports.QuickSearchModuleId = exports.QueryModuleId = exports.PlusMinusModuleId = exports.OpenFinModuleId = exports.LayoutModuleId = exports.IPushPullModuleId = exports.GridInfoModuleId = exports.Glue42ModuleId = exports.FreeTextColumnModuleId = exports.FormatColumnModuleId = exports.FilterModuleId = exports.ExportModuleId = exports.DataSourceModuleId = exports.DataChangeHistoryModuleId = exports.DashboardModuleId = exports.CustomSortModuleId = exports.ConditionalStyleModuleId = exports.ChartingModuleId = exports.CellSummaryModuleId = exports.CalculatedColumnModuleId = exports.BulkUpdateModuleId = exports.FlashingCellModuleId = exports.AlertModuleId = void 0;
 exports.AlertModuleId = 'Alert';
 exports.FlashingCellModuleId = 'FlashingCell';
 exports.BulkUpdateModuleId = 'BulkUpdate';
 exports.CalculatedColumnModuleId = 'CalculatedColumn';
 exports.CellSummaryModuleId = 'CellSummary';
-exports.ChartModuleId = 'Chart';
+exports.ChartingModuleId = 'Charting';
 exports.ConditionalStyleModuleId = 'ConditionalStyle';
 exports.CustomSortModuleId = 'CustomSort';
 exports.DashboardModuleId = 'Dashboard';
@@ -27,7 +27,6 @@ exports.QuickSearchModuleId = 'QuickSearch';
 exports.ScheduleModuleId = 'Schedule';
 exports.ShortcutModuleId = 'Shortcut';
 exports.SmartEditModuleId = 'SmartEdit';
-exports.SparklineColumnModuleId = 'SparklineColumn';
 exports.StateManagementModuleId = 'StateManagement';
 exports.SystemStatusModuleId = 'SystemStatus';
 exports.TeamSharingModuleId = 'TeamSharing';

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -14,7 +14,7 @@ const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 exports.DefaultAdaptableOptions = {
     adaptableId: GeneralConstants.ADAPTABLE_ID,
     adaptableStateKey: undefined,
-    agGridOptions: null,
+    gridOptions: null,
     primaryKey: '',
     autogeneratePrimaryKey: false,
     userName: GeneralConstants.USER_NAME,
@@ -34,36 +34,36 @@ exports.DefaultAdaptableOptions = {
         transition: 'Slide',
         actionHandlers: undefined,
         showApplicationIcon: false,
-        flashingCellDefaultProperties: {
-            FlashDuration: 500,
-            DownChangeStyle: {
-                BackColor: UIHelper_1.getHexForName(UIHelper_1.RED),
-            },
-            UpChangeStyle: {
-                BackColor: UIHelper_1.getHexForName(UIHelper_1.GREEN),
-            },
-            NeutralChangeStyle: {
-                BackColor: UIHelper_1.getHexForName(UIHelper_1.GRAY),
-            },
-        },
         showSystemStatusMessageNotifications: false,
         maxSystemMessagesInStore: 100,
     },
+    flashingCellOptions: {
+        defaultFlashDuration: 500,
+        defaultFlashTarget: 'cell',
+        defaultDownChangeStyle: {
+            BackColor: UIHelper_1.getHexForName(UIHelper_1.RED),
+        },
+        defaultUpChangeStyle: {
+            BackColor: UIHelper_1.getHexForName(UIHelper_1.GREEN),
+        },
+        defaultNeutralChangeStyle: {
+            BackColor: UIHelper_1.getHexForName(UIHelper_1.GRAY),
+        },
+    },
     containerOptions: {
         adaptableContainer: 'adaptable',
         agGridContainer: 'grid',
         agGridContainerWaitTimeout: 60000,
         modalContainer: undefined,
-        chartContainer: undefined,
         systemStatusContainer: undefined,
         alertContainer: undefined,
     },
     dashboardOptions: {
         canFloat: true,
-        showSettingsPanel: true,
         showQuickSearchInHeader: true,
         customDashboardButtons: undefined,
         customToolbars: undefined,
+        buttonsLocation: 'right',
     },
     editOptions: {
         validateOnServer: undefined,
@@ -187,6 +187,7 @@ exports.DefaultAdaptableOptions = {
         editableCellStyle: undefined,
         readOnlyCellStyle: undefined,
         styleClassNames: GeneralConstants_1.EMPTY_ARRAY,
+        columnTypes: GeneralConstants_1.EMPTY_ARRAY,
         permittedValues: undefined,
         editLookUpItems: undefined,
         actionColumns: undefined,
@@ -196,9 +197,7 @@ exports.DefaultAdaptableOptions = {
     toolPanelOptions: {
         showAdaptableToolPanel: true,
         adaptableToolPanelTitle: GeneralConstants.ADAPTABLE,
-        showModulesDropdown: true,
         showToolPanelsDropdown: true,
-        showColumnsDropdown: true,
         customToolPanelButtons: undefined,
         customToolPanels: undefined,
         iconKey: 'menu',
@@ -223,9 +222,11 @@ exports.DefaultAdaptableOptions = {
     },
     customPredicateDefs: [],
     settingsPanelOptions: {
-        type: 'window',
+        popupType: 'window',
         title: 'Settings Panel',
         icon: 'ConfigurationIcon',
         navigation: {},
+        alwaysShowInDashboard: false,
+        alwaysShowInToolPanel: false,
     },
 };

package/src/Utilities/Defaults/DefaultSettingsPanel.d.ts

@@ -1,6 +1,7 @@
+import { AdaptableSettingsPanel } from '../../PredefinedConfig/Common/Types';
 import { AdaptableModule } from '../../types';
 export declare const ACTION_POPUPS: AdaptableModule[];
 /**
  * This constants determines the order and the items that appear in the navigation.
  */
-export declare const DEFAULT_NAVIGATION_ITEMS: (AdaptableModule | '-')[];
+export declare const DEFAULT_NAVIGATION_ITEMS: (AdaptableSettingsPanel | '-')[];

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -8,13 +8,13 @@ const LoggingHelper_1 = require("./LoggingHelper");
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
 const DefaultAdaptableOptions_1 = require("../Defaults/DefaultAdaptableOptions");
 function assignAdaptableOptions(adaptableOptions) {
-    var _a, _b;
+    var _a;
     const returnedAdaptableOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions, 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.flashingCellOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.flashingCellOptions, adaptableOptions.flashingCellOptions);
     returnedAdaptableOptions.entitlementOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.entitlementOptions, adaptableOptions.entitlementOptions);
-    returnedAdaptableOptions.notificationsOptions.flashingCellDefaultProperties = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.notificationsOptions.flashingCellDefaultProperties, (_b = adaptableOptions.notificationsOptions) === null || _b === void 0 ? void 0 : _b.flashingCellDefaultProperties);
     returnedAdaptableOptions.dashboardOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dashboardOptions, adaptableOptions.dashboardOptions);
     returnedAdaptableOptions.editOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.editOptions, adaptableOptions.editOptions);
     returnedAdaptableOptions.containerOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.containerOptions, adaptableOptions.containerOptions);

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

@@ -30,9 +30,6 @@ export interface ScreenPopup {
         [key: string]: any;
     };
 }
-export interface ChartPopup {
-    ShowChartPopup: boolean;
-}
 export interface LoadingPopup {
     ShowLoadingPopup: boolean;
 }

package/src/Utilities/ObjectFactory.d.ts

@@ -1,7 +1,6 @@
 import { ScheduleType } from '../PredefinedConfig/Common/Enums';
 import { CustomSort } from '../PredefinedConfig/CustomSortState';
 import { DataSource } from '../PredefinedConfig/DataSourceState';
-import { PieChartDefinition, CategoryChartDefinition, SparklinesChartDefinition } from '../PredefinedConfig/ChartState';
 import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
 import { PlusMinusNudge } from '../PredefinedConfig/PlusMinusState';
 import { AlertDefinition, AlertProperties } from '../PredefinedConfig/AlertState';
@@ -14,7 +13,6 @@ import { ConditionalStyle } from '../PredefinedConfig/ConditionalStyleState';
 import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
 import { FreeTextColumn } from '../PredefinedConfig/FreeTextColumnState';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { SparklineColumn } from '../PredefinedConfig/SparklineColumnState';
 import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
 import { Glue42Report, Glue42Schedule } from '../PredefinedConfig/Glue42State';
 import { IPushPullReport } from '../PredefinedConfig/SystemState';
@@ -32,9 +30,6 @@ import { FlashingCellDefinition } from '../types';
 import { ToastOptions } from 'react-toastify';
 export declare function CreateEmptyCustomSort(): CustomSort;
 export declare function CreateEmptyDataSource(): DataSource;
-export declare function CreateEmptyPieChartDefinition(): PieChartDefinition;
-export declare function CreateEmptySparklinesChartDefinition(): SparklinesChartDefinition;
-export declare function CreateEmptyCategoryChartDefinition(): CategoryChartDefinition;
 export declare function CreateEmptyCalculatedColumn(isFilterable: boolean): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
 export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
@@ -43,7 +38,6 @@ export declare function CreateAlert(alertHeader: string, alertMessage: string, a
 export declare function CreateEmptyAlertDefinition(): AlertDefinition;
 export declare function CreateEmptyFlashingCellDefinition(): FlashingCellDefinition;
 export declare function CreateInternalAlertDefinitionForMessages(messageType: AdaptableMessageType, alertProperties?: AlertProperties): AlertDefinition;
-export declare function CreateEmptySparklineColumn(): SparklineColumn;
 export declare function CreateEmptyReport(): Report;
 export declare function CreateEmptyBaseSchedule(scheduleType: ScheduleType): BaseSchedule;
 export declare function CreateEmptyReminderSchedule(): ReminderSchedule;
@@ -75,9 +69,6 @@ export declare function CreateToastOptions(notificationsOptions: NotificationsOp
 export declare const ObjectFactory: {
     CreateEmptyCustomSort: typeof CreateEmptyCustomSort;
     CreateEmptyDataSource: typeof CreateEmptyDataSource;
-    CreateEmptyPieChartDefinition: typeof CreateEmptyPieChartDefinition;
-    CreateEmptySparklinesChartDefinition: typeof CreateEmptySparklinesChartDefinition;
-    CreateEmptyCategoryChartDefinition: typeof CreateEmptyCategoryChartDefinition;
     CreateEmptyCalculatedColumn: typeof CreateEmptyCalculatedColumn;
     CreateEmptyNamedQuery: typeof CreateEmptyNamedQuery;
     CreateEmptyPlusMinusNudge: typeof CreateEmptyPlusMinusNudge;
@@ -86,7 +77,6 @@ export declare const ObjectFactory: {
     CreateEmptyAlertDefinition: typeof CreateEmptyAlertDefinition;
     CreateEmptyFlashingCellDefinition: typeof CreateEmptyFlashingCellDefinition;
     CreateInternalAlertDefinitionForMessages: typeof CreateInternalAlertDefinitionForMessages;
-    CreateEmptySparklineColumn: typeof CreateEmptySparklineColumn;
     CreateEmptyReport: typeof CreateEmptyReport;
     CreateEmptyBaseSchedule: typeof CreateEmptyBaseSchedule;
     CreateEmptyReminderSchedule: typeof CreateEmptyReminderSchedule;

package/src/Utilities/ObjectFactory.js

@@ -1,13 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateEmptySparklineColumn = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateAlert = exports.CreateEmptyAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCategoryChartDefinition = exports.CreateEmptySparklinesChartDefinition = exports.CreateEmptyPieChartDefinition = exports.CreateEmptyDataSource = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateAlert = exports.CreateEmptyAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyDataSource = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
-const ChartEnums_1 = require("../PredefinedConfig/Common/ChartEnums");
-const DefaultPieChartProperties_1 = require("./Defaults/DefaultPieChartProperties");
-const DefaultCategoryChartProperties_1 = require("./Defaults/DefaultCategoryChartProperties");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
-const DefaultSparklinesChartProperties_1 = require("./Defaults/DefaultSparklinesChartProperties");
 const react_toastify_1 = require("react-toastify");
 function CreateEmptyCustomSort() {
     return { Uuid: Uuid_1.createUuid(), ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
@@ -17,48 +13,6 @@ function CreateEmptyDataSource() {
     return { Uuid: Uuid_1.createUuid(), Name: GeneralConstants_1.EMPTY_STRING, Description: GeneralConstants_1.EMPTY_STRING };
 }
 exports.CreateEmptyDataSource = CreateEmptyDataSource;
-function CreateEmptyPieChartDefinition() {
-    return {
-        Uuid: Uuid_1.createUuid(),
-        Name: GeneralConstants_1.EMPTY_STRING,
-        Description: GeneralConstants_1.EMPTY_STRING,
-        PrimaryColumnId: GeneralConstants_1.EMPTY_STRING,
-        SecondaryColumnId: undefined,
-        SecondaryColumnOperation: ChartEnums_1.SecondaryColumnOperation.Count,
-        ChartProperties: DefaultPieChartProperties_1.DefaultPieChartProperties,
-        ChartType: ChartEnums_1.ChartType.PieChart,
-        VisibleRowsOnly: true,
-    };
-}
-exports.CreateEmptyPieChartDefinition = CreateEmptyPieChartDefinition;
-function CreateEmptySparklinesChartDefinition() {
-    return {
-        Uuid: Uuid_1.createUuid(),
-        Name: GeneralConstants_1.EMPTY_STRING,
-        Description: GeneralConstants_1.EMPTY_STRING,
-        ColumnId: GeneralConstants_1.EMPTY_STRING,
-        Expression: undefined,
-        ChartProperties: DefaultSparklinesChartProperties_1.DefaultSparklinesChartProperties,
-        ChartType: ChartEnums_1.ChartType.SparklinesChart,
-        VisibleRowsOnly: true,
-    };
-}
-exports.CreateEmptySparklinesChartDefinition = CreateEmptySparklinesChartDefinition;
-function CreateEmptyCategoryChartDefinition() {
-    return {
-        Uuid: Uuid_1.createUuid(),
-        Name: GeneralConstants_1.EMPTY_STRING,
-        Description: GeneralConstants_1.EMPTY_STRING,
-        YAxisColumnIds: [],
-        YAxisTotal: GeneralConstants_1.CHART_DEFAULT_YAXIS_TOTAL,
-        XAxisColumnId: GeneralConstants_1.EMPTY_STRING,
-        XAxisExpression: undefined,
-        ChartProperties: DefaultCategoryChartProperties_1.DefaultCategoryChartProperties,
-        ChartType: ChartEnums_1.ChartType.CategoryChart,
-        VisibleRowsOnly: true,
-    };
-}
-exports.CreateEmptyCategoryChartDefinition = CreateEmptyCategoryChartDefinition;
 function CreateEmptyCalculatedColumn(isFilterable) {
     return {
         Uuid: Uuid_1.createUuid(),
@@ -124,9 +78,7 @@ function CreateEmptyAlertDefinition() {
             Predicate: undefined,
         },
         MessageType: GeneralConstants_1.ALERT_DEFAULT_MESSAGE_TYPE,
-        AlertProperties: {
-            LogToConsole: GeneralConstants_1.ALERT_DEFAULT_LOG_TO_CONSOLE,
-        },
+        AlertProperties: {},
     };
 }
 exports.CreateEmptyAlertDefinition = CreateEmptyAlertDefinition;
@@ -155,17 +107,6 @@ function CreateInternalAlertDefinitionForMessages(messageType, alertProperties)
     };
 }
 exports.CreateInternalAlertDefinitionForMessages = CreateInternalAlertDefinitionForMessages;
-function CreateEmptySparklineColumn() {
-    return {
-        Uuid: Uuid_1.createUuid(),
-        ColumnId: GeneralConstants_1.EMPTY_STRING,
-        MaximumValue: undefined,
-        MinimumValue: undefined,
-        ShowToolTip: true,
-        LineColor: DefaultSparklinesChartProperties_1.DefaultSparklinesChartProperties.Brush,
-    };
-}
-exports.CreateEmptySparklineColumn = CreateEmptySparklineColumn;
 function CreateEmptyReport() {
     return {
         Uuid: Uuid_1.createUuid(),
@@ -456,9 +397,6 @@ function getToastTransition(transition) {
 exports.ObjectFactory = {
     CreateEmptyCustomSort,
     CreateEmptyDataSource,
-    CreateEmptyPieChartDefinition,
-    CreateEmptySparklinesChartDefinition,
-    CreateEmptyCategoryChartDefinition,
     CreateEmptyCalculatedColumn,
     CreateEmptyNamedQuery,
     CreateEmptyPlusMinusNudge,
@@ -467,7 +405,6 @@ exports.ObjectFactory = {
     CreateEmptyAlertDefinition,
     CreateEmptyFlashingCellDefinition,
     CreateInternalAlertDefinitionForMessages,
-    CreateEmptySparklineColumn,
     CreateEmptyReport,
     CreateEmptyBaseSchedule,
     CreateEmptyReminderSchedule,

package/src/Utilities/Services/EntitlementService.js

@@ -7,7 +7,7 @@ class EntitlementService {
         this.adaptable = adaptable;
     }
     setModulesEntitlements() {
-        this.adaptable.modules.forEach((module) => {
+        this.adaptable.adaptableModules.forEach((module) => {
             module.setModuleEntitlement();
         });
     }

package/src/Utilities/Services/ModuleService.js

@@ -12,7 +12,7 @@ class ModuleService {
     createModuleMenus() {
         const dropdownMenuItems = [];
         const buttonMenuItems = [];
-        this.adaptable.modules.forEach((module) => {
+        this.adaptable.adaptableModules.forEach((module) => {
             const dropdownMenuItem = module.addModuleMenuItem('ModuleMenu');
             if (Helper_1.default.objectExists(dropdownMenuItem)) {
                 if (dropdownMenuItems.findIndex((m) => m.module == dropdownMenuItem.module) == -1) {
@@ -31,35 +31,35 @@ class ModuleService {
         this.adaptable.api.internalApi.setModuleButtonMenuItems(buttonMenuItems);
     }
     isModuleAvailable(adaptableModule) {
-        let module = this.adaptable.modules.get(adaptableModule);
+        let module = this.adaptable.adaptableModules.get(adaptableModule);
         if (!module) {
             return false;
         }
         return module.isModuleAvailable();
     }
     isModuleEditable(adaptableModule) {
-        let module = this.adaptable.modules.get(adaptableModule);
+        let module = this.adaptable.adaptableModules.get(adaptableModule);
         if (!module) {
             return false;
         }
         return module.isModuleEditable();
     }
     getTeamSharingAction(adaptableModule) {
-        let module = this.adaptable.modules.get(adaptableModule);
+        let module = this.adaptable.adaptableModules.get(adaptableModule);
         if (!module) {
             return undefined;
         }
         return module.getTeamSharingAction();
     }
     getModuleById(adaptableModule) {
-        return this.adaptable.modules.get(adaptableModule);
+        return this.adaptable.adaptableModules.get(adaptableModule);
     }
     getModuleInfoByModule(adaptableModule) {
         const module = this.getModuleById(adaptableModule);
         return module ? module.moduleInfo : undefined;
     }
     getModuleInfoByFriendlyName(friendlyName) {
-        for (let module of this.adaptable.modules.values()) {
+        for (let module of this.adaptable.adaptableModules.values()) {
             let moduleInfo = module.moduleInfo;
             if (moduleInfo && moduleInfo.FriendlyName == friendlyName) {
                 return moduleInfo;
@@ -72,7 +72,7 @@ class ModuleService {
         return (_a = this.getModuleById(adaptableModule)) === null || _a === void 0 ? void 0 : _a.getPopupMaxWidth();
     }
     getModuleCollection() {
-        return this.adaptable.modules;
+        return this.adaptable.adaptableModules;
     }
     getModuleDocumentationPageByModule(adaptableModule) {
         let url = `${DocumentationLinkConstants_1.HOST_URL_DOCS}/`;
@@ -139,10 +139,6 @@ class ModuleService {
                 return userInterfaceUrl + 'tool-panel';
             case 'DataChangeHistory':
                 return editingUrl + 'change-history-module';
-            case 'Chart':
-                return pluginUrl + 'chart/chart-plugin';
-            case 'SparklineColumn':
-                return pluginUrl + 'chart/sparkline-column-module';
             case 'Glue42':
                 return pluginUrl + 'glue42/glue42-plugin';
             case 'IPushPull':

package/src/View/AdaptableView.js

@@ -5,13 +5,10 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
-const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/SystemRedux"));
 const AdaptablePopup_1 = require("./Components/Popups/AdaptablePopup");
 const AdaptablePopupPrompt_1 = require("./Components/Popups/AdaptablePopupPrompt");
 const Dashboard_1 = require("./Dashboard/Dashboard");
 const AdaptablePopupConfirmation_1 = require("./Components/Popups/AdaptablePopupConfirmation");
-const AdaptableChart_1 = require("./Components/Popups/AdaptableChart");
-const ChartEnums_1 = require("../PredefinedConfig/Common/ChartEnums");
 const AdaptableLoadingScreen_1 = require("./Components/Popups/AdaptableLoadingScreen");
 const renderWithAdaptableContext_1 = require("./renderWithAdaptableContext");
 const License_1 = require("./License");
@@ -20,11 +17,10 @@ const ProgressIndicator_1 = require("../components/ProgressIndicator/ProgressInd
 const react_toastify_1 = require("react-toastify");
 class AdaptableView extends React.Component {
     render() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const watermark = (_d = (_c = (_b = (_a = this.props.AdaptableApi) === null || _a === void 0 ? void 0 : _a.internalApi) === null || _b === void 0 ? void 0 : _b.getSystemState()) === null || _c === void 0 ? void 0 : _c.License) === null || _d === void 0 ? void 0 : _d.watermark;
         return (React.createElement("div", null,
             this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard_1.Dashboard, { api: this.props.AdaptableApi })),
-            this.props.SystemState.ChartVisibility != ChartEnums_1.ChartVisibility.Hidden && (React.createElement(AdaptableChart_1.AdaptableChart, { api: this.props.AdaptableApi, onClose: this.props.onCloseChartPopup, showChart: this.props.SystemState.ChartVisibility == ChartEnums_1.ChartVisibility.Maximised, showModal: (_e = this.props.AdaptableApi.pluginsApi.getChartsPluginApi()) === null || _e === void 0 ? void 0 : _e.getPluginOptions().showModal })),
             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 }),
             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 }),
@@ -40,7 +36,6 @@ function mapStateToProps(state, ownProps) {
     return {
         PopupState: state.Popup,
         SystemState: state.System,
-        ChartState: state.Chart,
         AdaptableApi: ownProps.Adaptable.api,
     };
 }
@@ -48,7 +43,6 @@ function mapDispatchToProps(dispatch) {
     return {
         onCloseScreenPopup: () => dispatch(PopupRedux.PopupHideScreen()),
         onCloseAlertPopup: () => dispatch(PopupRedux.PopupHideAlert()),
-        onCloseChartPopup: () => dispatch(SystemRedux.ChartSetChartVisibility(ChartEnums_1.ChartVisibility.Hidden)),
         onClosePromptPopup: () => dispatch(PopupRedux.PopupHidePrompt()),
         onConfirmPromptPopup: (inputText) => dispatch(PopupRedux.PopupConfirmPrompt(inputText)),
         onConfirmConfirmationPopup: (comment) => dispatch(PopupRedux.PopupConfirmConfirmation(comment)),

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ColumnsList.d.ts

@@ -1,7 +1,8 @@
 import * as React from 'react';
-interface Column {
-    field: string;
-    type: string;
+import { ColDef } from '@ag-grid-community/all-modules';
+interface Column extends Partial<ColDef> {
+    field?: string;
+    type?: string | string[];
     caption?: string;
 }
 declare const _default: React.MemoExoticComponent<({ columns: cols, handle, onValidityChange, }: {

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

@@ -216,6 +216,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, }) => {
         },
     ];
     const items = columns.map((col) => {
+        var _a;
         const isPrimaryKey = col.field === primaryKeyField;
         const cItems = colItems.map((c) => (Object.assign({}, c)));
         cItems[0].Content = (React.createElement(Radio_1.default, { checked: isPrimaryKey, onChange: (checked) => {
@@ -235,7 +236,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, }) => {
         cItems[2].Content = (React.createElement(Input_1.default, { style: inputStyle, defaultValue: col.caption != undefined ? col.caption : humanized, placeholder: humanized, onChange: (event) => {
                 setColumnCaption(event.target.value, col.field);
             } }));
-        cItems[3].Content = (React.createElement(Dropdown_1.default, { style: inputStyle, showClearButton: false, options: dataTypes, value: col.type, onChange: onColumnTypeChange.bind(null, col) }));
+        cItems[3].Content = (React.createElement(Dropdown_1.default, { style: inputStyle, showClearButton: false, options: dataTypes, value: (_a = col === null || col === void 0 ? void 0 : col.type) !== null && _a !== void 0 ? _a : '', onChange: onColumnTypeChange.bind(null, col) }));
         cItems[4].Content = (React.createElement(CheckBox_1.CheckBox, { checked: isSortableColumn(col.field), onChange: (sortable) => {
                 sortable ? setSortableColumn(col.field) : setUnsortableColumn(col.field);
             } }));

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

@@ -16,7 +16,7 @@ const ConfigurationForm = (props) => {
     const searchOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.searchOptions), abOptions.searchOptions);
     const filterOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.filterOptions), abOptions.filterOptions);
     // we are 'hard-coding' this to use AG Grid but so does helper so ok for now and we can refactor when Adaptable Grid is ready
-    const gridOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.agGridOptions), abOptions.agGridOptions);
+    const gridOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.gridOptions), abOptions.gridOptions);
     return (React.createElement(React.Fragment, null,
         React.createElement(HelpBlock_1.default, null, "General Options"),
         React.createElement(FormLayout_1.default, { margin: 2, columns: [{ name: 'children' }, { name: 'label', style: { textAlign: 'start' } }] },
@@ -32,29 +32,29 @@ const ConfigurationForm = (props) => {
             React.createElement(FormLayout_1.FormRow, { label: "Enable Range Selection" },
                 React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.enableRangeSelection, onChange: (enableRangeSelection) => {
                         abOptions = Object.assign({}, abOptions);
-                        abOptions.agGridOptions = Object.assign({}, abOptions.agGridOptions);
-                        abOptions.agGridOptions.enableRangeSelection = enableRangeSelection;
+                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
+                        abOptions.gridOptions.enableRangeSelection = enableRangeSelection;
                         props.onChangeadaptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Show Quick Filter" },
                 React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.floatingFilter, onChange: (floatingFilter) => {
                         abOptions = Object.assign({}, abOptions);
-                        abOptions.agGridOptions = Object.assign({}, abOptions.agGridOptions);
-                        abOptions.agGridOptions.floatingFilter = floatingFilter;
+                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
+                        abOptions.gridOptions.floatingFilter = floatingFilter;
                         props.onChangeadaptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Suppress Column Virtualisation" },
                 React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.suppressColumnVirtualisation, onChange: (suppressColumnVirtualisation) => {
                         abOptions = Object.assign({}, abOptions);
-                        abOptions.agGridOptions = Object.assign({}, abOptions.agGridOptions);
-                        abOptions.agGridOptions.suppressColumnVirtualisation = suppressColumnVirtualisation;
+                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
+                        abOptions.gridOptions.suppressColumnVirtualisation = suppressColumnVirtualisation;
                         props.onChangeadaptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Show Column Menu Button" },
                 React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.suppressMenuHide, onChange: (suppressMenuHide) => {
                         abOptions = Object.assign({}, abOptions);
-                        abOptions.agGridOptions = Object.assign({}, abOptions.agGridOptions);
-                        abOptions.agGridOptions.suppressMenuHide = suppressMenuHide;
+                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
+                        abOptions.gridOptions.suppressMenuHide = suppressMenuHide;
                         props.onChangeadaptableOptions(abOptions);
                     } }))),
         React.createElement(HelpBlock_1.default, null, "Layout Options"),

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

@@ -29,8 +29,8 @@ const ConfigurationDialog = (props) => {
     };
     const onFinish = () => {
         const newABOptions = Object.assign({}, abOptions);
-        newABOptions.agGridOptions = Object.assign({}, abOptions.agGridOptions);
-        newABOptions.agGridOptions.columnDefs = columnsHandle.current.getColumns().map((c) => {
+        newABOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
+        newABOptions.gridOptions.columnDefs = columnsHandle.current.getColumns().map((c) => {
             const col = Object.assign(Object.assign({}, c), { headerName: c.caption || StringExtensions_1.default.Humanize(c.field) });
             delete col.caption;
             return col;
@@ -50,7 +50,7 @@ const ConfigurationDialog = (props) => {
                         React.createElement(Input_1.default, { value: abOptions.adaptableId, onChange: onadaptableIdChange, style: { minWidth: '20rem' } })))),
             React.createElement(ColumnsList_1.default, { handle: columnsHandle, onValidityChange: (valid) => {
                     setFinishEnabled(valid);
-                }, columns: abOptions.agGridOptions.columnDefs }))));
+                }, columns: abOptions.gridOptions.columnDefs }))));
     const stepTwo = (React.createElement(React.Fragment, null,
         React.createElement(Panel_1.default, { header: 'Configure AdapTable', border: "none", style: { flex: 1, overflow: 'auto' } },
             React.createElement(ConfigurationForm_1.default, { adaptableOptions: abOptions, onChangeadaptableOptions: (abOptions) => {

package/src/View/AdaptableWizardView/index.js

@@ -65,7 +65,7 @@ const Wizard = (props) => {
         const gridOptions = helper_1.prepareGridOptions(dataSourceInfo);
         const adaptableOptions = Object.assign({}, props.adaptableOptions);
         adaptableOptions.adaptableId = adaptableOptions.adaptableId || (file ? file.name : '');
-        adaptableOptions.agGridOptions = gridOptions;
+        adaptableOptions.gridOptions = gridOptions;
         if (dataSourceInfo.primaryKey) {
             adaptableOptions.primaryKey = dataSourceInfo.primaryKey;
         }

package/src/View/Alert/AlertEmptyView.js

@@ -11,6 +11,6 @@ exports.AlertEmptyView = (props) => {
         .getEntitlementAccessLevelForModule(props.module.moduleInfo.ModuleName);
     const text = accessLevel == 'ReadOnly'
         ? 'You have no Alert Definitions.'
-        : "Click 'New' to start creating Alert Definitions. An alert will be triggered whenever an edit - or external data change - matches the condition in the Alert Definition.";
+        : "Click 'New' to start creating Alert Definitions. An Alert is triggered whenever an edit - or external data change - matches the Rule in the Alert Definition.";
     return React.createElement(React.Fragment, null, text);
 };