@adaptabletools/adaptable 14.0.2 → 14.0.4

package/src/PredefinedConfig/Common/Enums.js

@@ -16,6 +16,7 @@ var ExportDestination;
     ExportDestination["CSV"] = "CSV";
     ExportDestination["Clipboard"] = "Clipboard";
     ExportDestination["JSON"] = "JSON";
+    ExportDestination["Table"] = "Table";
 })(ExportDestination = exports.ExportDestination || (exports.ExportDestination = {}));
 var ScheduleType;
 (function (ScheduleType) {

package/src/PredefinedConfig/Common/FDC3Context.d.ts

@@ -240,4 +240,7 @@ export declare type FDC3ContextType = 'fdc3.instrument' | 'fdc3.instrumentList'
 export interface CustomFDC3Context extends FDC3Context {
     type: any;
 }
+/**
+ * Data used in FDC3 Contexts
+ */
 export declare type ContextData = Record<string, unknown>;

package/src/PredefinedConfig/Common/Types.d.ts

@@ -6,12 +6,18 @@ export declare type AdaptableDashboardToolbars = AdaptableDashboardToolbar[];
 /**
  * List of all the Toolbars that Adaptable provides
  */
-export declare type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme' | 'Charting';
+export declare type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'Charting' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
 export declare const ALL_TOOLBARS: AdaptableDashboardToolbar[];
-export declare type AdaptableStatusBarPanel = 'CellSummary' | 'Alert' | 'GridInfo' | 'Dashboard' | 'ToolPanel' | 'StatusBar' | 'StateManagement' | 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'SystemStatus' | 'DataChangeHistory' | 'TeamSharing' | 'Theme' | 'BulkUpdate' | 'SettingsPanel' | 'SmartEdit' | 'Charting';
+/**
+ * Modules which can appear in the AdapTable Status Bar
+ */
+export declare type AdaptableStatusBarPanel = 'Alert' | 'CalculatedColumn' | 'BulkUpdate' | 'CellSummary' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'SmartEdit' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare const ALL_STATUS_SUB_PANELS: AdaptableStatusBarPanel[];
 export declare type AdaptableToolPanels = AdaptableToolPanel[];
-export declare type AdaptableToolPanel = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'Dashboard' | 'DataChangeHistory' | 'Export' | 'Filter' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme' | 'Charting';
+/**
+ * Modules which can appear as AdapTable Tool Panels
+ */
+export declare type AdaptableToolPanel = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'Charting' | 'Dashboard' | 'DataChangeHistory' | 'Export' | 'Filter' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
 export declare const ALL_TOOL_PANELS: AdaptableToolPanels;
 /**
  * Adaptable Module Button collection
@@ -22,18 +28,27 @@ export declare type AdaptableModuleButtons = AdaptableModuleButton[];
 /**
  * List of all the Module buttons Adaptable provides - each Module has a popup for which this is a shortcut button
  */
-export declare type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
+export declare type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
 export declare type AdaptableStateKeys = AdaptableStateKey[];
 export declare type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFin' | 'Glue42' | 'IPushPull';
 /**
  * Modules provided by AdapTable, subject to Entitlements and usually have Predefined Config
  */
-export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare const ALL_MODULES: AdaptableModule[];
-export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Charting';
+/**
+ * Modules which can appear in the Settings Panel
+ */
+export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'StyledColumn' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;
 export declare type AdaptableQLModules = AdaptableQLModule[];
+/**
+ * Modules which leverage AdapTableQL; can be used to set remote evaluation
+ */
 export declare type AdaptableQLModule = 'CalculatedColumn' | 'Filter' | 'Query';
+/**
+ * Column Types recognised by AdapTable; to be set in GridOptions
+ */
 export declare type AdaptableColumnType = 'abColDefBoolean' | 'abColDefDate' | 'abColDefNumber' | 'abColDefString' | 'abColDefObject' | 'abColDefNumberArray' | 'abColDefTupleNumberArray' | 'abColDefObjectNumberArray' | 'abColDefCustom' | 'abSpecialColumn';

package/src/PredefinedConfig/Common/Types.js

@@ -31,7 +31,6 @@ exports.ALL_STATUS_SUB_PANELS = [
     'BulkUpdate',
     'CalculatedColumn',
     'CellSummary',
-    'ConditionalStyle',
     'CustomSort',
     'Charting',
     'Dashboard',
@@ -62,6 +61,7 @@ exports.ALL_TOOL_PANELS = [
     'Alert',
     'BulkUpdate',
     'CellSummary',
+    'Charting',
     'Dashboard',
     'DataChangeHistory',
     'Export',
@@ -75,7 +75,6 @@ exports.ALL_TOOL_PANELS = [
     'StateManagement',
     'SystemStatus',
     'Theme',
-    'Charting',
 ];
 exports.ALL_MODULES = [
     ModuleConstants.AlertModuleId,
@@ -83,7 +82,6 @@ exports.ALL_MODULES = [
     ModuleConstants.CalculatedColumnModuleId,
     ModuleConstants.CellSummaryModuleId,
     ModuleConstants.ChartingModuleId,
-    ModuleConstants.ConditionalStyleModuleId,
     ModuleConstants.CustomSortModuleId,
     ModuleConstants.DashboardModuleId,
     ModuleConstants.DataChangeHistoryModuleId,

package/src/PredefinedConfig/ExportState.d.ts

@@ -29,11 +29,11 @@ export interface Report extends AdaptableObject {
      */
     Name: SystemReportName | string;
     /**
-     * Columns to display: options are 'AllColumns', 'VisibleColumns', 'SelectedColumns', 'ScopeColumns'
+     * Columns to display: 'AllColumns', 'VisibleColumns', 'SelectedColumns', 'ScopeColumns'
      */
     ReportColumnScope: ReportColumnScope;
     /**
-     * Rows to export: options are 'AllRows', 'VisibleRows', 'SelectedCellRows', 'SelectedRows', 'ExpressionRows'
+     * Rows to export: 'AllRows', 'VisibleRows', 'SelectedCellRows', 'SelectedRows', 'ExpressionRows'
      */
     ReportRowScope: ReportRowScope;
     /**

package/src/PredefinedConfig/FlashingCellState.d.ts

@@ -1,11 +1,11 @@
 import { ConfigState } from './ConfigState';
 import { AdaptableStyle } from './Common/AdaptableStyle';
-import { AdaptablePredicate, AdaptableScope } from '../types';
+import { AdaptableColumnPredicate, AdaptableScope } from '../types';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { TypeHint } from './Common/Types';
 import { SuspendableObject } from '../../types';
-export interface FlashingCellDefinitionPredicate extends AdaptablePredicate {
+export interface FlashingCellDefinitionPredicate extends AdaptableColumnPredicate {
     PredicateId: TypeHint<string, SystemFlashingCellPredicateId>;
 }
 /**

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -5,7 +5,8 @@ import { AdaptableScope } from './Common/AdaptableScope';
 import { SuspendableObject } from './Common/SuspendableObject';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { TypeHint } from './Common/Types';
-import { AdaptableBooleanQuery, AdaptablePredicate, GradientStyle, PercentBarStyle } from '../types';
+import { AdaptableBooleanQuery, GradientStyle, PercentBarStyle } from '../types';
+import { AdaptableColumnPredicate } from './Common/AdaptablePredicate';
 /**
  * Predefined Configuration for Format Column Module
  */
@@ -55,7 +56,7 @@ export interface FormatColumn extends SuspendableObject {
 export declare type FormatColumnRule = XOR<{
     Predicates: FormatColumnPredicate[];
 }, AdaptableBooleanQuery>;
-export interface FormatColumnPredicate extends AdaptablePredicate {
+export interface FormatColumnPredicate extends AdaptableColumnPredicate {
     PredicateId: TypeHint<string, SystemFormatColumnPredicateId>;
 }
 /**

package/src/PredefinedConfig/FreeTextColumnState.d.ts

@@ -32,7 +32,7 @@ export interface FreeTextColumn extends AdaptableObject {
     FreeTextStoredValues?: FreeTextStoredValue[];
     /**
      * Cell editor to use when editing a string Free Text Column
-     * * @defaultValue 'Inline'
+     * @defaultValue 'Inline'
      */
     TextEditor?: 'Inline' | 'Large';
     /**

package/src/PredefinedConfig/PredefinedConfig.d.ts

@@ -35,6 +35,10 @@ export interface PredefinedConfig {
      * Supplies a collection of *CalculatedColumn* objects that will display a value based on other cells in the row (using a Calculated Column Expression)
      */
     CalculatedColumn?: CalculatedColumnState;
+    /**
+     * Named Charts (wrapping Chart models)
+     */
+    Charting?: ChartingState;
     /**
      * @deprecated use `FormatColumn` instead
      */
@@ -103,8 +107,4 @@ export interface PredefinedConfig {
      * Sets the order and visibility of the Tool Panel controls in the AdapTable ToolPanel (on right of grid)
      */
     ToolPanel?: ToolPanelState;
-    /**
-     * Predefine charting models
-     */
-    Charting?: ChartingState;
 }

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -68,7 +68,7 @@ export interface NumericStyledColumn {
      */
     ColumnComparison?: ColumnComparison;
     /**
-     * Range can represent 'Number' (any number or Col-Min/Col-Max) or 'Percentage' (values 0-100)
+     * If using Ranges, they can provide 'Number' (any number or Col-Min/Col-Max) or 'Percentage' (values 0-100)
      * @defaultValue Number
      */
     RangeValueType?: RangeValueType;

package/src/PredefinedConfig/ThemeState.d.ts

@@ -30,10 +30,6 @@ export interface AdaptableTheme extends AdaptableObject {
      * Description of Theme - will appear in Theme Toolbar and Toolpanel
      */
     Description: string;
-    /**
-     * deprecated use `AgGridClassName` property instead
-     */
-    VendorGridClassName?: string;
     /**
      * Ag Grid theme to apply when loading theme
      */

package/src/Redux/ActionsReducers/PopupRedux.d.ts

@@ -36,6 +36,7 @@ export interface PopupShowWindowAction extends Redux.Action {
     Id: string;
     Title: string;
     PopupProps: any;
+    FactoryId: any;
     Icon?: string;
 }
 export interface PopupHideWindowAction extends Redux.Action {
@@ -83,6 +84,7 @@ export declare const PopupHideScreen: () => PopupHideScreenAction;
 export declare const PopupShowWindow: (config: {
     Id: string;
     Title: string;
+    FactoryId: string;
     PopupProps?: any;
     Icon?: string;
 }) => PopupShowWindowAction;

package/src/Redux/ActionsReducers/PopupRedux.js

@@ -34,6 +34,7 @@ const PopupShowWindow = (config) => ({
     Id: config.Id,
     Title: config.Title,
     PopupProps: config.PopupProps,
+    FactoryId: config.FactoryId,
     Icon: config.Icon,
 });
 exports.PopupShowWindow = PopupShowWindow;
@@ -271,6 +272,7 @@ const PopupReducer = (state = initialState, action) => {
                 Icon: showWindowAction.Icon,
                 Title: showWindowAction.Title,
                 PopupProps: showWindowAction.PopupProps,
+                FactoryId: showWindowAction.FactoryId,
             };
             let PopupList = [...state.WindowPopup.PopupList];
             // Prevent opening the same popup twice

package/src/Redux/ActionsReducers/StatusBarRedux.d.ts

@@ -2,7 +2,7 @@ import * as Redux from 'redux';
 import { AdaptableState } from '../../../types';
 import { StatusBarState, AdaptableStatusBar } from '../../PredefinedConfig/StatusBarState';
 /**
- * @ReduxAction Sets status bar panels
+ * @ReduxAction Sets Status Bar panels
  */
 export declare const SET_STATUS_BAR_PANELS = "SET_STATUS_BAR_PANELS";
 /**
@@ -18,5 +18,5 @@ export interface StatusBarReadyAction extends Redux.Action {
 export declare const StatusBarSetPanels: (statusPanels: AdaptableStatusBar[]) => StatusBarSetPanelsAction;
 export declare const initialState: StatusBarState;
 export declare const getStatusPanelsSelector: (state: AdaptableState) => AdaptableStatusBar[];
-export declare const ToolPanelReady: (statusBarState: StatusBarState) => StatusBarReadyAction;
+export declare const StatusBarReady: (statusBarState: StatusBarState) => StatusBarReadyAction;
 export declare const StatusBarReducer: Redux.Reducer<StatusBarState>;

package/src/Redux/ActionsReducers/StatusBarRedux.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatusBarReducer = exports.ToolPanelReady = exports.getStatusPanelsSelector = exports.initialState = exports.StatusBarSetPanels = exports.STATUS_BAR_READY = exports.SET_STATUS_BAR_PANELS = void 0;
+exports.StatusBarReducer = exports.StatusBarReady = exports.getStatusPanelsSelector = exports.initialState = exports.StatusBarSetPanels = exports.STATUS_BAR_READY = exports.SET_STATUS_BAR_PANELS = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 /**
- * @ReduxAction Sets status bar panels
+ * @ReduxAction Sets Status Bar panels
  */
 exports.SET_STATUS_BAR_PANELS = 'SET_STATUS_BAR_PANELS';
 /**
@@ -20,11 +20,11 @@ exports.initialState = {
 };
 const getStatusPanelsSelector = (state) => state.StatusBar.StatusBars;
 exports.getStatusPanelsSelector = getStatusPanelsSelector;
-const ToolPanelReady = (statusBarState) => ({
+const StatusBarReady = (statusBarState) => ({
     type: exports.STATUS_BAR_READY,
     statusBarState,
 });
-exports.ToolPanelReady = ToolPanelReady;
+exports.StatusBarReady = StatusBarReady;
 const StatusBarReducer = (state = exports.initialState, action) => {
     switch (action.type) {
         case exports.SET_STATUS_BAR_PANELS:

package/src/Redux/Store/AdaptableStore.js

@@ -569,17 +569,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  *******************/
                 case CalculatedColumnRedux.CALCULATED_COLUMN_READY: {
                     // create aggregated scalar columns at grid startup
-                    const aggregatedCalculatedColumns = adaptable.api.calculatedColumnApi
-                        .getCalculatedColumns()
-                        .filter((calculatedColumn) => { var _a; return (_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression; });
-                    aggregatedCalculatedColumns.forEach((calculatedColumn) => {
-                        adaptable.api.internalApi
-                            .getCalculatedColumnExpressionService()
-                            .createAggregatedScalarLiveValue(calculatedColumn);
-                    });
-                    // refresh calculated columns
-                    const aggCalculatedColumnIds = aggregatedCalculatedColumns.map((calculatedColumn) => calculatedColumn.ColumnId);
-                    adaptable.refreshCells(null, aggCalculatedColumnIds, true);
+                    adaptable.api.calculatedColumnApi.refreshAggregatedCalculatedColumns();
                     return;
                 }
                 /**

package/src/Strategy/AlertModule.js

@@ -13,12 +13,14 @@ const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
 const getAlertPreviewViewItems_1 = require("./Utilities/Alert/getAlertPreviewViewItems");
 const getAlertBehaviourViewItems_1 = require("./Utilities/Alert/getAlertBehaviourViewItems");
+const getAlertTypeViewItems_1 = require("./Utilities/Alert/getAlertTypeViewItems");
 const AlertEmptyView_1 = require("../View/Alert/AlertEmptyView");
 const AlertStatusSubPanel_1 = require("../View/Alert/AlertStatusSubPanel");
 const ActiveAlertsPanelItemLabel_1 = require("../View/Alert/ActiveAlertsPanelItemLabel");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const updateSingleToMultiplePredicates_1 = require("./Utilities/updateSingleToMultiplePredicates");
 const Helper_1 = require("../Utilities/Helpers/Helper");
+const getAlertType_1 = require("../View/Alert/Utilities/getAlertType");
 class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.AlertModuleId, ModuleConstants.AlertModuleFriendlyName, 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);
@@ -221,14 +223,16 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
     }
     toView(alert) {
+        const alertType = (0, getAlertType_1.getAlertType)(alert);
         return {
             items: [
-                (0, getScopeViewItems_1.getScopeViewItems)(alert.Scope, this.api),
-                (0, getRuleViewItems_1.getRuleViewItems)(alert.Rule, this.api),
+                (0, getAlertTypeViewItems_1.getAlertTypeViewItems)(alert),
+                alertType === 'DataChange' && Object.assign(Object.assign({}, (0, getScopeViewItems_1.getScopeViewItems)(alert.Scope, this.api)), { label: 'Trigger', name: 'Trigger' }),
+                Object.assign(Object.assign({}, (0, getRuleViewItems_1.getRuleViewItems)(alert.Rule, this.api)), { label: 'Rule', name: 'Rule' }),
                 (0, getAlertBehaviourViewItems_1.getAlertBehaviourViewItems)(this.api),
                 (0, getAlertPreviewViewItems_1.getAlertPreviewViewItems)(alert, this.api),
                 (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(alert, this.api),
-            ],
+            ].filter(Boolean),
             abObject: alert,
         };
     }

package/src/Strategy/ChartingModule.js

@@ -4,10 +4,11 @@ exports.ChartingModule = void 0;
 const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const ShowChartButton_1 = require("../View/Components/Charting/ShowChartButton");
-const ChartingWizard_1 = require("../View/Components/Charting/ChartingWizard/ChartingWizard");
+const ShowChartButton_1 = require("../View/Charting/ShowChartButton");
+const ChartingWizard_1 = require("../View/Charting/ChartingWizard/ChartingWizard");
 const ChartingRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/ChartingRedux"));
-const ChartingStatusBarPopover_1 = require("../View/Components/Charting/ChartingStatusBarPopover");
+const ChartingStatusBarPopover_1 = require("../View/Charting/ChartingStatusBarPopover");
+const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ChartingModuleId, ModuleConstants.ChartingFriendlyName, 'chart', 'ChartPopup', 'Create AG Grid Charts in order to see Adaptable Data visually', api);
@@ -83,6 +84,7 @@ class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                                 .join(', ')}`,
                     ].filter(Boolean),
                 },
+                (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(chart, this.api),
             ].filter(Boolean),
             abObject: chart,
         };

package/src/Strategy/ExportModule.d.ts

@@ -16,6 +16,7 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     export(report: Report, exportDestination: ExportDestination | string): void;
     private isCustomDestination;
     private convertReportToJSON;
+    private openReportInTablePopup;
     private convertReportToCsv;
     private convertReportToExcel;
     private copyToClipboard;

package/src/Strategy/ExportModule.js

@@ -19,6 +19,8 @@ const ReportExportDropdown_1 = require("../View/Export/ReportExportDropdown");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const ExportSelector_1 = require("../View/Export/ExportSelector");
 const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
+const windowFactory_1 = require("../View/Components/Popups/WindowPopups/windowFactory");
+const Uuid_1 = require("../PredefinedConfig/Uuid");
 class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ExportModuleId, ModuleConstants.ExportFriendlyName, 'export-data', 'ExportPopup', 'Export data from the Grid to numerous locations in numerous formatso', api);
@@ -124,6 +126,9 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     case Enums_1.ExportDestination.JSON:
                         this.convertReportToJSON(report);
                         break;
+                    case Enums_1.ExportDestination.Table:
+                        this.openReportInTablePopup(report);
+                        break;
                 }
             }
             this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemVisualExportEnd)());
@@ -148,6 +153,44 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const jsonFileName = this.api.internalApi.getReportService().getReportFileName(report.Name) + '.json';
         Helper_1.Helper.createDownloadedFile(jsonContent, jsonFileName, 'application/json');
     }
+    openReportInTablePopup(report) {
+        const reportData = this.api.internalApi.getReportService().getReportData(report, true);
+        if (this.isEmptyReportData(reportData)) {
+            this.showEmptyExportWarning();
+            return;
+        }
+        const popupProps = {
+            reportData,
+        };
+        let title = 'Export Table';
+        if (report.Name) {
+            title = `${title} [${report.Name}]`;
+        }
+        if (report.Scope) {
+            const scopeText = this.api.internalApi
+                .getReportService()
+                .GetReportColumnScopeShortDescription(report);
+            if (scopeText === null || scopeText === void 0 ? void 0 : scopeText.length) {
+                title = `${title} ${scopeText.join(',')}`;
+            }
+        }
+        if (report.Query) {
+            const queryText = this.api.internalApi
+                .getReportService()
+                .GetReportExpressionDescription(report, this.api.columnApi.getColumns());
+            if (queryText === null || queryText === void 0 ? void 0 : queryText.length) {
+                title = `${title} ${queryText}`;
+            }
+        }
+        this.api.internalApi.showPopupWindow({
+            // allow to open multiple tables
+            id: 'report-table-' + (0, Uuid_1.createUuid)(),
+            title: title,
+            icon: 'export-data',
+            factoryId: windowFactory_1.SHOW_EXPORT_TABLE,
+            popupProps,
+        });
+    }
     convertReportToCsv(report) {
         const csvContent = this.createCSVContent(report);
         if (StringExtensions_1.default.IsNullOrEmpty(csvContent)) {

package/src/Strategy/FlashingCellModule.js

@@ -216,7 +216,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
         var _a;
-        return this.api.predicateApi.handlePredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, {
+        return this.api.predicateApi.handleColumnPredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, {
             value: dataChangedEvent.newValue,
             oldValue: dataChangedEvent.oldValue,
             // TODO send real display value

package/src/Strategy/FormatColumnModule.js

@@ -64,13 +64,18 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const dashboardModuleButtons = this.api.internalApi.getState().Dashboard.ModuleButtons;
         if (dashboardModuleButtons.includes('ConditionalStyle')) {
             dashboardModuleButtons[dashboardModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
-            this.api.dashboardApi.setModuleButtons([...new Set(dashboardModuleButtons)]);
+            const test2 = dashboardModuleButtons;
+            this.api.dashboardApi.setModuleButtons([
+                ...new Set(dashboardModuleButtons),
+            ]);
         }
         // update ConditionalStyle toolPanel buttons
         const toolPanelModuleButtons = this.api.internalApi.getState().ToolPanel.ModuleButtons;
         if (toolPanelModuleButtons.includes('ConditionalStyle')) {
             toolPanelModuleButtons[toolPanelModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
-            this.api.toolPanelApi.setModuleButtons([...new Set(dashboardModuleButtons)]);
+            this.api.toolPanelApi.setModuleButtons([
+                ...new Set(dashboardModuleButtons),
+            ]);
         }
     }
     updateFormatColumnSingleToMultiplePredicates() {

package/src/Strategy/Interface/IModule.d.ts

@@ -22,7 +22,7 @@ export interface ModuleInfo {
 }
 export declare type TeamSharingReferences = TeamSharingReference[];
 export declare type TeamSharingReference = {
-    Module: StrictExtract<AdaptableModule, 'CalculatedColumn' | 'FreeTextColumn' | 'Query' | 'Alert' | 'ConditionalStyle' | 'CustomSort' | 'FlashingCell' | 'FormatColumn' | 'PlusMinus' | 'Shortcut' | 'Schedule'>;
+    Module: StrictExtract<AdaptableModule, 'CalculatedColumn' | 'FreeTextColumn' | 'Query' | 'Alert' | 'CustomSort' | 'FlashingCell' | 'FormatColumn' | 'PlusMinus' | 'Shortcut' | 'Schedule'>;
     Reference: AdaptableObject;
 };
 export interface AdaptableObjectItemView {

package/src/Strategy/LayoutModule.js

@@ -293,7 +293,14 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             isVisible: true,
             label: 'Expand Aggregated Value',
             onClick: () => {
-                this.api.internalApi.showPopupWindow(windowFactory_1.SHOW_PIVOT_COLUMN_DETAILS, `Rows for Aggregated Value: ${cellValue}`, undefined, popupProps);
+                this.api.internalApi.showPopupWindow({
+                    // force only one window instance opened
+                    id: windowFactory_1.SHOW_PIVOT_COLUMN_DETAILS,
+                    factoryId: windowFactory_1.SHOW_PIVOT_COLUMN_DETAILS,
+                    title: `Rows for Aggregated Value: ${cellValue}`,
+                    icon: undefined,
+                    popupProps,
+                });
             },
             icon: {
                 name: 'arrowexpand',

package/src/Strategy/StyledColumnModule.js

@@ -73,6 +73,9 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
+        const config = {
+            defaultCurrentSectionName: 'Style',
+        };
         // Need a Column and an editable Module
         if (column && this.isModuleEditable()) {
             // First look at Sparkline Columns - needs to be editable array type
@@ -99,6 +102,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         action: sparklineColumnExists ? 'Edit' : 'New',
                         source: 'ColumnMenu',
                         value: styledColumn,
+                        config,
                     };
                     returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Sparkline Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
                 }
@@ -127,6 +131,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         action: styledColumnExists ? 'Edit' : 'New',
                         source: 'ColumnMenu',
                         value: styledColumn,
+                        config,
                     };
                     returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Styled Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
                 }

package/src/Strategy/ThemeModule.js

@@ -18,10 +18,16 @@ class ThemeModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewProperties() {
         return {
             getStatusBarPanelProps: () => {
-                const currentTheme = this.api.themeApi.getCurrentTheme();
+                var _a;
+                const currentThemeName = this.api.themeApi.getCurrentTheme();
+                const currentTheme = this.api.themeApi
+                    .getThemes()
+                    .find((theme) => theme.Name === currentThemeName);
+                const text = (_a = currentTheme === null || currentTheme === void 0 ? void 0 : currentTheme.Description) !== null && _a !== void 0 ? _a : currentThemeName;
                 return {
-                    content: currentTheme,
+                    content: text,
                     popover: ThemeStatusPanelPopover_1.ThemeStatusPanelPopover,
+                    popoverMinWidth: 120,
                 };
             },
         };

package/src/Strategy/Utilities/Alert/getAlertPreviewViewItems.js

@@ -4,7 +4,7 @@ exports.getAlertPreviewViewItems = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const Tag_1 = require("../../../components/Tag");
-const AlertDisplayWizardSection_1 = require("../../../View/Alert/Wizard/AlertDisplayWizardSection");
+const AlertNotificationWizardSection_1 = require("../../../View/Alert/Wizard/AlertNotificationWizardSection");
 const getAlertPreviewViewItems = (alert, api) => {
     return {
         name: 'Type and Display',
@@ -13,7 +13,7 @@ const getAlertPreviewViewItems = (alert, api) => {
             if (!((_a = alert === null || alert === void 0 ? void 0 : alert.AlertProperties) === null || _a === void 0 ? void 0 : _a.DisplayNotification)) {
                 return React.createElement(Tag_1.Tag, null, alert.MessageType);
             }
-            return (React.createElement(AlertDisplayWizardSection_1.AlertPreview, { focusFirstButton: false, style: { maxWidth: 400 }, mt: 2, api: api, alertDefinition: alert }));
+            return (React.createElement(AlertNotificationWizardSection_1.AlertPreview, { focusFirstButton: false, style: { maxWidth: 400 }, mt: 2, api: api, alertDefinition: alert }));
         },
     };
 };

package/src/Strategy/Utilities/Alert/getAlertTypeViewItems.d.ts

@@ -0,0 +1,5 @@
+import { AlertDefinition } from '../../../types';
+export declare const getAlertTypeViewItems: (alert: AlertDefinition) => {
+    name: string;
+    values: string[];
+};

package/src/Strategy/Utilities/Alert/getAlertTypeViewItems.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAlertTypeViewItems = void 0;
+const getAlertType_1 = require("./../../../View/Alert/Utilities/getAlertType");
+const getAlertTypeViewItems = (alert) => {
+    const alertType = (0, getAlertType_1.getAlertType)(alert);
+    const text = (0, getAlertType_1.getAlertTypeText)(alertType);
+    return {
+        name: 'Type',
+        values: [text],
+    };
+};
+exports.getAlertTypeViewItems = getAlertTypeViewItems;

package/src/Strategy/Utilities/getObjectTagsViewItems.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getObjectTagsViewItems = void 0;
 const getObjectTagsViewItems = (object, api) => {
-    var _a;
-    if (!api.internalApi.shouldDisplayTagSections()) {
+    var _a, _b;
+    if (!api.internalApi.shouldDisplayTagSections() || !((_a = object === null || object === void 0 ? void 0 : object.Tags) === null || _a === void 0 ? void 0 : _a.length)) {
         return;
     }
     return {
         name: 'Tags',
-        values: (_a = object === null || object === void 0 ? void 0 : object.Tags) === null || _a === void 0 ? void 0 : _a.map((tag) => api.internalApi.getLabelForTag(tag)),
+        values: (_b = object === null || object === void 0 ? void 0 : object.Tags) === null || _b === void 0 ? void 0 : _b.map((tag) => api.internalApi.getLabelForTag(tag)),
     };
 };
 exports.getObjectTagsViewItems = getObjectTagsViewItems;

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

@@ -11,8 +11,6 @@ export declare const CellSummaryModuleId: ModuleConstants;
 export declare const CellSummaryFriendlyName = "Cell Summary";
 export declare const ChartingModuleId: ModuleConstants;
 export declare const ChartingFriendlyName = "Charts";
-export declare const ConditionalStyleModuleId: ModuleConstants;
-export declare const ConditionalStyleFriendlyName = "Conditional Style";
 export declare const CustomSortModuleId: ModuleConstants;
 export declare const CustomSortFriendlyName = "Custom Sort";
 export declare const DashboardModuleId: ModuleConstants;
@@ -74,7 +72,6 @@ export declare const ADAPTABLE_MODULE_MAP: {
     CalculatedColumn: string;
     CellSummary: string;
     Charting: string;
-    ConditionalStyle: string;
     CustomSort: string;
     Dashboard: string;
     DataChangeHistory: string;