@adaptabletools/adaptable 12.1.7 → 12.2.0-canary.0

package/src/Api/FilterApi.d.ts

@@ -48,6 +48,11 @@ export interface FilterApi {
      * @returns column filters
      */
     getColumnFilters(): ColumnFilter[];
+    /**
+     * Retrieves all active/no-suspedned Column Filters in currently applied Layout
+     * @returns column filters
+     */
+    getActiveColumnFilters(): ColumnFilter[];
     /**
      * Retrieves the Column Filter for the specified Column.
      * @param columnId Column ID to lookup
@@ -144,4 +149,22 @@ export interface FilterApi {
      * @param filters2
      */
     areColumnFiltersDifferent(filters1: ColumnFilter[], filters2: ColumnFilter[]): boolean;
+    /**
+     * Suspends a Column Filter
+     * @param columnFilter Column Filter to Suspend
+     */
+    suspendColumnFilter(columnFilter: ColumnFilter): void;
+    /**
+     * Unsuspends a Column Filter
+     * @param columnFilter Column Filter to UnSuspend
+     */
+    unSuspendColumnFilter(columnFilter: ColumnFilter): void;
+    /**
+     * Suspends all Column Filters
+     */
+    suspendAllColumnFilters(): void;
+    /**
+     * Unsuspends all Column Filters
+     */
+    unSuspendAllColumnFilters(): void;
 }

package/src/Api/GridApi.d.ts

@@ -206,6 +206,7 @@ export interface GridApi {
      */
     getAllRowNodes(config?: {
         includeGroupRows?: boolean;
+        filterFn?: (rowNode: RowNode) => boolean;
     }): RowNode[];
     /**
      * Retrieves Row Nodes that contain given Primary Keys

package/src/Api/Implementation/AlertApiImpl.js

@@ -313,10 +313,9 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         return scopeDescription + ' - ' + ruleDescription;
     }
     getAlertRuleDescription(alert) {
-        var _a, _b;
         let ruleDescription = alert.Rule.Predicate
             ? this.adaptable.api.predicateApi.predicateToString(alert.Rule.Predicate)
-            : (_b = (_a = alert.Rule.BooleanExpression) !== null && _a !== void 0 ? _a : alert.Rule.ObservableExpression) !== null && _b !== void 0 ? _b : alert.Rule.AggregatedBooleanExpression;
+            : this.adaptable.api.internalApi.getAdaptableQueryExpressionText(alert.Rule);
         return ruleDescription;
     }
 }

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

@@ -72,4 +72,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getDefaultAggFunc(columnId: string): string;
     getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
     getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
+    getTypesForColumn(columnId: string): string | string[] | undefined;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -434,5 +434,10 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         // can we cache this in some way?
         return Math.max(...this.getDistinctRawValuesForColumn(column.columnId));
     }
+    getTypesForColumn(columnId) {
+        var _a;
+        const agGridColumn = this.getAgGridColumnForAdaptableColumn(columnId);
+        return (_a = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef()) === null || _a === void 0 ? void 0 : _a.type;
+    }
 }
 exports.ColumnApiImpl = ColumnApiImpl;

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

@@ -3,7 +3,7 @@ import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } fr
 import { ApiBase } from './ApiBase';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { CustomDestination, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
+import { CustomDestination, CustomReport, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getExportState(): ExportState;
@@ -30,6 +30,8 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     editReports(reports: Report[]): Report[];
     isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
     exportVisualDataToExcel(): void;
+    getAllCustomReports(): CustomReport[] | undefined;
+    isCustomReport(report: Report): boolean;
     runCustomReport(customReportName: string): ReportData | undefined;
     getReportDataForReport(reportName: string): ReportData | undefined;
 }

package/src/Api/Implementation/ExportApiImpl.js

@@ -7,6 +7,8 @@ const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 class ExportApiImpl extends ApiBase_1.ApiBase {
     getExportState() {
         return this.getAdaptableState().Export;
@@ -56,9 +58,16 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         return systemDestinations;
     }
     getAllReports() {
-        return this.getAvailableSystemReports()
+        const reports = this.getAvailableSystemReports()
             .map((s) => this.getReportByName(s))
             .concat(this.getExportState().Reports);
+        const customReports = this.getAllCustomReports();
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(customReports)) {
+            reports.push(...customReports.map((c) => {
+                return ObjectFactory_1.default.CreateCustomReport(c.name);
+            }));
+        }
+        return reports;
     }
     getReportSchedules() {
         return this.getAdaptableState().Schedule.ReportSchedules;
@@ -111,7 +120,7 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
             return true;
         }
         // if its a Custom Report then the User has to run it so we just ignore completely
-        if (report.ReportRowScope == 'CustomRows' || report.ReportColumnScope == 'CustomColumns') {
+        if (this.isCustomReport(report)) {
             return false;
         }
         // Start with the DataChanged Column and go through all possibilities
@@ -169,9 +178,16 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     exportVisualDataToExcel() {
         this.adaptable.exportVisualDataToExcel();
     }
+    getAllCustomReports() {
+        return this.getExportOptions().customReports;
+    }
+    isCustomReport(report) {
+        var _a;
+        return ((_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
+    }
     runCustomReport(customReportName) {
         var _a;
-        const customReport = (_a = this.getExportOptions().customReports) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == customReportName);
+        const customReport = (_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == customReportName);
         if (!customReport) {
             LoggingHelper_1.LogAdaptableWarning(`Custom Report '${customReportName}' not found!`);
             return undefined;

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

@@ -17,6 +17,7 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
     isQuickFilterAvailable(): boolean;
     isQuickFilterVisible(): boolean;
     getColumnFilters(): ColumnFilter[];
+    getActiveColumnFilters(): ColumnFilter[];
     getColumnFilter(columnId: string): ColumnFilter | undefined;
     getColumnFilterDefs(): ColumnFilterDef[];
     getColumnFiltersForLayout(layoutName: string): ColumnFilter[];
@@ -44,4 +45,8 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
     shouldNewColumnFilterTriggerGridFiltering(action: LayoutRedux.LayoutColumnFilterAction | Redux.Action): boolean;
     areColumnFiltersDifferent(oldFilters: ColumnFilter[], newFilters: ColumnFilter[]): boolean;
     fireFilterAppliedEvent(): void;
+    suspendColumnFilter(columnFilter: ColumnFilter): void;
+    unSuspendColumnFilter(columnFilter: ColumnFilter): void;
+    suspendAllColumnFilters(): void;
+    unSuspendAllColumnFilters(): void;
 }

package/src/Api/Implementation/FilterApiImpl.js

@@ -47,6 +47,9 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         const currentLayout = this.adaptable.api.layoutApi.getCurrentLayout();
         return (_a = currentLayout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
     }
+    getActiveColumnFilters() {
+        return this.getColumnFilters().filter((columnFilter) => !columnFilter.IsSuspended);
+    }
     getColumnFilter(columnId) {
         return this.getColumnFilters().find((columnFilter) => columnFilter.ColumnId == columnId);
     }
@@ -237,7 +240,6 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         return allInputsHaveValues;
     }
     shouldNewColumnFilterTriggerGridFiltering(action) {
-        var _a, _b;
         // trigger filter change only:
         // - new -> new filter is active
         // - clear -> previous filters was active
@@ -246,6 +248,8 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         // - edit -> different & new is active
         // - edit -> different & old was active
         // - set -> new filter is active
+        // filter -> suspend changes
+        var _a, _b;
         const isNewAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_ADD &&
             this.adaptable.api.filterApi.isFilterActive(action.columnFilter);
         const isClearAndPreviousWasActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR &&
@@ -273,11 +277,18 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         }
         const isSetAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_SET &&
             this.adaptable.api.filterApi.isFilterActive(action.columnFilter);
+        const isSuspendChanged = [
+            LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND,
+            LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND_ALL,
+            LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND,
+            LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL,
+        ].includes(action.type);
         return (isNewAndActive ||
             isClearAndPreviousWasActive ||
             isClearAllAtLeastOneActiveFilter ||
             isEditTrigger ||
-            isSetAndActive);
+            isSetAndActive ||
+            isSuspendChanged);
     }
     areColumnFiltersDifferent(oldFilters, newFilters) {
         if (ArrayExtensions_1.default.IsNullOrEmpty(oldFilters) && ArrayExtensions_1.default.IsNullOrEmpty(newFilters)) {
@@ -294,5 +305,17 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
             this.adaptable.api.eventApi.emit('FilterApplied', filterAppliedInfo);
         }
     }
+    suspendColumnFilter(columnFilter) {
+        this.adaptable.api.internalApi.dispatchReduxAction(LayoutRedux.LayoutColumnFilterSuspend(columnFilter));
+    }
+    unSuspendColumnFilter(columnFilter) {
+        this.adaptable.api.internalApi.dispatchReduxAction(LayoutRedux.LayoutColumnFilterUnSuspend(columnFilter));
+    }
+    suspendAllColumnFilters() {
+        this.adaptable.api.internalApi.dispatchReduxAction(LayoutRedux.LayoutColumnFilterSuspendAll());
+    }
+    unSuspendAllColumnFilters() {
+        this.adaptable.api.internalApi.dispatchReduxAction(LayoutRedux.LayoutColumnFilterUnSuspendAll());
+    }
 }
 exports.FilterApiImpl = FilterApiImpl;

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

@@ -61,6 +61,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getVisibleRowNodes(): RowNode[];
     getAllRowNodes(config: {
         includeGroupRows?: boolean;
+        filterFn?: (rowNode: RowNode) => boolean;
     }): RowNode[];
     getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
     getRawValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;

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

@@ -11,7 +11,7 @@ import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInf
 import { AdaptableModule, AdaptableQLModule } from '../../PredefinedConfig/Common/Types';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AdaptableCellChangedAlert, AdaptableOptions, AdaptableRowChangedAlert, AdaptableState, AlertFormContext, BaseContext, Layout, LayoutAssociatedObject, SystemStatusMessageInfo, SharedEntity, AdaptableIcon } from '../../types';
+import { AdaptableCellChangedAlert, AdaptableOptions, AdaptableRowChangedAlert, AdaptableState, AlertFormContext, BaseContext, Layout, LayoutAssociatedObject, SystemStatusMessageInfo, SharedEntity, AdaptableIcon, AdaptableQuery } from '../../types';
 import { IValidationService } from '../../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../../Utilities/Services/Interface/IModuleService';
 import { IReportService } from '../../Utilities/Services/Interface/IReportService';
@@ -61,7 +61,6 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
         [key: string]: any;
     }): void;
     hidePopupScreen(): void;
-    hidePopupAlert(): void;
     setColumns(columns: AdaptableColumn[]): void;
     setSettingPanelModuleMenuItems(menuItems: AdaptableMenuItem[]): void;
     setModuleButtonMenuItems(menuItems: AdaptableMenuItem[]): void;
@@ -103,6 +102,7 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
     runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
+    evaluateExpressionInAdaptableQL(module: AdaptableQLModule, expression?: string): boolean;
     forAllRowNodesDo(func: (rowNode: RowNode) => void): void;
     forAllVisibleRowNodesDo(func: (rowNode: RowNode) => void): void;
     buildStandaloneColumnHeader(column: AdaptableColumn): AdaptableMenuItem[];
@@ -141,4 +141,5 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getLabelForTag(adaptableObjectTag: AdaptableObjectTag): string;
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
     getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
+    getAdaptableQueryExpressionText(query: Partial<AdaptableQuery>): string;
 }

package/src/Api/Implementation/InternalApiImpl.js

@@ -149,9 +149,6 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     hidePopupScreen() {
         this.dispatchAction(PopupRedux.PopupHideScreen());
     }
-    hidePopupAlert() {
-        this.dispatchAction(PopupRedux.PopupHideAlert());
-    }
     setColumns(columns) {
         this.dispatchAction(GridRedux.GridSetColumns(columns));
     }
@@ -302,6 +299,30 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         const adaptableQLModules = this.getAdaptableQLOptions().externallyEvaluatedModules;
         return !adaptableQLModules.includes(adaptableQLModule);
     }
+    evaluateExpressionInAdaptableQL(module, expression) {
+        var _a;
+        // temporary, until `externallyEvaluatedModules` is removed completely
+        const externallyEvaluatedModules = this.getAdaptableQLOptions().externallyEvaluatedModules;
+        if (externallyEvaluatedModules === null || externallyEvaluatedModules === void 0 ? void 0 : externallyEvaluatedModules.length) {
+            // fallback to deprecated property
+            return this.runModuleInAdaptableQL(module);
+        }
+        const evaluateExpressionExternallyFn = (_a = this.getAdaptableQLOptions()) === null || _a === void 0 ? void 0 : _a.evaluateExpressionExternally;
+        if (typeof evaluateExpressionExternallyFn !== 'function') {
+            return true;
+        }
+        const context = {
+            adaptableApi: this.getAdaptableApi(),
+            module,
+        };
+        if (expression) {
+            context.expression = expression;
+            context.referencedColumns = this.getAdaptableApi()
+                .queryLanguageApi.getColumnsFromExpression(expression)
+                .map((columnId) => this.getAdaptableApi().columnApi.getColumnFromId(columnId));
+        }
+        return evaluateExpressionExternallyFn(context);
+    }
     forAllRowNodesDo(func) {
         this.adaptable.forAllRowNodesDo(func);
     }
@@ -619,5 +640,15 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         // this will use the columnApi method that first looks for permitted values and then distinct values
         return this.adaptable.api.columnApi.getDistinctDisplayValuesForColumn(column.columnId);
     }
+    getAdaptableQueryExpressionText(query) {
+        var _a;
+        if (!query) {
+            return '';
+        }
+        const displayColumnFriendlyNames = (_a = this.adaptable.adaptableOptions.adaptableQLOptions) === null || _a === void 0 ? void 0 : _a.displayColumnFriendlyNamesForExpressions;
+        return displayColumnFriendlyNames
+            ? this.adaptable.api.queryLanguageApi.getAdaptableQueryExpressionWithColumnFriendlyNames(query)
+            : this.adaptable.api.queryLanguageApi.getAdaptableQueryExpression(query);
+    }
 }
 exports.InternalApiImpl = InternalApiImpl;

package/src/Api/Implementation/PredicateApiImpl.js

@@ -56,6 +56,10 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
                 return false;
             }
         }
+        if (['Values', 'ExcludeValues'].includes(predicate.PredicateId) &&
+            ArrayExtensions_1.default.IsNullOrEmpty(predicate.Inputs)) {
+            return false;
+        }
         return true;
     }
     handlePredicate(predicate, params, defaultReturn) {

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

@@ -13,4 +13,5 @@ export declare class QueryLanguageApiImpl extends ApiBase implements QueryLangua
     getQueryableColumnIds(): string[] | undefined;
     getModuleExpressionFunctionMap(): ExpressionFunctionMap;
     getAdaptableQueryExpression(query: Partial<AdaptableQuery>): string | undefined;
+    getAdaptableQueryExpressionWithColumnFriendlyNames(query: Partial<AdaptableQuery>): string | undefined;
 }

package/src/Api/Implementation/QueryLanguageApiImpl.js

@@ -48,9 +48,17 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
     }
     getColumnsFromExpression(expression) {
         try {
-            return this.adaptable.api.internalApi
+            const columnIds = this.adaptable.api.internalApi
                 .getQueryLanguageService()
                 .getColumnsFromExpression(expression);
+            columnIds.forEach((columnId) => {
+                const calculatedColumn = this.adaptable.api.calculatedColumnApi.getCalculatedColumnForColumnId(columnId);
+                if (calculatedColumn) {
+                    const transitiveColumnIds = this.getColumnsFromExpression(this.getAdaptableQueryExpression(calculatedColumn.Query));
+                    columnIds.push(...transitiveColumnIds);
+                }
+            });
+            return Array.from(new Set(columnIds));
         }
         catch (error) {
             // defensive programing, this should happen only if someone botched the predefined configs
@@ -82,5 +90,10 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
         var _a, _b, _c, _d;
         return ((_d = (_c = (_b = (_a = query.BooleanExpression) !== null && _a !== void 0 ? _a : query.ScalarExpression) !== null && _b !== void 0 ? _b : query.ObservableExpression) !== null && _c !== void 0 ? _c : query.AggregatedBooleanExpression) !== null && _d !== void 0 ? _d : query.AggregatedScalarExpression);
     }
+    getAdaptableQueryExpressionWithColumnFriendlyNames(query) {
+        return this.adaptable.api.internalApi
+            .getQueryLanguageService()
+            .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
+    }
 }
 exports.QueryLanguageApiImpl = QueryLanguageApiImpl;

package/src/Api/InternalApi.d.ts

@@ -17,7 +17,7 @@ import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { Layout } from '../PredefinedConfig/LayoutState';
 import { AdaptableAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
-import { AdaptableIcon, AdaptableMessageType, AlertDefinition, BaseContext, CellDataChangedInfo, EditLookUpPermittedValues, LayoutAssociatedObject, SharedEntity, SystemStatusMessageInfo } from '../types';
+import { AdaptableIcon, AdaptableMessageType, AdaptableQuery, AlertDefinition, BaseContext, CellDataChangedInfo, EditLookUpPermittedValues, LayoutAssociatedObject, SharedEntity, SystemStatusMessageInfo } from '../types';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
 import { AdaptableFlashingCell } from '../PredefinedConfig/Common/AdaptableFlashingCell';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
@@ -65,7 +65,6 @@ export interface InternalApi {
     }): void;
     isDocumentationLinksDisplayed(): boolean;
     hidePopupScreen(): void;
-    hidePopupAlert(): void;
     setColumns(columns: AdaptableColumn[]): void;
     setSettingPanelModuleMenuItems(menuItems: AdaptableMenuItem[]): void;
     setModuleButtonMenuItems(menuItems: AdaptableMenuItem[]): void;
@@ -105,7 +104,11 @@ export interface InternalApi {
     getRowEditService(): IRowEditService;
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
+    /**
+     * @deprecated use `evaluateExpressionInAdaptableQL()` instead
+     */
     runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
+    evaluateExpressionInAdaptableQL(adaptableQLModule: AdaptableQLModule, expression?: string): boolean;
     forAllRowNodesDo(func: (rowNode: RowNode) => void): void;
     forAllVisibleRowNodesDo(func: (rowNode: RowNode) => void): void;
     buildStandaloneColumnHeader(column: AdaptableColumn): AdaptableMenuItem[];
@@ -140,4 +143,5 @@ export interface InternalApi {
     getLabelForTag(adaptableObjectTag: AdaptableObjectTag): string;
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
     getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
+    getAdaptableQueryExpressionText(query: Partial<AdaptableQuery>): string;
 }

package/src/Api/QueryLanguageApi.d.ts

@@ -56,4 +56,9 @@ export interface QueryLanguageApi {
      * @param query - the AdaptableQuery
      */
     getAdaptableQueryExpression(query: Partial<AdaptableQuery>): string | undefined;
+    /**
+     * Returns the Expression string of the given AdaptableQuery with the column friendly names (instead of their technical IDs)
+     * @param query - the AdaptableQuery
+     */
+    getAdaptableQueryExpressionWithColumnFriendlyNames(query: Partial<AdaptableQuery>): string | undefined;
 }

package/src/PredefinedConfig/CalculatedColumnState.d.ts

@@ -31,7 +31,7 @@ export interface CalculatedColumn extends AdaptableObject {
     /**
      * Scalar/AggregatedScalar Query used by AdapTableQL to evaluate Column's value
      */
-    Query?: AdaptableCalculatedColumnQuery;
+    Query: AdaptableCalculatedColumnQuery;
 }
 /**
  * Set of optional properties that define a Calculated Column's behaviour
@@ -40,7 +40,7 @@ export interface CalculatedColumnSettings extends SpecialColumnSettings {
     /**
      *  Expression's return value DataType; inferred by AdapTable but settable by User
      */
-    DataType?: 'String' | 'Number' | 'Boolean' | 'Date';
+    DataType: 'String' | 'Number' | 'Boolean' | 'Date';
     /**
      * Show underlying Expression as ToolTip when hovering over a cell
      * @defaultValue false

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -27,7 +27,7 @@ exports.SystemPredicateDefs = [
         label: 'Values',
         icon: { text: 'IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
-        moduleScope: ['filter'],
+        moduleScope: ['filter', 'conditionalstyle', 'alert'],
         handler: ({ inputs, column, value }) => {
             if (inputs.length === 0) {
                 return true;
@@ -53,7 +53,7 @@ exports.SystemPredicateDefs = [
         label: 'Exclude Values',
         icon: { text: '!IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
-        moduleScope: ['filter'],
+        moduleScope: ['filter', 'conditionalstyle', 'alert'],
         handler: ({ inputs, column, value }) => {
             // basically negation of IN
             if (inputs.length === 0) {
@@ -135,7 +135,12 @@ exports.SystemPredicateDefs = [
         icon: { text: '=0' },
         columnScope: { DataTypes: ['Number'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
-        handler: ({ value }) => Number(value) == 0,
+        handler: ({ value }) => {
+            if (typeof value === 'string' && !StringExtensions_1.default.IsNumeric(value)) {
+                return false;
+            }
+            return Number(value) === 0;
+        },
     },
     {
         id: 'Equals',
@@ -162,7 +167,14 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Number'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
         inputs: [{ type: 'number' }],
-        handler: ({ value, inputs }) => Number(value) !== Number(inputs[0]),
+        handler: ({ value, inputs }) => {
+            const input = inputs[0];
+            if ((typeof value === 'string' && !StringExtensions_1.default.IsNumeric(value)) ||
+                (typeof input === 'string' && !StringExtensions_1.default.IsNumeric(input))) {
+                return false;
+            }
+            return Number(value) !== Number(inputs[0]);
+        },
         toString: ({ inputs }) => `!= ${inputs[0]}`,
         shortcuts: ['!='],
     },

package/src/PredefinedConfig/Common/AdaptableQuery.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isReactiveQuery = void 0;
 const isReactiveQuery = (query) => {
-    return !!query.ObservableExpression || !!query.AggregatedBooleanExpression;
+    return !!query.ObservableExpression;
 };
 exports.isReactiveQuery = isReactiveQuery;

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

@@ -0,0 +1,6 @@
+export declare const WEIGHTED_AVERAGE_AGG_FN_NAME = "weightedAvg";
+export interface WeightedAverageAggregation {
+    type: 'weightedAverage';
+    weightedColumnId: string;
+}
+export declare type AggregationColumns = Record<string, string | true | WeightedAverageAggregation>;

package/src/PredefinedConfig/Common/AggregationColumns.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WEIGHTED_AVERAGE_AGG_FN_NAME = void 0;
+exports.WEIGHTED_AVERAGE_AGG_FN_NAME = 'weightedAvg';

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

@@ -1,9 +1,9 @@
-import { AdaptableObject, AdaptablePredicate } from '../../types';
+import { SuspendableObject, AdaptablePredicate } from '../../types';
 import { TypeHint } from './Types';
 /**
  * Defines a Filter applied on a Column using a Predicate
  */
-export interface ColumnFilter extends AdaptableObject {
+export interface ColumnFilter extends SuspendableObject {
     /**
      * Column where Filter should be applied
      */

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

@@ -13,21 +13,6 @@ export declare enum MathOperation {
     Multiply = "Multiply",
     Divide = "Divide"
 }
-export declare enum ReportColumnScope {
-    AllColumns = "AllColumns",
-    VisibleColumns = "VisibleColumns",
-    SelectedColumns = "SelectedColumns",
-    ScopeColumns = "ScopeColumns",
-    CustomColumns = "CustomColumns"
-}
-export declare enum ReportRowScope {
-    AllRows = "AllRows",
-    VisibleRows = "VisibleRows",
-    SelectedCellRows = "SelectedCellRows",
-    SelectedRows = "SelectedRows",
-    ExpressionRows = "ExpressionRows",
-    CustomRows = "CustomRows"
-}
 export declare enum ExportDestination {
     Excel = "Excel",
     CSV = "CSV",

package/src/PredefinedConfig/Common/Enums.js

@@ -1,7 +1,7 @@
 "use strict";
 // General Enums
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeDirection = exports.FilterOnDataChangeOptions = exports.SummaryOperation = exports.StatusColour = exports.ColumnMenuTab = exports.FontSize = exports.FontStyle = exports.FontWeight = exports.SelectionMode = exports.SortOrder = exports.ScheduleType = exports.ExportDestination = exports.ReportRowScope = exports.ReportColumnScope = exports.MathOperation = exports.DataType = void 0;
+exports.ChangeDirection = exports.FilterOnDataChangeOptions = exports.SummaryOperation = exports.StatusColour = exports.ColumnMenuTab = exports.FontSize = exports.FontStyle = exports.FontWeight = exports.SelectionMode = exports.SortOrder = exports.ScheduleType = exports.ExportDestination = exports.MathOperation = exports.DataType = void 0;
 var DataType;
 (function (DataType) {
     DataType["String"] = "String";
@@ -20,23 +20,6 @@ var MathOperation;
     MathOperation["Divide"] = "Divide";
 })(MathOperation = exports.MathOperation || (exports.MathOperation = {}));
 // Enums used in Strategies
-var ReportColumnScope;
-(function (ReportColumnScope) {
-    ReportColumnScope["AllColumns"] = "AllColumns";
-    ReportColumnScope["VisibleColumns"] = "VisibleColumns";
-    ReportColumnScope["SelectedColumns"] = "SelectedColumns";
-    ReportColumnScope["ScopeColumns"] = "ScopeColumns";
-    ReportColumnScope["CustomColumns"] = "CustomColumns";
-})(ReportColumnScope = exports.ReportColumnScope || (exports.ReportColumnScope = {}));
-var ReportRowScope;
-(function (ReportRowScope) {
-    ReportRowScope["AllRows"] = "AllRows";
-    ReportRowScope["VisibleRows"] = "VisibleRows";
-    ReportRowScope["SelectedCellRows"] = "SelectedCellRows";
-    ReportRowScope["SelectedRows"] = "SelectedRows";
-    ReportRowScope["ExpressionRows"] = "ExpressionRows";
-    ReportRowScope["CustomRows"] = "CustomRows";
-})(ReportRowScope = exports.ReportRowScope || (exports.ReportRowScope = {}));
 var ExportDestination;
 (function (ExportDestination) {
     ExportDestination["Excel"] = "Excel";

package/src/PredefinedConfig/ExportState.d.ts

@@ -29,13 +29,13 @@ export interface Report extends AdaptableObject {
      */
     Name: SystemReportName | string;
     /**
-     * Columns to display: options are 'AllColumns', 'VisibleColumns', 'SelectedColumns', 'ScopeColumns', 'CustomColumns'
+     * Columns to display: options are 'AllColumns', 'VisibleColumns', 'SelectedColumns', 'ScopeColumns'
      */
-    ReportColumnScope: 'AllColumns' | 'VisibleColumns' | 'SelectedColumns' | 'ScopeColumns' | 'CustomColumns';
+    ReportColumnScope: ReportColumnScope;
     /**
-     * Rows to export: options are 'AllRows', 'VisibleRows', 'SelectedCellRows', 'SelectedRows', 'ExpressionRows', 'CustomRows'
+     * Rows to export: options are 'AllRows', 'VisibleRows', 'SelectedCellRows', 'SelectedRows', 'ExpressionRows'
      */
-    ReportRowScope: 'AllRows' | 'VisibleRows' | 'SelectedCellRows' | 'SelectedRows' | 'ExpressionRows' | 'CustomRows';
+    ReportRowScope: ReportRowScope;
     /**
      * Columns Scope; only required if `ReportColumnScope` is 'ScopeColumns'
      */
@@ -79,6 +79,14 @@ export interface ReportData {
  * Names of Reports provided by AdapTable
  */
 export declare type SystemReportName = 'Visual Data' | 'All Data' | 'Current Data' | 'Selected Cells' | 'Selected Rows';
+/**
+ * Columns to be included in a Report
+ */
+export declare type ReportColumnScope = 'AllColumns' | 'VisibleColumns' | 'SelectedColumns' | 'ScopeColumns';
+/**
+ * AG Grid Row Data to be included in a Report
+ */
+export declare type ReportRowScope = 'AllRows' | 'VisibleRows' | 'SelectedCellRows' | 'SelectedRows' | 'ExpressionRows';
 /**
  * Array containing all System Report names
  */

package/src/PredefinedConfig/LayoutState.d.ts

@@ -2,6 +2,7 @@ import { ConfigState } from './ConfigState';
 import { AdaptableObject } from './Common/AdaptableObject';
 import { ColumnSort } from './Common/ColumnSort';
 import { ColumnFilter } from '../types';
+import { AggregationColumns } from './Common/AggregationColumns';
 /**
  * Predefined Configuration for the Layout Module
  */
@@ -52,7 +53,7 @@ export interface Layout extends AdaptableObject {
     /**
      * Columns showing aggregated values in grouped rows; first value in record is Column name and second is either the agg func (e.g. sum, avg etc.) or 'true' (to use default aggfunc)
      */
-    AggregationColumns?: Record<string, string | true>;
+    AggregationColumns?: AggregationColumns;
     /**
      * Whether pivoting should be enabled in the Grid when this Layout loads
      */