@adaptabletools/adaptable 11.3.0 → 12.0.0-canary.0

package/src/Strategy/LayoutModule.js

@@ -21,6 +21,26 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         });
     }
+    /*
+  // commenting this out as it doesnt make sense we dont know which filters should be applied to which layout
+  // for this we will jsut say they need to reapply them
+    updateOldConfig() {
+      // @ts-ignore ignore reading deprecated state
+      const oldColumnFilters = this.api.filterApi.getFilterState().ColumnFilters;
+      if (ArrayExtensions.IsNotNullOrEmpty(oldColumnFilters)) {
+        ConsoleLogWarning(
+          `DEPRECATED: The 'Filter.ColumnFilters' property is deprecated; use 'Layout.ColumnFilters' instead'!`
+        );
+  
+        this.api.internalApi.clearColumnFilterState();
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
+  
+        if (ArrayExtensions.IsNullOrEmpty(currentLayout.ColumnFilters)) {
+          this.api.layoutApi.setColumnFilter(oldColumnFilters);
+        }
+      }
+    }
+    */
     getModuleAdaptableObjects() {
         return this.api.layoutApi.getAllLayout();
     }
@@ -152,11 +172,13 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (columns.length >
             maxColumnsToDisplay + 1 /* +1 is to show tag only beginning with 2, 'other 2' */) {
             const extraColumns = columns.length - maxColumnsToDisplay;
-            const firstNColumns = columns.slice(0, maxColumnsToDisplay);
+            const firstNColumns = columns
+                .slice(0, maxColumnsToDisplay)
+                .map((column) => columnIdToFriendlyName(column));
             columns = [...firstNColumns, `and other ${extraColumns}`];
         }
         else {
-            columns = columns.map((column) => this.api.columnApi.getFriendlyNameFromColumnId(column));
+            columns = columns.map((column) => columnIdToFriendlyName(column));
         }
         return {
             items: [

package/src/Strategy/SmartEditModule.js

@@ -128,7 +128,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                                 currentCell: selectedCell,
                                 adaptableApi: this.api,
                             };
-                            newValue = smartEditOperation.Operation(context);
+                            newValue = smartEditOperation.operation(context);
                         }
                         else {
                             switch (smartEditOperation) {

package/src/Strategy/StatusBarModule.js

@@ -30,9 +30,7 @@ class StatusBarModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.statusBarApi.setStatusPanels(newStatusPanelsState);
     }
     isModuleAvailable() {
-        return false;
-        // TODO: replace with this like when we release Status Bar properly
-        // return super.isModuleAvailable() && this.api.statusBarApi.getAgGridStatusPanels().length > 0;
+        return super.isModuleAvailable() && this.api.statusBarApi.getAgGridStatusPanels().length > 0;
     }
 }
 exports.StatusBarModule = StatusBarModule;

package/src/Strategy/TeamSharingModule.js

@@ -49,7 +49,7 @@ class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return;
         }
         // check if the changed adaptable object is active in TeamSharing
-        const activeSharedEntity = this.api.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap[changedAdaptableObject.Uuid];
+        const activeSharedEntity = this.api.internalApi.getState().TeamSharing.ActiveSharedEntityMap[changedAdaptableObject.Uuid];
         if (!activeSharedEntity) {
             return;
         }

package/src/Strategy/ToolPanelModule.js

@@ -15,10 +15,7 @@ class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!super.isModuleAvailable()) {
             return false;
         }
-        const toolPanelOptions = this.api.internalApi.getAdaptableOptions().toolPanelOptions;
-        return (toolPanelOptions &&
-            toolPanelOptions.showAdaptableToolPanel &&
-            toolPanelOptions.showAdaptableToolPanel == true);
+        return this.api.internalApi.getAdaptableInstance().hasAdaptableToolPanel;
     }
     updateOldConfig() {
         const deprecatedToolPanelConfigs = this.api.toolPanelApi.getToolPanelState().VisibleToolPanels;

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

@@ -1,6 +1,7 @@
 import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { AdaptableTheme } from '../../PredefinedConfig/ThemeState';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableColumnType } from '../../PredefinedConfig/Common/Types';
 export declare const AUTOGENERATED_PK_COLUMN: string;
 export declare const MISSING_COLUMN: string;
 export declare const DEFAULT_LAYOUT: string;
@@ -9,6 +10,10 @@ export declare const DARK_THEME: string;
 export declare const USER_NAME: string;
 export declare const ADAPTABLE_ID: string;
 export declare const ADAPTABLE: string;
+export declare const ADAPTABLE_TOOLPANEL_ID: string;
+export declare const ADAPTABLE_TOOLPANEL_COMPONENT: string;
+export declare const AGGRID_TOOLPANEL_FILTERS: string;
+export declare const AGGRID_TOOLPANEL_COLUMNS: string;
 export declare const MENU_PREFIX: string;
 export declare const READ_ONLY_STYLE: string;
 export declare const ALL_COLUMN_VALUES: string;
@@ -17,7 +22,7 @@ export declare const FILTER_NEVER: 'Always' | 'Never' | 'Throttle';
 export declare const FILTER_THROTTLE: 'Always' | 'Never' | 'Throttle';
 export declare const EMPTY_STRING: string;
 export declare const EMPTY_ARRAY: any[];
-export declare const AB_SPECIAL_COLUMN = "abSpecialColumn";
+export declare const AB_SPECIAL_COLUMN: AdaptableColumnType;
 export declare const HALF_SECOND: number;
 export declare const AG_GRID_GROUPED_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
@@ -40,7 +45,6 @@ export declare const ALERT_DEFAULT_SHOW_POPUP: boolean;
  */
 export declare const SUMMARY_OPERATION_STATE_PROPERTY: string;
 export declare const CURRENT_LAYOUT_STATE_PROPERTY: string;
-export declare const CURRENT_DATA_SOURCE_STATE_PROPERTY: string;
 export declare const CURRENT_REPORT_STATE_PROPERTY: string;
 export declare const FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY: string;
 export declare const FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY: string;

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,6 +1,6 @@
 "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.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_PIVOT_COLUMN = 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_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_PIVOT_COLUMN = 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.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = 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 UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -11,6 +11,11 @@ exports.DARK_THEME = 'dark';
 exports.USER_NAME = 'anonymous';
 exports.ADAPTABLE_ID = 'adaptable_id';
 exports.ADAPTABLE = 'AdapTable';
+exports.ADAPTABLE_TOOLPANEL_ID = 'adaptable';
+exports.ADAPTABLE_TOOLPANEL_COMPONENT = 'AdaptableToolPanel';
+// from https://www.ag-grid.com/javascript-data-grid/side-bar/#string-configuration
+exports.AGGRID_TOOLPANEL_FILTERS = 'filters';
+exports.AGGRID_TOOLPANEL_COLUMNS = 'columns';
 exports.MENU_PREFIX = 'ab_';
 exports.READ_ONLY_STYLE = 'ab_readonly';
 exports.ALL_COLUMN_VALUES = 'ALL_COLUMN_VALUES';
@@ -54,7 +59,6 @@ exports.ALERT_DEFAULT_SHOW_POPUP = true;
  */
 exports.SUMMARY_OPERATION_STATE_PROPERTY = 'SummaryOperation';
 exports.CURRENT_LAYOUT_STATE_PROPERTY = 'CurrentLayout';
-exports.CURRENT_DATA_SOURCE_STATE_PROPERTY = 'CurrentDataSource';
 exports.CURRENT_REPORT_STATE_PROPERTY = 'CurrentReport';
 exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = 'DefaultUpColor';
 exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = 'DefautDownColor';

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

@@ -9,7 +9,7 @@ export declare const ConditionalStyleModuleId: ModuleConstants;
 export declare const CustomSortModuleId: ModuleConstants;
 export declare const DashboardModuleId: ModuleConstants;
 export declare const DataChangeHistoryModuleId: ModuleConstants;
-export declare const DataSourceModuleId: ModuleConstants;
+export declare const DataSetModuleId: ModuleConstants;
 export declare const ExportModuleId: ModuleConstants;
 export declare const FilterModuleId: ModuleConstants;
 export declare const FormatColumnModuleId: ModuleConstants;

package/src/Utilities/Constants/ModuleConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatusBarModuleId = 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.StatusBarModuleId = 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.DataSetModuleId = 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';
@@ -11,7 +11,7 @@ exports.ConditionalStyleModuleId = 'ConditionalStyle';
 exports.CustomSortModuleId = 'CustomSort';
 exports.DashboardModuleId = 'Dashboard';
 exports.DataChangeHistoryModuleId = 'DataChangeHistory';
-exports.DataSourceModuleId = 'DataSource';
+exports.DataSetModuleId = 'DataSet';
 exports.ExportModuleId = 'Export';
 exports.FilterModuleId = 'Filter';
 exports.FormatColumnModuleId = 'FormatColumn';

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -58,6 +58,7 @@ exports.DefaultAdaptableOptions = {
     adaptableQLOptions: {
         caseSensitiveTextComparisons: false,
         externallyEvaluatedModules: [],
+        customPredicateDefs: [],
         expressionOptions: {
             defaultBooleanFunctions: booleanExpressionFunctions_1.booleanExpressionFunctions,
             defaultScalarFunctions: scalarExpressionFunctions_1.scalarExpressionFunctions,
@@ -78,6 +79,12 @@ exports.DefaultAdaptableOptions = {
         systemStatusContainer: undefined,
         alertContainer: undefined,
     },
+    columnOptions: {
+        columnTypes: GeneralConstants_1.EMPTY_ARRAY,
+        showMissingColumnsWarning: true,
+        autoOrderGroupedColumns: true,
+        hideColumnWhenGrouped: false,
+    },
     dashboardOptions: {
         canFloat: true,
         showQuickSearchInHeader: true,
@@ -124,10 +131,8 @@ exports.DefaultAdaptableOptions = {
     generalOptions: {
         hideEmptyGroupRows: false,
         showMissingPrimaryKeyAlert: false,
-        showMissingColumnsWarning: true,
+        dataSets: GeneralConstants_1.EMPTY_ARRAY,
         showGroupingTotalsAsHeader: false,
-        hideColumnWhenGrouped: false,
-        autoOrderGroupedColumns: true,
         alternativeModuleNames: undefined,
         currentCalendar: 'United Kingdom',
         cellSummaryOperations: undefined,
@@ -185,6 +190,7 @@ exports.DefaultAdaptableOptions = {
         enableFilterOnSpecialColumns: true,
         maxFilterValuesToDisplay: 2000,
         systemFilters: AdaptablePredicate_1.SystemFilterPredicateIds,
+        showQuickFilter: true,
     },
     searchOptions: {
         excludeColumnFromQuickSearch: undefined,
@@ -217,37 +223,31 @@ exports.DefaultAdaptableOptions = {
             showOutsideDays: true,
             datepickerButtons: ['close', 'today'],
         },
+        actionOptions: {
+            actionColumns: undefined,
+            actionRowButtons: undefined,
+            actionRowButtonsPosition: 'pinnedLeft',
+        },
         colorPalette: UIHelper_1.default.getDefaultColors(),
         editableCellStyle: undefined,
         readOnlyCellStyle: undefined,
         styleClassNames: GeneralConstants_1.EMPTY_ARRAY,
-        columnTypes: GeneralConstants_1.EMPTY_ARRAY,
         permittedValues: undefined,
         editLookUpItems: undefined,
-        actionColumns: undefined,
+        customDisplayFormatters: undefined,
         showDocumentationLinks: true,
         gridInfoSections: ['GridSummary', 'AdaptableOptions', 'ColumnInfo'],
         showAdapTableVersion: true,
-        rowActionButtons: undefined,
-        rowActionButtonsPosition: 'pinnedLeft',
     },
     toolPanelOptions: {
-        showAdaptableToolPanel: true,
-        adaptableToolPanelTitle: GeneralConstants.ADAPTABLE,
         showToolPanelsDropdown: true,
         customButtons: undefined,
         customToolPanels: undefined,
-        iconKey: 'menu',
-        width: UIHelper_1.default.getAdaptableToolPanelWidth(),
-        minWidth: UIHelper_1.default.getAdaptableToolPanelWidth(),
-        maxWidth: undefined,
-        toolPanelOrder: ['filters', 'columns', 'adaptable'],
     },
     dataChangeHistoryOptions: {
         activeByDefault: false,
         showDataChange: undefined,
     },
-    customPredicateDefs: [],
     settingsPanelOptions: {
         popupType: 'window',
         title: 'Settings Panel',

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -20,7 +20,7 @@ exports.DEFAULT_NAVIGATION_ITEMS = [
     'CalculatedColumn',
     'ConditionalStyle',
     'CustomSort',
-    'DataSource',
+    'DataSet',
     'Export',
     'Filter',
     'FlashingCell',

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -12,6 +12,7 @@ function assignAdaptableOptions(adaptableOptions) {
     const returnedAdaptableOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions, adaptableOptions);
     returnedAdaptableOptions.adaptableStateKey = (_a = returnedAdaptableOptions.adaptableStateKey) !== null && _a !== void 0 ? _a : returnedAdaptableOptions.adaptableId;
     returnedAdaptableOptions.adaptableQLOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions, adaptableOptions.adaptableQLOptions);
+    returnedAdaptableOptions.columnOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnOptions, adaptableOptions.columnOptions);
     returnedAdaptableOptions.adaptableQLOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions.expressionOptions, returnedAdaptableOptions.adaptableQLOptions.expressionOptions);
     returnedAdaptableOptions.layoutOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.layoutOptions, adaptableOptions.layoutOptions);
     returnedAdaptableOptions.notificationsOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.notificationsOptions, adaptableOptions.notificationsOptions);
@@ -26,6 +27,7 @@ function assignAdaptableOptions(adaptableOptions) {
     returnedAdaptableOptions.searchOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.searchOptions, adaptableOptions.searchOptions);
     returnedAdaptableOptions.filterOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.filterOptions, adaptableOptions.filterOptions);
     returnedAdaptableOptions.userInterfaceOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions, adaptableOptions.userInterfaceOptions);
+    returnedAdaptableOptions.userInterfaceOptions.actionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions.actionOptions, returnedAdaptableOptions.userInterfaceOptions.actionOptions);
     returnedAdaptableOptions.userInterfaceOptions.dateInputOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions.dateInputOptions, returnedAdaptableOptions.userInterfaceOptions.dateInputOptions);
     returnedAdaptableOptions.menuOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.menuOptions, adaptableOptions.menuOptions);
     returnedAdaptableOptions.stateOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.stateOptions, adaptableOptions.stateOptions);
@@ -67,7 +69,7 @@ function checkValidPrimaryKey(adaptable) {
             adaptable.api.alertApi.showAlertError('No Primary Key', errorMessage);
         }
         else {
-            if (adaptable.adaptableOptions.generalOptions.showMissingColumnsWarning == true) {
+            if (adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning == true) {
                 LoggingHelper_1.ConsoleLogError(errorMessage);
             }
         }

package/src/Utilities/ObjectFactory.d.ts

@@ -1,6 +1,5 @@
 import { ScheduleType } from '../PredefinedConfig/Common/Enums';
 import { CustomSort } from '../PredefinedConfig/CustomSortState';
-import { DataSource } from '../PredefinedConfig/DataSourceState';
 import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
 import { PlusMinusNudge } from '../PredefinedConfig/PlusMinusState';
 import { AlertDefinition, AlertProperties } from '../PredefinedConfig/AlertState';
@@ -19,17 +18,15 @@ import { IPushPullReport } from '../PredefinedConfig/SystemState';
 import { IPushPullSchedule } from '../PredefinedConfig/IPushPullState';
 import { OpenFinSchedule, OpenFinReport } from '../PredefinedConfig/OpenFinState';
 import { NamedQuery } from '../PredefinedConfig/QueryState';
-import { ColumnFilter, SystemFilterPredicateId } from '../PredefinedConfig/FilterState';
 import { ReminderSchedule } from '../PredefinedConfig/ScheduleState';
 import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
 import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { FlashingCellDefinition, GridDataChangedInfo } from '../types';
+import { ColumnFilter, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
 import { ToastOptions } from 'react-toastify';
 export declare function CreateEmptyCustomSort(): CustomSort;
-export declare function CreateEmptyDataSource(): DataSource;
 export declare function CreateEmptyCalculatedColumn(isFilterable: boolean): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
 export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
@@ -64,12 +61,12 @@ export declare function CreateEmptyStyle(): AdaptableStyle;
 export declare function CreateSystemStatusMessageInfo(message: string, type: AdaptableMessageType, furtherInfo?: string): SystemStatusMessageInfo;
 export declare function CreateEmptyCellSummmary(): CellSummmary;
 export declare function CreateColumnFilter(ColumnId: string, PredicateId: SystemFilterPredicateId, Inputs: any[]): ColumnFilter;
-export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose }?: {
+export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose, containerId }: {
     onClose?: VoidFunction;
+    containerId: string;
 }): ToastOptions;
 export declare const ObjectFactory: {
     CreateEmptyCustomSort: typeof CreateEmptyCustomSort;
-    CreateEmptyDataSource: typeof CreateEmptyDataSource;
     CreateEmptyCalculatedColumn: typeof CreateEmptyCalculatedColumn;
     CreateEmptyNamedQuery: typeof CreateEmptyNamedQuery;
     CreateEmptyPlusMinusNudge: typeof CreateEmptyPlusMinusNudge;

package/src/Utilities/ObjectFactory.js

@@ -1,6 +1,6 @@
 "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.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = 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.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -9,10 +9,6 @@ function CreateEmptyCustomSort() {
     return { Uuid: Uuid_1.createUuid(), ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
 }
 exports.CreateEmptyCustomSort = CreateEmptyCustomSort;
-function CreateEmptyDataSource() {
-    return { Uuid: Uuid_1.createUuid(), Name: GeneralConstants_1.EMPTY_STRING, Description: GeneralConstants_1.EMPTY_STRING };
-}
-exports.CreateEmptyDataSource = CreateEmptyDataSource;
 function CreateEmptyCalculatedColumn(isFilterable) {
     return {
         Uuid: Uuid_1.createUuid(),
@@ -359,7 +355,7 @@ function CreateColumnFilter(ColumnId, PredicateId, Inputs) {
     };
 }
 exports.CreateColumnFilter = CreateColumnFilter;
-function CreateToastOptions(notificationsOptions, { onClose } = {}) {
+function CreateToastOptions(notificationsOptions, { onClose, containerId }) {
     const adaptableToastPosition = notificationsOptions.position;
     const position = getToastPosition(adaptableToastPosition);
     const duration = notificationsOptions.duration;
@@ -369,6 +365,7 @@ function CreateToastOptions(notificationsOptions, { onClose } = {}) {
     const isDraggable = notificationsOptions.isDraggable;
     const transition = getToastTransition(notificationsOptions.transition);
     const toastProps = {
+        containerId,
         position,
         autoClose: duration == 'always' ? false : duration,
         hideProgressBar: !showProgressBar,
@@ -412,7 +409,6 @@ function getToastTransition(transition) {
 }
 exports.ObjectFactory = {
     CreateEmptyCustomSort,
-    CreateEmptyDataSource,
     CreateEmptyCalculatedColumn,
     CreateEmptyNamedQuery,
     CreateEmptyPlusMinusNudge,

package/src/Utilities/Services/EntitlementService.js

@@ -33,7 +33,13 @@ class EntitlementService {
             const moduleEntitlements = entitlementOptions.moduleEntitlements;
             if (moduleEntitlements) {
                 if (typeof moduleEntitlements === 'function') {
-                    const dynamicModuleEntitlement = moduleEntitlements(adaptableModule, adaptableOptions.userName, adaptableOptions.adaptableId, defaultAccessLevel);
+                    const entitlementContext = {
+                        adaptableModule,
+                        userName: adaptableOptions.userName,
+                        adaptableId: adaptableOptions.adaptableId,
+                        defaultAccessLevel,
+                    };
+                    const dynamicModuleEntitlement = moduleEntitlements(entitlementContext);
                     return dynamicModuleEntitlement !== null && dynamicModuleEntitlement !== void 0 ? dynamicModuleEntitlement : defaultAccessLevel;
                 }
                 else {

package/src/Utilities/Services/ModuleService.js

@@ -93,7 +93,7 @@ class ModuleService {
                 return learnUrl + 'handbook-sorting';
             case 'Dashboard':
                 return learnUrl + 'ui-dashboard';
-            case 'DataSource':
+            case 'DataSet':
                 return learnUrl + 'handbook-data-sources';
             case 'DataChangeHistory':
                 return learnUrl + 'handbook-monitoring#data-change-history';

package/src/Utilities/Services/ReportService.js

@@ -341,18 +341,17 @@ class ReportService {
             : // type === formattedValue
                 this.adaptableApi.gridApi.getFormattedValueFromRawValue(columnId, cellRawValue);
     }
-    computeCellExportValueFormat(columnType) {
+    computeCellExportValueFormat(columnDataType) {
         const exportOptions = this.adaptableApi.internalApi.getAdaptableOptions().exportOptions;
         if (exportOptions.exportFormatType === 'rawValue' ||
             exportOptions.exportFormatType === 'formattedValue') {
             return exportOptions.exportFormatType;
         }
         // format is customized based on column data type
-        switch (columnType) {
+        switch (columnDataType) {
             case 'String':
                 return exportOptions.exportFormatType.string;
             case 'Number':
-            case 'NumberArray':
                 return exportOptions.exportFormatType.number;
             case 'Date':
                 return exportOptions.exportFormatType.date;

package/src/Utilities/Services/TeamSharingService.js

@@ -74,7 +74,7 @@ class TeamSharingService {
                 return importInfo === null || importInfo === void 0 ? void 0 : importInfo.AddAction(Entity);
             }
         };
-        const existingSharedEntities = this.adaptableApi.teamSharingApi.getSharedEntities();
+        const existingSharedEntities = this.adaptableApi.internalApi.getLocalTeamSharingEntities();
         const sharedEntityDependencyTree = this.getSharedEntityDependencyTree(importedSharedEntity, existingSharedEntities);
         const importSteps = sharedEntityDependencyTree.map((sharedEntity) => ({
             sharedEntity,
@@ -84,13 +84,13 @@ class TeamSharingService {
     }
     getSharedEntityLocalAndRemoteRevisions(changedAdaptableObjectId, remoteSharedEntities) {
         var _a, _b, _c, _d;
-        const localRevision = (_b = (_a = this.adaptableApi.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap[changedAdaptableObjectId]) === null || _a === void 0 ? void 0 : _a.Revision) !== null && _b !== void 0 ? _b : -1;
+        const localRevision = (_b = (_a = this.adaptableApi.internalApi.getState().TeamSharing.ActiveSharedEntityMap[changedAdaptableObjectId]) === null || _a === void 0 ? void 0 : _a.Revision) !== null && _b !== void 0 ? _b : -1;
         const remoteRevision = (_d = (_c = remoteSharedEntities.find((sharedEntity) => sharedEntity.Entity.Uuid === changedAdaptableObjectId)) === null || _c === void 0 ? void 0 : _c.Revision) !== null && _d !== void 0 ? _d : -1;
         return [localRevision, remoteRevision];
     }
     getStaleActiveSharedEntities() {
-        const sharedEntities = this.adaptableApi.teamSharingApi.getSharedEntities();
-        const activeEntities = this.adaptableApi.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap;
+        const sharedEntities = this.adaptableApi.internalApi.getLocalTeamSharingEntities();
+        const activeEntities = this.adaptableApi.internalApi.getState().TeamSharing.ActiveSharedEntityMap;
         const result = {};
         sharedEntities
             .filter((sharedEntity) => sharedEntity.Type === 'Active')

package/src/View/AdaptablePopover/index.d.ts

@@ -12,6 +12,7 @@ export interface AdaptablePopoverProps extends React.ClassAttributes<AdaptablePo
     useButton?: boolean;
     tooltipText?: string;
     popoverMinWidth?: number;
+    popoverMaxWidth?: number;
     popupPadding?: number;
 }
 export declare class AdaptablePopover extends React.Component<AdaptablePopoverProps, {}> {

package/src/View/AdaptablePopover/index.js

@@ -11,7 +11,7 @@ const OverlayTrigger_1 = tslib_1.__importDefault(require("../../components/Overl
 const rebass_1 = require("rebass");
 class AdaptablePopover extends React.Component {
     render() {
-        var _a, _b;
+        var _a, _b, _c;
         let messageType = this.props.MessageType != null ? this.props.MessageType : 'Info';
         const showIcon = (_a = this.props.showIcon) !== null && _a !== void 0 ? _a : true;
         let useButton = this.props.useButton != null ? this.props.useButton : false;
@@ -23,11 +23,10 @@ class AdaptablePopover extends React.Component {
                 margin: '0px',
                 padding: '0px',
                 minWidth: popoverMinWidth,
-                maxWidth: 300,
+                maxWidth: (_b = this.props.popoverMaxWidth) !== null && _b !== void 0 ? _b : 300,
             } },
-            title ? (React.createElement(rebass_1.Text, { fontSize: 2, padding: 2 },
-                React.createElement("b", null, title))) : null,
-            React.createElement(rebass_1.Box, { className: "ab-Popover__body", padding: (_b = this.props.popupPadding) !== null && _b !== void 0 ? _b : 2 }, this.props.bodyText.map((textOrHTML, index) => (React.createElement("span", { key: index }, textOrHTML))))));
+            title ? (React.createElement(rebass_1.Text, { fontSize: 4, padding: 2 }, title)) : null,
+            React.createElement(rebass_1.Box, { className: "ab-Popover__body", padding: (_c = this.props.popupPadding) !== null && _c !== void 0 ? _c : 2 }, this.props.bodyText.map((textOrHTML, index) => (React.createElement("span", { key: index }, textOrHTML))))));
         const icon = 'info'; // - think this is wrong - UIHelper.getGlyphByMessageType(messageType);
         const color = UIHelper_1.UIHelper.getColorByMessageType(messageType);
         const iconStyle = {
@@ -37,7 +36,7 @@ class AdaptablePopover extends React.Component {
         return (React.createElement(rebass_1.Flex, { alignItems: "center", className: this.props.className },
             React.createElement(OverlayTrigger_1.default, { showTriangle: true, render: () => popoverClickRootClose, showEvent: (this.props.showEvent || 'mouseenter'), hideEvent: (this.props.hideEvent || 'mouseleave'), style: {
                     overflow: 'visible',
-                }, defaultZIndex: 100000 }, useButton ? (React.createElement(ButtonInfo_1.ButtonInfo, { style: iconStyle, onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText }, this.props.children)) : (React.createElement("div", { tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' } },
+                }, defaultZIndex: 100000 }, useButton ? (React.createElement(ButtonInfo_1.ButtonInfo, { style: iconStyle, onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText }, this.props.children)) : (React.createElement("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' } },
                 this.props.children,
                 showIcon && React.createElement(icons_1.Icon, { name: icon }))))));
     }

package/src/View/AdaptableView.js

@@ -33,7 +33,7 @@ class AdaptableView extends React.Component {
             , { 
                 // we NEEEEED!!!! this containerId, otherwise, toastify will have memory leaks when the adaptable
                 // instance is destroyed and re-created many times
-                containerId: adaptableOptions.adaptableId, limit: adaptableOptions.notificationsOptions.maxNotifications, closeButton: false, icon: false, theme: "colored" }),
+                containerId: adaptableOptions.adaptableId, enableMultiContainer: true, limit: adaptableOptions.notificationsOptions.maxNotifications, closeButton: false, icon: false, theme: "colored" }),
             (watermark === null || watermark === void 0 ? void 0 : watermark.show) && React.createElement(License_1.LicenseWatermark, null, watermark === null || watermark === void 0 ? void 0 : watermark.text),
             React.createElement(WindowPopups_1.WindowPopups, null),
             React.createElement(FormPopups_1.FormPopups, null),

package/src/View/AdaptableViewFactory.js

@@ -26,7 +26,7 @@ const QuickSearchViewPanel_1 = require("./QuickSearch/QuickSearchViewPanel");
 const SmartEditViewPanel_1 = require("./SmartEdit/SmartEditViewPanel");
 const SystemStatusViewPanel_1 = require("./SystemStatus/SystemStatusViewPanel");
 const ThemeViewPanel_1 = require("./Theme/ThemeViewPanel");
-const DataSourceViewPanel_1 = require("./DataSource/DataSourceViewPanel");
+const DataSetViewPanel_1 = require("./DataSet/DataSetViewPanel");
 const DataChangeHistoryPopup_1 = require("./DataChangeHistory/DataChangeHistoryPopup");
 const DataChangeHistoryViewPanel_1 = require("./DataChangeHistory/DataChangeHistoryViewPanel");
 const StateManagementViewPanel_1 = require("./StateManagement/StateManagementViewPanel");
@@ -59,7 +59,7 @@ exports.AdaptableViewPanelFactory = new Map([
     [ModuleConstants.SmartEditModuleId, SmartEditViewPanel_1.SmartEditViewPanelControl],
     [ModuleConstants.SystemStatusModuleId, SystemStatusViewPanel_1.SystemStatusViewPanel],
     [ModuleConstants.ThemeModuleId, ThemeViewPanel_1.ThemeViewPanelControl],
-    [ModuleConstants.DataSourceModuleId, DataSourceViewPanel_1.DataSourceViewPanelControl],
+    [ModuleConstants.DataSetModuleId, DataSetViewPanel_1.DataSetViewPanelControl],
     [ModuleConstants.DataChangeHistoryModuleId, DataChangeHistoryViewPanel_1.DataChangeHistoryViewPanelControl],
     [ModuleConstants.StateManagementModuleId, StateManagementViewPanel_1.StateManagementViewPanel],
 ]);

package/src/View/Alert/ActiveAlertsPanel.d.ts

@@ -0,0 +1,2 @@
+import * as React from 'react';
+export declare const ActiveAlertsPanel: React.FunctionComponent;

package/src/View/Alert/ActiveAlertsPanel.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActiveAlertsPanel = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const AdaptableContext_1 = require("../AdaptableContext");
+const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
+const AdaptableObjectCompactList_1 = require("../Components/AdaptableObjectList/AdaptableObjectCompactList");
+const react_redux_1 = require("react-redux");
+exports.ActiveAlertsPanel = () => {
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const filterModule = adaptable.ModuleService.getModuleById(ModuleConstants.AlertModuleId);
+    const alerts = react_redux_1.useSelector((state) => state.System.AdaptableAlerts);
+    return React.createElement(AdaptableObjectCompactList_1.AdaptableObjectCompactList, { abObjects: alerts, module: filterModule });
+};

package/src/View/Alert/AlertStatusSubPanel.js

@@ -5,16 +5,14 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const AdaptableContext_1 = require("../AdaptableContext");
-const AlertsPanel_1 = require("./AlertsPanel");
 const getAlertButtonStyle_1 = require("./Utilities/getAlertButtonStyle");
 const StatusBarPanel_1 = require("../StatusBar/StatusBarPanel");
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
+const ActiveAlertsPanel_1 = require("./ActiveAlertsPanel");
 const initialStyle = { color: '', background: '' };
 exports.AlertStatusPanel = () => {
     const adaptable = AdaptableContext_1.useAdaptable();
     const [style, setStyle] = React.useState(initialStyle);
-    const dispatch = react_redux_1.useDispatch();
     const module = adaptable.ModuleService.getModuleById(ModuleConstants.AlertModuleId);
     const statusbarHighlightDuration = adaptable.adaptableOptions.alertOptions.statusbarHighlightDuration;
     /**
@@ -49,9 +47,6 @@ exports.AlertStatusPanel = () => {
             setStyle(initialStyle);
         }, statusbarHighlightDuration);
     }, [alerts]);
-    // Dropdown content
-    const handleDeleteAlert = React.useCallback((alert) => dispatch(SystemRedux.SystemAlertDelete(alert)), []);
-    const handleDeleteAllAlerts = React.useCallback((alerts) => dispatch(SystemRedux.SystemAlertDeleteAll(alerts)), []);
-    let alertsPanel = (React.createElement(AlertsPanel_1.AlertsPanel, { Alerts: alerts, ShowPanel: true, ShowHeader: false, onClearAlert: handleDeleteAlert, onClearAllAlerts: handleDeleteAllAlerts }));
-    return (React.createElement(StatusBarPanel_1.StatusBarPanel, { "data-name": module.moduleInfo.ModuleName, color: style.color, backgroundColor: style.background, onAction: handleAction, icon: module.moduleInfo.Glyph, popover: alerts.length ? alertsPanel : null, content: text }));
+    let alertsPanel = React.createElement(ActiveAlertsPanel_1.ActiveAlertsPanel, null);
+    return (React.createElement(StatusBarPanel_1.StatusBarPanel, { tooltip: module.moduleInfo.ModuleName, "data-name": module.moduleInfo.ModuleName, color: style.color, backgroundColor: style.background, onAction: handleAction, icon: module.moduleInfo.Glyph, popover: alerts.length ? alertsPanel : null, content: text }));
 };

package/src/View/Alert/AlertViewPanel.js

@@ -6,10 +6,10 @@ const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const AdaptablePopover_1 = require("../AdaptablePopover");
-const AlertsPanel_1 = require("./AlertsPanel");
 const rebass_1 = require("rebass");
 const UIHelper_1 = tslib_1.__importDefault(require("../UIHelper"));
 const getAlertButtonStyle_1 = require("./Utilities/getAlertButtonStyle");
+const ActiveAlertsPanel_1 = require("./ActiveAlertsPanel");
 class AlertViewPanelComponent extends React.Component {
     constructor(props) {
         super(props);
@@ -31,7 +31,7 @@ class AlertViewPanelComponent extends React.Component {
             : this.props.AdaptableAlerts.length == 1
                 ? '1 Alert'
                 : this.props.AdaptableAlerts.length + ' Alerts';
-        const alertsPanel = (React.createElement(AlertsPanel_1.AlertsPanel, { Alerts: this.props.AdaptableAlerts, ShowPanel: true, ShowHeader: false, onClearAlert: this.props.onDeleteAlert, onRender: () => this.setState({ ShowMessage: false }), onClearAllAlerts: this.props.onDeleteAllAlert }));
+        const alertsPanel = React.createElement(ActiveAlertsPanel_1.ActiveAlertsPanel, null);
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(rebass_1.Flex, { alignItems: "stretch", className: `ab-${elementType}__Alert__wrap` },
             React.createElement(rebass_1.Flex, { style: { borderRadius: 'var(--ab__border-radius)' }, className: `ab-${elementType}__Alert__text`, marginRight: 2, padding: 2, color: buttonTextColor, backgroundColor: buttonBackground, fontSize: 'var( --ab-font-size-2)', alignItems: "center" }, collapsedText),