@adaptabletools/adaptable 23.0.0-canary.1 → 23.0.0-canary.10

package/src/Api/Events/ThemeSelected.d.ts

@@ -0,0 +1,11 @@
+import { SystemThemeName } from '../../AdaptableState/ThemeState';
+import { BaseContext } from '../../types';
+/**
+ * Object returned by the `ThemeSelected` event
+ */
+export interface ThemeSelectedInfo extends BaseContext {
+    /**
+     * Shipped theme that is now active: `light`, `dark`, or `os`
+     */
+    theme: SystemThemeName;
+}

package/src/Api/Events/ThemeSelected.js

@@ -0,0 +1 @@
+export {};

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/ColumnScopeApiImpl.d.ts

@@ -2,7 +2,7 @@ import { ApiBase } from './ApiBase';
 import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { ColumnScope, ScopeDataType } from '../../AdaptableState/Common/ColumnScope';
 import { ColumnScopeApi } from '../ColumnScopeApi';
-import { CellColorRange } from '../../AdaptableState/StyledColumnState';
+import { CellColorRange } from '../../AdaptableState/StyledColumns/Common/NumericStyledColumn';
 export declare class ColumnScopeApiImpl extends ApiBase implements ColumnScopeApi {
     isColumnInScope(column: AdaptableColumn | undefined, scope: ColumnScope | undefined): boolean;
     getColumnsInScope(scope: ColumnScope): AdaptableColumn[];

package/src/Api/Implementation/EventApiImpl.js

@@ -1,6 +1,7 @@
 import { ApiBase } from './ApiBase';
 import Emitter from '../../Utilities/Emitter';
 import { EventInternalApi } from '../Internal/EventInternalApi';
+import { logDeprecation } from '../../Utilities/logDeprecation';
 export class EventApiImpl extends ApiBase {
     emitter;
     internalApi;
@@ -15,6 +16,9 @@ export class EventApiImpl extends ApiBase {
         this.emitter.destroy();
     }
     on = (eventName, callback) => {
+        if (eventName === 'ThemeChanged') {
+            logDeprecation(this._adaptable.logger, 'EventApi', 'ThemeChanged', undefined, "The 'ThemeChanged' event is deprecated. Subscribe to 'ThemeSelected' instead.");
+        }
         let result;
         if (eventName === 'AdaptableReady') {
             this.emitter.onIncludeFiredOnce(eventName).then(callback);

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/LayoutApiImpl.d.ts

@@ -7,7 +7,6 @@ import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupP
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { LayoutInternalApi } from '../Internal/LayoutInternalApi';
 import { ExtendedLayout } from '../../AdaptableState/Common/ExtendedLayout';
-import { ParameterizedAggFunc } from '../../AdaptableState/Common/AggregationColumns';
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     internalApi: LayoutInternalApi;
     constructor(_adaptable: IAdaptable);
@@ -45,6 +44,5 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     deleteLayout(layout: Layout): void;
     deleteLayoutByName(layoutName: string): void;
     removeColumnFromCurrentLayout(columnId: string): void;
-    setColumnParameterizedAggregation(columnId: string, parameterizedAgg: ParameterizedAggFunc): void;
     addColumnToCurrentLayout(columnId: string): void;
 }

package/src/Api/Implementation/LayoutApiImpl.js

@@ -6,8 +6,6 @@ import { createUuid } from '../../AdaptableState/Uuid';
 import { PopupShowPrompt } from '../../Redux/ActionsReducers/PopupRedux';
 import { LayoutInternalApi } from '../Internal/LayoutInternalApi';
 import { isPivotLayout, normalizeLayout } from './LayoutHelpers';
-import { getParameterizedAggregationDefinition } from '../../Aggregation/ParameterizedAggregationRegistry';
-import { upsertColumnAggregationInLayout } from '../../Aggregation/parameterizedAggregationHelpers';
 import { ERROR_LAYOUT } from '../../Utilities/Constants/GeneralConstants';
 export class LayoutApiImpl extends ApiBase {
     internalApi;
@@ -456,18 +454,6 @@ export class LayoutApiImpl extends ApiBase {
             }
         }
     }
-    setColumnParameterizedAggregation(columnId, parameterizedAgg) {
-        const definition = getParameterizedAggregationDefinition(parameterizedAgg.type);
-        if (!definition || !definition.isComplete(parameterizedAgg)) {
-            this.logWarn(`Cannot apply parameterized aggregation '${parameterizedAgg.type}' — required arguments are missing.`);
-            return;
-        }
-        this.updateCurrentLayout((layout) => {
-            upsertColumnAggregationInLayout(layout, columnId, parameterizedAgg);
-            return layout;
-        });
-        this.getAgGridApi()?.setColumnAggFunc(columnId, definition.agGridAggFuncName);
-    }
     addColumnToCurrentLayout(columnId) {
         const column = this.getColumnApi().getColumnWithColumnId(columnId);
         if (column) {

package/src/Api/Implementation/LayoutHelpers.d.ts

@@ -16,6 +16,8 @@ export declare const normalizeTableLayout: (tableLayout: TableLayout, options?:
     isTree: boolean;
 }) => TableLayout;
 export declare const normalizePivotLayout: (pivotLayout: PivotLayout) => PivotLayout;
+/** Clears module-scoped dedupe state when a new Adaptable instance starts (e.g. Playwright retries). */
+export declare const resetLayoutHelperErrorOnceMessages: () => void;
 export declare const getLayoutRowGroupValuesExceptionGroupKeys: (layout: TableLayout | PivotLayout) => any[][];
 export declare const toRowGroupValuesForLayoutState: (rowGroupValuesModel: TableLayoutModel["RowGroupValues"]) => TableLayout["RowGroupValues"];
 export declare const toRowGroupValuesForLayoutModel: (rowGroupValuesState: TableLayout["RowGroupValues"]) => TableLayoutModel["RowGroupValues"];

package/src/Api/Implementation/LayoutHelpers.js

@@ -1,8 +1,8 @@
-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';
-import { aggregationValueFromColumnAggregationModel, aggregationValueToColumnAggregationModel, } from '../../Aggregation/ParameterizedAggregationRegistry';
+import { isWeightedAverageAggregation, WEIGHTED_AVERAGE_AGG_FN_NAME, isWeightedAverageAggFuncName, } from '../../AdaptableState/Common/AggregationColumns';
 import { removeAdaptableObjectPrimitivesInlineDeep } from '../../Utilities/Helpers/AdaptableHelper';
 export function columnWidthsToColumnSizing(columnWidths) {
     if (!columnWidths) {
@@ -83,6 +83,10 @@ export const normalizePivotLayout = (pivotLayout) => {
     return pivotLayout;
 };
 const errorOnceMessages = new Map();
+/** Clears module-scoped dedupe state when a new Adaptable instance starts (e.g. Playwright retries). */
+export const resetLayoutHelperErrorOnceMessages = () => {
+    errorOnceMessages.clear();
+};
 const errorOnce = (message) => {
     if (errorOnceMessages.get(message)) {
         return;
@@ -248,6 +252,9 @@ export const tableLayoutToTableLayoutModel = (tableLayout) => {
     if (tableLayout.Metadata) {
         result.Ignore_Metadata = tableLayout.Metadata;
     }
+    if (tableLayout.OpenCharts) {
+        result.Ignore_OpenCharts = tableLayout.OpenCharts;
+    }
     if (tableLayout.RowSummaries != null) {
         result.Ignore_RowSummaries = tableLayout.RowSummaries;
     }
@@ -327,10 +334,16 @@ export const pivotLayoutToPivotLayoutModel = (pivotLayout) => {
     if (pivotLayout.Metadata) {
         result.Ignore_Metadata = pivotLayout.Metadata;
     }
+    if (pivotLayout.OpenCharts) {
+        result.Ignore_OpenCharts = pivotLayout.OpenCharts;
+    }
     return result;
 };
 function toAggFunc(aggFunc) {
-    return aggregationValueToColumnAggregationModel(aggFunc);
+    if (isWeightedAverageAggregation(aggFunc)) {
+        return { aggFunc: WEIGHTED_AVERAGE_AGG_FN_NAME, weightedColumnId: aggFunc.weightedColumnId };
+    }
+    return { aggFunc };
 }
 export const tableLayoutModelToTableLayout = (layoutModel) => {
     const tableLayout = {
@@ -376,6 +389,9 @@ export const tableLayoutModelToTableLayout = (layoutModel) => {
     if (layoutModel.Ignore_Metadata) {
         tableLayout.Metadata = layoutModel.Ignore_Metadata;
     }
+    if (layoutModel.Ignore_OpenCharts) {
+        tableLayout.OpenCharts = layoutModel.Ignore_OpenCharts;
+    }
     // if (layoutModel.RowGroupDisplayType) {
     tableLayout.RowGroupDisplayType = layoutModel.RowGroupDisplayType ?? 'single';
     // }
@@ -432,11 +448,14 @@ export const tableLayoutModelToTableLayout = (layoutModel) => {
     return tableLayout;
 };
 function toAggregationColumnValue(columnAggregationModel) {
-    const parameterizedValue = aggregationValueFromColumnAggregationModel(columnAggregationModel);
-    if (parameterizedValue !== undefined) {
-        return parameterizedValue;
-    }
-    return columnAggregationModel.aggFunc;
+    return columnAggregationModel &&
+        typeof columnAggregationModel.aggFunc === 'string' &&
+        isWeightedAverageAggFuncName(columnAggregationModel.aggFunc)
+        ? {
+            type: 'weightedAverage',
+            weightedColumnId: columnAggregationModel.weightedColumnId,
+        }
+        : columnAggregationModel.aggFunc;
 }
 export const pivotLayoutModelToPivotLayout = (layoutModel) => {
     const pivotLayout = {
@@ -481,6 +500,9 @@ export const pivotLayoutModelToPivotLayout = (layoutModel) => {
     if (layoutModel.Ignore_Metadata) {
         pivotLayout.Metadata = layoutModel.Ignore_Metadata;
     }
+    if (layoutModel.Ignore_OpenCharts) {
+        pivotLayout.OpenCharts = layoutModel.Ignore_OpenCharts;
+    }
     if (layoutModel.PivotGroupedColumns) {
         pivotLayout.PivotGroupedColumns = layoutModel.PivotGroupedColumns;
     }

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.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { ThemeApi } from '../ThemeApi';
-import { AdaptableTheme, ThemeState } from '../../AdaptableState/ThemeState';
+import { AdaptableTheme, SystemThemeEntry, ThemeState } from '../../AdaptableState/ThemeState';
 import { ThemeInternalApi } from '../Internal/ThemeInternalApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export declare class ThemeApiImpl extends ApiBase implements ThemeApi {
@@ -12,7 +12,7 @@ export declare class ThemeApiImpl extends ApiBase implements ThemeApi {
     loadDarkTheme(): void;
     getCurrentTheme(): string;
     getCurrentThemeObject(): AdaptableTheme;
-    setSystemThemes(systemThemes: AdaptableTheme[]): void;
+    setSystemThemes(systemThemes: SystemThemeEntry[]): void;
     setUserThemes(userThemes: AdaptableTheme[]): void;
     getSystemThemes(): AdaptableTheme[];
     applyCurrentTheme(): void;
@@ -24,4 +24,5 @@ export declare class ThemeApiImpl extends ApiBase implements ThemeApi {
     editTheme(theme: AdaptableTheme): void;
     addUserTheme(theme: AdaptableTheme): void;
     deleteUserTheme(theme: AdaptableTheme): void;
+    private warnUserThemesDeprecated;
 }

package/src/Api/Implementation/ThemeApiImpl.js

@@ -1,10 +1,10 @@
 import * as ThemeRedux from '../../Redux/ActionsReducers/ThemeRedux';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { ApiBase } from './ApiBase';
-import { StaticThemes } from '../../themes';
 import { ThemeInternalApi } from '../Internal/ThemeInternalApi';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 import { logDeprecation } from '../../Utilities/logDeprecation';
+import { systemThemeEntryToAdaptableTheme } from '../../Utilities/Helpers/ThemeHelper';
 export class ThemeApiImpl extends ApiBase {
     internalApi;
     constructor(_adaptable) {
@@ -34,32 +34,30 @@ export class ThemeApiImpl extends ApiBase {
         this.dispatchAction(ThemeRedux.ThemeSetSystemThemes(systemThemes));
     }
     setUserThemes(userThemes) {
+        this.warnUserThemesDeprecated();
         this.dispatchAction(ThemeRedux.ThemeSetUserThemes(userThemes));
     }
     getSystemThemes() {
         const themes = this.getAdaptableState().Theme.SystemThemes ?? [];
-        return themes.map((theme) => {
-            if (typeof theme === 'string') {
-                const description = StaticThemes.find((staticTheme) => staticTheme.Name === theme)?.Description ?? theme;
-                return {
-                    Name: theme,
-                    Description: description,
-                };
-            }
-            return theme;
-        });
+        return themes.map((theme) => systemThemeEntryToAdaptableTheme(theme, this._adaptable.logger));
     }
     applyCurrentTheme() {
-        const currentTheme = this.getThemes().filter((theme) => typeof theme === 'string'
-            ? theme === this.getCurrentTheme()
-            : theme.Name === this.getCurrentTheme())[0];
+        const currentThemeName = this.getCurrentTheme();
+        const currentTheme = this.getThemes().find((theme) => theme.Name === currentThemeName);
         if (!currentTheme) {
             return;
         }
         this._adaptable.applyAdaptableTheme(currentTheme);
-        this.getEventApi().internalApi.fireThemeChangedEvent(currentTheme, 'ThemeSelected');
+        if (this.internalApi.isSystemTheme(currentThemeName)) {
+            this.getEventApi().internalApi.fireThemeSelectedEvent(currentThemeName);
+            this.getEventApi().internalApi.fireThemeChangedEvent(currentTheme, 'ThemeSelected');
+        }
+        else {
+            this.getEventApi().internalApi.fireThemeChangedEvent(currentTheme, 'ThemeSelected');
+        }
     }
     getUserThemes() {
+        this.warnUserThemesDeprecated();
         return this.getAdaptableState().Theme.UserThemes ?? [];
     }
     getThemes() {
@@ -76,6 +74,7 @@ export class ThemeApiImpl extends ApiBase {
         return this._adaptable.agGridThemeAdapter.getAgGridCurrentThemeClassNames();
     }
     editTheme(theme) {
+        this.warnUserThemesDeprecated();
         this.dispatchAction(ThemeRedux.ThemeEdit(theme));
         this.getEventApi().internalApi.fireThemeChangedEvent(theme, 'ThemeEdited');
         const currentTheme = this.getCurrentTheme();
@@ -84,10 +83,15 @@ export class ThemeApiImpl extends ApiBase {
         }
     }
     addUserTheme(theme) {
+        this.warnUserThemesDeprecated();
         AdaptableHelper.addAdaptableObjectPrimitives(theme);
         this.dispatchAction(ThemeRedux.ThemeAdd(theme));
     }
     deleteUserTheme(theme) {
+        this.warnUserThemesDeprecated();
         this.dispatchAction(ThemeRedux.ThemeDelete(theme));
     }
+    warnUserThemesDeprecated() {
+        logDeprecation(this._adaptable.logger, 'ThemeState', 'UserThemes', undefined, 'UserThemes is deprecated and will be removed in the next major version. Customise shipped light/dark themes via CSS variable overrides instead.');
+    }
 }

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';
@@ -122,7 +122,7 @@ export class AlertInternalApi extends ApiBase {
             let backgroundColor = '';
             switch (highlightType) {
                 case 'Error':
-                    backgroundColor = 'var(--ab-color-error)';
+                    backgroundColor = 'var(--ab-color-destructive)';
                     break;
                 case 'Info':
                     backgroundColor = 'var(--ab-color-info)';

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/DataSetInternalApi.d.ts

@@ -1,5 +1,8 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { DataSet } from '../../AdaptableOptions/DataSetOptions';
 export declare class DataSetInternalApi extends ApiBase {
+    handleDataSetSelected(dataSet: DataSet): void;
     showDataSetForm(dataSet: DataSet): void;
+    private buildDataSetForm;
+    private runDataSetHandler;
 }

package/src/Api/Internal/DataSetInternalApi.js

@@ -1,20 +1,80 @@
 import { ApiBase } from '../Implementation/ApiBase';
 export class DataSetInternalApi extends ApiBase {
+    handleDataSetSelected(dataSet) {
+        if (!dataSet.form) {
+            this.getEventApi().internalApi.fireDataSetSelectedEvent(dataSet);
+            const dataSetSelectedInfo = {
+                ...this.getAdaptableInternalApi().buildBaseContext(),
+                dataSet,
+            };
+            this.runDataSetHandler(async () => {
+                if (dataSet.loadData) {
+                    const rowData = await dataSet.loadData(dataSetSelectedInfo);
+                    if (rowData != null) {
+                        this.getGridApi().loadGridData(rowData);
+                    }
+                }
+                if (dataSet.onSelect) {
+                    await dataSet.onSelect(dataSetSelectedInfo);
+                }
+            }, 'selection', dataSet.name);
+        }
+    }
     showDataSetForm(dataSet) {
-        if (dataSet.form) {
-            this.getAdaptableInternalApi().showPopupForm({
-                Id: 'data-set-form',
-                Form: dataSet.form,
-                prepareContext: (context) => {
-                    return new Promise((resolve) => {
-                        const preparedContext = {
-                            ...context,
-                            dataSet,
-                        };
-                        resolve(preparedContext);
-                    });
+        if (!dataSet.form) {
+            return;
+        }
+        this.getAdaptableInternalApi().showPopupForm({
+            Id: 'data-set-form',
+            Form: this.buildDataSetForm(dataSet),
+            prepareContext: (context) => {
+                return new Promise((resolve) => {
+                    const preparedContext = {
+                        ...context,
+                        dataSet,
+                    };
+                    resolve(preparedContext);
+                });
+            },
+        });
+    }
+    buildDataSetForm(dataSet) {
+        const sourceForm = dataSet.form;
+        if (!dataSet.onFormSubmit) {
+            return sourceForm;
+        }
+        const invokeOnFormSubmit = (context) => {
+            this.runDataSetHandler(() => dataSet.onFormSubmit(context), 'onFormSubmit', dataSet.name);
+        };
+        const onSubmit = (formData, context) => {
+            sourceForm.onSubmit?.(formData, context);
+            invokeOnFormSubmit({ ...context, formData, dataSet });
+        };
+        const buttons = sourceForm.buttons?.length > 0
+            ? sourceForm.buttons
+            : [
+                {
+                    label: 'OK',
+                    onClick: (_, context) => invokeOnFormSubmit({ ...context, dataSet }),
                 },
-            });
+            ];
+        return {
+            ...sourceForm,
+            onSubmit,
+            buttons,
+        };
+    }
+    runDataSetHandler(handler, handlerName, dataSetName) {
+        try {
+            const result = handler();
+            if (result != null && typeof result.then === 'function') {
+                result.catch((error) => {
+                    this.logError(`DataSet '${dataSetName}' ${handlerName} handler failed`, error);
+                });
+            }
+        }
+        catch (error) {
+            this.logError(`DataSet '${dataSetName}' ${handlerName} handler failed`, error);
         }
     }
 }

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

@@ -2,6 +2,7 @@ import { IRowNode } from 'ag-grid-enterprise';
 import * as Redux from 'redux';
 import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { AdaptableAlert, AdaptableFlashingCell, AdaptablePersistentState, AdaptableSharedEntity, AdaptableState, AdaptableTheme, CalculatedColumn, CreatedRowInfo, DashboardState, DataImportedInfo, DataSet, DeletedRowInfo, EditedRowInfo, LayoutState, RowDataChangedInfo, ReportSchedule, SystemStatusMessageInfo } from '../../types';
+import { SystemThemeName } from '../../AdaptableState/ThemeState';
 import { ApiBase } from '../Implementation/ApiBase';
 import { LayoutChangedAction } from '../Events/LayoutChanged';
 export declare class EventInternalApi extends ApiBase {
@@ -10,6 +11,7 @@ export declare class EventInternalApi extends ApiBase {
     fireRowChangedEvent(rowDataChangedInfo: RowDataChangedInfo): void;
     fireDashboardChangedEvent(trigger: string, oldDashboardState: DashboardState, newDashboardState: DashboardState): void;
     fireAlertFiredEvent(alertToFire: AdaptableAlert): void;
+    fireThemeSelectedEvent(theme: SystemThemeName): void;
     fireThemeChangedEvent(theme: AdaptableTheme, trigger: 'ThemeSelected' | 'ThemeEdited'): void;
     fireLayoutChangedEvent(trigger: LayoutChangedAction, oldState: LayoutState, newState: LayoutState): void;
     fireScheduledReportRanEvent(reportSchedule: ReportSchedule): void;

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()) {
@@ -76,8 +76,15 @@ export class EventInternalApi extends ApiBase {
         };
         this.getEventApi().emit('AlertFired', alertFiredInfo);
     }
+    fireThemeSelectedEvent(theme) {
+        const themeSelectedInfo = {
+            ...this.getAdaptableInternalApi().buildBaseContext(),
+            theme,
+        };
+        this.getEventApi().emit('ThemeSelected', themeSelectedInfo);
+    }
     fireThemeChangedEvent(theme, trigger) {
-        let themeChangedInfo = {
+        const themeChangedInfo = {
             ...this.getAdaptableInternalApi().buildBaseContext(),
             trigger: trigger,
             theme: theme,
@@ -99,7 +106,8 @@ export class EventInternalApi extends ApiBase {
     fireScheduledReportRanEvent(reportSchedule) {
         const reportScheduleRanInfo = {
             ...this.getAdaptableInternalApi().buildBaseContext(),
-            reportSchedule: reportSchedule,
+            reportSchedule,
+            RanAt: new Date().toISOString(),
         };
         this.getEventApi().emit('ReportScheduleRan', reportScheduleRanInfo);
     }

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.d.ts

@@ -1,13 +1,15 @@
 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 {
-    getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
-    getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
-    getAvgValueForNumericColumn(column: AdaptableColumn): number | undefined;
-    getMedianValueForNumericColumn(column: AdaptableColumn): number | undefined;
+    getMinValueForNumericColumn(column: AdaptableColumn | undefined): number | undefined;
+    getMaxValueForNumericColumn(column: AdaptableColumn | undefined): number | undefined;
+    getAvgValueForNumericColumn(column: AdaptableColumn | undefined): number | undefined;
+    getMedianValueForNumericColumn(column: AdaptableColumn | undefined): number | undefined;
     /**
      * Gets the Minimum Value to display for a Styled Column
      * @param styledColumn Styled Column to check

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',
@@ -11,25 +11,25 @@ const isDynamicRangeEndpoint = (value) => typeof value === 'string' &&
     DYNAMIC_RANGE_ENDPOINTS.includes(value);
 export class StyledColumnInternalApi extends ApiBase {
     getMinValueForNumericColumn(column) {
-        if (column.dataType !== 'number') {
+        if (!column || column.dataType !== 'number') {
             return undefined;
         }
         return this._adaptable.getMinMaxCachedValueForColumn(column, 'min');
     }
     getMaxValueForNumericColumn(column) {
-        if (column.dataType !== 'number') {
+        if (!column || column.dataType !== 'number') {
             return undefined;
         }
         return this._adaptable.getMinMaxCachedValueForColumn(column, 'max');
     }
     getAvgValueForNumericColumn(column) {
-        if (column.dataType !== 'number') {
+        if (!column || column.dataType !== 'number') {
             return undefined;
         }
         return this._adaptable.getMinMaxCachedValueForColumn(column, 'avg');
     }
     getMedianValueForNumericColumn(column) {
-        if (column.dataType !== 'number') {
+        if (!column || column.dataType !== 'number') {
             return undefined;
         }
         return this._adaptable.getMinMaxCachedValueForColumn(column, 'median');

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

@@ -3,5 +3,4 @@ export declare class ThemeInternalApi extends ApiBase {
     isSystemTheme(themeName: string): boolean;
     getThemeClassName(theme: string): string;
     getDOMPreferredColorScheme(): 'dark' | 'light';
-    openInWindow(): void;
 }