@adaptabletools/adaptable 14.0.3 → 14.1.0

package/src/Api/CalculatedColumnApi.d.ts

@@ -45,6 +45,15 @@ export interface CalculatedColumnApi {
      * Opens Settings Panel with Calculated Column section selected and visible
      */
     openCalculatedColumnSettingsPanel(): void;
+    /**
+     * Re-calculates all aggregated CalculatedColumns (defined with a `AggregatedScalarExpression`)
+     */
+    refreshAggregatedCalculatedColumns(): void;
+    /**
+     * Re-calculates the aggregated CalculatedColumn (defined with a `AggregatedScalarExpression`) with the given `columnId`
+     * @param columnId column ID of the aggregated CalculatedColumn
+     */
+    refreshAggregatedCalculatedColumn(columnId: string): void;
     /**
      * TO BE REMOVED
      */

package/src/Api/ChartingApi.d.ts

@@ -1,11 +1,18 @@
 import { ChartModel, ChartRef } from '@ag-grid-community/core';
-import { ChartDefinition } from '../types';
+import { ChartContainer, ChartDefinition } from '../types';
+export interface ChartingOpenState {
+    charts: {
+        chartDefinition: ChartDefinition;
+        isOpen: boolean;
+        containerName: string | null;
+    }[];
+}
 /**
  * Provides run-time access to Charting Module and related State
  */
 export interface ChartingApi {
     /**
-     * Whether AdapTable's charting functionality is available
+     * Whether AdapTable's Charting functionality is available
      */
     isChartingEnabled(): boolean;
     /**
@@ -17,16 +24,21 @@ export interface ChartingApi {
      */
     getPersistedCharts(): ChartModel[];
     /**
-     * Retrieves all adaptable chart definitions
+     * Retrieves all adaptable Chart definitions
      */
     getChartDefinitions(): ChartDefinition[];
     /**
-     * Retrieves chart definition by uuid
-     * @param uuid chart uuid
+     * Retrieves Chart definition by uuid
+     * @param uuid Chart uuid
      */
     getChartDefinitionByUuid(uuid: string): ChartDefinition | undefined;
     /**
-     * Retrieves AG Grid ChartRef for given chartId
+     * Retrieves Chart definition by name
+     * @param name Chart name
+     */
+    getChartDefinitionByName(name: string): ChartDefinition | undefined;
+    /**
+     * Retrieves AG Grid ChartRef for given ChartId
      */
     getChartRef(chartId: string): ChartRef | undefined;
     /**
@@ -41,23 +53,28 @@ export interface ChartingApi {
      * Opens a Chart Definition
      *
      * @param chartDefinition chart definition
+     * @param container container element or container name
      */
-    showChartDefinition(chartDefinition: ChartDefinition, container?: HTMLElement): ChartRef;
+    showChartDefinition(chartDefinition: ChartDefinition, container?: HTMLElement | string): ChartRef;
     /**
-     * Open a Chart definition.
-     * If the chart is already opened a second chart is not opened.
+     * Close chart definition
+     * @param chartDefinition Chart Definition
+     */
+    closeChartDefinition(chartDefinition: ChartDefinition): void;
+    /**
+     * Displays a Chart; if Chart is already open, 2nd Chart is not opened
      *
-     * @param chartDefinition chart definition
+     * @param chartDefinition Chart Definition to show
      */
     showChartDefinitionOnce(chartDefinition: ChartDefinition, container?: HTMLElement): ChartRef;
     /**
-     * Edit existing chart
-     * @param chartDefinition
+     * Edit existing Chart
+     * @param chartDefinition Chart Definition to edit
      */
     editChartDefinition(chartDefinition: ChartDefinition): void;
     /**
-     * Add new chart
-     * @param chartDefinition
+     * Add new Chart Definition
+     * @param chartDefinition Chart Definition to add
      */
     addChartDefinition(chartDefinition: ChartDefinition): void;
     /**
@@ -67,4 +84,14 @@ export interface ChartingApi {
      * @deprecated use `getChartDefinitions()` instead
      */
     getAllChartDefinitions(): ChartDefinition[];
+    /**
+     * Returns information about all saved charts, including their open state.
+     */
+    getChartingOpenState(): ChartingOpenState;
+    /**
+     * Retrieves the name of the container in which the chart is open.
+     * Return null if the chart is not open.
+     * @param chartDefinition
+     */
+    getOpenChartContainer(chartDefinition: ChartDefinition): ChartContainer | null;
 }

package/src/Api/ColumnApi.d.ts

@@ -70,6 +70,10 @@ export interface ColumnApi {
      * Returns all Queryable Columns
      */
     getQueryableColumns(): AdaptableColumn[];
+    /**
+     * Returns all Exportable Columns
+     */
+    getExportableColumns(): AdaptableColumn[];
     /**
      * Returns all Columns that have given DataType
      * @param dataType the DataType of the Columns to retrieve

package/src/Api/DataSetApi.d.ts

@@ -20,8 +20,8 @@ export interface DataSetApi {
      */
     getDataSetByName(dataSetName: string): DataSet;
     /**
-     * Makes given Data Set current
-     * @param dataSetName Name of Data Set to apply
+     * Loads the given Data Set (makes it the Current one)
+     * @param dataSetName Name of Data Set to load
      */
     setDataSet(dataSetName: string): void;
     /**

package/src/Api/EventApi.d.ts

@@ -1,4 +1,5 @@
 import { AdaptableFDC3EventInfo, SelectionChangedInfo, LiveDataChangedInfo, DashboardChangedInfo, ThemeChangedInfo, AlertFiredInfo, LayoutChangedInfo, SearchChangedInfo, AdaptableReadyInfo, CustomToolbarConfiguredInfo, CellChangedInfo, SystemStatusMessageDisplayedInfo, CheckboxColumnClickedInfo, AdaptableStateChangedInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, TeamSharingEntityChangedInfo, ActionRowSubmittedInfo, DataSetSelectedInfo, AdaptableStateReloadedInfo, GridSortedInfo, QueryRunInfo, FilterAppliedInfo } from '../types';
+import { ChartChangedInfo } from './Events/ChartChanged';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */
@@ -241,6 +242,19 @@ export interface EventApi {
      * @param callback
      */
     off(eventName: 'DataSetSelected', callback: (dataSetSelectedInfo: DataSetSelectedInfo) => void): void;
+    /**
+     * Event fired when a Chart is Changed
+     *
+     * @param eventName ChartChanged
+     * @param callback ChartChangedInfo
+     */
+    on(eventName: 'ChartChanged', callback: (chartChangedInfo: ChartChangedInfo) => void): () => void;
+    /**
+     * Unsubscribe from ChartChanged
+     * @param eventName ChartChanged
+     * @param callbackChartChangedInfo
+     */
+    off(eventName: 'ChartChanged', callback: (chartChangedInfo: ChartChangedInfo) => void): void;
     /**
      * Fired when Adaptable is up and running - has no arguments.
      * @param eventName - AdaptableReady
@@ -292,6 +306,6 @@ export interface EventApi {
     emitSync(eventName: 'DashboardChanged', data?: any): any[];
     emitSync(eventName: 'FlashingCellDisplayed', data?: any): any[];
     emitSync(eventName: 'AdaptableDestroy'): any[];
-    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataSetSelected' | 'FDC3MessageSent' | 'FilterApplied' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'LiveDataChanged' | 'QueryRun' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged', data?: any): Promise<any>;
+    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataSetSelected' | 'FDC3MessageSent' | 'FilterApplied' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'LiveDataChanged' | 'QueryRun' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged', data?: any): Promise<any>;
     destroy(): void;
 }

package/src/Api/Events/ChartChanged.d.ts

@@ -0,0 +1,8 @@
+import { ChartingOpenState } from '../../types';
+import { BaseEventInfo } from './BaseEventInfo';
+/**
+ * Info used in Chart Changed Event
+ */
+export interface ChartChangedInfo extends BaseEventInfo {
+    chartingOpenState: ChartingOpenState;
+}

package/src/Api/Events/ChartChanged.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/Api/ExportApi.d.ts

@@ -3,6 +3,7 @@ import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } fr
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { CustomDestination, ServerReport, ExportFormContext } from '../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../PredefinedConfig/Common/Enums';
+import { AdaptableColumnBase } from '../types';
 /**
  * Provides run-time access to the Export Module and Report state
  */
@@ -169,4 +170,8 @@ export interface ExportApi {
      * @deprecated internal method, will be removed in next major release
      */
     isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
+    /**
+     * Returns whether the given column is exportable
+     */
+    isColumnExportable(adaptablColumn: AdaptableColumnBase): boolean;
 }

package/src/Api/Implementation/CalculatedColumnApiImpl.d.ts

@@ -16,6 +16,8 @@ export declare class CalculatedColumnApiImpl extends ApiBase implements Calculat
     editCalculatedColumns(calculatedColumns: CalculatedColumn[]): CalculatedColumn[];
     deleteCalculatedColumn(column: string): void;
     openCalculatedColumnSettingsPanel(): void;
+    refreshAggregatedCalculatedColumns(): void;
+    refreshAggregatedCalculatedColumn(columnId: string): void;
     showCalculatedColumnPopup(): void;
     getCalculatedColumnModuleReferences(calculatedColumn: CalculatedColumn): string[];
     getCalculatedColumnsReferencingColumnId(columnId: string): CalculatedColumn[];

package/src/Api/Implementation/CalculatedColumnApiImpl.js

@@ -7,6 +7,7 @@ const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const CalculatedColumnInternalApi_1 = require("../Internal/CalculatedColumnInternalApi");
+const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -52,6 +53,29 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
     openCalculatedColumnSettingsPanel() {
         this.showModulePopup(ModuleConstants.CalculatedColumnModuleId);
     }
+    refreshAggregatedCalculatedColumns() {
+        const aggregatedCalculatedColumns = this.getCalculatedColumns().filter((calculatedColumn) => { var _a; return (_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression; });
+        aggregatedCalculatedColumns.forEach((calculatedColumn) => {
+            this.getAdaptableApi()
+                .internalApi.getCalculatedColumnExpressionService()
+                .createAggregatedScalarLiveValue(calculatedColumn);
+        });
+        // refresh calculated columns
+        const aggCalculatedColumnIds = aggregatedCalculatedColumns.map((calculatedColumn) => calculatedColumn.ColumnId);
+        this.getGridApi().refreshCells(null, aggCalculatedColumnIds);
+    }
+    refreshAggregatedCalculatedColumn(columnId) {
+        var _a;
+        const aggregatedCalculatedColumn = this.getCalculatedColumnForColumnId(columnId);
+        if (!((_a = aggregatedCalculatedColumn === null || aggregatedCalculatedColumn === void 0 ? void 0 : aggregatedCalculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression)) {
+            (0, LoggingHelper_1.LogAdaptableWarning)(`Aggregated calculated column with ID=${columnId} was NOT found (and refreshed)!`);
+            return;
+        }
+        this.getAdaptableApi()
+            .internalApi.getCalculatedColumnExpressionService()
+            .createAggregatedScalarLiveValue(aggregatedCalculatedColumn);
+        this.getGridApi().refreshCells(null, [columnId]);
+    }
     showCalculatedColumnPopup() {
         (0, logDeprecation_1.logDeprecation)('CalculatedColumnApi', 'showCalculatedColumnPopup', 'openCalculatedColumnSettingsPanel');
         this.showModulePopup(ModuleConstants.CalculatedColumnModuleId);

package/src/Api/Implementation/ChartingApiImpl.d.ts

@@ -1,8 +1,12 @@
 import { ChartModel, ChartRef } from '@ag-grid-community/core';
 import { ChartingApi } from '../ChartingApi';
 import { ApiBase } from './ApiBase';
-import { ChartDefinition } from '../../types';
+import { ChartContainer, ChartDefinition } from '../../types';
+import { ChartingInternalApi } from '../Internal/ChartingInternalApi';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export declare class ChartingApiImpl extends ApiBase implements ChartingApi {
+    internalApi: ChartingInternalApi;
+    constructor(adaptable: IAdaptable);
     isChartingEnabled(): boolean;
     getCurrentChartModels(): ChartModel[];
     getChartRef(chartId: string): ChartRef;
@@ -11,9 +15,19 @@ export declare class ChartingApiImpl extends ApiBase implements ChartingApi {
     getChartDefinitions(): ChartDefinition[];
     getAllChartDefinitions(): ChartDefinition[];
     getChartDefinitionByUuid(uuid: string): ChartDefinition;
+    getChartDefinitionByName(name: string): ChartDefinition | undefined;
     showPersistedCharts(): ChartRef[];
-    showChartDefinition(chartDefiniton: ChartDefinition, container?: HTMLElement): ChartRef;
+    showChartDefinition(chartDefiniton: ChartDefinition, container?: HTMLElement | string): ChartRef;
     showChartDefinitionOnce(chartDefinition: ChartDefinition, container?: HTMLElement): ChartRef;
+    closeChartDefinition(chartDefinition: ChartDefinition): void;
     editChartDefinition(editedChartDefinition: ChartDefinition): void;
     addChartDefinition(chart: ChartDefinition): void;
+    getChartingOpenState(): {
+        charts: {
+            chartDefinition: ChartDefinition;
+            isOpen: boolean;
+            containerName: string;
+        }[];
+    };
+    getOpenChartContainer(chartDefinition: ChartDefinition): ChartContainer | null;
 }

package/src/Api/Implementation/ChartingApiImpl.js

@@ -7,7 +7,13 @@ const ChartingRedux = tslib_1.__importStar(require("./../../Redux/ActionsReducer
 const ChartingRedux_1 = require("./../../Redux/ActionsReducers/ChartingRedux");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
+const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
+const ChartingInternalApi_1 = require("../Internal/ChartingInternalApi");
 class ChartingApiImpl extends ApiBase_1.ApiBase {
+    constructor(adaptable) {
+        super(adaptable);
+        this.internalApi = new ChartingInternalApi_1.ChartingInternalApi(adaptable);
+    }
     isChartingEnabled() {
         return this.adaptable.canGenerateCharts();
     }
@@ -39,24 +45,70 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
     getChartDefinitionByUuid(uuid) {
         return this.getChartDefinitions().find((c) => c.Uuid == uuid);
     }
+    getChartDefinitionByName(name) {
+        if (StringExtensions_1.default.IsNotNullOrEmpty(name)) {
+            let chartDefinition = this.getChartDefinitions().find((c) => c.Name == name);
+            if (this.checkItemExists(chartDefinition, name, 'Chart')) {
+                return chartDefinition;
+            }
+        }
+    }
     showPersistedCharts() {
         return this.adaptable.showCharts(this.getChartDefinitions());
     }
     showChartDefinition(chartDefiniton, container) {
-        return this.adaptable.showChart(chartDefiniton, container);
+        let containerElement = container;
+        if (typeof containerElement === 'string') {
+            containerElement = this.internalApi.getContainerElemetnByName(containerElement);
+        }
+        return this.adaptable.showChart(chartDefiniton, containerElement);
     }
     showChartDefinitionOnce(chartDefinition, container) {
-        const chartRef = this.adaptable.api.chartingApi.getChartRef(chartDefinition.Model.chartId);
+        var _a;
+        const chartRef = this.adaptable.api.chartingApi.getChartRef((_a = chartDefinition === null || chartDefinition === void 0 ? void 0 : chartDefinition.Model) === null || _a === void 0 ? void 0 : _a.chartId);
         if (chartRef) {
             return;
         }
         return this.showChartDefinition(chartDefinition, container);
     }
+    closeChartDefinition(chartDefinition) {
+        const chartRef = this.getChartRef(chartDefinition.Model.chartId);
+        if (chartRef) {
+            chartRef.destroyChart();
+        }
+    }
     editChartDefinition(editedChartDefinition) {
         this.dispatchAction(ChartingRedux.ChartingEditChart(editedChartDefinition));
     }
     addChartDefinition(chart) {
         this.dispatchAction(ChartingRedux.ChartingAddChart(chart));
     }
+    getChartingOpenState() {
+        return {
+            charts: this.getChartDefinitions().map((chartDefinition) => {
+                var _a, _b;
+                return {
+                    chartDefinition,
+                    isOpen: this.getChartRef((_a = chartDefinition === null || chartDefinition === void 0 ? void 0 : chartDefinition.Model) === null || _a === void 0 ? void 0 : _a.chartId) != null,
+                    containerName: (_b = this.getOpenChartContainer(chartDefinition)) === null || _b === void 0 ? void 0 : _b.name,
+                };
+            }),
+        };
+    }
+    getOpenChartContainer(chartDefinition) {
+        var _a, _b, _c;
+        const containerOptions = (_b = (_a = this.adaptable.api.optionsApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers;
+        if (!containerOptions || !containerOptions.length) {
+            return null;
+        }
+        return ((_c = containerOptions.find((container) => {
+            const chartRef = this.getChartRef(chartDefinition.Model.chartId);
+            const containerElement = this.internalApi.getContainerElement(container);
+            if (!(chartRef === null || chartRef === void 0 ? void 0 : chartRef.chartElement) || !containerElement) {
+                return false;
+            }
+            return containerElement.contains(chartRef.chartElement);
+        })) !== null && _c !== void 0 ? _c : null);
+    }
 }
 exports.ChartingApiImpl = ChartingApiImpl;

package/src/Api/Implementation/ColumnApiImpl.d.ts

@@ -72,6 +72,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getPivotableColumns(): AdaptableColumn[];
     getAggregatableColumns(): AdaptableColumn[];
     getQueryableColumns(): AdaptableColumn[];
+    getExportableColumns(): AdaptableColumn[];
     private logMissingColumnWarning;
     getDistinctDisplayValuesForColumn(columnId: string): any[];
     getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string, showFilteredRowsOnly: boolean): Promise<{

package/src/Api/Implementation/ColumnApiImpl.js

@@ -367,6 +367,9 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     getQueryableColumns() {
         return this.getColumns().filter((c) => c.queryable);
     }
+    getExportableColumns() {
+        return this.getColumns().filter((c) => c.exportable);
+    }
     logMissingColumnWarning(columnId) {
         if (this.adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning === true) {
             if (!this.isAutoRowGroupColumn(columnId) &&

package/src/Api/Implementation/ExportApiImpl.d.ts

@@ -7,6 +7,7 @@ import { CustomDestination, ExportFormContext, ServerReport } from '../../Adapta
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExportInternalApi } from '../Internal/ExportInternalApi';
+import { AdaptableColumnBase } from '../../types';
 export declare class ExportApiImpl extends ApiBase implements ExportApi {
     internalApi: ExportInternalApi;
     constructor(adaptable: IAdaptable);
@@ -42,4 +43,5 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     isServerReport(report: Report): boolean;
     runServerReport(serverReportName: string): ReportData | undefined;
     getReportDataForReport(reportName: string): ReportData | undefined;
+    isColumnExportable(adaptableColumn: AdaptableColumnBase): boolean;
 }

package/src/Api/Implementation/ExportApiImpl.js

@@ -168,5 +168,15 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         }
         return this.adaptable.api.internalApi.getReportService().getReportData(report);
     }
+    isColumnExportable(adaptableColumn) {
+        const isExportableFn = this.getExportOptions().isColumnExportable;
+        if (typeof isExportableFn === 'function') {
+            return isExportableFn({
+                adaptableApi: this.adaptable.api,
+                adaptableColumn,
+            });
+        }
+        return true;
+    }
 }
 exports.ExportApiImpl = ExportApiImpl;

package/src/Api/Implementation/PredicateApiImpl.d.ts

@@ -1,7 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { PredicateApi } from '../PredicateApi';
-import { AdaptablePredicate, AdaptablePredicateDef, PredicateDefHandlerParams, PredicateModuleScope } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptableColumnDataType, SystemFilterPredicateId } from '../../types';
+import { PredicateDefHandlerParams, PredicateModuleScope } from '../../PredefinedConfig/Common/AdaptablePredicate';
+import { AdaptablePredicate, AdaptablePredicateDef, AdaptableColumnDataType, AdaptableColumnPredicate, SystemFilterPredicateId } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { PredicateInternalApi } from '../Internal/PredicateInternalApi';
 export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
@@ -14,10 +14,12 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     getPredicateDefById(predicateId: string): AdaptablePredicateDef;
     getSystemPredicateDefById(predicateId: string): AdaptablePredicateDef;
     getCustomPredicateDefById(predicateId: string): AdaptablePredicateDef;
-    predicateToString(predicate: AdaptablePredicate): string | undefined;
-    isValidPredicate(predicate: AdaptablePredicate | undefined): boolean;
+    predicateToString(predicate: AdaptableColumnPredicate): string | undefined;
+    isValidPredicate(predicate: AdaptableColumnPredicate | undefined): boolean;
     arePredicatesValid(predicates: AdaptablePredicate[]): boolean;
     isEveryPredicateValid(predicates: AdaptablePredicate[]): boolean;
+    handleColumnPredicate(predicate: AdaptableColumnPredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
+    handleColumnPredicates(predicates: AdaptableColumnPredicate[], params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     handlePredicate(predicate: AdaptablePredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     handlePredicates(predicates: AdaptablePredicate[], params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;

package/src/Api/Implementation/PredicateApiImpl.js

@@ -42,9 +42,13 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
             (0, LoggingHelper_1.LogAdaptableWarning)('Cannot find Predicate with Id:' + predicate.PredicateId);
             return '[Predicate Not found]';
         }
-        return predicateDef.hasOwnProperty('toString')
+        let strPredicate = predicateDef.hasOwnProperty('toString')
             ? predicateDef.toString({ inputs: predicate.Inputs })
             : predicateDef.label;
+        if ('ColumnId' in predicate) {
+            strPredicate = `[${predicate.ColumnId}] ${strPredicate}`;
+        }
+        return strPredicate;
     }
     isValidPredicate(predicate) {
         if (!predicate) {
@@ -71,6 +75,21 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
     isEveryPredicateValid(predicates) {
         return predicates.every((predicate) => this.isValidPredicate(predicate));
     }
+    handleColumnPredicate(predicate, params, defaultReturn) {
+        if (!predicate.ColumnId) {
+            return this.handlePredicate(predicate, params, defaultReturn);
+        }
+        const paramsForColumn = Object.assign(Object.assign({}, params), { column: this.adaptable.api.columnApi.getColumnWithColumnId(predicate.ColumnId), 
+            // value: params?.node?.data?.[predicate.ColumnId],
+            value: this.adaptable.api.gridApi.getRawValueFromRowNode(params.node, predicate.ColumnId) });
+        if ('oldValue' in paramsForColumn) {
+            delete paramsForColumn.oldValue;
+        }
+        return this.handlePredicate(predicate, paramsForColumn, defaultReturn);
+    }
+    handleColumnPredicates(predicates, params, defaultReturn) {
+        return predicates.every((predicate) => this.handleColumnPredicate(predicate, params, defaultReturn));
+    }
     handlePredicate(predicate, params, defaultReturn) {
         var _a;
         if (!predicate) {

package/src/Api/Implementation/QueryApiImpl.js

@@ -67,8 +67,14 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
     }
     expandCurrentQuery(query) {
         const preparedQuery = query !== null && query !== void 0 ? query : this.getCurrentQuery();
-        this.getAdaptableApi().internalApi.showPopupWindow(windowFactory_1.WINDOW_QUERY_EDITOR, 'Current Query', 'query', {
-            value: preparedQuery,
+        this.getAdaptableApi().internalApi.showPopupWindow({
+            id: windowFactory_1.WINDOW_QUERY_EDITOR,
+            title: 'Current Query',
+            icon: 'query',
+            factoryId: windowFactory_1.WINDOW_QUERY_EDITOR,
+            popupProps: {
+                value: preparedQuery,
+            },
         });
     }
     fireQueryRunEvent() {

package/src/Api/Internal/AdaptableInternalApi.d.ts

@@ -34,7 +34,13 @@ export declare class AdaptableInternalApi extends ApiBase {
     showPopupScreen(module: AdaptableModule, componentName: string, popupParams?: ModuleParams, popupProps?: {
         [key: string]: any;
     }): void;
-    showPopupWindow(id: string, title: string, icon: string, popupProps: any): void;
+    showPopupWindow({ id, title, icon, popupProps, factoryId, }: {
+        id: string;
+        title: string;
+        icon?: string;
+        popupProps: any;
+        factoryId: string;
+    }): void;
     hidePopupScreen(): void;
     setSettingPanelModuleMenuItems(menuItems: AdaptableMenuItem[]): void;
     setModuleButtonMenuItems(menuItems: AdaptableMenuItem[]): void;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -30,12 +30,13 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     showPopupScreen(module, componentName, popupParams, popupProps) {
         this.dispatchAction(PopupRedux.PopupShowScreen(module, componentName, popupParams, popupProps));
     }
-    showPopupWindow(id, title, icon, popupProps) {
+    showPopupWindow({ id, title, icon, popupProps, factoryId, }) {
         this.dispatchAction(PopupRedux.PopupShowWindow({
             Id: id,
             Title: title,
             Icon: icon,
             PopupProps: popupProps,
+            FactoryId: factoryId,
         }));
     }
     hidePopupScreen() {

package/src/Api/Internal/AlertInternalApi.js

@@ -461,7 +461,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
     }
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
         var _a;
-        return this.getAdaptableApi().predicateApi.handlePredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, {
+        return this.getAdaptableApi().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/Api/Internal/CalculatedColumnInternalApi.d.ts

@@ -1,5 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { CalculatedColumn } from '../../PredefinedConfig/CalculatedColumnState';
+import { AdaptableColumn } from '../../types';
 export declare class CalculatedColumnInternalApi extends ApiBase {
     /**
      * Returns all the references in the AdaptableState of the given CalculatedColumn
@@ -21,4 +22,5 @@ export declare class CalculatedColumnInternalApi extends ApiBase {
      * @param calculatedColumnId CalculatedColumnId to check
      */
     getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId: string): string[];
+    getCalculatedColumnsDependentOnColumn(column: AdaptableColumn): string[];
 }

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -53,5 +53,14 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
             return this.getReferencedColumnIdsForCalculatedColumn(calculatedColumn);
         }
     }
+    getCalculatedColumnsDependentOnColumn(column) {
+        const calculatedColumns = this.adaptable.api.calculatedColumnApi.getCalculatedColumns();
+        return calculatedColumns
+            .filter((calculatedColumn) => {
+            const dependentColumns = this.getReferencedColumnIdsForCalculatedColumnId(calculatedColumn.ColumnId);
+            return dependentColumns.includes(column.columnId);
+        })
+            .map((calculatedColumn) => calculatedColumn.ColumnId);
+    }
 }
 exports.CalculatedColumnInternalApi = CalculatedColumnInternalApi;

package/src/Api/Internal/ChartingInternalApi.d.ts

@@ -0,0 +1,6 @@
+import { ApiBase } from '../Implementation/ApiBase';
+import { ChartContainer } from '../../types';
+export declare class ChartingInternalApi extends ApiBase {
+    getContainerElement(chartContainer: ChartContainer): HTMLElement | null;
+    getContainerElemetnByName(containerName: string): HTMLElement | null;
+}

package/src/Api/Internal/ChartingInternalApi.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChartingInternalApi = void 0;
+const ApiBase_1 = require("../Implementation/ApiBase");
+const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+class ChartingInternalApi extends ApiBase_1.ApiBase {
+    getContainerElement(chartContainer) {
+        const element = typeof (chartContainer === null || chartContainer === void 0 ? void 0 : chartContainer.element) === 'string'
+            ? document.querySelector(chartContainer.element)
+            : chartContainer === null || chartContainer === void 0 ? void 0 : chartContainer.element;
+        if (!element && typeof (chartContainer === null || chartContainer === void 0 ? void 0 : chartContainer.element) === 'string') {
+            (0, LoggingHelper_1.ConsoleLogByMessageType)(`Chart container element not found: ${chartContainer.element}`, 'Error');
+            return null;
+        }
+        return element;
+    }
+    getContainerElemetnByName(containerName) {
+        var _a, _b, _c;
+        const chartContainers = (_c = (_b = (_a = this.adaptable.api.optionsApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers) !== null && _c !== void 0 ? _c : [];
+        const chartContainer = chartContainers.find((container) => container.name === containerName);
+        return this.getContainerElement(chartContainer);
+    }
+}
+exports.ChartingInternalApi = ChartingInternalApi;

package/src/Api/Internal/FormatColumnInternalApi.d.ts

@@ -117,4 +117,9 @@ export declare class FormatColumnInternalApi extends ApiBase {
      * @returns Format Columns with Expression
      */
     getFormatColumnsWithExpression(): FormatColumn[];
+    getFormatColumnsDependentOnColumns(columnSet: Set<string>): FormatColumn[];
+    /**
+     * Retrieves the columns that need rerendering based on format column predicates.
+     */
+    getFormatColumnColumnsDependentOnColumnChange(column: AdaptableColumn): string[];
 }