@adaptabletools/adaptable 23.0.0-canary.8 → 23.0.0-canary.9

package/index.css

@@ -582,9 +582,6 @@
   .twa\:inline-flex {
     display: inline-flex;
   }
-  .twa\:inline-grid {
-    display: inline-grid;
-  }
   .twa\:field-sizing-content {
     field-sizing: content;
   }
@@ -1274,9 +1271,6 @@
   .twa\:grid-cols-\[4\.5rem_1fr\] {
     grid-template-columns: 4.5rem 1fr;
   }
-  .twa\:grid-cols-\[160px_140px_140px\] {
-    grid-template-columns: 160px 140px 140px;
-  }
   .twa\:grid-cols-\[auto_1fr\] {
     grid-template-columns: auto 1fr;
   }
@@ -5852,7 +5846,18 @@
     --ab-icon-fill: currentColor;
     --ab-custom-scrollbar-size: 10px;
     --ab-grid-row-height: 35px;
-    --ab-cmp-column-tag__background: #d8e0e8;
+    --ab-cmp-column-tag__background: var(--ab-color-primary);
+  }
+  @supports (color: color-mix(in lab, red, red)) {
+    :root {
+      --ab-cmp-column-tag__background: color-mix(
+    in srgb,
+    var(--ab-color-primary) 80%,
+    var(--ab-color-accent)
+  );
+    }
+  }
+  :root {
     --ab-cmp-column-tag__foreground: var(--ab-color-primary-foreground);
     --ab-loaded: 777;
     --ab_flex-direction: column;
@@ -7488,7 +7493,7 @@
   .ab-Tag {
     max-width: 100%;
   }
-  .ab-Tag.ab-Tag--column {
+  .ab-Tag--column {
     background: var(--ab-cmp-column-tag__background);
     color: var(--ab-cmp-column-tag__foreground, inherit);
   }
@@ -9007,11 +9012,16 @@
   .ab--theme-dark {
     --ab-color-secondary: oklch(0.269 0 0);
     --ab-color-secondary-foreground: oklch(0.985 0 0);
-    --ab-color-destructive: oklch(0.396 0.141 25.723);
-    --ab-color-destructive-foreground: oklch(0.637 0.237 25.331);
     --ab-color-border: oklch(0.269 0 0);
     --ab-theme-loaded: dark;
-    --ab-color-input-background: color-mix(in srgb, var(--ab-color-background) 95%, black);
+    --ab-color-input-background: var(--ab-color-background);
+  }
+  @supports (color: color-mix(in lab, red, red)) {
+    .ab--theme-dark {
+      --ab-color-input-background: color-mix(in srgb, var(--ab-color-background) 95%, black);
+    }
+  }
+  .ab--theme-dark {
     --ab-cmp-input--disabled__background: #232323;
     --ab-color-background: var(--ab-color-defaultbackground, #474c52);
     --ab-color-foreground: var(--ab-color-text-on-defaultbackground, #e2e2e2);
@@ -9021,13 +9031,18 @@
     --ab-color-primarydark: #1c2021;
     --ab-color-card: #51555a;
     --ab-color-card-foreground: var(--ab-color-foreground);
-    --ab-cmp-draggable-list-item__background: color-mix(
+    --ab-cmp-draggable-list-item__background: var(--ab-color-primary);
+  }
+  @supports (color: color-mix(in lab, red, red)) {
+    .ab--theme-dark {
+      --ab-cmp-draggable-list-item__background: color-mix(
       in srgb,
       var(--ab-color-primary) 72%,
       var(--ab-color-primarylight)
     );
-    --ab-cmp-column-tag__background: #6f7882;
-    --ab-cmp-column-tag__foreground: var(--ab-color-primary-foreground);
+    }
+  }
+  .ab--theme-dark {
     --ab-color-palette-1: #5c1a1a;
     --ab-color-palette-2: #ffb4b4;
     --ab-color-palette-3: #4a3b00;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "23.0.0-canary.8",
+  "version": "23.0.0-canary.9",
   "description": "Powerful AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/{Utilities → AdaptableState/Aggregations}/weightedAverage.js

@@ -1,4 +1,4 @@
-import toNumber from './utils/toNumber';
+import { toNumber } from '../../Utilities/Extensions/NumberExtensions';
 export const getNumericValue = (input) => {
     if (typeof input === 'number') {
         return input;

package/src/AdaptableState/Common/Enums.d.ts

@@ -4,17 +4,10 @@ export declare enum MathOperation {
     Multiply = "Multiply",
     Divide = "Divide"
 }
-export declare enum ScheduleType {
-    Reminder = "Reminder"
-}
 export declare enum SortOrder {
     Asc = "Asc",
     Desc = "Desc"
 }
-export declare enum SelectionMode {
-    Multi = "Multi",
-    Single = "Single"
-}
 export declare enum FontWeight {
     Normal = "Normal",
     Bold = "Bold"
@@ -49,8 +42,3 @@ export declare enum SummaryOperation {
     Std_Deviation = "Std Deviation",
     Only = "Only"
 }
-export declare enum ChangeDirection {
-    Up = "Up",
-    Down = "Down",
-    Neutral = "Neutral"
-}

package/src/AdaptableState/Common/Enums.js

@@ -7,20 +7,11 @@ export var MathOperation;
     MathOperation["Divide"] = "Divide";
 })(MathOperation || (MathOperation = {}));
 // Enums used in Strategies
-export var ScheduleType;
-(function (ScheduleType) {
-    ScheduleType["Reminder"] = "Reminder";
-})(ScheduleType || (ScheduleType = {}));
 export var SortOrder;
 (function (SortOrder) {
     SortOrder["Asc"] = "Asc";
     SortOrder["Desc"] = "Desc";
 })(SortOrder || (SortOrder = {}));
-export var SelectionMode;
-(function (SelectionMode) {
-    SelectionMode["Multi"] = "Multi";
-    SelectionMode["Single"] = "Single";
-})(SelectionMode || (SelectionMode = {}));
 export var FontWeight;
 (function (FontWeight) {
     FontWeight["Normal"] = "Normal";
@@ -61,9 +52,3 @@ export var SummaryOperation;
     SummaryOperation["Std_Deviation"] = "Std Deviation";
     SummaryOperation["Only"] = "Only";
 })(SummaryOperation || (SummaryOperation = {}));
-export var ChangeDirection;
-(function (ChangeDirection) {
-    ChangeDirection["Up"] = "Up";
-    ChangeDirection["Down"] = "Down";
-    ChangeDirection["Neutral"] = "Neutral";
-})(ChangeDirection || (ChangeDirection = {}));

package/src/{Utilities → AdaptableState/Common}/MenuItem.d.ts

@@ -1,8 +1,8 @@
 import * as Redux from 'redux';
-import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from '../AdaptableState/Common/Menu';
-import { AdaptableModule } from '../AdaptableState/Common/Types';
-import { AdaptableIcon, AdaptableSystemIconName } from '../AdaptableState/Common/AdaptableIcon';
+import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
+import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from './Menu';
+import { AdaptableModule } from './Types';
+import { AdaptableIcon, AdaptableSystemIconName } from './AdaptableIcon';
 export declare class MenuItemDoReduxAction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
     constructor(name: MENU_TYPE_NAME, label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
     name: MENU_TYPE_NAME;

package/src/{Utilities → AdaptableState/Common}/MenuItem.js

@@ -1,4 +1,4 @@
-import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
+import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
 // A menu item which performs a Redux Action when it is clicke
 export class MenuItemDoReduxAction {
     constructor(name, label, module, reduxAction, icon, isVisible) {

package/src/AdaptableState/StyledColumns/BulletChartStyle.d.ts

@@ -1,6 +1,6 @@
 import { CellFontStyle } from '../Common/AdaptableStyle';
-import { BarChartCellTextProperties } from './Common/BarChartCellText';
-import { BarChartMarker } from './Common/BarChartMarker';
+import { BarStyleCellTextProperties } from './Common/BarStyleProperties';
+import { BarStyleMarker } from './Common/BarStyleProperties';
 import { CellTextOptions } from './Common/CellTextOptions';
 import { NumericStyledColumn } from './Common/NumericStyledColumn';
 /**
@@ -61,7 +61,7 @@ export interface BulletChartStyle extends NumericStyledColumn {
     /**
      * Optional cell-text overlay configuration.
      */
-    CellTextProperties?: BarChartCellTextProperties;
+    CellTextProperties?: BarStyleCellTextProperties;
     /**
      * Tooltip content - same tokens (`'CellValue'`, `'PercentageValue'`) as
      * Percent Bar.
@@ -119,7 +119,7 @@ export interface BulletChartTargetProperties {
      * When `Target` is an array, this style applies to all markers; pass a
      * `Target` object with its own `Marker` property to override per-marker.
      */
-    Marker?: BarChartMarker;
+    Marker?: BarStyleMarker;
 }
 /**
  * A single Bullet Chart target. Either a primitive resolvable value (number /
@@ -139,7 +139,7 @@ export interface BulletChartTargetDefinition {
     /**
      * Per-target marker override. Falls back to `BulletChartTargetProperties.Marker`.
      */
-    Marker?: BarChartMarker;
+    Marker?: BarStyleMarker;
     /**
      * Optional label displayed in the tooltip alongside the marker value.
      */

package/src/AdaptableState/StyledColumns/Common/{BarChartCellText.d.ts → BarStyleProperties.d.ts}

@@ -1,3 +1,27 @@
+/**
+ * Marker primitives shared by bar-chart-style Styled Columns —
+ * Bullet Chart target markers and Range Bar value / reference markers.
+ */
+/**
+ * Visual style of a marker drawn on a bar-chart-style track or bar — used by
+ * Bullet Chart target markers and Range Bar value / reference markers.
+ */
+export interface BarStyleMarker {
+    /**
+     * Marker shape.
+     */
+    Shape?: 'Line' | 'Triangle' | 'Dot' | 'Diamond';
+    /**
+     * Marker colour. Defaults to the current text colour.
+     *
+     * @defaultValue 'var(--ab-color-text)'
+     */
+    Color?: string;
+    /**
+     * Line thickness (for `Shape: 'Line'`) or shape size in px.
+     */
+    Size?: number;
+}
 /**
  * Per-value cell-text overlay layout shared by Percent Bar, Bullet Chart
  * and Range Bar styles. Each token (`CellValue`, `PercentValue`) can be
@@ -6,29 +30,29 @@
 /**
  * Horizontal alignment for cell text (Cell or Percent) in Percent, Range Bar & Bullet styles (Left, Center, Right)
  */
-export type BarChartCellTextHorizontalAlignment = 'Left' | 'Center' | 'Right';
+export type BarStyleCellTextHorizontalAlignment = 'Left' | 'Center' | 'Right';
 /**
  * Vertical alignment for cell text value relative to bar/chart (Above, Below, Merged)
  */
-export type BarChartCellTextVerticalAlignment = 'Above' | 'Below' | 'Merged';
+export type BarStyleCellTextVerticalAlignment = 'Above' | 'Below' | 'Merged';
 /**
  * Placement of cell text value (Cell or Percent) around the bar/chart
  *
  * @defaultValue `{ Horizontal: 'Left', Vertical: 'Below' }`
  */
-export interface BarChartCellTextPlacement {
+export interface BarStyleCellTextPlacement {
     /**
      * Horizontal alignment within its vertical band.
      *
      * @defaultValue 'Left'
      */
-    Horizontal?: BarChartCellTextHorizontalAlignment;
+    Horizontal?: BarStyleCellTextHorizontalAlignment;
     /**
      * Vertical position relative to the bar/chart.
      *
      * @defaultValue 'Below'
      */
-    Vertical?: BarChartCellTextVerticalAlignment;
+    Vertical?: BarStyleCellTextVerticalAlignment;
 }
 /**
  * Per-value cell-text layout: each value (Cell Value, Percent Value) can be
@@ -38,23 +62,23 @@ export interface BarChartCellTextPlacement {
  * same horizontal slot at the same vertical position they are concatenated with
  * a single space (Cell Value first, then Percent Value).
  */
-export interface BarChartCellTextLayout {
+export interface BarStyleCellTextLayout {
     /**
      * Placement of the formatted cell value.
      */
-    CellValue?: BarChartCellTextPlacement;
+    CellValue?: BarStyleCellTextPlacement;
     /**
      * Placement of the percent value (the cell value's position along the bar's
      * `[min, max]` scale as a 0–100% reading).
      */
-    PercentValue?: BarChartCellTextPlacement;
+    PercentValue?: BarStyleCellTextPlacement;
 }
 /**
  * Cell-text overlay configuration shared by Percent Bar, Range Bar and Bullet Chart.
  */
-export interface BarChartCellTextProperties {
+export interface BarStyleCellTextProperties {
     /**
      * Per-value placement on the 3 × 3 grid around / on the bar/chart.
      */
-    CellTextLayout?: BarChartCellTextLayout;
+    CellTextLayout?: BarStyleCellTextLayout;
 }

package/src/AdaptableState/StyledColumns/GradientStyle.d.ts

@@ -4,7 +4,7 @@ import { NumericStyledColumn } from './Common/NumericStyledColumn';
 /**
  * Colours for a zero-centred diverging gradient: negative and positive bands that meet at `0`
  */
-export interface GradientZeroCentredColors {
+export interface ZeroCentredColors {
     /**
      * Colour applied to negative cell values (`Col-Min`…`0`)
      */
@@ -21,7 +21,7 @@ export interface GradientStyle extends NumericStyledColumn {
     /**
      * Zero-centred diverging gradient (`Col-Min`…`0` and `0`…`Col-Max`
      */
-    ZeroCentred?: GradientZeroCentredColors;
+    ZeroCentred?: ZeroCentredColors;
     /**
      * Alpha (0–1) at **low** end of the matched range’s scale
      *

package/src/AdaptableState/StyledColumns/PercentBarStyle.d.ts

@@ -1,5 +1,5 @@
 import { CellFontStyle } from '../Common/AdaptableStyle';
-import { BarChartCellTextProperties } from './Common/BarChartCellText';
+import { BarStyleCellTextProperties } from './Common/BarStyleProperties';
 import { CellTextOptions } from './Common/CellTextOptions';
 import { NumericStyledColumn } from './Common/NumericStyledColumn';
 /**
@@ -9,7 +9,7 @@ export interface PercentBarStyle extends NumericStyledColumn {
     /**
      * Optional cell-text overlay configuration (display tokens, position, layout, alignment).
      */
-    CellTextProperties?: BarChartCellTextProperties;
+    CellTextProperties?: BarStyleCellTextProperties;
     /**
      * Whether Tooltip shows Cell Value, Percent Value, both or none
      */

package/src/AdaptableState/StyledColumns/RangeBarStyle.d.ts

@@ -1,5 +1,5 @@
-import { BarChartCellTextProperties } from './Common/BarChartCellText';
-import { BarChartMarker } from './Common/BarChartMarker';
+import { BarStyleCellTextProperties } from './Common/BarStyleProperties';
+import { BarStyleMarker } from './Common/BarStyleProperties';
 import { CellTextOptions } from './Common/CellTextOptions';
 import { DynamicRangeEndpoint, NumericStyledColumn } from './Common/NumericStyledColumn';
 /**
@@ -62,7 +62,7 @@ export interface RangeBarStyle extends NumericStyledColumn {
      *
      * @defaultValue `{ Shape: 'Diamond', Color: 'var(--ab-color-accent)', Size: 8 }`
      */
-    Marker?: BarChartMarker;
+    Marker?: BarStyleMarker;
     /**
      * Behaviour when the cell value falls outside `[Min, Max]`, plus the
      * optional marker colour override used by `Mode: 'Clamp'`.
@@ -88,7 +88,7 @@ export interface RangeBarStyle extends NumericStyledColumn {
     /**
      * Optional cell-text overlay configuration.
      */
-    CellTextProperties?: BarChartCellTextProperties;
+    CellTextProperties?: BarStyleCellTextProperties;
     /**
      * Tooltip content — same tokens (`'CellValue'`, `'PercentageValue'`)
      * as Percent Bar / Bullet Chart.
@@ -110,7 +110,7 @@ export interface RangeBarReferenceProperties {
      *
      * @defaultValue `{ Shape: 'Line', Color: 'var(--ab-color-foreground)', Size: 2 }`
      */
-    Marker?: BarChartMarker;
+    Marker?: BarStyleMarker;
 }
 /**
  * Out-of-range behaviour for a Range Bar.

package/src/Api/Implementation/AlertApiImpl.js

@@ -8,7 +8,7 @@ import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import { AlertInternalApi } from '../Internal/AlertInternalApi';
 import { resolveContainerElement } from '../../Utilities/resolveContainerElement';
-import { isRuleBasedAlertDefinition } from '../../Utilities/Helpers/ScheduledAlertHelper';
+import { isRuleBasedAlertDefinition } from '../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 export class AlertApiImpl extends ApiBase {
     internalApi;
     constructor(_adaptable) {

package/src/Api/Implementation/ChartingApiImpl.js

@@ -4,7 +4,7 @@ import { ChartingGetChartModels } from './../../Redux/ActionsReducers/ChartingRe
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import { ChartingInternalApi } from '../Internal/ChartingInternalApi';
 import ObjectFactory from '../../Utilities/ObjectFactory';
-import { validateChartName } from '../../Utilities/Helpers/chartingHelper';
+import { validateChartName } from '../../Utilities/Helpers/ChartHelper';
 export class ChartingApiImpl extends ApiBase {
     /**
      * @internal

package/src/Api/Implementation/ExportApiImpl.js

@@ -1,5 +1,5 @@
 import * as ExportRedux from '../../Redux/ActionsReducers/ExportRedux';
-import { getScheduledReports } from '../../Utilities/Helpers/ScheduledReportHelper';
+import { getScheduledReports } from '../../Utilities/Helpers/Scheduling/ScheduledReportHelper';
 import { ApiBase } from './ApiBase';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { ExportInternalApi } from '../Internal/ExportInternalApi';

package/src/Api/Implementation/LayoutHelpers.js

@@ -1,4 +1,4 @@
-import isEqual from '../../Utilities/utils/isEqual';
+import { isEqual } from '../../Utilities/Extensions/ObjectExtensions';
 import { isPivotLayoutModel } from '../../layout-manager/src/isPivotLayoutModel';
 import { normalizeTableLayoutModel, normalizePivotLayoutModel, } from '../../layout-manager/src/normalizeLayoutModel';
 import { simplifyTableLayoutModel, simplifyPivotLayoutModel, } from '../../layout-manager/src/simplifyLayoutModel';

package/src/Api/Implementation/QuickSearchApiImpl.js

@@ -1,7 +1,7 @@
 import * as QuickSearchRedux from '../../Redux/ActionsReducers/QuickSearchRedux';
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
-import { resolveQuickSearchCellMatchStyle, resolveQuickSearchCurrentTextMatchStyle, resolveQuickSearchTextMatchStyle, } from '../../Utilities/Helpers/QuickSearchStyleHelper';
+import { resolveQuickSearchCellMatchStyle, resolveQuickSearchCurrentTextMatchStyle, resolveQuickSearchTextMatchStyle, } from '../../Utilities/Helpers/QuickSearchHelper';
 import { ApiBase } from './ApiBase';
 export class QuickSearchApiImpl extends ApiBase {
     getQuickSearchState() {

package/src/Api/Implementation/ThemeApiImpl.js

@@ -4,7 +4,7 @@ import { ApiBase } from './ApiBase';
 import { ThemeInternalApi } from '../Internal/ThemeInternalApi';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 import { logDeprecation } from '../../Utilities/logDeprecation';
-import { systemThemeEntryToAdaptableTheme } from '../../Utilities/Helpers/ThemeHelpers';
+import { systemThemeEntryToAdaptableTheme } from '../../Utilities/Helpers/ThemeHelper';
 export class ThemeApiImpl extends ApiBase {
     internalApi;
     constructor(_adaptable) {

package/src/Api/Internal/ActionColumnInternalApi.js

@@ -2,7 +2,7 @@ import { ApiBase } from '../Implementation/ApiBase';
 import { createUuid } from '../../AdaptableState/Uuid';
 import { ActionColumnRenderer, ReactActionColumnRenderer, } from '../../agGrid/cellRenderers/ActionColumnRenderer';
 import { ACTION_COLUMN_TYPE } from '../../AdaptableState/Common/AdaptableColumn';
-import { calculateActionColumnWidth } from '../../Utilities/Helpers/ActionColumnWidthHelper';
+import { calculateActionColumnWidth } from '../../Utilities/Helpers/ActionColumnHelper';
 export class ActionColumnInternalApi extends ApiBase {
     getColDefsForActionColumns() {
         const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();

package/src/Api/Internal/AlertInternalApi.js

@@ -5,7 +5,7 @@ import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { AlertModuleId } from '../../Utilities/Constants/ModuleConstants';
 import { isCellDataChangedInfo } from '../../Utilities/Services/Interface/IAlertService';
 import ObjectFactory from '../../Utilities/ObjectFactory';
-import { isRuleBasedAlertDefinition, getRuleAlertProperties, } from '../../Utilities/Helpers/ScheduledAlertHelper';
+import { isRuleBasedAlertDefinition, getRuleAlertProperties, } from '../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 import Helper from '../../Utilities/Helpers/Helper';
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';

package/src/Api/Internal/ChartingInternalApi.js

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { isChartNameTaken } from '../../Utilities/Helpers/chartingHelper';
+import { isChartNameTaken } from '../../Utilities/Helpers/ChartHelper';
 export class ChartingInternalApi extends ApiBase {
     getContainerElement(chartContainer) {
         const element = typeof chartContainer?.element === 'string'

package/src/Api/Internal/ColumnInternalApi.js

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { AG_GRID_GROUPED_COLUMN } from '../../Utilities/Constants/GeneralConstants';
-import uniq from '../../Utilities/utils/uniq';
+import { uniq } from '../../Utilities/Extensions/ArrayExtensions';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import { isPivotGrandTotal, isPivotResultColumn } from '../Implementation/ColumnApiImpl';
 import { destructurePivotColumnId } from '../../layout-manager/src/destructurePivotColumnId';

package/src/Api/Internal/EventInternalApi.js

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import isEqual from '../../Utilities/utils/isEqual';
+import { isEqual } from '../../Utilities/Extensions/ObjectExtensions';
 export class EventInternalApi extends ApiBase {
     fireGridSortedEvent() {
         if (this.isAdapTableReady()) {

package/src/Api/Internal/ExportInternalApi.js

@@ -3,7 +3,7 @@ import { createGrid, } from 'ag-grid-enterprise';
 import { createUuid } from '../../AdaptableState/Uuid';
 import { ALL_DATA_REPORT, CURRENT_LAYOUT_REPORT, SELECTED_DATA_REPORT, SYSTEM_EXPORT_DESTINATIONS, SYSTEM_REPORT_NAMES, } from '../../Utilities/Constants/GeneralConstants';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
-import { DateFormatter } from '../../Utilities/Helpers/FormatHelper';
+import { DateFormatter } from '../../Utilities/Helpers/DisplayFormatHelper';
 import Helper from '../../Utilities/Helpers/Helper';
 import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
 import { SystemExportBegin, SystemExportEnd } from '../../Redux/ActionsReducers/InternalRedux';

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
-import FormatHelper from '../../Utilities/Helpers/FormatHelper';
+import FormatHelper from '../../Utilities/Helpers/DisplayFormatHelper';
 import ObjectFactory from '../../Utilities/ObjectFactory';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { errorOnce } from '../../agGrid/AdaptableLogger';

package/src/Api/Internal/GridInternalApi.js

@@ -3,7 +3,7 @@ import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { getDateComparatorForGridCell, getGenericComparatorForGridCell, getNumericComparatorForGridCell, sortCellValueArrayNumeric, sortCellValueArrayDates, sortCellValueArray, } from '../../Utilities/Extensions/ArrayExtensions';
 import { multisort } from '@infinite-table/infinite-react';
 import { convertAdaptableStyleToCSS } from '../../Utilities/Helpers/StyleHelper';
-import { getRuleAlertProperties } from '../../Utilities/Helpers/ScheduledAlertHelper';
+import { getRuleAlertProperties } from '../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 import UIHelper from '../../View/UIHelper';
 import { ApiBase } from '../Implementation/ApiBase';
 export class GridInternalApi extends ApiBase {

package/src/Api/Internal/StyledColumnInternalApi.js

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
-import { expandGradientCellRanges, gradientStyleRangeLookupValueType } from '../../Utilities/Helpers/StyledColumnGradientHelper';
+import { expandGradientCellRanges, gradientStyleRangeLookupValueType } from '../../Utilities/Helpers/StyledColumns/GradientStyleHelper';
 const DYNAMIC_RANGE_ENDPOINTS = [
     'Col-Min',
     'Col-Max',

package/src/Redux/ActionsReducers/ExportRedux.js

@@ -1,6 +1,6 @@
 import { EMPTY_ARRAY } from '../../Utilities/Constants/GeneralConstants';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
-import { ensureExportStateSchedulesUuids, normalizeScheduledReportSchedule, replaceScheduledReportScheduleInList, } from '../../Utilities/Helpers/ScheduledReportHelper';
+import { ensureExportStateSchedulesUuids, normalizeScheduledReportSchedule, replaceScheduledReportScheduleInList, } from '../../Utilities/Helpers/Scheduling/ScheduledReportHelper';
 import { changeIsSuspendInList } from './utils';
 /**
  * @ReduxAction A Report has been selected

package/src/Redux/ActionsReducers/InternalRedux.js

@@ -2,7 +2,7 @@ import { EMPTY_ARRAY, EMPTY_STRING } from '../../Utilities/Constants/GeneralCons
 import { CELL_SUMMARY_DEFAULT_OPERATION } from '../../Utilities/Constants/ReduxConstants';
 import { MathOperation } from '../../AdaptableState/Common/Enums';
 import { cloneObject } from '../../Utilities/Helpers/Helper';
-import { getRuleAlertProperties } from '../../Utilities/Helpers/ScheduledAlertHelper';
+import { getRuleAlertProperties } from '../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 import { AnnotationsService } from '../../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,4 +1,4 @@
-import debounce from '../../Utilities/utils/debounce';
+import { debounce } from '../../Utilities/Helpers/TimingHelper';
 import { MergeStateFunction } from './AdaptableReduxMerger';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
 import { buildAdaptableStateFunctionConfig } from './buildAdaptableStateFunctionConfig';

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -1,7 +1,5 @@
-import mergeWith from '../../Utilities/utils/mergeWith';
-import merge from '../../Utilities/utils/merge';
-import isArray from '../../Utilities/utils/isArray';
-import isObject from '../../Utilities/utils/isObject';
+import { isArray } from '../../Utilities/Extensions/ArrayExtensions';
+import { isObject, merge, mergeWith, } from '../../Utilities/Extensions/ObjectExtensions';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 function customizer(objValue, srcValue) {

package/src/Redux/Store/AdaptableStore.js

@@ -5,9 +5,9 @@ import { PROGRESS_INDICATOR_HIDE, PROGRESS_INDICATOR_SHOW } from '../ActionsRedu
 import { createEngine as createEngineLocal } from './AdaptableReduxLocalStorageEngine';
 import { mergeReducer } from './AdaptableReduxMerger';
 import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../AdaptableState/Common/AdaptableAlert';
-import { closeAgChartDefinitionIfOpen, closeExternalChartDefinitionIfOpen, } from '../../Utilities/Helpers/chartingHelper';
-import { refreshScheduledAlertJobs, refreshScheduledReportJobs, } from '../../Utilities/Helpers/ScheduledJobsMiddlewareHelper';
-import { getRuleAlertProperties, isScheduledAlertDefinition, } from '../../Utilities/Helpers/ScheduledAlertHelper';
+import { closeAgChartDefinitionIfOpen, closeExternalChartDefinitionIfOpen, } from '../../Utilities/Helpers/ChartHelper';
+import { refreshScheduledAlertJobs, refreshScheduledReportJobs, } from '../../Utilities/Helpers/Scheduling/ScheduledJobsMiddlewareHelper';
+import { getRuleAlertProperties, isScheduledAlertDefinition, } from '../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 import { ERROR_LAYOUT } from '../../Utilities/Constants/GeneralConstants';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import Emitter from '../../Utilities/Emitter';

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

@@ -1,4 +1,4 @@
-import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction, } from '../Utilities/MenuItem';
+import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction, } from '../AdaptableState/Common/MenuItem';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import { ACCESS_LEVEL_FULL, ACCESS_LEVEL_HIDDEN, ACCESS_LEVEL_READ_ONLY, } from '../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

@@ -15,8 +15,8 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { getAlertBehaviourViewItems } from './Utilities/Alert/getAlertBehaviourViewItems';
 import { getAlertPreviewViewItems } from './Utilities/Alert/getAlertPreviewViewItems';
 import { getAlertTypeViewItems } from './Utilities/Alert/getAlertTypeViewItems';
-import { getActiveScheduledAlertDefinitions, isRuleBasedAlertDefinition, isScheduledAlertDefinition, } from '../Utilities/Helpers/ScheduledAlertHelper';
-import { createScheduleJobManager } from '../Utilities/Helpers/ScheduleJobManager';
+import { getActiveScheduledAlertDefinitions, isRuleBasedAlertDefinition, isScheduledAlertDefinition, } from '../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
+import { createScheduleJobManager } from '../Utilities/Helpers/Scheduling/ScheduleJobManager';
 import UIHelper from '../View/UIHelper';
 export class AlertModule extends AdaptableModuleBase {
     isListeningToCellDataChanges;