@adaptabletools/adaptable 12.1.7 → 12.1.8-canary.0

package/index.css

@@ -2598,66 +2598,6 @@ template {
   --ab-cmp-toolpanelpanel_body__background: var(--ab-cmp-dashboardpanel_body__background);
   --ab-cmp-toolpanelpanel_body__padding: var(--ab-cmp-dashboardpanel_body__padding); }
 
-.ab-LayoutEditor {
-  overflow: auto;
-  display: grid;
-  padding: var(--ab-space-2);
-  flex: 1 1 0;
-  min-height: 0;
-  grid-template-columns: 28rem 1fr;
-  grid-template-rows: repeat(3, 1fr);
-  grid-column-gap: 0px;
-  grid-row-gap: 0px;
-  row-gap: var(--ab-space-2);
-  column-gap: var(--ab-space-2);
-  grid-gap: var(--ab-space-2); }
-
-.ab-LayoutEditor,
-  .ab-LayoutEditor * {
-    box-sizing: border-box; }
-
-.ab-LayoutEditor__ColumnList {
-  overflow: auto; }
-
-.ab-LayoutEditor__ColumnListPanel {
-  grid-area: 1 / 1 / 4 / 2; }
-
-.ab-LayoutEditor__ColumnSortListPanel {
-  grid-area: 1 / 2 / 2 / 3; }
-
-.ab-LayoutEditor__RowGroupsListPanel {
-  grid-area: 2 / 2 / 3 / 3; }
-
-.ab-LayoutEditor__PivotListPanel {
-  grid-area: 3 / 2 / 4 / 3; }
-
-.ab-LayoutEditor__PivotList--empty,
-.ab-LayoutEditor__RowGroupsList--empty,
-.ab-LayoutEditor__ColumnSortList--empty {
-  display: flex;
-  flex-flow: column;
-  align-items: center;
-  justify-content: center; }
-
-.ab-LayoutEditor__PivotList,
-.ab-LayoutEditor__RowGroupsList,
-.ab-LayoutEditor__ColumnSortList {
-  padding-top: var(--ab-space-2); }
-
-.ab-LayoutEditor__PivotList__column,
-.ab-LayoutEditor__RowGroupsList__column,
-.ab-LayoutEditor__ColumnSortList__column,
-.ab-LayoutEditor__ColumnList__column {
-  background: var(--ab-color-primary);
-  color: var(--ab-color-text-on-primary);
-  margin: 0 0 var(--ab-space-2) 0; }
-
-.ab-LayoutEditor__PivotList__column,
-.ab-LayoutEditor__RowGroupsList__column,
-.ab-LayoutEditor__ColumnSortList__column {
-  padding-top: var(--ab-space-2);
-  padding-bottom: var(--ab-space-2); }
-
 :root {
   --ab-cmp-popover__border-radius: var(--ab__border-radius);
   --ab-cmp-popover__background: var(--ab-color-defaultbackground);
@@ -2798,6 +2738,13 @@ template {
   --ab-cmp-adaptable-layout-wizard-column-input__max-width: 200px;
   --ab-cmp-adaptable-layout-wizard-column-input__width: 100%; }
 
+.ab-PermitedValuesSelector__PopupContent {
+  z-index: 1000;
+  font-size: var(--ab-cmp-adaptable-permitted-values-selector__font-size);
+  border: 1px solid var(--ab-cmp-adaptable-permitted-values-selector__border);
+  background-color: var(--ab-cmp-adaptable-permitted-values-selector__background-color);
+  padding: var(--ab-cmp-adaptable-permitted-values-selector__padding); }
+
 .ab-Radio-input:focus + svg rect {
   stroke: var(--ab-color-accent);
   stroke-width: 2; }
@@ -4258,6 +4205,12 @@ button.ab-StatusBar__SubPanel:hover {
   max-width: var(--ab-cmp-adaptable-layout-wizard-column-input__max-width);
   width: var(--ab-cmp-adaptable-layout-wizard-column-input__width); }
 
+:root {
+  --ab-cmp-adaptable-permitted-values-selector__font-size: var(--ab-font-size-2);
+  --ab-cmp-adaptable-permitted-values-selector__border: 1px solid var(--ab-color-primarydark);
+  --ab-cmp-adaptable-permitted-values-selector__background-color: var(--ab-color-defaultbackground);
+  --ab-cmp-adaptable-permitted-values-selector__padding: var(--ab-space-1); }
+
 .ab-alert--error {
   background: var(--ab-color-error); }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.1.7",
+  "version": "12.1.8-canary.0",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1660658453580;
+declare const _default: 1661370166897;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1660658453580;
+exports.default = 1661370166897;

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -188,6 +188,7 @@ export interface IAdaptable {
     getVisibleRowNodes(): RowNode[];
     getAllRowNodes(config?: {
         includeGroupRows?: boolean;
+        filterFn?: (rowNode: RowNode) => boolean;
     }): RowNode[];
     getRowsInViewport(): RowNode[];
     isGroupRowNode(rowNode: RowNode): boolean;

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -157,4 +157,16 @@ export interface FilterOptions {
      * @gridInfoItem
      */
     showDistinctFilteredValuesOnly?: boolean;
+    /**
+     * Display Clear Filter button in Toolbar and Toolpanel
+     * @defaultValue  false
+     * @gridInfoItem
+     */
+    showClearFilterButton?: boolean;
+    /**
+     * Display Suspend / Unsuspend Button in Toolbar and Toolpanel
+     * @defaultValue  false
+     * @gridInfoItem
+     */
+    showSuspendFilterButton?: boolean;
 }

package/src/AdaptableOptions/FinancePluginOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableIcon, ContextMenuContext, GridCell } from '../../types';
+import { AdaptableApi, AdaptableIcon, ContextMenuContext, FDC3Context, GridCell } from '../../types';
 import { CustomFDC3Context } from '../PredefinedConfig/Common/FDC3Context';
 /**
  * Options required for when using the Finance plugin
@@ -41,6 +41,18 @@ export interface FinancePluginOptions {
      * Columns to use a Weighted Average aggregation
      */
     weightedAverageColumns?: WeightedAverageColumn[];
+    /**
+     * Intents to which to subscribe.
+     */
+    availableFDC3Intents?: (FDC3Intent | CustomFDC3Intent)[];
+    /**
+     * Called when an intent from `availableIntents` is raised.
+     */
+    onFDC3Intent?: (intent: FDC3Intent | CustomFDC3Intent, context: FDC3Context, adaptableApi: AdaptableApi) => void;
+    /**
+     * Called when a context changes.
+     */
+    onFDC3Context?: (context: FDC3Context, adaptableApi: AdaptableApi) => void;
 }
 /**
  * An Column which contains a Weighted Average aggregation
@@ -265,3 +277,12 @@ export interface RaiseFDC3IntentContext extends ContextMenuContext {
      */
     intent: FDC3Intent | CustomFDC3Intent;
 }
+export declare type FDC3ContextHandler = (context: FDC3Context) => void;
+export interface FDC3DesktopAgent {
+    raiseIntent: (intent: FDC3Intent, context: FDC3Context) => void;
+    broadcast: (context: FDC3Context) => void;
+    addIntentListener: (intent: FDC3Intent | CustomFDC3Intent, listener: (context: FDC3Context) => void) => void;
+    addContextListener: (contextType: string | null, handler: FDC3ContextHandler) => {
+        unsubscribe: () => void;
+    };
+}

package/src/AdaptableOptions/StateOptions.d.ts

@@ -4,7 +4,7 @@ import { AdaptableState } from '../PredefinedConfig/AdaptableState';
  */
 export interface StateOptions {
     /**
-     * Allows the customization of Adaptable State loading
+     * Allows customization of Adaptable State loading
      */
     loadState?: AdaptableLoadStateFunction;
     /**
@@ -12,11 +12,11 @@ export interface StateOptions {
      */
     applyState?: (state: any) => any;
     /**
-     * Allows the customization of the Adaptable State that is going to be persisted
+     * Allows customization of Adaptable State about to be persisted
      */
     saveState?: AdaptableSaveStateFunction;
     /**
-     * Allows the customization of Adaptable State persistence
+     * Allows customization of Adaptable State persistence
      */
     persistState?: AdaptablePersistStateFunction;
     /**
@@ -34,39 +34,52 @@ export interface StateOptions {
      */
     debounceStateDelay?: number;
 }
-export declare type AdaptableStateFunctionConfig = {
+/**
+ * State Function Config object passed into all State Options functions (except 'applyState')
+ */
+export interface AdaptableStateFunctionConfig {
+    /**
+     * Id of current Adaptable instance
+     */
     adaptableId: string;
+    /**
+     * State Key being used
+     */
     adaptableStateKey: string;
+    /**
+     * current Adaptable user
+     */
     userName: string;
+    /**
+     * optional url
+     */
     url?: string;
-};
+}
 /**
  * Allows customization of state persistence - used `persistState` function in StateOptions
  *
  * @example
  * ```
- * persistState = (state, {adaptableId, adaptableStateKey}) => {
- *  localStorage.setItem(adaptableStateKey, JSON.stringify(state))
+ * persistState = (state, stateFunctionConfig) => {
+ *  localStorage.setItem(stateFunctionConfig.adaptableStateKey, JSON.stringify(state))
  * }
  * ```
  */
 export interface AdaptablePersistStateFunction {
-    (state: any, { adaptableId, adaptableStateKey, userName, url }: AdaptableStateFunctionConfig): Promise<any>;
+    (state: any, adaptableStateFunctionConfig: AdaptableStateFunctionConfig): Promise<any>;
 }
 /**
  * Allows clearing state when a custom persistState is used.
  * Only called by configApi.reloadPredefinedConfig
- *
- * @example
  */
 export interface AdaptableClearStateFunction {
-    ({ adaptableId, adaptableStateKey, userName, url }: AdaptableStateFunctionConfig): Promise<any>;
+    (adaptablestatefunctionconfig: AdaptableStateFunctionConfig): Promise<any>;
 }
 /**
  * Allows the customization state persistence - used by `saveState` function in StateOptions
  */
 export interface AdaptableSaveStateFunction {
-    (state: AdaptableState, { adaptableId, adaptableStateKey, userName, url }: AdaptableStateFunctionConfig): any;
+    (state: AdaptableState, adaptablestatefunctionconfig: AdaptableStateFunctionConfig): any;
 }
 /**
  * Allows customization of state loading - used by `loadState` function in StateOptions

package/src/Api/ColumnApi.d.ts

@@ -308,6 +308,11 @@ export interface ColumnApi {
      * @param columnId Column to Check
      */
     getDefaultAggFunc(columnId: string): string;
+    /**
+     * Returns the `types` property for a given Column
+     * @param columnId Column to Check
+     */
+    getTypesForColumn(columnId: string): string | string[];
     getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
     getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
 }

package/src/Api/ExportApi.d.ts

@@ -133,6 +133,11 @@ export interface ExportApi {
      * Exports data currently in grid to Excel as What-You-See-Is-What-You-Get
      */
     exportVisualDataToExcel(): void;
+    /**
+     * Whether a Report is a Custom Report
+     * @param customReportName Report to Check
+     */
+    isCustomReport(report: Report): boolean;
     /**
      * Runs the report function of the CustomReport with the given reportName
      * @param reportName custom report name

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/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

@@ -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;

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));
     }

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.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

package/src/Api/InternalApi.d.ts

@@ -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;

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>;