@adaptabletools/adaptable 12.1.7 → 12.1.8-canary.0

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

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

package/src/Redux/ActionsReducers/PlusMinusRedux.js

@@ -26,7 +26,7 @@ exports.PLUS_MINUS_RULE_DELETE = 'PLUS_MINUS_RULE_DELETE';
  */
 exports.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
  */
 exports.PLUS_MINUS_RULE_UNSUSPEND = 'PLUS_MINUS_RULE_UNSUSPEND';
 /**

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

@@ -11,7 +11,6 @@ export declare const POPUP_HIDE_SCREEN = "POPUP_HIDE_SCREEN";
 export declare const POPUP_SHOW_LOADING = "POPUP_SHOW_LOADING";
 export declare const POPUP_HIDE_LOADING = "POPUP_HIDE_LOADING";
 export declare const POPUP_SHOW_ALERT = "POPUP_SHOW_ALERT";
-export declare const POPUP_HIDE_ALERT = "POPUP_HIDE_ALERT";
 export declare const POPUP_SHOW_PROMPT = "POPUP_SHOW_PROMPT";
 export declare const POPUP_HIDE_PROMPT = "POPUP_HIDE_PROMPT";
 export declare const POPUP_CONFIRM_PROMPT = "POPUP_CONFIRM_PROMPT";
@@ -96,7 +95,6 @@ export declare const PopupShowForm: (config: {
 }) => PopupShowFormAction;
 export declare const PopupHideForm: (id: string) => PopupHideFormAction;
 export declare const PopupShowAlert: (alert: AdaptableAlert) => PopupShowAlertAction;
-export declare const PopupHideAlert: () => PopupHideAlertAction;
 export declare const PopupShowLoading: () => PopupShowLoadingAction;
 export declare const PopupHideLoading: () => PopupHideLoadingAction;
 export declare const PopupShowPrompt: (prompt: UIPrompt) => PopupShowPromptAction;

package/src/Redux/ActionsReducers/PopupRedux.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PopupReducer = exports.PopupClearParam = exports.PopupCancelConfirmation = exports.PopupConfirmConfirmation = exports.PopupShowConfirmation = exports.PopupConfirmPrompt = exports.PopupHidePrompt = exports.PopupShowPrompt = exports.PopupHideLoading = exports.PopupShowLoading = exports.PopupHideAlert = exports.PopupShowAlert = exports.PopupHideForm = exports.PopupShowForm = exports.PopupHideWindow = exports.PopupShowWindow = exports.PopupHideScreen = exports.PopupShowScreen = exports.POPUP_HIDE_FORM = exports.POPUP_SHOW_FORM = exports.POPUP_HIDE_WINDOW = exports.POPUP_SHOW_WINDOW = exports.POPUP_CLEAR_PARAM = exports.POPUP_CANCEL_CONFIRMATION = exports.POPUP_CONFIRM_CONFIRMATION = exports.POPUP_SHOW_CONFIRMATION = exports.POPUP_CONFIRM_PROMPT = exports.POPUP_HIDE_PROMPT = exports.POPUP_SHOW_PROMPT = exports.POPUP_HIDE_ALERT = exports.POPUP_SHOW_ALERT = exports.POPUP_HIDE_LOADING = exports.POPUP_SHOW_LOADING = exports.POPUP_HIDE_SCREEN = exports.POPUP_SHOW_SCREEN = void 0;
+exports.PopupReducer = exports.PopupClearParam = exports.PopupCancelConfirmation = exports.PopupConfirmConfirmation = exports.PopupShowConfirmation = exports.PopupConfirmPrompt = exports.PopupHidePrompt = exports.PopupShowPrompt = exports.PopupHideLoading = exports.PopupShowLoading = exports.PopupShowAlert = exports.PopupHideForm = exports.PopupShowForm = exports.PopupHideWindow = exports.PopupShowWindow = exports.PopupHideScreen = exports.PopupShowScreen = exports.POPUP_HIDE_FORM = exports.POPUP_SHOW_FORM = exports.POPUP_HIDE_WINDOW = exports.POPUP_SHOW_WINDOW = exports.POPUP_CLEAR_PARAM = exports.POPUP_CANCEL_CONFIRMATION = exports.POPUP_CONFIRM_CONFIRMATION = exports.POPUP_SHOW_CONFIRMATION = exports.POPUP_CONFIRM_PROMPT = exports.POPUP_HIDE_PROMPT = exports.POPUP_SHOW_PROMPT = exports.POPUP_SHOW_ALERT = exports.POPUP_HIDE_LOADING = exports.POPUP_SHOW_LOADING = exports.POPUP_HIDE_SCREEN = exports.POPUP_SHOW_SCREEN = void 0;
 exports.POPUP_SHOW_SCREEN = 'POPUP_SHOW_SCREEN';
 exports.POPUP_HIDE_SCREEN = 'POPUP_HIDE_SCREEN';
 exports.POPUP_SHOW_LOADING = 'POPUP_SHOW_LOADING';
 exports.POPUP_HIDE_LOADING = 'POPUP_HIDE_LOADING';
 exports.POPUP_SHOW_ALERT = 'POPUP_SHOW_ALERT';
-exports.POPUP_HIDE_ALERT = 'POPUP_HIDE_ALERT';
 exports.POPUP_SHOW_PROMPT = 'POPUP_SHOW_PROMPT';
 exports.POPUP_HIDE_PROMPT = 'POPUP_HIDE_PROMPT';
 exports.POPUP_CONFIRM_PROMPT = 'POPUP_CONFIRM_PROMPT';
@@ -63,10 +62,6 @@ const PopupShowAlert = (alert) => {
     };
 };
 exports.PopupShowAlert = PopupShowAlert;
-const PopupHideAlert = () => ({
-    type: exports.POPUP_HIDE_ALERT,
-});
-exports.PopupHideAlert = PopupHideAlert;
 const PopupShowLoading = () => ({
     type: exports.POPUP_SHOW_LOADING,
 });
@@ -75,12 +70,6 @@ const PopupHideLoading = () => ({
     type: exports.POPUP_HIDE_LOADING,
 });
 exports.PopupHideLoading = PopupHideLoading;
-//export const PopupShowGridInfo = (): PopupShowGridInfoAction => ({
-//  type: POPUP_SHOW_GRID_INFO,
-//});
-//export const PopupHideGridInfo = (): PopupHideGridInfoAction => ({
-//  type: POPUP_HIDE_GRID_INFO,
-//});
 const PopupShowPrompt = (prompt) => ({
     type: exports.POPUP_SHOW_PROMPT,
     prompt: prompt,
@@ -123,9 +112,6 @@ const initialState = {
     LoadingPopup: {
         ShowLoadingPopup: true,
     },
-    AlertPopup: {
-        Alert: null,
-    },
     ConfirmationPopup: {
         ShowConfirmationPopup: false,
         Msg: '',
@@ -261,19 +247,6 @@ const PopupReducer = (state = initialState, action) => {
                 ConfirmationPopup: newConfirmationPopup,
             });
         }
-        case exports.POPUP_SHOW_ALERT: {
-            let showAlertAction = action;
-            let newAlertPopup = {
-                Alert: showAlertAction.alert,
-            };
-            return Object.assign({}, state, { AlertPopup: newAlertPopup });
-        }
-        case exports.POPUP_HIDE_ALERT: {
-            let newAlertPopup = {
-                Alert: null,
-            };
-            return Object.assign({}, state, { AlertPopup: newAlertPopup });
-        }
         case exports.POPUP_SHOW_LOADING: {
             let newLoadingPopup = { ShowLoadingPopup: true };
             return Object.assign({}, state, { LoadingPopup: newLoadingPopup });

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

@@ -27,7 +27,7 @@ export declare const REPORT_SCHEDULE_DELETE = "REPORT_SCHEDULE_DELETE";
  */
 export declare const REPORT_SCHEDULE_SUSPEND = "REPORT_SCHEDULE_SUSPEND";
 /**
- * @ReduxAction A Report Schedule has been un-suspended or activated
+ * @ReduxAction A Report Schedule has been unsuspended or activated
  */
 export declare const REPORT_SCHEDULE_UNSUSPEND = "REPORT_SCHEDULE_UNSUSPEND";
 /**
@@ -47,7 +47,7 @@ export declare const REMINDER_SCHEDULE_DELETE = "REMINDER_SCHEDULE_DELETE";
  */
 export declare const REMINDER_SCHEDULE_SUSPEND = "REMINDER_SCHEDULE_SUSPEND";
 /**
- * @ReduxAction A Reminder Schedule has been un-suspended or activated
+ * @ReduxAction A Reminder Schedule has been unsuspended or activated
  */
 export declare const REMINDER_SCHEDULE_UNSUSPEND = "REMINDER_SCHEDULE_UNSUSPEND";
 /**
@@ -67,7 +67,7 @@ export declare const IPUSHPULL_SCHEDULE_DELETE = "IPUSHPULL_SCHEDULE_DELETE";
  */
 export declare const IPUSHPULL_SCHEDULE_SUSPEND = "IPUSHPULL_SCHEDULE_SUSPEND";
 /**
- * @ReduxAction An ipushpull Schedule has been un-suspended or activated
+ * @ReduxAction An ipushpull Schedule has been unsuspended or activated
  */
 export declare const IPUSHPULL_SCHEDULE_UNSUSPEND = "IPUSHPULL_SCHEDULE_UNSUSPEND";
 /**
@@ -87,7 +87,7 @@ export declare const GLUE42_SCHEDULE_DELETE = "GLUE42_SCHEDULE_DELETE";
  */
 export declare const GLUE42_SCHEDULE_SUSPEND = "GLUE42_SCHEDULE_SUSPEND";
 /**
- * @ReduxAction A Glue42 Schedule has been un-suspended or activated
+ * @ReduxAction A Glue42 Schedule has been unsuspended or activated
  */
 export declare const GLUE42_SCHEDULE_UNSUSPEND = "GLUE42_SCHEDULE_UNSUSPEND";
 /**
@@ -107,7 +107,7 @@ export declare const OPENFIN_SCHEDULE_DELETE = "OPENFIN_SCHEDULE_DELETE";
  */
 export declare const OPENFIN_SCHEDULE_SUSPEND = "OPENFIN_SCHEDULE_SUSPEND";
 /**
- * @ReduxAction An OpenFin Schedule has been un-suspended or activated
+ * @ReduxAction An OpenFin Schedule has been unsuspended or activated
  */
 export declare const OPENFIN_SCHEDULE_UNSUSPEND = "OPENFIN_SCHEDULE_UNSUSPEND";
 /**

package/src/Redux/ActionsReducers/ScheduleRedux.js

@@ -27,7 +27,7 @@ exports.REPORT_SCHEDULE_DELETE = 'REPORT_SCHEDULE_DELETE';
  */
 exports.REPORT_SCHEDULE_SUSPEND = 'REPORT_SCHEDULE_SUSPEND';
 /**
- * @ReduxAction A Report Schedule has been un-suspended or activated
+ * @ReduxAction A Report Schedule has been unsuspended or activated
  */
 exports.REPORT_SCHEDULE_UNSUSPEND = 'REPORT_SCHEDULE_UNSUSPEND';
 /**
@@ -47,7 +47,7 @@ exports.REMINDER_SCHEDULE_DELETE = 'REMINDER_SCHEDULE_DELETE';
  */
 exports.REMINDER_SCHEDULE_SUSPEND = 'REMINDER_SCHEDULE_SUSPEND';
 /**
- * @ReduxAction A Reminder Schedule has been un-suspended or activated
+ * @ReduxAction A Reminder Schedule has been unsuspended or activated
  */
 exports.REMINDER_SCHEDULE_UNSUSPEND = 'REMINDER_SCHEDULE_UNSUSPEND';
 /**
@@ -67,7 +67,7 @@ exports.IPUSHPULL_SCHEDULE_DELETE = 'IPUSHPULL_SCHEDULE_DELETE';
  */
 exports.IPUSHPULL_SCHEDULE_SUSPEND = 'IPUSHPULL_SCHEDULE_SUSPEND';
 /**
- * @ReduxAction An ipushpull Schedule has been un-suspended or activated
+ * @ReduxAction An ipushpull Schedule has been unsuspended or activated
  */
 exports.IPUSHPULL_SCHEDULE_UNSUSPEND = 'IPUSHPULL_SCHEDULE_UNSUSPEND';
 /**
@@ -87,7 +87,7 @@ exports.GLUE42_SCHEDULE_DELETE = 'GLUE42_SCHEDULE_DELETE';
  */
 exports.GLUE42_SCHEDULE_SUSPEND = 'GLUE42_SCHEDULE_SUSPEND';
 /**
- * @ReduxAction A Glue42 Schedule has been un-suspended or activated
+ * @ReduxAction A Glue42 Schedule has been unsuspended or activated
  */
 exports.GLUE42_SCHEDULE_UNSUSPEND = 'GLUE42_SCHEDULE_UNSUSPEND';
 /**
@@ -107,7 +107,7 @@ exports.OPENFIN_SCHEDULE_DELETE = 'OPENFIN_SCHEDULE_DELETE';
  */
 exports.OPENFIN_SCHEDULE_SUSPEND = 'OPENFIN_SCHEDULE_SUSPEND';
 /**
- * @ReduxAction An OpenFin Schedule has been un-suspended or activated
+ * @ReduxAction An OpenFin Schedule has been unsuspended or activated
  */
 exports.OPENFIN_SCHEDULE_UNSUSPEND = 'OPENFIN_SCHEDULE_UNSUSPEND';
 /**

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

@@ -17,7 +17,7 @@ export declare const SHORTCUT_DELETE = "SHORTCUT_DELETE";
  */
 export declare const SHORTCUT_SUSPEND = "SHORTCUT_SUSPEND";
 /**
- * @ReduxAction A Shortcut has been un-suspended or activated
+ * @ReduxAction A Shortcut has been unsuspended or activated
  */
 export declare const SHORTCUT_UNSUSPEND = "SHORTCUT_UNSUSPEND";
 /**

package/src/Redux/ActionsReducers/ShortcutRedux.js

@@ -22,7 +22,7 @@ exports.SHORTCUT_DELETE = 'SHORTCUT_DELETE';
  */
 exports.SHORTCUT_SUSPEND = 'SHORTCUT_SUSPEND';
 /**
- * @ReduxAction A Shortcut has been un-suspended or activated
+ * @ReduxAction A Shortcut has been unsuspended or activated
  */
 exports.SHORTCUT_UNSUSPEND = 'SHORTCUT_UNSUSPEND';
 /**