@adaptabletools/adaptable-cjs 23.0.0-canary.7 → 23.0.0-canary.9

package/src/Api/Internal/ActionColumnInternalApi.js

@@ -5,7 +5,7 @@ const ApiBase_1 = require("../Implementation/ApiBase");
 const Uuid_1 = require("../../AdaptableState/Uuid");
 const ActionColumnRenderer_1 = require("../../agGrid/cellRenderers/ActionColumnRenderer");
 const AdaptableColumn_1 = require("../../AdaptableState/Common/AdaptableColumn");
-const ActionColumnWidthHelper_1 = require("../../Utilities/Helpers/ActionColumnWidthHelper");
+const ActionColumnHelper_1 = require("../../Utilities/Helpers/ActionColumnHelper");
 class ActionColumnInternalApi extends ApiBase_1.ApiBase {
     getColDefsForActionColumns() {
         const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();
@@ -25,7 +25,7 @@ class ActionColumnInternalApi extends ApiBase_1.ApiBase {
             const actionButtons = Array.isArray(actionColumn.actionColumnButton)
                 ? actionColumn.actionColumnButton
                 : [actionColumn.actionColumnButton];
-            const resolvedWidth = (0, ActionColumnWidthHelper_1.calculateActionColumnWidth)(actionColumn, actionButtons);
+            const resolvedWidth = (0, ActionColumnHelper_1.calculateActionColumnWidth)(actionColumn, actionButtons);
             const newColDef = {
                 headerName: actionColumn.friendlyName ? actionColumn.friendlyName : actionColumn.columnId,
                 colId: actionColumn.columnId,

package/src/Api/Internal/AlertInternalApi.js

@@ -9,7 +9,7 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Exten
 const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
 const IAlertService_1 = require("../../Utilities/Services/Interface/IAlertService");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/ScheduledAlertHelper");
+const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));

package/src/Api/Internal/ChartingInternalApi.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartingInternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
-const chartingHelper_1 = require("../../Utilities/Helpers/chartingHelper");
+const ChartHelper_1 = require("../../Utilities/Helpers/ChartHelper");
 class ChartingInternalApi extends ApiBase_1.ApiBase {
     getContainerElement(chartContainer) {
         const element = typeof chartContainer?.element === 'string'
@@ -22,7 +22,7 @@ class ChartingInternalApi extends ApiBase_1.ApiBase {
     getUniqueChartName() {
         let index = 1;
         let candidate = `Chart ${index}`;
-        while ((0, chartingHelper_1.isChartNameTaken)(this.getAdaptableApi(), candidate)) {
+        while ((0, ChartHelper_1.isChartNameTaken)(this.getAdaptableApi(), candidate)) {
             index += 1;
             candidate = `Chart ${index}`;
         }

package/src/Api/Internal/ColumnInternalApi.js

@@ -5,7 +5,7 @@ exports.getAutoRowGroupColumnIdFor = getAutoRowGroupColumnIdFor;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const uniq_1 = tslib_1.__importDefault(require("../../Utilities/utils/uniq"));
+const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const ColumnApiImpl_1 = require("../Implementation/ColumnApiImpl");
 const destructurePivotColumnId_1 = require("../../layout-manager/src/destructurePivotColumnId");
@@ -39,7 +39,7 @@ class ColumnInternalApi extends ApiBase_1.ApiBase {
                 colTypes.push(agGridColType);
             }
         });
-        return (0, uniq_1.default)(colTypes).filter((c) => StringExtensions_1.default.IsNotNullOrEmptyOrWhiteSpace(c));
+        return (0, ArrayExtensions_1.uniq)(colTypes).filter((c) => StringExtensions_1.default.IsNotNullOrEmptyOrWhiteSpace(c));
     }
     /**
      * Retrieves a list providing the Friendly Name / Caption for all columns

package/src/Api/Internal/EventInternalApi.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventInternalApi = void 0;
-const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
-const isEqual_1 = tslib_1.__importDefault(require("../../Utilities/utils/isEqual"));
+const ObjectExtensions_1 = require("../../Utilities/Extensions/ObjectExtensions");
 class EventInternalApi extends ApiBase_1.ApiBase {
     fireGridSortedEvent() {
         if (this.isAdapTableReady()) {
@@ -64,7 +63,7 @@ class EventInternalApi extends ApiBase_1.ApiBase {
             isToolbarStateChangedToVisible,
             isToolbarStateChangedToHidden,
         };
-        if (!(0, isEqual_1.default)(oldDashboardState, newDashboardState)) {
+        if (!(0, ObjectExtensions_1.isEqual)(oldDashboardState, newDashboardState)) {
             setTimeout(() => {
                 const eventApi = this.getEventApi();
                 if (eventApi) {
@@ -96,7 +95,7 @@ class EventInternalApi extends ApiBase_1.ApiBase {
         this.getEventApi().emit('ThemeChanged', themeChangedInfo);
     }
     fireLayoutChangedEvent(trigger, oldState, newState) {
-        if ((0, isEqual_1.default)(oldState, newState)) {
+        if ((0, ObjectExtensions_1.isEqual)(oldState, newState)) {
             return;
         }
         const layoutChangedInfo = {

package/src/Api/Internal/ExportInternalApi.js

@@ -7,7 +7,7 @@ const ag_grid_enterprise_1 = require("ag-grid-enterprise");
 const Uuid_1 = require("../../AdaptableState/Uuid");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
-const FormatHelper_1 = require("../../Utilities/Helpers/FormatHelper");
+const DisplayFormatHelper_1 = require("../../Utilities/Helpers/DisplayFormatHelper");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const InternalRedux_1 = require("../../Redux/ActionsReducers/InternalRedux");
@@ -204,7 +204,7 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
         }
         else {
             if (this.getAdaptableApi().optionsApi.getExportOptions().appendFileTimestamp) {
-                fileName = `${fileName}_${(0, FormatHelper_1.DateFormatter)(new Date(), {
+                fileName = `${fileName}_${(0, DisplayFormatHelper_1.DateFormatter)(new Date(), {
                     Pattern: 'yyyyMMdd_HHmmss',
                 })}`;
             }

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -4,7 +4,7 @@ exports.FormatColumnInternalApi = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
-const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
+const DisplayFormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/DisplayFormatHelper"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
@@ -126,7 +126,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      */
     getNumberFormattedValue(value, node, column, options) {
         const preparedValue = this.applyCustomFormatters(value, node, column, options);
-        return FormatHelper_1.default.NumberFormatter(preparedValue, options, node, column, this.getAdaptableApi());
+        return DisplayFormatHelper_1.default.NumberFormatter(preparedValue, options, node, column, this.getAdaptableApi());
     }
     /**
      * Format value according to format options.
@@ -136,7 +136,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      */
     getStringFormattedValue(value, node, column, options) {
         const preparedValue = this.applyCustomFormatters(value, node, column, options);
-        return FormatHelper_1.default.StringFormatter(preparedValue, options, node, column, this.getAdaptableApi());
+        return DisplayFormatHelper_1.default.StringFormatter(preparedValue, options, node, column, this.getAdaptableApi());
     }
     /**
      * Format value according to format options.
@@ -149,7 +149,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         const dateFormatterOptions = options;
         // only use DateFormatter if we have a pattern
         return dateFormatterOptions.Pattern
-            ? FormatHelper_1.default.DateFormatter(preparedValue, options)
+            ? DisplayFormatHelper_1.default.DateFormatter(preparedValue, options)
             : preparedValue;
     }
     applyCustomFormatters(value, node, abColumn, options) {

package/src/Api/Internal/GridInternalApi.js

@@ -7,7 +7,7 @@ const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/
 const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
 const infinite_react_1 = require("@infinite-table/infinite-react");
 const StyleHelper_1 = require("../../Utilities/Helpers/StyleHelper");
-const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/ScheduledAlertHelper");
+const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 const UIHelper_1 = tslib_1.__importDefault(require("../../View/UIHelper"));
 const ApiBase_1 = require("../Implementation/ApiBase");
 class GridInternalApi extends ApiBase_1.ApiBase {

package/src/Api/Internal/StyledColumnInternalApi.d.ts

@@ -1,6 +1,8 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
-import { BadgeStyle, BadgeStyleDefinition, CellColorRange, ColumnComparison, NumericStyledColumn, StyledColumn } from '../../AdaptableState/StyledColumnState';
+import { StyledColumn } from '../../AdaptableState/StyledColumnState';
+import { CellColorRange, ColumnComparison, NumericStyledColumn } from '../../AdaptableState/StyledColumns/Common/NumericStyledColumn';
+import { BadgeStyle, BadgeStyleDefinition } from '../../AdaptableState/StyledColumns/BadgeStyle';
 import { IRowNode } from 'ag-grid-enterprise';
 import { PredicateDefHandlerContext } from '../../types';
 export declare class StyledColumnInternalApi extends ApiBase {

package/src/Api/Internal/StyledColumnInternalApi.js

@@ -4,7 +4,7 @@ exports.StyledColumnInternalApi = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
-const StyledColumnGradientHelper_1 = require("../../Utilities/Helpers/StyledColumnGradientHelper");
+const GradientStyleHelper_1 = require("../../Utilities/Helpers/StyledColumns/GradientStyleHelper");
 const DYNAMIC_RANGE_ENDPOINTS = [
     'Col-Min',
     'Col-Max',
@@ -65,8 +65,8 @@ class StyledColumnInternalApi extends ApiBase_1.ApiBase {
         // for Gradient Column we want just the range that contains cell value
         if (styledColumn.GradientStyle) {
             const gs = styledColumn.GradientStyle;
-            const ranges = (0, StyledColumnGradientHelper_1.expandGradientCellRanges)(gs);
-            const lookupType = (0, StyledColumnGradientHelper_1.gradientStyleRangeLookupValueType)(gs);
+            const ranges = (0, GradientStyleHelper_1.expandGradientCellRanges)(gs);
+            const lookupType = (0, GradientStyleHelper_1.gradientStyleRangeLookupValueType)(gs);
             const range = this.findRangeForColumn(ranges, column, lookupType, cellValue);
             return this.getCellColorRangeMinValue(range, column, lookupType);
         }
@@ -142,8 +142,8 @@ class StyledColumnInternalApi extends ApiBase_1.ApiBase {
         }
         if (styledColumn.GradientStyle) {
             const gs = styledColumn.GradientStyle;
-            const ranges = (0, StyledColumnGradientHelper_1.expandGradientCellRanges)(gs);
-            const lookupType = (0, StyledColumnGradientHelper_1.gradientStyleRangeLookupValueType)(gs);
+            const ranges = (0, GradientStyleHelper_1.expandGradientCellRanges)(gs);
+            const lookupType = (0, GradientStyleHelper_1.gradientStyleRangeLookupValueType)(gs);
             let range = this.findRangeForColumn(ranges, column, lookupType, cellValue);
             return this.getCellColorRangeMaxValue(range, column, lookupType);
         }
@@ -284,7 +284,7 @@ class StyledColumnInternalApi extends ApiBase_1.ApiBase {
         let rangeValueType = 'Number';
         if (styledColumn.GradientStyle) {
             if (styledColumn.GradientStyle.ZeroCentred) {
-                cellColorRange = (0, StyledColumnGradientHelper_1.expandGradientCellRanges)(styledColumn.GradientStyle);
+                cellColorRange = (0, GradientStyleHelper_1.expandGradientCellRanges)(styledColumn.GradientStyle);
             }
             else if (styledColumn.GradientStyle?.CellRanges) {
                 cellColorRange = styledColumn.GradientStyle.CellRanges;

package/src/Redux/ActionsReducers/ExportRedux.js

@@ -4,7 +4,7 @@ exports.ExportReducer = exports.ScheduledReportJobRun = exports.ScheduledReportU
 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 ScheduledReportHelper_1 = require("../../Utilities/Helpers/Scheduling/ScheduledReportHelper");
 const utils_1 = require("./utils");
 /**
  * @ReduxAction A Report has been selected

package/src/Redux/ActionsReducers/InternalRedux.js

@@ -7,7 +7,7 @@ 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 ScheduledAlertHelper_1 = require("../../Utilities/Helpers/Scheduling/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

package/src/Redux/Store/AdaptableReduxLocalStorageEngine.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEngine = createEngine;
-const tslib_1 = require("tslib");
-const debounce_1 = tslib_1.__importDefault(require("../../Utilities/utils/debounce"));
+const TimingHelper_1 = require("../../Utilities/Helpers/TimingHelper");
 const AdaptableReduxMerger_1 = require("./AdaptableReduxMerger");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 const buildAdaptableStateFunctionConfig_1 = require("./buildAdaptableStateFunctionConfig");
@@ -45,7 +44,7 @@ class AdaptableReduxLocalStorageEngine {
         this.persistState = config.persistState;
         this.save =
             config.debounceStateDelay > 0
-                ? (0, debounce_1.default)(this.save, config.debounceStateDelay, {
+                ? (0, TimingHelper_1.debounce)(this.save, config.debounceStateDelay, {
                     maxWait: 1000,
                 })
                 : this.save;

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -6,14 +6,12 @@ exports.ProcessKeepUserDefinedRevision = ProcessKeepUserDefinedRevision;
 exports.MergeStateFunction = MergeStateFunction;
 exports.MergeState = MergeState;
 const tslib_1 = require("tslib");
-const mergeWith_1 = tslib_1.__importDefault(require("../../Utilities/utils/mergeWith"));
-const merge_1 = tslib_1.__importDefault(require("../../Utilities/utils/merge"));
-const isArray_1 = tslib_1.__importDefault(require("../../Utilities/utils/isArray"));
-const isObject_1 = tslib_1.__importDefault(require("../../Utilities/utils/isObject"));
+const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
+const ObjectExtensions_1 = require("../../Utilities/Extensions/ObjectExtensions");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 function customizer(objValue, srcValue) {
-    if ((0, isArray_1.default)(objValue)) {
+    if ((0, ArrayExtensions_1.isArray)(objValue)) {
         if (!Array.isArray(srcValue)) {
             // TODO AFL: clarify if this is still relevant, after the state & options refactoring
             /**
@@ -24,7 +22,7 @@ function customizer(objValue, srcValue) {
             return srcValue;
         }
         const length = srcValue ? srcValue.length : null;
-        const result = (0, mergeWith_1.default)(objValue, srcValue, customizer);
+        const result = (0, ObjectExtensions_1.mergeWith)(objValue, srcValue, customizer);
         if (length != null) {
             // when merging arrays, lodash result has the length of the
             // longest array, but we don't want that to happen
@@ -130,13 +128,13 @@ function MergeState(oldState, newState) {
         const value = newState[key];
         // Assign if we don't need to merge at all
         if (!result.hasOwnProperty(key)) {
-            result[key] = (0, isObject_1.default)(value) && !Array.isArray(value) ? (0, merge_1.default)({}, value) : value;
+            result[key] = (0, ObjectExtensions_1.isObject)(value) && !Array.isArray(value) ? (0, ObjectExtensions_1.merge)({}, value) : value;
             continue;
         }
         const oldValue = result[key];
-        if ((0, isObject_1.default)(value) && !Array.isArray(value)) {
+        if ((0, ObjectExtensions_1.isObject)(value) && !Array.isArray(value)) {
             // use both lodash functions so that we can merge from State onto Initial Adaptable State where it exists but from the former where it doesnt.
-            result[key] = (0, mergeWith_1.default)({}, oldValue, value, customizer);
+            result[key] = (0, ObjectExtensions_1.mergeWith)({}, oldValue, value, customizer);
         }
         else {
             result[key] = value;

package/src/Redux/Store/AdaptableStore.js

@@ -9,9 +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 ChartHelper_1 = require("../../Utilities/Helpers/ChartHelper");
+const ScheduledJobsMiddlewareHelper_1 = require("../../Utilities/Helpers/Scheduling/ScheduledJobsMiddlewareHelper");
+const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/Scheduling/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"));
@@ -1363,12 +1363,12 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  *******************/
                 case ChartingRedux.CHARTING_DELETE_CHART: {
                     const deleteAction = action;
-                    (0, chartingHelper_1.closeAgChartDefinitionIfOpen)(adaptable.api, deleteAction.chartDefinition);
+                    (0, ChartHelper_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);
+                    (0, ChartHelper_1.closeExternalChartDefinitionIfOpen)(adaptable.api, returnAction.chartDefinition);
                     adaptable.api.chartingApi.internalApi.onDeleteExternalChart(returnAction.chartDefinition);
                     return returnAction;
                 }

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -3,7 +3,7 @@ import { IModule, ModuleInfo, TeamSharingReferences } from './Interface/IModule'
 import { Action } from 'redux';
 import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
-import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction } from '../Utilities/MenuItem';
+import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction } from '../AdaptableState/Common/MenuItem';
 import { AdaptableMenuItem, AdaptableContextMenuItemName, ContextMenuContext, AdaptableColumnMenuItemName } from '../AdaptableState/Common/Menu';
 import { AdaptableModule } from '../AdaptableState/Common/Types';
 import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';

package/src/Strategy/AdaptableModuleBase.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableModuleBase = void 0;
 const tslib_1 = require("tslib");
-const MenuItem_1 = require("../Utilities/MenuItem");
+const MenuItem_1 = require("../AdaptableState/Common/MenuItem");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 /**

package/src/Strategy/AlertModule.d.ts

@@ -4,7 +4,7 @@ import { AdaptableAlert } from '../AdaptableState/Common/AdaptableAlert';
 import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { ContextMenuContext } from '../AdaptableState/Common/Menu';
 import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
-import { MenuItemShowPopup } from '../Utilities/MenuItem';
+import { MenuItemShowPopup } from '../AdaptableState/Common/MenuItem';
 import { LayoutExtendedConfig } from '../types';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';

package/src/Strategy/AlertModule.js

@@ -19,8 +19,8 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const getAlertBehaviourViewItems_1 = require("./Utilities/Alert/getAlertBehaviourViewItems");
 const getAlertPreviewViewItems_1 = require("./Utilities/Alert/getAlertPreviewViewItems");
 const getAlertTypeViewItems_1 = require("./Utilities/Alert/getAlertTypeViewItems");
-const ScheduledAlertHelper_1 = require("../Utilities/Helpers/ScheduledAlertHelper");
-const ScheduleJobManager_1 = require("../Utilities/Helpers/ScheduleJobManager");
+const ScheduledAlertHelper_1 = require("../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
+const ScheduleJobManager_1 = require("../Utilities/Helpers/Scheduling/ScheduleJobManager");
 const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
 class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     isListeningToCellDataChanges;

package/src/Strategy/BulkUpdateModule.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { BulkUpdateValidationResult, IBulkUpdateModule } from './Interface/IBulkUpdateModule';
 import { PreviewInfo } from '../Utilities/Interface/Preview';
-import { MenuItemShowPopup } from '../Utilities/MenuItem';
+import { MenuItemShowPopup } from '../AdaptableState/Common/MenuItem';
 import { ContextMenuContext } from '../AdaptableState/Common/Menu';
 import { AccessLevel, AdaptableApi } from '../types';
 export declare class BulkUpdateModule extends AdaptableModuleBase implements IBulkUpdateModule {

package/src/Strategy/CalculatedColumnModule.d.ts

@@ -20,8 +20,8 @@ export declare class CalculatedColumnModule extends AdaptableModuleBase implemen
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(calculatedColumn: CalculatedColumn): string[];
     getReferencedNamedQueryNames(calculatedColumn: CalculatedColumn): string[];
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
     getTeamSharingAction(): TeamSharingImportInfo<CalculatedColumn>;
     toView(calculateColumn: CalculatedColumn): {
         items: AdaptableObjectItemView[];

package/src/Strategy/CellSummaryModule.d.ts

@@ -21,8 +21,8 @@ export declare class CellSummaryModule extends AdaptableModuleBase implements IC
     isModuleAvailable(): boolean;
     getModuleUnavailableMessage(): string | undefined;
     getViewAccessLevel(): AccessLevel;
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
     createCellSummaryInfo(selectedCellInfo: SelectedCellInfo): CellSummmaryInfo;
     private getNumberFormatOptions;
     private formatValue;

package/src/Strategy/ChartingModule.d.ts

@@ -9,7 +9,7 @@ export declare class ChartingModule extends AdaptableModuleBase implements IModu
     protected getAgGridModuleDependencies(): AgModuleName[];
     onAdaptableReady(): void;
     isModuleEnabled(): boolean;
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
     getModuleAdaptableObjects(): (ChartDefinition | ExternalChartDefinition)[];
     toViewAll(): AdaptableObjectView[];
     toView(chart: ChartDefinition | ExternalChartDefinition): AdaptableObjectView;

package/src/Strategy/ChartingModule.js

@@ -12,7 +12,7 @@ const ChartingState_1 = require("../AdaptableState/ChartingState");
 const Helper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/Helper"));
 const getObjectTagsViewItems_1 = require("../Utilities/getObjectTagsViewItems");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
-const chartingHelper_1 = require("../Utilities/Helpers/chartingHelper");
+const ChartHelper_1 = require("../Utilities/Helpers/ChartHelper");
 class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ChartingModuleId, ModuleConstants.ChartingFriendlyName, 'chart', 'ChartPopup', 'Create AG Grid Charts in order to see Adaptable Data visually', api);
@@ -26,7 +26,7 @@ class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 layoutChangedInfo.newLayoutState.CurrentLayout !==
                     layoutChangedInfo.oldLayoutState?.CurrentLayout) {
                 const layout = this.api.layoutApi.getCurrentLayout();
-                (0, chartingHelper_1.openLayoutCharts)(this.api, layout);
+                (0, ChartHelper_1.openLayoutCharts)(this.api, layout);
             }
         });
         requestAnimationFrame(() => {
@@ -35,10 +35,10 @@ class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             const layout = this.api.layoutApi.getCurrentLayout();
             if (layout?.OpenCharts !== undefined) {
-                (0, chartingHelper_1.openLayoutCharts)(this.api, layout);
+                (0, ChartHelper_1.openLayoutCharts)(this.api, layout);
             }
             else {
-                (0, chartingHelper_1.restoreChartsOnReady)(this.api);
+                (0, ChartHelper_1.restoreChartsOnReady)(this.api);
             }
         });
     }

package/src/Strategy/ColumnInfoModule.d.ts

@@ -6,6 +6,6 @@ import { AdaptableColumn, ContextMenuContext } from '../types';
 export declare class ColumnInfoModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
 }

package/src/Strategy/CommentModule.d.ts

@@ -7,5 +7,5 @@ export declare class CommentModule extends AdaptableModuleBase implements IModul
     onAdaptableReady(): void;
     isModuleEnabled(): boolean;
     private loadComments;
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemDoClickFunction<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../AdaptableState/Common/MenuItem").MenuItemDoClickFunction<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
 }

package/src/Strategy/CustomSortModule.d.ts

@@ -11,7 +11,7 @@ export declare class CustomSortModule extends AdaptableModuleBase implements IMo
     getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(customSort: CustomSort): string[];
     hasNamedQueryReferences(): boolean;
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"custom-sort-add" | "custom-sort-edit">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"custom-sort-add" | "custom-sort-edit">[];
     getTeamSharingAction(): TeamSharingImportInfo<CustomSort>;
     toView(customSort: CustomSort): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];

package/src/Strategy/ExportModule.js

@@ -13,8 +13,8 @@ const ExportSchedulesTab_1 = require("../View/Export/ExportSchedulesTab");
 const getObjectTagsViewItems_1 = require("../Utilities/getObjectTagsViewItems");
 const ExportStatusBar_1 = require("../View/Export/ExportStatusBar");
 const ReportListItem_1 = require("../View/Export/ReportListItem");
-const ScheduledReportHelper_1 = require("../Utilities/Helpers/ScheduledReportHelper");
-const ScheduleJobManager_1 = require("../Utilities/Helpers/ScheduleJobManager");
+const ScheduledReportHelper_1 = require("../Utilities/Helpers/Scheduling/ScheduledReportHelper");
+const ScheduleJobManager_1 = require("../Utilities/Helpers/Scheduling/ScheduleJobManager");
 class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     scheduledReportJobManager;
     constructor(api) {

package/src/Strategy/FlashingCellModule.d.ts

@@ -19,7 +19,7 @@ export declare class FlashingCellModule extends AdaptableModuleBase implements I
     getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(alertDefinition: FlashingCellDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: FlashingCellDefinition): string[];
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemDoReduxAction<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemDoReduxAction<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
     createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
     private isFlashingTargetOnlyAggChange;
     private isAlertPredicateTriggered;