@adaptabletools/adaptable 14.0.3 → 14.0.4

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -193,7 +193,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
             node: node,
             column: column,
         };
-        return this.adaptable.api.predicateApi.handlePredicates((_a = formatColumn.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, params, false);
+        return this.adaptable.api.predicateApi.handleColumnPredicates((_a = formatColumn.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, params, false);
     }
     evaluateExpression(formatColumn, node) {
         const isValidExpression = this.adaptable.api.queryLanguageApi.isValidBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, `Invalid format column rule '${formatColumn.Rule.BooleanExpression}'`);
@@ -231,5 +231,29 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
             .getFormatColumns()
             .filter((fc) => { var _a; return !!((_a = fc.Rule) === null || _a === void 0 ? void 0 : _a.BooleanExpression); });
     }
+    getFormatColumnsDependentOnColumns(columnSet) {
+        return this.getFormatColumnApi()
+            .getFormatColumns()
+            .filter((fc) => { var _a, _b; return (_b = (_a = fc.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.some((p) => columnSet.has(p.ColumnId)); });
+    }
+    /**
+     * Retrieves the columns that need rerendering based on format column predicates.
+     */
+    getFormatColumnColumnsDependentOnColumnChange(column) {
+        const impactedColumnIds = new Set();
+        impactedColumnIds.add(column.columnId);
+        this.getCalculatedColumnApi()
+            .internalApi.getCalculatedColumnsDependentOnColumn(column)
+            .forEach((calculatedColumnId) => {
+            impactedColumnIds.add(calculatedColumnId);
+        });
+        const columnsThatNeedRefresh = new Set();
+        this.getFormatColumnsDependentOnColumns(impactedColumnIds).forEach((formatColumn) => {
+            this.adaptable.api.scopeApi.getColumnsForScope(formatColumn.Scope).forEach((col) => {
+                columnsThatNeedRefresh.add(col.columnId);
+            });
+        });
+        return [...columnsThatNeedRefresh];
+    }
 }
 exports.FormatColumnInternalApi = FormatColumnInternalApi;

package/src/Api/PredicateApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableColumnDataType, SystemFilterPredicateId } from '../../types';
+import { AdaptableColumnDataType, AdaptableColumnPredicate, SystemFilterPredicateId } from '../../types';
 import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, PredicateModuleScope } from '../PredefinedConfig/Common/AdaptablePredicate';
 /**
  * Functions which manage the Predicate object in AdapTable
@@ -51,6 +51,22 @@ export interface PredicateApi {
      * @param predicates Predicates Definitions to check
      */
     isEveryPredicateValid(predicates: AdaptablePredicate[]): boolean;
+    /**
+     * Same has handle predicate but it tales into account predicate column id.
+     *
+     * @param predicate
+     * @param params
+     * @param defaultReturn
+     */
+    handleColumnPredicate(predicate: AdaptableColumnPredicate, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
+    /**
+     * Same has handle predicates but it tales into account predicate column id.
+     *
+     * @param predicate
+     * @param params
+     * @param defaultReturn
+     */
+    handleColumnPredicates(predicate: AdaptableColumnPredicate[], params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     /**
      * Main Handler function for a Predicate Definition - used by AdapTableQL
      * @param predicate Predicate to handle

package/src/PredefinedConfig/AlertState.d.ts

@@ -1,6 +1,6 @@
 import { ConfigState } from './ConfigState';
 import { AdaptableScope } from './Common/AdaptableScope';
-import { AdaptablePredicate } from './Common/AdaptablePredicate';
+import { AdaptableColumnPredicate } from './Common/AdaptablePredicate';
 import { TypeHint } from './Common/Types';
 import { AdaptableMessageType } from './Common/AdaptableMessageType';
 import { AdaptableForm } from './Common/AdaptableForm';
@@ -56,7 +56,7 @@ export interface AlertDefinition extends SuspendableObject {
 export declare type AlertButtonForm = Omit<AdaptableForm<AlertFormContext>, 'title' | 'buttons' | 'description'> & {
     Buttons?: AlertButton<AlertFormContext>[];
 };
-export interface AlertDefinitionPredicate extends AdaptablePredicate {
+export interface AlertDefinitionPredicate extends AdaptableColumnPredicate {
     PredicateId: TypeHint<string, SystemAlertPredicateId>;
 }
 /**
@@ -69,6 +69,9 @@ export declare type AlertRule = XOR<{
  *  Alert Query which may be either a Boolean, Observable or AggregatedBoolean Expression
  */
 export declare type AdaptableAlertQuery = XOR<AdaptableBooleanQuery, XOR<AdaptableObservableQuery, AdaptableAggregatedBooleanQuery>>;
+/**
+ * Actions available in an Alert
+ */
 export declare type AdaptableAlertAction = 'highlight-cell' | 'highlight-row' | 'jump-to-cell' | 'jump-to-row' | 'jump-to-column' | 'suspend' | 'undo';
 /**
  * Defines a button that appears in an Alert Form

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

@@ -6,7 +6,13 @@ import { AlertDefinition } from '../AlertState';
  * Defines an Alert fired by AdapTable
  */
 export declare type AdaptableAlert = AdaptableCellChangedAlert | AdaptableRowChangedAlert | AdaptableGenericAlert;
+/**
+ * Type of AdapTable Alert: generic, cellChange or rowChange
+ */
 export declare type AdaptableAlertType = 'generic' | 'cellChange' | 'rowChange';
+/**
+ * Defines a generic AdapTable Alert
+ */
 export interface AdaptableGenericAlert extends AdaptableAlertBase<'generic'> {
 }
 /**

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

@@ -16,7 +16,7 @@ export interface AdaptableColumnBase extends AdaptableObject {
      */
     friendlyName: string;
     /**
-     * DataType of the column
+     * DataType of the Column
      */
     dataType: AdaptableColumnDataType;
 }
@@ -34,15 +34,15 @@ export interface AdaptableColumnGroup {
     groupCount: number;
 }
 /**
- * Defines an Adaptable Column - created at run-time based on AG Grid column definition
+ * Defines an Adaptable Column - created at run-time based on AG Grid ColDef
  */
 export interface AdaptableColumn extends AdaptableColumnBase {
     /**
-     * Is the field of the row to get the cell data from
+     * Field in the row to get cell data from
      */
     field?: string;
     /**
-     * Is this the Primary Key column
+     * Is this the Primary Key Column
      */
     isPrimaryKey: boolean;
     /**
@@ -50,11 +50,11 @@ export interface AdaptableColumn extends AdaptableColumnBase {
      */
     width?: number;
     /**
-     * Flex details of the column
+     * Flex details of the Column
      */
     flex?: number;
     /**
-     * Is the column editable; returns FALSE if the column has conditional/dynamic editability, assuming some rows are editable
+     * Is Column editable; returns FALSE if Column has conditional/dynamic editability, assuming some rows are editable
      */
     readOnly: boolean;
     /**
@@ -94,15 +94,19 @@ export interface AdaptableColumn extends AdaptableColumnBase {
      */
     queryable: boolean;
     /**
-     * Available aggregations for the Column
+     * Whether the Column can be included in Reports
+     */
+    exportable: boolean;
+    /**
+     * Available Aggregations for the Column
      */
     availableAggregationFunctions?: string[];
     /**
-     * Custom aggregation function for the Column
+     * Custom Aggregation function for the Column
      */
     aggregationFunction?: string;
     /**
-     * Is Column currently grouped
+     * Is Column currently Row-Grouped
      */
     isGrouped: boolean;
     /**
@@ -110,7 +114,7 @@ export interface AdaptableColumn extends AdaptableColumnBase {
      */
     isFixed: boolean;
     /**
-     * The pinned position of the column
+     * The pinned position of the Column
      */
     pinned: 'left' | 'right' | false;
     /**
@@ -122,7 +126,7 @@ export interface AdaptableColumn extends AdaptableColumnBase {
      */
     isExcludedFromQuickSearch: boolean;
     /**
-     * The parent column group, if the column belongs to one
+     * The parent Column group (if Column belongs to one)
      */
     columnGroup?: AdaptableColumnGroup;
 }

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

@@ -1,5 +1,8 @@
 import { AdaptableButton } from './AdaptableButton';
 import { BaseContext } from '../../types';
+/**
+ * Data which appears in an AdapTable Form
+ */
 export declare type AdaptableFormData = Record<string, any>;
 /**
  * Defines a form which appears dynamically; used by Alerts & Export Custom Destinations
@@ -50,5 +53,8 @@ export interface AdaptableFormField {
         label: string;
     }[];
 }
+/**
+ * Types of Controls used in an AdapTable Form
+ */
 export declare type AdaptableFormFieldType = 'text' | 'select' | 'date' | 'number' | 'checkbox' | 'textOutput';
 export declare function getDefaultAdaptableFormData<T extends BaseContext = BaseContext>(formDef?: AdaptableForm<T>): AdaptableFormData;

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

@@ -51,4 +51,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable internal icon names
  */
-export declare type AdaptableInternalIconName = 'add' | 'add-row' | 'alert' | 'align-justify' | 'analysis' | 'application' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrowexpand' | 'attach-file' | 'blanks' | 'boolean-list' | 'broadcast' | 'brush' | 'build' | 'bulk-update' | 'calculated-column' | 'calendar' | 'call' | 'campaign' | 'cell-summary' | 'cell-validation' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clear' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'column-chooser' | 'column-filter' | 'comment' | 'contains' | 'custom-sort' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'drag' | 'edit' | 'ends-with' | 'equal' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'flashing-cell' | 'folder' | 'folder-open' | 'folder-shared' | 'format-column' | 'freetext-column' | 'function' | 'gradient-column' | 'greater-than' | 'greater-than-or-equal' | 'hide-column' | 'history' | 'home' | 'import-export' | 'info' | 'instrument' | 'invalid' | 'ipushpull' | 'justify' | 'layout' | 'less-than' | 'less-than-or-equal' | 'list' | 'login' | 'logout' | 'menu' | 'minus' | 'multiplication' | 'newpage' | 'news' | 'non-blanks' | 'not-contains' | 'not-equal' | 'ok' | 'open-in-new' | 'pause' | 'percent' | 'percent-bar' | 'person' | 'pie-chart' | 'play' | 'plus' | 'plus-minus' | 'query' | 'quick-search' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'settings' | 'shortcut' | 'show-column' | 'smart-edit' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'starts-with' | 'state-management' | 'statusbar' | 'stop' | 'system-status' | 'tab-unselected' | 'team-share' | 'theme' | 'tool-panel' | 'track-changes' | 'trash' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'updated-row' | 'upload' | 'warning';
+export declare type AdaptableInternalIconName = 'add' | 'add-row' | 'alert' | 'align-justify' | 'analysis' | 'application' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrowexpand' | 'attach-file' | 'blanks' | 'boolean-list' | 'broadcast' | 'brush' | 'build' | 'bulk-update' | 'calculated-column' | 'calendar' | 'call' | 'campaign' | 'cell-summary' | 'cell-validation' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clear' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'column-chooser' | 'column-filter' | 'comment' | 'contains' | 'custom-sort' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'drag' | 'edit' | 'ends-with' | 'equal' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'flashing-cell' | 'folder' | 'folder-open' | 'folder-shared' | 'format-column' | 'freetext-column' | 'function' | 'gradient-column' | 'greater-than' | 'greater-than-or-equal' | 'hide-column' | 'history' | 'home' | 'import-export' | 'info' | 'instrument' | 'invalid' | 'ipushpull' | 'justify' | 'layout' | 'less-than' | 'less-than-or-equal' | 'list' | 'login' | 'logout' | 'menu' | 'minus' | 'multiplication' | 'newpage' | 'news' | 'non-blanks' | 'not-contains' | 'not-equal' | 'ok' | 'open-in-new' | 'pause' | 'percent' | 'percent-bar' | 'person' | 'pie-chart' | 'play' | 'plus' | 'plus-minus' | 'query' | 'quick-search' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'settings' | 'shortcut' | 'show-column' | 'smart-edit' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'starts-with' | 'state-management' | 'statusbar' | 'stop' | 'system-status' | 'tab-unselected' | 'team-share' | 'theme' | 'tool-panel' | 'track-changes' | 'trash' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'updated-row' | 'upload' | 'warning' | 'visibility' | 'visibility-off';

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

@@ -15,6 +15,12 @@ export interface AdaptablePredicate {
      */
     Inputs?: any[];
 }
+export interface AdaptableColumnPredicate extends AdaptablePredicate {
+    /**
+     * If specified, ColumnId restricts the predicate evaluation to the given column
+     */
+    ColumnId?: string;
+}
 /**
  * Defines a Predicate - include where it can run and what it does
  */

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

@@ -1,16 +1,31 @@
 import { XOR } from '../../Utilities/Extensions/TypeExtensions';
+/**
+ * Wraps an AdapTableQL Boolean Expression
+ */
 export interface AdaptableBooleanQuery {
     BooleanExpression: string;
 }
+/**
+ * Wraps an AdapTableQL Scalar Expression
+ */
 export interface AdaptableScalarQuery {
     ScalarExpression: string;
 }
+/**
+ * Wraps an AdapTableQL Observable Expression
+ */
 export interface AdaptableObservableQuery {
     ObservableExpression: string;
 }
+/**
+ * Wraps an AdapTableQL Aggregated Boolean Expression
+ */
 export interface AdaptableAggregatedBooleanQuery {
     AggregatedBooleanExpression: string;
 }
+/**
+ * Wraps an AdapTableQL Aggregated Scalar Expression
+ */
 export interface AdaptableAggregatedScalarQuery {
     AggregatedScalarExpression: string;
 }

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

@@ -8,7 +8,8 @@ export declare enum ExportDestination {
     Excel = "Excel",
     CSV = "CSV",
     Clipboard = "Clipboard",
-    JSON = "JSON"
+    JSON = "JSON",
+    Table = "Table"
 }
 export declare enum ScheduleType {
     Report = "Report",

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/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/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,
         };