@adaptabletools/adaptable 12.1.5 → 12.1.8-canary.0

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[];
@@ -42,5 +43,10 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
      */
     isFilterActive(filter: ColumnFilter): boolean;
     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);
     }
@@ -176,7 +179,16 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         if (!columnFilter.Predicate) {
             return true;
         }
-        if ((_a = columnFilter.Predicate.Inputs) === null || _a === void 0 ? void 0 : _a.some((input) => StringExtensions_1.default.IsNullOrEmpty(input))) {
+        const someInputsAreEmpty = (_a = columnFilter.Predicate.Inputs) === null || _a === void 0 ? void 0 : _a.some((input) => {
+            if (typeof input === 'string') {
+                return StringExtensions_1.default.IsNullOrEmpty(input);
+            }
+            if (typeof input === 'number') {
+                return isNaN(input);
+            }
+            return !input;
+        });
+        if (someInputsAreEmpty) {
             return true;
         }
         const column = this.adaptable.api.columnApi.getColumnFromId(columnFilter.ColumnId);
@@ -228,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
@@ -237,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 &&
@@ -264,14 +277,27 @@ 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)) {
+            return false;
+        }
+        return ArrayExtensions_1.default.areArraysNotEqual(oldFilters, newFilters);
     }
     fireFilterAppliedEvent() {
-        if (this.adaptable.isInitialised) {
+        if (this.adaptable.isLive) {
             const filterAppliedInfo = {
                 columnFilters: this.getColumnFilters(),
                 adaptableApi: this.getAdaptableApi(),
@@ -279,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/FlashingCellApiImpl.d.ts

@@ -21,4 +21,5 @@ export declare class FlashingCellApiImpl extends ApiBase implements FlashingCell
     editFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
     getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
     getFlashingCellPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    clearGridFlashing(): void;
 }

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -106,5 +106,9 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
     getFlashingCellPredicateDefsForScope(scope) {
         return this.getFlashingCellPredicateDefs().filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
     }
+    clearGridFlashing() {
+        const currentFlashingCells = this.getAdaptableState().System.AdaptableFlashingCells;
+        this.dispatchAction(SystemRedux.SystemFlashingCellDeleteAll());
+    }
 }
 exports.FlashingCellApiImpl = FlashingCellApiImpl;

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/GridApiImpl.js

@@ -260,7 +260,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.redrawHeader();
     }
     fireSearchChangedEvent(searchChangedTrigger) {
-        if (this.adaptable.isInitialised) {
+        if (this.adaptable.isLive) {
             const adaptableSearchState = this.adaptable.api.configApi.getAdaptableSearchState();
             const adaptableSortState = this.adaptable.api.configApi.getAdaptableSortState();
             const searchChangedInfo = {
@@ -273,7 +273,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         }
     }
     fireGridSortedEvent() {
-        if (this.adaptable.isInitialised) {
+        if (this.adaptable.isLive) {
             const adaptableSortState = this.adaptable.api.configApi.getAdaptableSortState();
             const adaptableApi = this.getAdaptableApi();
             const gridSortedInfo = {
@@ -284,7 +284,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         }
     }
     fireCellChangedEvent(cellDataChangedInfo) {
-        if (this.adaptable.isInitialised) {
+        if (this.adaptable.isLive) {
             const cellChangedInfo = {
                 adaptableApi: this.adaptable.api,
                 cellChange: cellDataChangedInfo,
@@ -293,7 +293,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         }
     }
     fireGridDataChangedEvent(dataRows, rowNodes = [], rowTrigger) {
-        if (this.adaptable.isInitialised) {
+        if (this.adaptable.isLive) {
             const gridDataChangedInfo = {
                 changedAt: Date.now(),
                 adaptableApi: this.adaptable.api,

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/LayoutApiImpl.d.ts

@@ -12,7 +12,7 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     };
     getCurrentVisibleColumnIds(): string[];
     setLayout(layoutName: string): void;
-    fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState): void;
+    fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState, skipEqualityCheck?: boolean): void;
     getCurrentLayout(): Layout;
     getCurrentLayoutColumnSort(columnId: string): ColumnSort['SortOrder'] | null;
     areDraftAndCurrentLayoutEqual(): boolean;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -50,16 +50,17 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             }
         }
     }
-    fireLayoutChangedEvent(trigger, oldSate, newState) {
+    fireLayoutChangedEvent(trigger, oldSate, newState, skipEqualityCheck) {
         const layoutChangedInfo = {
             adaptableApi: this.adaptable.api,
             actionName: trigger,
             oldLayoutState: oldSate,
             newLayoutState: newState,
         };
-        if (!isEqual_1.default(oldSate, newState)) {
-            this.adaptable.api.eventApi.emit('LayoutChanged', layoutChangedInfo);
+        if (!skipEqualityCheck && isEqual_1.default(oldSate, newState)) {
+            return;
         }
+        this.adaptable.api.eventApi.emit('LayoutChanged', layoutChangedInfo);
     }
     getCurrentLayout() {
         const state = this.getAdaptableState();

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/QueryApiImpl.js

@@ -89,7 +89,7 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
         }));
     }
     fireQueryRunEvent() {
-        if (this.adaptable.isInitialised) {
+        if (this.adaptable.isLive) {
             const currentQuery = this.adaptable.api.queryApi.getCurrentQuery();
             const adaptableApi = this.getAdaptableApi();
             const queryRunInfo = {

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/Implementation/TeamSharingApiImpl.js

@@ -47,7 +47,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.TeamSharingModuleId);
     }
     fireTeamSharingEntityChangedEvent(sharedEntity) {
-        if (this.adaptable.isInitialised) {
+        if (this.adaptable.isLive) {
             const teamSharingEntityChangedInfo = {
                 adaptableApi: this.adaptable.api,
                 sharedEntity: sharedEntity,

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/Api/LayoutApi.d.ts

@@ -113,7 +113,7 @@ export interface LayoutApi {
      * @param oldSate Layout State before change
      * @param newState Layout State after change
      */
-    fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState): void;
+    fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState, skipEqualityCheck?: boolean): void;
     /**
      * Compares 2 Layouts for equality
      * @param layout1 First Layout

package/src/Api/SystemStatusApi.d.ts

@@ -24,7 +24,7 @@ export interface SystemStatusApi {
      */
     setInfoSystemStatus(statusMessage: string, furtherInformation?: string): void;
     /**
-     * Opens System Status popup
+     * Opens Settings Panel with System Status section selected and visible
      */
     showSystemStatusPopup(): void;
     /**

package/src/Api/ToolPanelApi.d.ts

@@ -11,7 +11,7 @@ export interface ToolPanelApi {
      */
     getToolPanelState(): ToolPanelState;
     /**
-     * Opens the Tool Panel popup
+     * Opens Settings Panel with Tool Panel section selected and visible
      */
     showToolPanelPopup(): 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/AdaptableColumn.js

@@ -8,14 +8,15 @@ const isValidOrderForColumnGroups = ({ oldColumns, newColumns, }) => {
         let count = 0;
         columns.forEach((column) => {
             var _a, _b;
-            if (column.columnGroup &&
+            if (column &&
+                column.columnGroup &&
                 column.columnGroup.groupCount > 1 &&
                 !column.columnGroup.allowGroupSplit) {
                 if (prevGroup !== column.columnGroup.columnGroupId) {
                     count++;
                 }
             }
-            prevGroup = (_b = (_a = column.columnGroup) === null || _a === void 0 ? void 0 : _a.columnGroupId) !== null && _b !== void 0 ? _b : '';
+            prevGroup = (_b = (_a = column === null || column === void 0 ? void 0 : column.columnGroup) === null || _a === void 0 ? void 0 : _a.columnGroupId) !== null && _b !== void 0 ? _b : '';
         });
         return count;
     };

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -16,6 +16,7 @@ const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
 const isBefore_1 = tslib_1.__importDefault(require("date-fns/isBefore"));
 const isSameDay_1 = tslib_1.__importDefault(require("date-fns/isSameDay"));
 const CalendarHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/CalendarHelper"));
+const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const DateHelper_1 = require("../../Utilities/Helpers/DateHelper");
 /**
  * Array of Predicate Defs which are shipped by AdapTable
@@ -26,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;
@@ -52,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) {
@@ -134,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',
@@ -143,7 +149,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: ['='],
     },
@@ -154,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: ['!='],
     },
@@ -397,7 +417,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isAfter_1.default(DateHelper_1.parseFilterValueDate(value), DateHelper_1.parseFilterInputDate(inputs[0])),
+        handler: ({ value, inputs }) => isAfter_1.default(DateHelper_1.parseDateValue(value), DateHelper_1.parseDateValue(inputs[0])),
         toString: ({ inputs }) => `> ${inputs[0]}`,
     },
     {
@@ -407,7 +427,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isBefore_1.default(DateHelper_1.parseFilterValueDate(value), DateHelper_1.parseFilterInputDate(inputs[0])),
+        handler: ({ value, inputs }) => isBefore_1.default(DateHelper_1.parseDateValue(value), DateHelper_1.parseDateValue(inputs[0])),
         toString: ({ inputs }) => `< ${inputs[0]}`,
     },
     {
@@ -417,7 +437,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isSameDay_1.default(DateHelper_1.parseFilterValueDate(value), DateHelper_1.parseFilterInputDate(inputs[0])),
+        handler: ({ value, inputs }) => isSameDay_1.default(DateHelper_1.parseDateValue(value), DateHelper_1.parseDateValue(inputs[0])),
         toString: ({ inputs }) => `= ${inputs[0]}`,
     },
     {
@@ -427,7 +447,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => !isSameDay_1.default(DateHelper_1.parseFilterValueDate(value), DateHelper_1.parseFilterInputDate(inputs[0])),
+        handler: ({ value, inputs }) => !isSameDay_1.default(DateHelper_1.parseDateValue(value), DateHelper_1.parseDateValue(inputs[0])),
         toString: ({ inputs }) => `!= ${inputs[0]}`,
     },
     {
@@ -436,7 +456,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
-        handler: ({ value, api }) => isSameDay_1.default(DateHelper_1.parseFilterValueDate(value), CalendarHelper_1.default.getNextWorkingDay()),
+        handler: ({ value, api }) => isSameDay_1.default(DateHelper_1.parseDateValue(value), CalendarHelper_1.default.getNextWorkingDay()),
     },
     {
         id: 'LastWorkDay',

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/Common/SpecialColumnSettings.d.ts

@@ -8,32 +8,32 @@ export interface SpecialColumnSettings {
     Width?: number;
     /**
      * Whether Column is filterable
-     * @defaultValue true
+     * @defaultValue false
      */
     Filterable?: boolean;
     /**
      * Whether Column can be resized (by dragging column header edges)
-     * @defaultValue true
+     * @defaultValue false
      */
     Resizable?: boolean;
     /**
      * Whether Column can be grouped
-     * @defaultValue true
+     * @defaultValue false
      */
     Groupable?: boolean;
     /**
      * Whether Column is sortable
-     * @defaultValue true
+     * @defaultValue false
      */
     Sortable?: boolean;
     /**
      * Whether Column can be used when grid is in pivot mode
-     * @defaultValue true
+     * @defaultValue false
      */
     Pivotable?: boolean;
     /**
      * Whether Column can be used in an aggregation when grouping
-     * @defaultValue true
+     * @defaultValue false
      */
     Aggregatable?: boolean;
     /**

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