@adaptabletools/adaptable-cjs 22.1.1 → 23.0.0-canary.1

package/src/Redux/ActionsReducers/ExportRedux.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExportReducer = exports.FormatSelect = exports.ExportReady = exports.ReportDelete = exports.ReportEdit = exports.ReportAdd = exports.ReportSelect = exports.FORMAT_SELECT = exports.EXPORT_READY = exports.REPORT_DELETE = exports.REPORT_EDIT = exports.REPORT_ADD = exports.REPORT_SELECT = void 0;
+exports.ExportReducer = exports.ScheduledReportJobRun = exports.ScheduledReportUnSuspend = exports.ScheduledReportSuspend = exports.ScheduledReportDelete = exports.ScheduledReportEdit = exports.ScheduledReportAdd = exports.FormatSelect = exports.ExportEnsureScheduleUuids = exports.ExportReady = exports.ReportDelete = exports.ReportEdit = exports.ReportAdd = exports.ReportSelect = exports.SCHEDULED_REPORT_JOB_RUN = exports.SCHEDULED_REPORT_UNSUSPEND = exports.SCHEDULED_REPORT_SUSPEND = exports.SCHEDULED_REPORT_DELETE = exports.SCHEDULED_REPORT_EDIT = exports.SCHEDULED_REPORT_ADD = exports.FORMAT_SELECT = exports.EXPORT_ENSURE_SCHEDULE_UUIDS = exports.EXPORT_READY = exports.REPORT_DELETE = exports.REPORT_EDIT = exports.REPORT_ADD = exports.REPORT_SELECT = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
+const ScheduledReportHelper_1 = require("../../Utilities/Helpers/ScheduledReportHelper");
+const utils_1 = require("./utils");
 /**
  * @ReduxAction A Report has been selected
  */
@@ -24,10 +26,35 @@ exports.REPORT_DELETE = 'REPORT_DELETE';
  * @ReduxAction Export Module is ready
  */
 exports.EXPORT_READY = 'EXPORT_READY';
+exports.EXPORT_ENSURE_SCHEDULE_UUIDS = 'EXPORT_ENSURE_SCHEDULE_UUIDS';
 /**
  * @ReduxAction A report Format has been selected
  */
 exports.FORMAT_SELECT = 'FORMAT_SELECT';
+/**
+ * @ReduxAction A Scheduled Report has been added
+ */
+exports.SCHEDULED_REPORT_ADD = 'SCHEDULED_REPORT_ADD';
+/**
+ * @ReduxAction A Scheduled Report has been edited
+ */
+exports.SCHEDULED_REPORT_EDIT = 'SCHEDULED_REPORT_EDIT';
+/**
+ * @ReduxAction A Scheduled Report has been deleted
+ */
+exports.SCHEDULED_REPORT_DELETE = 'SCHEDULED_REPORT_DELETE';
+/**
+ * @ReduxAction A Scheduled Report has been suspended
+ */
+exports.SCHEDULED_REPORT_SUSPEND = 'SCHEDULED_REPORT_SUSPEND';
+/**
+ * @ReduxAction A Scheduled Report has been unsuspended
+ */
+exports.SCHEDULED_REPORT_UNSUSPEND = 'SCHEDULED_REPORT_UNSUSPEND';
+/**
+ * @ReduxAction A Scheduled Report job has been run
+ */
+exports.SCHEDULED_REPORT_JOB_RUN = 'SCHEDULED_REPORT_JOB_RUN';
 const ReportSelect = (SelectedReport) => ({
     type: exports.REPORT_SELECT,
     SelectedReport,
@@ -53,13 +80,54 @@ const ExportReady = (exportState) => ({
     exportState,
 });
 exports.ExportReady = ExportReady;
+const ExportEnsureScheduleUuids = () => ({
+    type: exports.EXPORT_ENSURE_SCHEDULE_UUIDS,
+});
+exports.ExportEnsureScheduleUuids = ExportEnsureScheduleUuids;
 const FormatSelect = (SelectedFormat) => ({
     type: exports.FORMAT_SELECT,
     SelectedFormat,
 });
 exports.FormatSelect = FormatSelect;
+const ScheduledReportAdd = (reportSchedule) => ({
+    type: exports.SCHEDULED_REPORT_ADD,
+    reportSchedule,
+});
+exports.ScheduledReportAdd = ScheduledReportAdd;
+const ScheduledReportEdit = (reportSchedule) => ({
+    type: exports.SCHEDULED_REPORT_EDIT,
+    reportSchedule,
+});
+exports.ScheduledReportEdit = ScheduledReportEdit;
+const ScheduledReportDelete = (reportSchedule) => ({
+    type: exports.SCHEDULED_REPORT_DELETE,
+    reportSchedule,
+});
+exports.ScheduledReportDelete = ScheduledReportDelete;
+const ScheduledReportSuspend = (reportSchedule) => ({
+    type: exports.SCHEDULED_REPORT_SUSPEND,
+    reportSchedule,
+});
+exports.ScheduledReportSuspend = ScheduledReportSuspend;
+const ScheduledReportUnSuspend = (reportSchedule) => ({
+    type: exports.SCHEDULED_REPORT_UNSUSPEND,
+    reportSchedule,
+});
+exports.ScheduledReportUnSuspend = ScheduledReportUnSuspend;
+const ScheduledReportJobRun = (reportSchedule) => ({
+    type: exports.SCHEDULED_REPORT_JOB_RUN,
+    reportSchedule,
+});
+exports.ScheduledReportJobRun = ScheduledReportJobRun;
+function updateScheduledReports(state, updater) {
+    return {
+        ...state,
+        ReportSchedules: updater(state.ReportSchedules ?? []),
+    };
+}
 const initialState = {
     Reports: GeneralConstants_1.EMPTY_ARRAY,
+    ReportSchedules: GeneralConstants_1.EMPTY_ARRAY,
 };
 const ExportReducer = (state = initialState, action) => {
     let reports;
@@ -82,16 +150,52 @@ const ExportReducer = (state = initialState, action) => {
                 Reports: state.Reports.map((abObject) => abObject.Uuid === actionReport.Uuid ? actionReport : abObject),
             };
         case exports.REPORT_DELETE: {
-            const actionReport = action.report;
+            const deletedReport = action.report;
             return {
                 ...state,
-                Reports: state.Reports.filter((abObject) => abObject.Uuid !== actionReport.Uuid),
+                Reports: state.Reports.filter((abObject) => abObject.Uuid !== deletedReport.Uuid),
+                ReportSchedules: (state.ReportSchedules ?? []).filter((schedule) => schedule.ReportName !== deletedReport.Name),
             };
         }
         case exports.FORMAT_SELECT:
             return Object.assign({}, state, {
                 CurrentFormat: action.SelectedFormat,
             });
+        case exports.EXPORT_READY:
+            return (0, ScheduledReportHelper_1.ensureExportStateSchedulesUuids)(action.exportState ?? state);
+        case exports.EXPORT_ENSURE_SCHEDULE_UUIDS:
+            return (0, ScheduledReportHelper_1.ensureExportStateSchedulesUuids)(state);
+        case exports.SCHEDULED_REPORT_ADD: {
+            const { reportSchedule } = action;
+            const ensuredState = (0, ScheduledReportHelper_1.ensureExportStateSchedulesUuids)(state);
+            const normalized = (0, ScheduledReportHelper_1.normalizeScheduledReportSchedule)(reportSchedule);
+            AdaptableHelper_1.default.addAdaptableObjectPrimitives(normalized);
+            return updateScheduledReports(ensuredState, (schedules) => [...schedules, normalized]);
+        }
+        case exports.SCHEDULED_REPORT_EDIT: {
+            const { reportSchedule } = action;
+            const ensuredState = (0, ScheduledReportHelper_1.ensureExportStateSchedulesUuids)(state);
+            const normalized = (0, ScheduledReportHelper_1.normalizeScheduledReportSchedule)(reportSchedule);
+            AdaptableHelper_1.default.addAdaptableObjectPrimitives(normalized);
+            return updateScheduledReports(ensuredState, (schedules) => (0, ScheduledReportHelper_1.replaceScheduledReportScheduleInList)(schedules, normalized));
+        }
+        case exports.SCHEDULED_REPORT_DELETE: {
+            const { reportSchedule } = action;
+            const ensuredState = (0, ScheduledReportHelper_1.ensureExportStateSchedulesUuids)(state);
+            return updateScheduledReports(ensuredState, (schedules) => schedules.filter((s) => s.Uuid !== reportSchedule.Uuid));
+        }
+        case exports.SCHEDULED_REPORT_SUSPEND: {
+            const { reportSchedule } = action;
+            const ensuredState = (0, ScheduledReportHelper_1.ensureExportStateSchedulesUuids)(state);
+            return updateScheduledReports(ensuredState, (schedules) => (0, utils_1.changeIsSuspendInList)(reportSchedule, schedules, true));
+        }
+        case exports.SCHEDULED_REPORT_UNSUSPEND: {
+            const { reportSchedule } = action;
+            const ensuredState = (0, ScheduledReportHelper_1.ensureExportStateSchedulesUuids)(state);
+            return updateScheduledReports(ensuredState, (schedules) => (0, utils_1.changeIsSuspendInList)(reportSchedule, schedules, false));
+        }
+        case exports.SCHEDULED_REPORT_JOB_RUN:
+            return state;
         default:
             return state;
     }

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

@@ -38,7 +38,6 @@ export declare const ALERT_DELETE_ALL = "ALERT_DELETE_ALL";
 export declare const ALERT_REMOVE_CELL_HIGHLIGHT = "ALERT_REMOVE_CELL_HIGHLIGHT";
 export declare const ALERT_REMOVE_ROW_HIGHLIGHT = "ALERT_REMOVE_ROW_HIGHLIGHT";
 export declare const SYSTEM_STATUS_MESSAGE_INFO_ADD = "SYSTEM_STATUS_MESSAGE_INFO_ADD";
-export declare const SYSTEM_STATUS_MESSAGE_INFO_DELETE = "SYSTEM_STATUS_MESSAGE_INFO_DELETE";
 export declare const SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = "SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL";
 export declare const SMARTEDIT_CHECK_CELL_SELECTION = "SMARTEDIT_CHECK_CELL_SELECTION";
 export declare const SMARTEDIT_FETCH_PREVIEW = "SMARTEDIT_FETCH_PREVIEW";
@@ -179,9 +178,6 @@ export interface SystemStatusMessageInfoAddAction extends Redux.Action {
     systemStatusMessageInfo: SystemStatusMessageInfo;
     maxSystemStatusMessagesInStore: number;
 }
-export interface SystemStatusMessageInfoDeleteAction extends Redux.Action {
-    systemStatusMessageInfo: SystemStatusMessageInfo;
-}
 export interface SystemStatusMessageInfoDeleteAllAction extends Redux.Action {
 }
 export interface SetAvailableFilterValuesAction extends Redux.Action {
@@ -314,7 +310,6 @@ export declare const AdaptableAlertRemoveRowHighlight: (alert: AdaptableAlert) =
 export declare const CreateCellSummaryInfo: () => CreateCellSummaryInfoAction;
 export declare const SetCellSummaryInfo: (CellSummary: CellSummmaryInfo) => SetCellSummaryInfoAction;
 export declare const SystemStatusMessageInfoAdd: (SystemStatusMessageInfo: SystemStatusMessageInfo, MaxSystemStatusMessagesInStore: number) => SystemStatusMessageInfoAddAction;
-export declare const SystemStatusMessageInfoDelete: (SystemStatusMessageInfo: SystemStatusMessageInfo) => SystemStatusMessageInfoDeleteAction;
 export declare const SystemStatusMessageInfoDeleteAll: () => SystemStatusMessageInfoDeleteAllAction;
 export declare const SmartEditChangeValue: (value: number) => SmartEditChangeValueAction;
 export declare const SmartEditChangeOperation: (smartEditOperation: SmartEditOperation) => SmartEditChangeOperationAction;

package/src/Redux/ActionsReducers/InternalRedux.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QUICK_FILTER_BAR_HIDE = exports.QUICK_FILTER_BAR_SHOW = exports.SETTINGS_PANEL_SET = exports.DATA_CHANGE_HISTORY_RESUME = exports.DATA_CHANGE_HISTORY_SUSPEND = exports.DATA_CHANGE_HISTORY_DISABLE = exports.DATA_CHANGE_HISTORY_ENABLE = exports.DATA_CHANGE_HISTORY_CLEAR_ROW = exports.DATA_CHANGE_HISTORY_UNDO = exports.DATA_CHANGE_HISTORY_ADD = exports.LICENSE_DISABLE_PERSISTENCE = exports.LICENSE_SHOW_WATERMARK = exports.CREATE_CELL_SUMMARY_INFO = exports.SET_CELL_SUMMARY_INFO = exports.CELL_SUMMARY_CHANGE_OPERATION = exports.CACHED_QUERY_ADD = exports.BULK_UPDATE_CHANGE_VALUE = exports.BULK_UPDATE_SET_PREVIEW = exports.BULK_UPDATE_SET_VALID_SELECTION = exports.BULK_UPDATE_CHECK_CELL_SELECTION = exports.SMART_EDIT_CHANGE_OPERATION = exports.SMART_EDIT_CHANGE_VALUE = exports.SMARTEDIT_SET_PREVIEW = exports.SMARTEDIT_SET_VALID_SELECTION = exports.SMARTEDIT_FETCH_PREVIEW = exports.SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.ALERT_REMOVE_ROW_HIGHLIGHT = exports.ALERT_REMOVE_CELL_HIGHLIGHT = exports.ALERT_DELETE_ALL = exports.ALERT_DELETE = exports.ALERT_ADD = exports.HIGHLIGHT_ROW_DELETE_ALL = exports.HIGHLIGHT_ROWS_DELETE = exports.HIGHLIGHT_ROW_DELETE = exports.HIGHLIGHT_ROWS_ADD = exports.HIGHLIGHT_ROW_ADD = exports.HIGHLIGHT_COLUMN_DELETE_ALL = exports.HIGHLIGHT_COLUMN_DELETE = exports.HIGHLIGHT_COLUMN_ADD = exports.HIGHLIGHT_CELL_DELETE_ALL = exports.HIGHLIGHT_CELL_DELETE = exports.HIGHLIGHT_CELL_ADD = exports.SET_DASHBOARD_MODULE_BUTTONS = exports.SET_SETTINGS_PANEL_ITEMS = exports.SET_SELECTED_ROWS = exports.SET_SELECTED_CELLS = exports.SET_COLUMNS = void 0;
-exports.CellSummaryChangeOperation = exports.CachedQueryAdd = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SetCellSummaryInfo = exports.CreateCellSummaryInfo = exports.AdaptableAlertRemoveRowHighlight = exports.AdaptableAlertRemoveCellHighlight = exports.AdaptableAlertDeleteAll = exports.AdaptableAlertDelete = exports.AdaptableAlertAdd = exports.SetDasboardModuleButtons = exports.SetSettingsPanelItems = exports.SetSelectedRows = exports.SetSelectedCells = exports.SetColumns = exports.GridHighlightRowDeleteAll = exports.GridHighlightRowsDelete = exports.HighlightRowDelete = exports.HighlightRowsAdd = exports.HighlightRowAdd = exports.HighlightColumnDeleteAll = exports.HighlightColumnDelete = exports.HighlightColumnAdd = exports.HighlightCellDeleteAll = exports.HighlightCellDelete = exports.HighlightCellAdd = exports.DATA_IMPORT_COMPLETED = exports.SUMMARY_ROW_SET = exports.CELL_POPUP_EDIT_FOCUSED_ENTITY = exports.CELL_POPUP_HIDE = exports.CELL_POPUP_SHOW = exports.SYSTEM_EXPORT_END = exports.SYSTEM_EXPORT_BEGIN = exports.SET_QUICK_SEARCH_FLOATING_VISIBILITY = exports.CHARTING_SET_CURRENT_CHART_MODELS = exports.DATA_SET_SELECT = exports.DASHBOARD_REFRESH = exports.LAYOUT_SHOW_NON_EXTENDED_OBJECTS = exports.DISABLE_DELETE_CONFIRMATION = void 0;
-exports.InternalReducer = exports.DataImportCompleted = exports.CommentsAndNotesFocusedEntitySelector = exports.CommentsAndNotesEditModeSelector = exports.CommentsAndNotesSelector = exports.QuickSearchFloatingVisibilitySelector = exports.DisableDeleteConfirmationSelector = exports.CellPopupHide = exports.RowSummarySet = exports.CellPopupEditFocusedEntity = exports.CellPopupShow = exports.QuickSearchFloatingVisibility = exports.SystemExportEnd = exports.SystemExportBegin = exports.DisableDeleteConfirmation = exports.ChartingCurrentChartModelsSelector = exports.ChartingSetCurrentChartModels = exports.DataSetSelect = exports.DashboardRefresh = exports.LayoutShowNonExtendedObjects = exports.QuickFilterBarHide = exports.QuickFilterBarShow = exports.SettingsPanelSet = exports.DataChangeHistoryResume = exports.DataChangeHistorySuspend = exports.DataChangeHistoryDisable = exports.DataChangeHistoryEnable = exports.DataChangeHistoryClearRow = exports.DataChangeHistoryUndo = exports.DataChangeHistoryAdd = exports.LicenseDisablePersistence = exports.LicenseShowWatermark = void 0;
+exports.DISABLE_DELETE_CONFIRMATION = exports.QUICK_FILTER_BAR_HIDE = exports.QUICK_FILTER_BAR_SHOW = exports.SETTINGS_PANEL_SET = exports.DATA_CHANGE_HISTORY_RESUME = exports.DATA_CHANGE_HISTORY_SUSPEND = exports.DATA_CHANGE_HISTORY_DISABLE = exports.DATA_CHANGE_HISTORY_ENABLE = exports.DATA_CHANGE_HISTORY_CLEAR_ROW = exports.DATA_CHANGE_HISTORY_UNDO = exports.DATA_CHANGE_HISTORY_ADD = exports.LICENSE_DISABLE_PERSISTENCE = exports.LICENSE_SHOW_WATERMARK = exports.CREATE_CELL_SUMMARY_INFO = exports.SET_CELL_SUMMARY_INFO = exports.CELL_SUMMARY_CHANGE_OPERATION = exports.CACHED_QUERY_ADD = exports.BULK_UPDATE_CHANGE_VALUE = exports.BULK_UPDATE_SET_PREVIEW = exports.BULK_UPDATE_SET_VALID_SELECTION = exports.BULK_UPDATE_CHECK_CELL_SELECTION = exports.SMART_EDIT_CHANGE_OPERATION = exports.SMART_EDIT_CHANGE_VALUE = exports.SMARTEDIT_SET_PREVIEW = exports.SMARTEDIT_SET_VALID_SELECTION = exports.SMARTEDIT_FETCH_PREVIEW = exports.SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.ALERT_REMOVE_ROW_HIGHLIGHT = exports.ALERT_REMOVE_CELL_HIGHLIGHT = exports.ALERT_DELETE_ALL = exports.ALERT_DELETE = exports.ALERT_ADD = exports.HIGHLIGHT_ROW_DELETE_ALL = exports.HIGHLIGHT_ROWS_DELETE = exports.HIGHLIGHT_ROW_DELETE = exports.HIGHLIGHT_ROWS_ADD = exports.HIGHLIGHT_ROW_ADD = exports.HIGHLIGHT_COLUMN_DELETE_ALL = exports.HIGHLIGHT_COLUMN_DELETE = exports.HIGHLIGHT_COLUMN_ADD = exports.HIGHLIGHT_CELL_DELETE_ALL = exports.HIGHLIGHT_CELL_DELETE = exports.HIGHLIGHT_CELL_ADD = exports.SET_DASHBOARD_MODULE_BUTTONS = exports.SET_SETTINGS_PANEL_ITEMS = exports.SET_SELECTED_ROWS = exports.SET_SELECTED_CELLS = exports.SET_COLUMNS = void 0;
+exports.LicenseDisablePersistence = exports.LicenseShowWatermark = exports.CellSummaryChangeOperation = exports.CachedQueryAdd = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoAdd = exports.SetCellSummaryInfo = exports.CreateCellSummaryInfo = exports.AdaptableAlertRemoveRowHighlight = exports.AdaptableAlertRemoveCellHighlight = exports.AdaptableAlertDeleteAll = exports.AdaptableAlertDelete = exports.AdaptableAlertAdd = exports.SetDasboardModuleButtons = exports.SetSettingsPanelItems = exports.SetSelectedRows = exports.SetSelectedCells = exports.SetColumns = exports.GridHighlightRowDeleteAll = exports.GridHighlightRowsDelete = exports.HighlightRowDelete = exports.HighlightRowsAdd = exports.HighlightRowAdd = exports.HighlightColumnDeleteAll = exports.HighlightColumnDelete = exports.HighlightColumnAdd = exports.HighlightCellDeleteAll = exports.HighlightCellDelete = exports.HighlightCellAdd = exports.DATA_IMPORT_COMPLETED = exports.SUMMARY_ROW_SET = exports.CELL_POPUP_EDIT_FOCUSED_ENTITY = exports.CELL_POPUP_HIDE = exports.CELL_POPUP_SHOW = exports.SYSTEM_EXPORT_END = exports.SYSTEM_EXPORT_BEGIN = exports.SET_QUICK_SEARCH_FLOATING_VISIBILITY = exports.CHARTING_SET_CURRENT_CHART_MODELS = exports.DATA_SET_SELECT = exports.DASHBOARD_REFRESH = exports.LAYOUT_SHOW_NON_EXTENDED_OBJECTS = void 0;
+exports.InternalReducer = exports.DataImportCompleted = exports.CommentsAndNotesFocusedEntitySelector = exports.CommentsAndNotesEditModeSelector = exports.CommentsAndNotesSelector = exports.QuickSearchFloatingVisibilitySelector = exports.DisableDeleteConfirmationSelector = exports.CellPopupHide = exports.RowSummarySet = exports.CellPopupEditFocusedEntity = exports.CellPopupShow = exports.QuickSearchFloatingVisibility = exports.SystemExportEnd = exports.SystemExportBegin = exports.DisableDeleteConfirmation = exports.ChartingCurrentChartModelsSelector = exports.ChartingSetCurrentChartModels = exports.DataSetSelect = exports.DashboardRefresh = exports.LayoutShowNonExtendedObjects = exports.QuickFilterBarHide = exports.QuickFilterBarShow = exports.SettingsPanelSet = exports.DataChangeHistoryResume = exports.DataChangeHistorySuspend = exports.DataChangeHistoryDisable = exports.DataChangeHistoryEnable = exports.DataChangeHistoryClearRow = exports.DataChangeHistoryUndo = exports.DataChangeHistoryAdd = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ReduxConstants_1 = require("../../Utilities/Constants/ReduxConstants");
 const Enums_1 = require("../../AdaptableState/Common/Enums");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
+const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/ScheduledAlertHelper");
 const AnnotationsService_1 = require("../../Utilities/Services/AnnotationsService");
 /*
 Bit of a mixed bag of actions but essentially its those that are related to Strategies but where we DONT want to persist state
@@ -45,7 +46,6 @@ exports.ALERT_REMOVE_CELL_HIGHLIGHT = 'ALERT_REMOVE_CELL_HIGHLIGHT';
 exports.ALERT_REMOVE_ROW_HIGHLIGHT = 'ALERT_REMOVE_ROW_HIGHLIGHT';
 // Status Message
 exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = 'SYSTEM_STATUS_MESSAGE_INFO_ADD';
-exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = 'SYSTEM_STATUS_MESSAGE_INFO_DELETE';
 exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = 'SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL';
 // Smart Edit
 exports.SMARTEDIT_CHECK_CELL_SELECTION = 'SMARTEDIT_CHECK_CELL_SELECTION';
@@ -225,11 +225,6 @@ const SystemStatusMessageInfoAdd = (SystemStatusMessageInfo, MaxSystemStatusMess
     maxSystemStatusMessagesInStore: MaxSystemStatusMessagesInStore,
 });
 exports.SystemStatusMessageInfoAdd = SystemStatusMessageInfoAdd;
-const SystemStatusMessageInfoDelete = (SystemStatusMessageInfo) => ({
-    type: exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE,
-    systemStatusMessageInfo: SystemStatusMessageInfo,
-});
-exports.SystemStatusMessageInfoDelete = SystemStatusMessageInfoDelete;
 const SystemStatusMessageInfoDeleteAll = () => ({
     type: exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL,
 });
@@ -630,7 +625,10 @@ const InternalReducer = (state = initialState, action) => {
                             ...abObject,
                         };
                         newAbObject.alertDefinition = (0, Helper_1.cloneObject)(abObject.alertDefinition);
-                        delete newAbObject.alertDefinition.AlertProperties.HighlightCell;
+                        const ruleAlertProperties = (0, ScheduledAlertHelper_1.getRuleAlertProperties)(newAbObject.alertDefinition);
+                        if (ruleAlertProperties) {
+                            delete ruleAlertProperties.HighlightCell;
+                        }
                         return newAbObject;
                     }
                     return abObject;
@@ -649,7 +647,10 @@ const InternalReducer = (state = initialState, action) => {
                             ...abObject,
                         };
                         newAbObject.alertDefinition = (0, Helper_1.cloneObject)(abObject.alertDefinition);
-                        delete newAbObject.alertDefinition.AlertProperties.HighlightRow;
+                        const ruleAlertProperties = (0, ScheduledAlertHelper_1.getRuleAlertProperties)(newAbObject.alertDefinition);
+                        if (ruleAlertProperties) {
+                            delete ruleAlertProperties.HighlightRow;
+                        }
                         return newAbObject;
                     }
                     return abObject;

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

@@ -1,18 +1,35 @@
 import * as Redux from 'redux';
 import { QuickSearchState } from '../../AdaptableState/QuickSearchState';
 import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
-export declare const QUICK_SEARCH_SET_CELL_MATCHING_STYLE_DEFAULT: {
+export declare const QUICK_SEARCH_DEFAULT_CELL_MATCH_STYLE: {
     BackColor: string;
     ForeColor: string;
 };
+export declare const QUICK_SEARCH_DEFAULT_TEXT_MATCH_STYLE: {
+    BackColor: string;
+    ForeColor: string;
+};
+export declare const QUICK_SEARCH_DEFAULT_CURRENT_TEXT_MATCH_STYLE: {
+    BackColor: string;
+    ForeColor: string;
+    FontWeight: "Bold";
+};
 /**
  * @ReduxAction Runs Quick Search
  */
 export declare const QUICK_SEARCH_RUN = "QUICK_SEARCH_RUN";
 /**
- * @ReduxAction Sets Quick Search style
+ * @ReduxAction Sets Quick Search whole-cell style (SSRM / legacy)
  */
 export declare const QUICK_SEARCH_SET_CELL_MATCHING_STYLE = "QUICK_SEARCH_SET_CELL_MATCHING_STYLE";
+/**
+ * @ReduxAction Sets Quick Search matched-text style (AG Grid Find)
+ */
+export declare const QUICK_SEARCH_SET_TEXT_MATCHING_STYLE = "QUICK_SEARCH_SET_TEXT_MATCHING_STYLE";
+/**
+ * @ReduxAction Sets Quick Search active-match text style (AG Grid Find)
+ */
+export declare const QUICK_SEARCH_SET_CURRENT_TEXT_MATCHING_STYLE = "QUICK_SEARCH_SET_CURRENT_TEXT_MATCHING_STYLE";
 /**
  * @ReduxAction Quick Search Module is ready
  */
@@ -23,10 +40,18 @@ export interface QuickSearchRunAction extends Redux.Action {
 export interface QuickSearchSetMatchingCellStyleAction extends Redux.Action {
     matchingCellStyle: AdaptableStyle;
 }
+export interface QuickSearchSetTextMatchingStyleAction extends Redux.Action {
+    textMatchStyle: AdaptableStyle;
+}
+export interface QuickSearchSetCurrentTextMatchingStyleAction extends Redux.Action {
+    currentTextMatchStyle: AdaptableStyle;
+}
 export interface QuickSearchReadyAction extends Redux.Action {
     quickSearchState: QuickSearchState;
 }
 export declare const QuickSearchRun: (quickSearchText: string) => QuickSearchRunAction;
 export declare const QuickSearchSetCellMatchingStyle: (matchingCellStyle: AdaptableStyle) => QuickSearchSetMatchingCellStyleAction;
+export declare const QuickSearchSetTextMatchingStyle: (textMatchStyle: AdaptableStyle) => QuickSearchSetTextMatchingStyleAction;
+export declare const QuickSearchSetCurrentTextMatchingStyle: (currentTextMatchStyle: AdaptableStyle) => QuickSearchSetCurrentTextMatchingStyleAction;
 export declare const QuickSearchReady: (quickSearchState: QuickSearchState) => QuickSearchReadyAction;
 export declare const QuickSearchReducer: Redux.Reducer<QuickSearchState>;

package/src/Redux/ActionsReducers/QuickSearchRedux.js

@@ -1,20 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QuickSearchReducer = exports.QuickSearchReady = exports.QuickSearchSetCellMatchingStyle = exports.QuickSearchRun = exports.QUICK_SEARCH_READY = exports.QUICK_SEARCH_SET_CELL_MATCHING_STYLE = exports.QUICK_SEARCH_RUN = exports.QUICK_SEARCH_SET_CELL_MATCHING_STYLE_DEFAULT = void 0;
+exports.QuickSearchReducer = exports.QuickSearchReady = exports.QuickSearchSetCurrentTextMatchingStyle = exports.QuickSearchSetTextMatchingStyle = exports.QuickSearchSetCellMatchingStyle = exports.QuickSearchRun = exports.QUICK_SEARCH_READY = exports.QUICK_SEARCH_SET_CURRENT_TEXT_MATCHING_STYLE = exports.QUICK_SEARCH_SET_TEXT_MATCHING_STYLE = exports.QUICK_SEARCH_SET_CELL_MATCHING_STYLE = exports.QUICK_SEARCH_RUN = exports.QUICK_SEARCH_DEFAULT_CURRENT_TEXT_MATCH_STYLE = exports.QUICK_SEARCH_DEFAULT_TEXT_MATCH_STYLE = exports.QUICK_SEARCH_DEFAULT_CELL_MATCH_STYLE = void 0;
 const ReduxConstants_1 = require("../../Utilities/Constants/ReduxConstants");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-exports.QUICK_SEARCH_SET_CELL_MATCHING_STYLE_DEFAULT = {
-    BackColor: ReduxConstants_1.QUICK_SEARCH_DEFAULT_BACK_COLOR,
+exports.QUICK_SEARCH_DEFAULT_CELL_MATCH_STYLE = {
+    BackColor: ReduxConstants_1.QUICK_SEARCH_DEFAULT_CELL_BACK_COLOR,
     ForeColor: ReduxConstants_1.QUICK_SEARCH_DEFAULT_FORE_COLOR,
 };
+exports.QUICK_SEARCH_DEFAULT_TEXT_MATCH_STYLE = {
+    BackColor: ReduxConstants_1.QUICK_SEARCH_DEFAULT_TEXT_BACK_COLOR,
+    ForeColor: ReduxConstants_1.QUICK_SEARCH_DEFAULT_FORE_COLOR,
+};
+exports.QUICK_SEARCH_DEFAULT_CURRENT_TEXT_MATCH_STYLE = {
+    BackColor: ReduxConstants_1.QUICK_SEARCH_DEFAULT_CURRENT_BACK_COLOR,
+    ForeColor: ReduxConstants_1.QUICK_SEARCH_DEFAULT_FORE_COLOR,
+    FontWeight: 'Bold',
+};
 /**
  * @ReduxAction Runs Quick Search
  */
 exports.QUICK_SEARCH_RUN = 'QUICK_SEARCH_RUN';
 /**
- * @ReduxAction Sets Quick Search style
+ * @ReduxAction Sets Quick Search whole-cell style (SSRM / legacy)
  */
 exports.QUICK_SEARCH_SET_CELL_MATCHING_STYLE = 'QUICK_SEARCH_SET_CELL_MATCHING_STYLE';
+/**
+ * @ReduxAction Sets Quick Search matched-text style (AG Grid Find)
+ */
+exports.QUICK_SEARCH_SET_TEXT_MATCHING_STYLE = 'QUICK_SEARCH_SET_TEXT_MATCHING_STYLE';
+/**
+ * @ReduxAction Sets Quick Search active-match text style (AG Grid Find)
+ */
+exports.QUICK_SEARCH_SET_CURRENT_TEXT_MATCHING_STYLE = 'QUICK_SEARCH_SET_CURRENT_TEXT_MATCHING_STYLE';
 /**
  * @ReduxAction Quick Search Module is ready
  */
@@ -29,6 +46,16 @@ const QuickSearchSetCellMatchingStyle = (matchingCellStyle) => ({
     matchingCellStyle: matchingCellStyle,
 });
 exports.QuickSearchSetCellMatchingStyle = QuickSearchSetCellMatchingStyle;
+const QuickSearchSetTextMatchingStyle = (textMatchStyle) => ({
+    type: exports.QUICK_SEARCH_SET_TEXT_MATCHING_STYLE,
+    textMatchStyle,
+});
+exports.QuickSearchSetTextMatchingStyle = QuickSearchSetTextMatchingStyle;
+const QuickSearchSetCurrentTextMatchingStyle = (currentTextMatchStyle) => ({
+    type: exports.QUICK_SEARCH_SET_CURRENT_TEXT_MATCHING_STYLE,
+    currentTextMatchStyle,
+});
+exports.QuickSearchSetCurrentTextMatchingStyle = QuickSearchSetCurrentTextMatchingStyle;
 const QuickSearchReady = (quickSearchState) => ({
     type: exports.QUICK_SEARCH_READY,
     quickSearchState,
@@ -47,6 +74,15 @@ const QuickSearchReducer = (state = initialState, action) => {
             return Object.assign({}, state, {
                 CellMatchStyle: action.matchingCellStyle,
             });
+        case exports.QUICK_SEARCH_SET_TEXT_MATCHING_STYLE:
+            return Object.assign({}, state, {
+                TextMatchStyle: action.textMatchStyle,
+            });
+        case exports.QUICK_SEARCH_SET_CURRENT_TEXT_MATCHING_STYLE:
+            return Object.assign({}, state, {
+                CurrentTextMatchStyle: action
+                    .currentTextMatchStyle,
+            });
         default:
             return state;
     }

package/src/Redux/Store/AdaptableStore.js

@@ -9,6 +9,9 @@ const PopupRedux_1 = require("../ActionsReducers/PopupRedux");
 const AdaptableReduxLocalStorageEngine_1 = require("./AdaptableReduxLocalStorageEngine");
 const AdaptableReduxMerger_1 = require("./AdaptableReduxMerger");
 const AdaptableAlert_1 = require("../../AdaptableState/Common/AdaptableAlert");
+const chartingHelper_1 = require("../../Utilities/Helpers/chartingHelper");
+const ScheduledJobsMiddlewareHelper_1 = require("../../Utilities/Helpers/ScheduledJobsMiddlewareHelper");
+const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/ScheduledAlertHelper");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
@@ -33,7 +36,6 @@ const NamedQueryRedux = tslib_1.__importStar(require("../ActionsReducers/NamedQu
 const NoteRedux = tslib_1.__importStar(require("../ActionsReducers/NoteRedux"));
 const PlusMinusRedux = tslib_1.__importStar(require("../ActionsReducers/PlusMinusRedux"));
 const QuickSearchRedux = tslib_1.__importStar(require("../ActionsReducers/QuickSearchRedux"));
-const ScheduleRedux = tslib_1.__importStar(require("../ActionsReducers/ScheduleRedux"));
 const ShortcutRedux = tslib_1.__importStar(require("../ActionsReducers/ShortcutRedux"));
 const SmartEditRedux = tslib_1.__importStar(require("../ActionsReducers/SmartEditRedux"));
 const StatusBarRedux = tslib_1.__importStar(require("../ActionsReducers/StatusBarRedux"));
@@ -132,7 +134,6 @@ class AdaptableStore {
             Note: NoteRedux.NoteReducer,
             PlusMinus: PlusMinusRedux.PlusMinusReducer,
             QuickSearch: QuickSearchRedux.QuickSearchReducer,
-            Schedule: ScheduleRedux.ScheduleReducer,
             Shortcut: ShortcutRedux.ShortcutReducer,
             StatusBar: StatusBarRedux.StatusBarReducer,
             StyledColumn: StyledColumnRedux.StyledColumnReducer,
@@ -492,17 +493,20 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case AlertRedux.ALERT_DEFINITION_UNSUSPEND_ALL:
                 case AlertRedux.ALERT_DEFINITION_SUSPEND_ALL: {
                     const returnAction = next(action);
-                    const alertDefinition = returnAction
-                        .alertDefinition;
-                    if (returnAction.type === AlertRedux.ALERT_DEFINITION_ADD ||
-                        returnAction.type === AlertRedux.ALERT_DEFINITION_EDIT ||
-                        returnAction.type === AlertRedux.ALERT_DEFINITION_UNSUSPEND) {
-                        // in case of edit, the existing reactive alert will be deleted and recreated
-                        adaptable.api.internalApi.getAlertService().createReactiveAlert(alertDefinition);
-                    }
-                    if (returnAction.type === AlertRedux.ALERT_DEFINITION_DELETE ||
-                        returnAction.type === AlertRedux.ALERT_DEFINITION_SUSPEND) {
-                        adaptable.api.internalApi.getAlertService().deleteReactiveAlert(alertDefinition);
+                    const alertDefinition = returnAction.alertDefinition;
+                    if (alertDefinition) {
+                        if (!(0, ScheduledAlertHelper_1.isScheduledAlertDefinition)(alertDefinition) &&
+                            (returnAction.type === AlertRedux.ALERT_DEFINITION_ADD ||
+                                returnAction.type === AlertRedux.ALERT_DEFINITION_EDIT ||
+                                returnAction.type === AlertRedux.ALERT_DEFINITION_UNSUSPEND)) {
+                            // in case of edit, the existing reactive alert will be deleted and recreated
+                            adaptable.api.internalApi.getAlertService().createReactiveAlert(alertDefinition);
+                        }
+                        if (!(0, ScheduledAlertHelper_1.isScheduledAlertDefinition)(alertDefinition) &&
+                            (returnAction.type === AlertRedux.ALERT_DEFINITION_DELETE ||
+                                returnAction.type === AlertRedux.ALERT_DEFINITION_SUSPEND)) {
+                            adaptable.api.internalApi.getAlertService().deleteReactiveAlert(alertDefinition);
+                        }
                     }
                     if (returnAction.type === AlertRedux.ALERT_DEFINITION_SUSPEND_ALL) {
                         adaptable.api.internalApi
@@ -532,6 +536,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     if (module) {
                         module.checkListenToCellDataChanged();
                     }
+                    (0, ScheduledJobsMiddlewareHelper_1.refreshScheduledAlertJobs)(adaptable);
                     return returnAction;
                 }
                 /*******************
@@ -628,6 +633,16 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  * Action: We set up all columns again
                  */
                 case QuickSearchRedux.QUICK_SEARCH_SET_CELL_MATCHING_STYLE:
+                case QuickSearchRedux.QUICK_SEARCH_SET_TEXT_MATCHING_STYLE:
+                case QuickSearchRedux.QUICK_SEARCH_SET_CURRENT_TEXT_MATCHING_STYLE: {
+                    const returnAction = next(action);
+                    adaptable.applyQuickSearchFindCssVars();
+                    if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(adaptable.api.quickSearchApi.getQuickSearchValue())) {
+                        adaptable.refreshAgGridFind();
+                    }
+                    adaptable.updateColumnModelAndRefreshGrid();
+                    return returnAction;
+                }
                 case FormatColumnRedux.FORMAT_COLUMN_ADD_BATCH:
                 case FormatColumnRedux.FORMAT_COLUMN_ADD:
                 case FormatColumnRedux.FORMAT_COLUMN_EDIT:
@@ -668,10 +683,10 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  */
                 case QuickSearchRedux.QUICK_SEARCH_RUN: {
                     let returnAction = next(action);
-                    adaptable.api.gridApi.refreshAllCells(true);
                     const actionTyped = action;
                     const searchText = actionTyped.quickSearchText;
                     adaptable.setAgGridFindSearchValue(searchText);
+                    adaptable.api.gridApi.refreshAllCells(true);
                     // if set then return a query on the text
                     if (adaptable.adaptableOptions.quickSearchOptions.filterGridAfterQuickSearch) {
                         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(searchText)) {
@@ -694,13 +709,13 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     const actionTyped = action;
                     let ret = next(action);
                     const adaptableAlert = actionTyped.alert;
-                    if (adaptableAlert.alertDefinition.AlertProperties?.HighlightCell &&
+                    if ((0, ScheduledAlertHelper_1.getRuleAlertProperties)(adaptableAlert.alertDefinition)?.HighlightCell &&
                         (0, AdaptableAlert_1.isAdaptableCellChangedAlert)(adaptableAlert) &&
                         adaptableAlert.cellDataChangedInfo) {
                         const rowNode = adaptableAlert.cellDataChangedInfo.rowNode;
                         adaptable.api.gridApi.refreshCell(rowNode, adaptableAlert.cellDataChangedInfo.column.columnId, true);
                     }
-                    if (adaptableAlert.alertDefinition.AlertProperties?.HighlightRow &&
+                    if ((0, ScheduledAlertHelper_1.getRuleAlertProperties)(adaptableAlert.alertDefinition)?.HighlightRow &&
                         (0, AdaptableAlert_1.isAdaptableRowChangedAlert)(adaptableAlert) &&
                         adaptableAlert.rowDataChangedInfo) {
                         adaptable.api.gridApi.refreshRowNodes(adaptableAlert.rowDataChangedInfo.rowNodes);
@@ -716,13 +731,13 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     let ret = next(action);
                     let alerts = actionTyped.alerts;
                     alerts.forEach((alert) => {
-                        if (alert.alertDefinition.AlertProperties?.HighlightCell &&
+                        if ((0, ScheduledAlertHelper_1.getRuleAlertProperties)(alert.alertDefinition)?.HighlightCell &&
                             (0, AdaptableAlert_1.isAdaptableCellChangedAlert)(alert) &&
                             alert.cellDataChangedInfo) {
                             let rowNode = alert.cellDataChangedInfo.rowNode;
                             adaptable.api.gridApi.refreshCell(rowNode, alert.cellDataChangedInfo.column.columnId, true);
                         }
-                        if (alert.alertDefinition.AlertProperties?.HighlightRow &&
+                        if ((0, ScheduledAlertHelper_1.getRuleAlertProperties)(alert.alertDefinition)?.HighlightRow &&
                             (0, AdaptableAlert_1.isAdaptableRowChangedAlert)(alert) &&
                             alert.rowDataChangedInfo) {
                             adaptable.api.gridApi.refreshRowNodes(alert.rowDataChangedInfo.rowNodes);
@@ -738,7 +753,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     let ret = next(action);
                     const actionTyped = action;
                     const adaptableAlert = actionTyped.alert;
-                    if (adaptableAlert.alertDefinition.AlertProperties?.HighlightCell) {
+                    if ((0, ScheduledAlertHelper_1.getRuleAlertProperties)(adaptableAlert.alertDefinition)?.HighlightCell) {
                         if ((0, AdaptableAlert_1.isAdaptableCellChangedAlert)(adaptableAlert) &&
                             adaptableAlert.cellDataChangedInfo) {
                             const rowNode = adaptableAlert.cellDataChangedInfo.rowNode;
@@ -751,7 +766,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     let ret = next(action);
                     const actionTyped = action;
                     const adaptableAlert = actionTyped.alert;
-                    if (adaptableAlert.alertDefinition.AlertProperties?.HighlightRow) {
+                    if ((0, ScheduledAlertHelper_1.getRuleAlertProperties)(adaptableAlert.alertDefinition)?.HighlightRow) {
                         if ((0, AdaptableAlert_1.isAdaptableCellChangedAlert)(adaptableAlert) &&
                             adaptableAlert.cellDataChangedInfo) {
                             adaptable.api.gridApi.refreshRowNodes([adaptableAlert.cellDataChangedInfo.rowNode]);
@@ -1000,43 +1015,16 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     return returnAction;
                 }
                 /*******************
-                 * SCHEDULE ACTIONS
+                 * SCHEDULED JOB ACTIONS (export report schedules)
                  *******************/
-                /**
-                 * Use Case: Schedule has changed
-                 * Action: Set up ALL jobs
-                 */
-                case ScheduleRedux.REMINDER_SCHEDULE_ADD:
-                case ScheduleRedux.REMINDER_SCHEDULE_EDIT:
-                case ScheduleRedux.REMINDER_SCHEDULE_DELETE:
-                case ScheduleRedux.REMINDER_SCHEDULE_UNSUSPEND:
-                case ScheduleRedux.REMINDER_SCHEDULE_SUSPEND:
-                case ScheduleRedux.REMINDER_SCHEDULE_UNSUSPEND_ALL:
-                case ScheduleRedux.REMINDER_SCHEDULE_SUSPEND_ALL:
-                case ScheduleRedux.REPORT_SCHEDULE_ADD:
-                case ScheduleRedux.REPORT_SCHEDULE_EDIT:
-                case ScheduleRedux.REPORT_SCHEDULE_DELETE:
-                case ScheduleRedux.REPORT_SCHEDULE_SUSPEND:
-                case ScheduleRedux.REPORT_SCHEDULE_UNSUSPEND:
-                case ScheduleRedux.REPORT_SCHEDULE_SUSPEND_ALL:
-                case ScheduleRedux.REPORT_SCHEDULE_UNSUSPEND_ALL:
-                case ScheduleRedux.IPUSHPULL_SCHEDULE_ADD:
-                case ScheduleRedux.IPUSHPULL_SCHEDULE_EDIT:
-                case ScheduleRedux.IPUSHPULL_SCHEDULE_DELETE:
-                case ScheduleRedux.IPUSHPULL_SCHEDULE_SUSPEND:
-                case ScheduleRedux.IPUSHPULL_SCHEDULE_UNSUSPEND:
-                case ScheduleRedux.IPUSHPULL_SCHEDULE_SUSPEND_ALL:
-                case ScheduleRedux.IPUSHPULL_SCHEDULE_UNSUSPEND_ALL:
-                case ScheduleRedux.OPENFIN_SCHEDULE_ADD:
-                case ScheduleRedux.OPENFIN_SCHEDULE_EDIT:
-                case ScheduleRedux.OPENFIN_SCHEDULE_DELETE:
-                case ScheduleRedux.OPENFIN_SCHEDULE_SUSPEND:
-                case ScheduleRedux.OPENFIN_SCHEDULE_UNSUSPEND:
-                case ScheduleRedux.OPENFIN_SCHEDULE_SUSPEND_ALL:
-                case ScheduleRedux.OPENFIN_SCHEDULE_UNSUSPEND_ALL: {
-                    let returnAction = next(action);
-                    let module = (adaptable.adaptableModules.get(ModuleConstants.ScheduleModuleId));
-                    module.setUpScheduleJobs();
+                case ExportRedux.EXPORT_ENSURE_SCHEDULE_UUIDS:
+                case ExportRedux.SCHEDULED_REPORT_ADD:
+                case ExportRedux.SCHEDULED_REPORT_EDIT:
+                case ExportRedux.SCHEDULED_REPORT_DELETE:
+                case ExportRedux.SCHEDULED_REPORT_SUSPEND:
+                case ExportRedux.SCHEDULED_REPORT_UNSUSPEND: {
+                    const returnAction = next(action);
+                    (0, ScheduledJobsMiddlewareHelper_1.refreshScheduledReportJobs)(adaptable);
                     return returnAction;
                 }
                 /*******************
@@ -1071,7 +1059,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case DashboardRedux.DASHBOARD_SET_MODULE_BUTTONS:
                 case DashboardRedux.DASHBOARD_ACTIVE_TAB_INDEX_CHANGE:
                 case DashboardRedux.DASHBOARD_SET_IS_FLOATING:
-                case DashboardRedux.DASHBOARD_SET_IS_INLINE:
                 case DashboardRedux.DASHBOARD_SET_IS_HIDDEN:
                 case DashboardRedux.DASHBOARD_SET_FLOATING_POSITION:
                 case DashboardRedux.DASHBOARD_SET_TABS:
@@ -1305,7 +1292,11 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  */
                 case PlusMinusRedux.PLUS_MINUS_RULE_ADD:
                 case PlusMinusRedux.PLUS_MINUS_RULE_EDIT:
-                case PlusMinusRedux.PLUS_MINUS_RULE_DELETE: {
+                case PlusMinusRedux.PLUS_MINUS_RULE_DELETE:
+                case PlusMinusRedux.PLUS_MINUS_RULE_SUSPEND:
+                case PlusMinusRedux.PLUS_MINUS_RULE_UNSUSPEND:
+                case PlusMinusRedux.PLUS_MINUS_RULE_SUSPEND_ALL:
+                case PlusMinusRedux.PLUS_MINUS_RULE_UNSUSPEND_ALL: {
                     let returnAction = next(action);
                     let module = (adaptable.adaptableModules.get(ModuleConstants.PlusMinusModuleId));
                     if (module) {
@@ -1358,16 +1349,24 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     const actionTyped = action;
                     let report = actionTyped.report;
                     let currentReport = middlewareAPI.getState().Export.CurrentReport;
+                    const returnAction = next(action);
                     if (report && report.Name == currentReport) {
                         adaptable.api.exportApi.clearReport();
                     }
-                    return next(action);
+                    (0, ScheduledJobsMiddlewareHelper_1.refreshScheduledReportJobs)(adaptable);
+                    return returnAction;
                 }
                 /*******************
                  * CHARTING ACTIONS
                  *******************/
+                case ChartingRedux.CHARTING_DELETE_CHART: {
+                    const deleteAction = action;
+                    (0, chartingHelper_1.closeAgChartDefinitionIfOpen)(adaptable.api, deleteAction.chartDefinition);
+                    return next(action);
+                }
                 case ChartingRedux.CHARTING_DELETE_EXTERNAL_CHART: {
                     const returnAction = next(action);
+                    (0, chartingHelper_1.closeExternalChartDefinitionIfOpen)(adaptable.api, returnAction.chartDefinition);
                     adaptable.api.chartingApi.internalApi.onDeleteExternalChart(returnAction.chartDefinition);
                     return returnAction;
                 }