@adaptabletools/adaptable 12.1.6 → 12.1.8-canary.1

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

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

package/src/PredefinedConfig/PopupState.d.ts

@@ -1,4 +1,4 @@
-import { ScreenPopup, AlertPopup, ConfirmationPopup, PromptPopup, LoadingPopup, WindowPopup, FormPopup } from '../Utilities/Interface/MessagePopups';
+import { ScreenPopup, ConfirmationPopup, PromptPopup, LoadingPopup, WindowPopup, FormPopup } from '../Utilities/Interface/MessagePopups';
 import { InternalState } from './InternalState';
 /**
  * Internal state to manage open popups - NOT persisted by Redux
@@ -7,7 +7,6 @@ export interface PopupState extends InternalState {
     ScreenPopup: ScreenPopup;
     WindowPopup: WindowPopup;
     FormPopup: FormPopup;
-    AlertPopup: AlertPopup;
     ConfirmationPopup: ConfirmationPopup;
     PromptPopup: PromptPopup;
     LoadingPopup: LoadingPopup;

package/src/Redux/ActionsReducers/AlertRedux.d.ts

@@ -17,7 +17,7 @@ export declare const ALERT_DEFINITION_DELETE = "ALERT_DEFINITION_DELETE";
  */
 export declare const ALERT_DEFINITION_SUSPEND = "ALERT_DEFINITION_SUSPEND";
 /**
- * @ReduxAction Alert Definition is un-suspended, or activated
+ * @ReduxAction Alert Definition is unsuspended, or activated
  */
 export declare const ALERT_DEFINITION_UNSUSPEND = "ALERT_DEFINITION_UNSUSPEND";
 export declare const ALERT_CLEAR_FLASHING_CELLS = "ALERT_CLEAR_FLASHING_CELLS";

package/src/Redux/ActionsReducers/AlertRedux.js

@@ -22,7 +22,7 @@ exports.ALERT_DEFINITION_DELETE = 'ALERT_DEFINITION_DELETE';
  */
 exports.ALERT_DEFINITION_SUSPEND = 'ALERT_DEFINITION_SUSPEND';
 /**
- * @ReduxAction Alert Definition is un-suspended, or activated
+ * @ReduxAction Alert Definition is unsuspended, or activated
  */
 exports.ALERT_DEFINITION_UNSUSPEND = 'ALERT_DEFINITION_UNSUSPEND';
 exports.ALERT_CLEAR_FLASHING_CELLS = 'ALERT_CLEAR_FLASHING_CELLS';

package/src/Redux/ActionsReducers/ConditionalStyleRedux.d.ts

@@ -21,7 +21,7 @@ export declare const CONDITIONAL_STYLE_READY = "CONDITIONAL_STYLE_READY";
  */
 export declare const CONDITIONAL_STYLE_SUSPEND = "CONDITIONAL_STYLE_SUSPEND";
 /**
- * @ReduxAction Conditional Style is un-suspended, or activated
+ * @ReduxAction Conditional Style is unsuspended, or activated
  */
 export declare const CONDITIONAL_STYLE_UNSUSPEND = "CONDITIONAL_STYLE_UNSUSPEND";
 export interface ConditionalStyleAction extends Redux.Action {

package/src/Redux/ActionsReducers/ConditionalStyleRedux.js

@@ -26,7 +26,7 @@ exports.CONDITIONAL_STYLE_READY = 'CONDITIONAL_STYLE_READY';
  */
 exports.CONDITIONAL_STYLE_SUSPEND = 'CONDITIONAL_STYLE_SUSPEND';
 /**
- * @ReduxAction Conditional Style is un-suspended, or activated
+ * @ReduxAction Conditional Style is unsuspended, or activated
  */
 exports.CONDITIONAL_STYLE_UNSUSPEND = 'CONDITIONAL_STYLE_UNSUSPEND';
 const ConditionalStyleAdd = (conditionalStyle) => ({

package/src/Redux/ActionsReducers/CustomSortRedux.d.ts

@@ -17,7 +17,7 @@ export declare const CUSTOM_SORT_DELETE = "CUSTOM_SORT_DELETE";
  */
 export declare const CUSTOM_SORT_SUSPEND = "CUSTOM_SORT_SUSPEND";
 /**
- * @ReduxAction A Custom Sort has been un-suspended (activated)
+ * @ReduxAction A Custom Sort has been unsuspended (activated)
  */
 export declare const CUSTOM_SORT_UNSUSPEND = "CUSTOM_SORT_UNSUSPEND";
 /**

package/src/Redux/ActionsReducers/CustomSortRedux.js

@@ -22,7 +22,7 @@ exports.CUSTOM_SORT_DELETE = 'CUSTOM_SORT_DELETE';
  */
 exports.CUSTOM_SORT_SUSPEND = 'CUSTOM_SORT_SUSPEND';
 /**
- * @ReduxAction A Custom Sort has been un-suspended (activated)
+ * @ReduxAction A Custom Sort has been unsuspended (activated)
  */
 exports.CUSTOM_SORT_UNSUSPEND = 'CUSTOM_SORT_UNSUSPEND';
 /**

package/src/Redux/ActionsReducers/FlashingCellRedux.d.ts

@@ -18,7 +18,7 @@ export declare const FLASHING_CELL_DEFINITION_DELETE = "FLASHING_CELL_DEFINITION
  */
 export declare const FLASHING_CELL_DEFINITION_SUSPEND = "FLASHING_CELL_DEFINITION_SUSPEND";
 /**
- * @ReduxAction Flashing Cell Definition is un-suspended, or activated
+ * @ReduxAction Flashing Cell Definition is unsuspended, or activated
  */
 export declare const FLASHING_CELL_DEFINITION_UNSUSPEND = "FLASHING_CELL_DEFINITION_UNSUSPEND";
 /**

package/src/Redux/ActionsReducers/FlashingCellRedux.js

@@ -21,7 +21,7 @@ exports.FLASHING_CELL_DEFINITION_DELETE = 'FLASHING_CELL_DEFINITION_DELETE';
  */
 exports.FLASHING_CELL_DEFINITION_SUSPEND = 'FLASHING_CELL_DEFINITION_SUSPEND';
 /**
- * @ReduxAction Flashing Cell Definition is un-suspended, or activated
+ * @ReduxAction Flashing Cell Definition is unsuspended, or activated
  */
 exports.FLASHING_CELL_DEFINITION_UNSUSPEND = 'FLASHING_CELL_DEFINITION_UNSUSPEND';
 /**

package/src/Redux/ActionsReducers/FormatColumnRedux.d.ts

@@ -21,7 +21,7 @@ export declare const FORMAT_COLUMN_READY = "FORMAT_COLUMN_READY";
  */
 export declare const FORMAT_COLUMN_SUSPEND = "FORMAT_COLUMN_SUSPEND";
 /**
- * @ReduxAction FormatColumn Module is un-suspended, or activated
+ * @ReduxAction FormatColumn Module is unsuspended, or activated
  */
 export declare const FORMAT_COLUMN_UNSUSPEND = "FORMAT_COLUMN_UNSUSPEND";
 export interface FormatColumnAction extends Redux.Action {

package/src/Redux/ActionsReducers/FormatColumnRedux.js

@@ -26,7 +26,7 @@ exports.FORMAT_COLUMN_READY = 'FORMAT_COLUMN_READY';
  */
 exports.FORMAT_COLUMN_SUSPEND = 'FORMAT_COLUMN_SUSPEND';
 /**
- * @ReduxAction FormatColumn Module is un-suspended, or activated
+ * @ReduxAction FormatColumn Module is unsuspended, or activated
  */
 exports.FORMAT_COLUMN_UNSUSPEND = 'FORMAT_COLUMN_UNSUSPEND';
 const FormatColumnAdd = (formatColumn) => ({

package/src/Redux/ActionsReducers/LayoutRedux.d.ts

@@ -46,6 +46,22 @@ export declare const LAYOUT_COLUMN_FILTER_CLEAR_ALL = "LAYOUT_COLUMN_FILTER_CLEA
  * @ReduxAction A Column Filter has been cleared
  */
 export declare const LAYOUT_COLUMN_FILTER_CLEAR = "LAYOUT_COLUMN_FILTER_CLEAR";
+/**
+ * @ReduxAction Filter is suspended
+ */
+export declare const LAYOUT_COLUMN_FILTER_SUSPEND = "LAYOUT_COLUMN_FILTER_SUSPEND";
+/**
+ * @ReduxAction Filter is un-suspended, or activated
+ */
+export declare const LAYOUT_COLUMN_FILTER_UNSUSPEND = "LAYOUT_COLUMN_FILTER_UNSUSPEND";
+/**
+ * @ReduxAction Filter is suspended
+ */
+export declare const LAYOUT_COLUMN_FILTER_SUSPEND_ALL = "LAYOUT_COLUMN_FILTER_SUSPEND_ALL";
+/**
+ * @ReduxAction Filter is un-suspended, or activated
+ */
+export declare const LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL = "LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL";
 export interface LayoutColumnFilterAction extends Redux.Action {
     columnFilter: ColumnFilter;
 }
@@ -59,11 +75,23 @@ export interface LayoutColumnFilterClearAction extends LayoutColumnFilterAction
 }
 export interface LayoutColumnFilterClearAllAction extends Redux.Action {
 }
+export interface LayoutColumnFilterSuspendAction extends LayoutColumnFilterAction {
+}
+export interface LayoutColumnFilterSuspendAllAction extends Redux.Action {
+}
+export interface LayoutColumnFilterUnSuspendAction extends LayoutColumnFilterAction {
+}
+export interface LayoutColumnFilterUnSuspendAllAction extends Redux.Action {
+}
 export declare const LayoutColumnFilterAdd: (columnFilter: ColumnFilter) => LayoutColumnFilterAddAction;
 export declare const LayoutColumnFilterEdit: (columnFilter: ColumnFilter) => LayoutColumnFilterEditAction;
 export declare const LayoutColumnFilterSet: (columnFilter: ColumnFilter) => LayoutColumnFilterSetAction;
 export declare const LayoutColumnFilterClearAll: () => LayoutColumnFilterClearAllAction;
 export declare const LayoutColumnFilterClear: (columnFilter: ColumnFilter) => LayoutColumnFilterClearAction;
+export declare const LayoutColumnFilterSuspend: (columnFilter: ColumnFilter) => LayoutColumnFilterSuspendAction;
+export declare const LayoutColumnFilterUnSuspend: (columnFilter: ColumnFilter) => LayoutColumnFilterUnSuspendAction;
+export declare const LayoutColumnFilterSuspendAll: () => LayoutColumnFilterSuspendAllAction;
+export declare const LayoutColumnFilterUnSuspendAll: () => LayoutColumnFilterUnSuspendAllAction;
 /**
  * @ReduxAction A new caption / header has been set for a Column in the Layout
  */

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LayoutReducer = exports.getColumnFilterSelector = exports.LayoutReady = exports.LayoutSelect = exports.LayoutRemoveColumn = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LAYOUT_READY = exports.LAYOUT_SET_COLUMN_CAPTION = exports.LayoutColumnFilterClear = exports.LayoutColumnFilterClearAll = exports.LayoutColumnFilterSet = exports.LayoutColumnFilterEdit = exports.LayoutColumnFilterAdd = exports.LAYOUT_COLUMN_FILTER_CLEAR = exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_COLUMN_FILTER_SET = exports.LAYOUT_COLUMN_FILTER_EDIT = exports.LAYOUT_COLUMN_FILTER_ADD = exports.LAYOUT_REMOVE_COLUMN = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = void 0;
+exports.LayoutReducer = exports.getColumnFilterSelector = exports.LayoutReady = exports.LayoutSelect = exports.LayoutRemoveColumn = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LAYOUT_READY = exports.LAYOUT_SET_COLUMN_CAPTION = exports.LayoutColumnFilterUnSuspendAll = exports.LayoutColumnFilterSuspendAll = exports.LayoutColumnFilterUnSuspend = exports.LayoutColumnFilterSuspend = exports.LayoutColumnFilterClear = exports.LayoutColumnFilterClearAll = exports.LayoutColumnFilterSet = exports.LayoutColumnFilterEdit = exports.LayoutColumnFilterAdd = exports.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL = exports.LAYOUT_COLUMN_FILTER_SUSPEND_ALL = exports.LAYOUT_COLUMN_FILTER_UNSUSPEND = exports.LAYOUT_COLUMN_FILTER_SUSPEND = exports.LAYOUT_COLUMN_FILTER_CLEAR = exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_COLUMN_FILTER_SET = exports.LAYOUT_COLUMN_FILTER_EDIT = exports.LAYOUT_COLUMN_FILTER_ADD = exports.LAYOUT_REMOVE_COLUMN = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
@@ -48,6 +48,22 @@ exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = 'LAYOUT_COLUMN_FILTER_CLEAR_ALL';
  * @ReduxAction A Column Filter has been cleared
  */
 exports.LAYOUT_COLUMN_FILTER_CLEAR = 'LAYOUT_COLUMN_FILTER_CLEAR';
+/**
+ * @ReduxAction Filter is suspended
+ */
+exports.LAYOUT_COLUMN_FILTER_SUSPEND = 'LAYOUT_COLUMN_FILTER_SUSPEND';
+/**
+ * @ReduxAction Filter is un-suspended, or activated
+ */
+exports.LAYOUT_COLUMN_FILTER_UNSUSPEND = 'LAYOUT_COLUMN_FILTER_UNSUSPEND';
+/**
+ * @ReduxAction Filter is suspended
+ */
+exports.LAYOUT_COLUMN_FILTER_SUSPEND_ALL = 'LAYOUT_COLUMN_FILTER_SUSPEND_ALL';
+/**
+ * @ReduxAction Filter is un-suspended, or activated
+ */
+exports.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL = 'LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL';
 // Column Filter Methods
 const LayoutColumnFilterAdd = (columnFilter) => ({
     type: exports.LAYOUT_COLUMN_FILTER_ADD,
@@ -73,6 +89,24 @@ const LayoutColumnFilterClear = (columnFilter) => ({
     columnFilter,
 });
 exports.LayoutColumnFilterClear = LayoutColumnFilterClear;
+const LayoutColumnFilterSuspend = (columnFilter) => ({
+    type: exports.LAYOUT_COLUMN_FILTER_SUSPEND,
+    columnFilter,
+});
+exports.LayoutColumnFilterSuspend = LayoutColumnFilterSuspend;
+const LayoutColumnFilterUnSuspend = (columnFilter) => ({
+    type: exports.LAYOUT_COLUMN_FILTER_UNSUSPEND,
+    columnFilter,
+});
+exports.LayoutColumnFilterUnSuspend = LayoutColumnFilterUnSuspend;
+const LayoutColumnFilterSuspendAll = () => ({
+    type: exports.LAYOUT_COLUMN_FILTER_SUSPEND_ALL,
+});
+exports.LayoutColumnFilterSuspendAll = LayoutColumnFilterSuspendAll;
+const LayoutColumnFilterUnSuspendAll = () => ({
+    type: exports.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL,
+});
+exports.LayoutColumnFilterUnSuspendAll = LayoutColumnFilterUnSuspendAll;
 /**
  * @ReduxAction A new caption / header has been set for a Column in the Layout
  */
@@ -133,7 +167,7 @@ const initialState = {
     Layouts: GeneralConstants_1.EMPTY_ARRAY,
 };
 const LayoutReducer = (state = initialState, action) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     let layouts;
     const currentLayout = state.Layouts.find((layout) => layout.Name === state.CurrentLayout);
     switch (action.type) {
@@ -256,6 +290,50 @@ const LayoutReducer = (state = initialState, action) => {
             });
             return Object.assign(Object.assign({}, state), { Layouts });
         }
+        case exports.LAYOUT_COLUMN_FILTER_SUSPEND: {
+            const actionTypedSuspend = action;
+            const columnFilters = ((_e = currentLayout.ColumnFilters) !== null && _e !== void 0 ? _e : []).map((abObject) => abObject.Uuid === actionTypedSuspend.columnFilter.Uuid
+                ? Object.assign(Object.assign({}, abObject), { IsSuspended: true }) : abObject);
+            const Layouts = state.Layouts.map((layout) => {
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
+        case exports.LAYOUT_COLUMN_FILTER_UNSUSPEND: {
+            const actionTypedSuspend = action;
+            const columnFilters = ((_f = currentLayout.ColumnFilters) !== null && _f !== void 0 ? _f : []).map((abObject) => abObject.Uuid === actionTypedSuspend.columnFilter.Uuid
+                ? Object.assign(Object.assign({}, abObject), { IsSuspended: false }) : abObject);
+            const Layouts = state.Layouts.map((layout) => {
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
+        case exports.LAYOUT_COLUMN_FILTER_SUSPEND_ALL: {
+            const columnFilters = ((_g = currentLayout.ColumnFilters) !== null && _g !== void 0 ? _g : []).map((abObject) => (Object.assign(Object.assign({}, abObject), { IsSuspended: true })));
+            const Layouts = state.Layouts.map((layout) => {
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
+        case exports.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL: {
+            const columnFilters = ((_h = currentLayout.ColumnFilters) !== null && _h !== void 0 ? _h : []).map((abObject) => (Object.assign(Object.assign({}, abObject), { IsSuspended: false })));
+            const Layouts = state.Layouts.map((layout) => {
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
         default:
             return state;
     }

package/src/Redux/ActionsReducers/PlusMinusRedux.d.ts

@@ -22,7 +22,7 @@ export declare const PLUS_MINUS_RULE_DELETE = "PLUS_MINUS_RULE_DELETE";
  */
 export declare const PLUS_MINUS_RULE_SUSPEND = "PLUS_MINUS_RULE_SUSPEND";
 /**
- * @ReduxAction A Plus Minus Rule has been un-suspended
+ * @ReduxAction A Plus Minus Rule has been unsuspended
  */
 export declare const PLUS_MINUS_RULE_UNSUSPEND = "PLUS_MINUS_RULE_UNSUSPEND";
 /**