@adaptabletools/adaptable-cjs 23.0.0-canary.0 → 23.0.0-canary.10

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

@@ -2,14 +2,20 @@ import { AdaptableTheme } from '../../AdaptableState/ThemeState';
 import { BaseContext } from '../../types';
 /**
  * Object returned by the `ThemeChanged` event
+ *
+ * @deprecated Use {@link ThemeSelectedInfo} and the `ThemeSelected` event instead. Will be removed in the next major version.
  */
 export interface ThemeChangedInfo extends BaseContext {
     /**
      * Current Theme: either name of a System Theme or a Custom Theme object
+     *
+     * @deprecated Use `ThemeSelectedInfo.theme` instead.
      */
     theme: AdaptableTheme | string;
     /**
      * What caused Event to fire: "ThemeSelected" or "ThemeEdited"
+     *
+     * @deprecated No longer required — use the `ThemeSelected` event for theme selection.
      */
     trigger: 'ThemeSelected' | 'ThemeEdited';
 }

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,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/Api/Implementation/AlertApiImpl.js

@@ -12,7 +12,7 @@ const AdaptableAlert_1 = require("../../AdaptableState/Common/AdaptableAlert");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const AlertInternalApi_1 = require("../Internal/AlertInternalApi");
 const resolveContainerElement_1 = require("../../Utilities/resolveContainerElement");
-const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/ScheduledAlertHelper");
+const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 class AlertApiImpl extends ApiBase_1.ApiBase {
     internalApi;
     constructor(_adaptable) {

package/src/Api/Implementation/ChartingApiImpl.js

@@ -8,7 +8,7 @@ const ChartingRedux_1 = require("./../../Redux/ActionsReducers/ChartingRedux");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const ChartingInternalApi_1 = require("../Internal/ChartingInternalApi");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const chartingHelper_1 = require("../../Utilities/Helpers/chartingHelper");
+const ChartHelper_1 = require("../../Utilities/Helpers/ChartHelper");
 class ChartingApiImpl extends ApiBase_1.ApiBase {
     /**
      * @internal
@@ -76,7 +76,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         }
     }
     editChartDefinition(editedChartDefinition) {
-        const nameValidation = (0, chartingHelper_1.validateChartName)(this.getAdaptableApi(), editedChartDefinition.Name, editedChartDefinition.Uuid);
+        const nameValidation = (0, ChartHelper_1.validateChartName)(this.getAdaptableApi(), editedChartDefinition.Name, editedChartDefinition.Uuid);
         if (nameValidation !== true) {
             this.getAdatableLogger().consoleLogByMessageType(nameValidation, 'Warning');
             return;
@@ -88,7 +88,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         this._adaptable.updateChart(chartDefinition);
     }
     addChartDefinition(chart) {
-        const nameValidation = (0, chartingHelper_1.validateChartName)(this.getAdaptableApi(), chart.Name, chart.Uuid);
+        const nameValidation = (0, ChartHelper_1.validateChartName)(this.getAdaptableApi(), chart.Name, chart.Uuid);
         if (nameValidation !== true) {
             this.getAdatableLogger().consoleLogByMessageType(nameValidation, 'Warning');
             return;
@@ -130,7 +130,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         const saveChartBehaviour = options?.saveChartBehaviour ?? 'manual';
         const chartName = chartDefinition.Name?.trim() || this.internalApi.getUniqueChartName();
         if (saveChartBehaviour === 'auto') {
-            const nameValidation = (0, chartingHelper_1.validateChartName)(this.getAdaptableApi(), chartName, chartDefinition.Uuid);
+            const nameValidation = (0, ChartHelper_1.validateChartName)(this.getAdaptableApi(), chartName, chartDefinition.Uuid);
             if (nameValidation !== true) {
                 this.getAdatableLogger().consoleLogByMessageType(nameValidation, 'Warning');
                 return;
@@ -190,7 +190,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         }
     }
     editExternalChartDefinition(chartDefinition) {
-        const nameValidation = (0, chartingHelper_1.validateChartName)(this.getAdaptableApi(), chartDefinition.Name, chartDefinition.Uuid);
+        const nameValidation = (0, ChartHelper_1.validateChartName)(this.getAdaptableApi(), chartDefinition.Name, chartDefinition.Uuid);
         if (nameValidation !== true) {
             this.getAdatableLogger().consoleLogByMessageType(nameValidation, 'Warning');
             return;

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

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
 const EventInternalApi_1 = require("../Internal/EventInternalApi");
+const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class EventApiImpl extends ApiBase_1.ApiBase {
     emitter;
     internalApi;
@@ -19,6 +20,9 @@ class EventApiImpl extends ApiBase_1.ApiBase {
         this.emitter.destroy();
     }
     on = (eventName, callback) => {
+        if (eventName === 'ThemeChanged') {
+            (0, logDeprecation_1.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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExportApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ExportRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ExportRedux"));
-const ScheduledReportHelper_1 = require("../../Utilities/Helpers/ScheduledReportHelper");
+const ScheduledReportHelper_1 = require("../../Utilities/Helpers/Scheduling/ScheduledReportHelper");
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ExportInternalApi_1 = require("../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

@@ -10,8 +10,6 @@ const Uuid_1 = require("../../AdaptableState/Uuid");
 const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
 const LayoutInternalApi_1 = require("../Internal/LayoutInternalApi");
 const LayoutHelpers_1 = require("./LayoutHelpers");
-const ParameterizedAggregationRegistry_1 = require("../../Aggregation/ParameterizedAggregationRegistry");
-const parameterizedAggregationHelpers_1 = require("../../Aggregation/parameterizedAggregationHelpers");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 class LayoutApiImpl extends ApiBase_1.ApiBase {
     internalApi;
@@ -460,18 +458,6 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             }
         }
     }
-    setColumnParameterizedAggregation(columnId, parameterizedAgg) {
-        const definition = (0, ParameterizedAggregationRegistry_1.getParameterizedAggregationDefinition)(parameterizedAgg.type);
-        if (!definition || !definition.isComplete(parameterizedAgg)) {
-            this.logWarn(`Cannot apply parameterized aggregation '${parameterizedAgg.type}' — required arguments are missing.`);
-            return;
-        }
-        this.updateCurrentLayout((layout) => {
-            (0, parameterizedAggregationHelpers_1.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,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPivotLayout = exports.pivotLayoutModelToPivotLayout = exports.tableLayoutModelToTableLayout = exports.pivotLayoutToPivotLayoutModel = exports.tableLayoutToTableLayoutModel = exports.checkForDuplicateColumns = exports.toRowGroupValuesForLayoutModel = exports.toRowGroupValuesForLayoutState = exports.getLayoutRowGroupValuesExceptionGroupKeys = exports.normalizePivotLayout = exports.normalizeTableLayout = exports.normalizeLayout = exports.areLayoutsEqual = exports.layoutModelToLayoutState = exports.layoutStateToLayoutModel = void 0;
+exports.isPivotLayout = exports.pivotLayoutModelToPivotLayout = exports.tableLayoutModelToTableLayout = exports.pivotLayoutToPivotLayoutModel = exports.tableLayoutToTableLayoutModel = exports.checkForDuplicateColumns = exports.toRowGroupValuesForLayoutModel = exports.toRowGroupValuesForLayoutState = exports.getLayoutRowGroupValuesExceptionGroupKeys = exports.resetLayoutHelperErrorOnceMessages = exports.normalizePivotLayout = exports.normalizeTableLayout = exports.normalizeLayout = exports.areLayoutsEqual = exports.layoutModelToLayoutState = exports.layoutStateToLayoutModel = void 0;
 exports.columnWidthsToColumnSizing = columnWidthsToColumnSizing;
-const tslib_1 = require("tslib");
-const isEqual_1 = tslib_1.__importDefault(require("../../Utilities/utils/isEqual"));
+const ObjectExtensions_1 = require("../../Utilities/Extensions/ObjectExtensions");
 const isPivotLayoutModel_1 = require("../../layout-manager/src/isPivotLayoutModel");
 const normalizeLayoutModel_1 = require("../../layout-manager/src/normalizeLayoutModel");
 const simplifyLayoutModel_1 = require("../../layout-manager/src/simplifyLayoutModel");
-const ParameterizedAggregationRegistry_1 = require("../../Aggregation/ParameterizedAggregationRegistry");
+const AggregationColumns_1 = require("../../AdaptableState/Common/AggregationColumns");
 const AdaptableHelper_1 = require("../../Utilities/Helpers/AdaptableHelper");
 function columnWidthsToColumnSizing(columnWidths) {
     if (!columnWidths) {
@@ -69,7 +68,7 @@ const areLayoutsEqual = (layout1, layout2) => {
     if (!layout1 || !layout2) {
         return false;
     }
-    return (0, isEqual_1.default)((0, exports.normalizeLayout)(layout1), (0, exports.normalizeLayout)(layout2));
+    return (0, ObjectExtensions_1.isEqual)((0, exports.normalizeLayout)(layout1), (0, exports.normalizeLayout)(layout2));
 };
 exports.areLayoutsEqual = areLayoutsEqual;
 const normalizeLayout = (layout, options) => {
@@ -94,6 +93,11 @@ const normalizePivotLayout = (pivotLayout) => {
 };
 exports.normalizePivotLayout = normalizePivotLayout;
 const errorOnceMessages = new Map();
+/** Clears module-scoped dedupe state when a new Adaptable instance starts (e.g. Playwright retries). */
+const resetLayoutHelperErrorOnceMessages = () => {
+    errorOnceMessages.clear();
+};
+exports.resetLayoutHelperErrorOnceMessages = resetLayoutHelperErrorOnceMessages;
 const errorOnce = (message) => {
     if (errorOnceMessages.get(message)) {
         return;
@@ -263,6 +267,9 @@ 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;
     }
@@ -343,11 +350,17 @@ const pivotLayoutToPivotLayoutModel = (pivotLayout) => {
     if (pivotLayout.Metadata) {
         result.Ignore_Metadata = pivotLayout.Metadata;
     }
+    if (pivotLayout.OpenCharts) {
+        result.Ignore_OpenCharts = pivotLayout.OpenCharts;
+    }
     return result;
 };
 exports.pivotLayoutToPivotLayoutModel = pivotLayoutToPivotLayoutModel;
 function toAggFunc(aggFunc) {
-    return (0, ParameterizedAggregationRegistry_1.aggregationValueToColumnAggregationModel)(aggFunc);
+    if ((0, AggregationColumns_1.isWeightedAverageAggregation)(aggFunc)) {
+        return { aggFunc: AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME, weightedColumnId: aggFunc.weightedColumnId };
+    }
+    return { aggFunc };
 }
 const tableLayoutModelToTableLayout = (layoutModel) => {
     const tableLayout = {
@@ -393,6 +406,9 @@ 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';
     // }
@@ -450,11 +466,14 @@ const tableLayoutModelToTableLayout = (layoutModel) => {
 };
 exports.tableLayoutModelToTableLayout = tableLayoutModelToTableLayout;
 function toAggregationColumnValue(columnAggregationModel) {
-    const parameterizedValue = (0, ParameterizedAggregationRegistry_1.aggregationValueFromColumnAggregationModel)(columnAggregationModel);
-    if (parameterizedValue !== undefined) {
-        return parameterizedValue;
-    }
-    return columnAggregationModel.aggFunc;
+    return columnAggregationModel &&
+        typeof columnAggregationModel.aggFunc === 'string' &&
+        (0, AggregationColumns_1.isWeightedAverageAggFuncName)(columnAggregationModel.aggFunc)
+        ? {
+            type: 'weightedAverage',
+            weightedColumnId: columnAggregationModel.weightedColumnId,
+        }
+        : columnAggregationModel.aggFunc;
 }
 const pivotLayoutModelToPivotLayout = (layoutModel) => {
     const pivotLayout = {
@@ -499,6 +518,9 @@ 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

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const QuickSearchRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QuickSearchRedux"));
 const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const QuickSearchStyleHelper_1 = require("../../Utilities/Helpers/QuickSearchStyleHelper");
+const QuickSearchHelper_1 = require("../../Utilities/Helpers/QuickSearchHelper");
 const ApiBase_1 = require("./ApiBase");
 class QuickSearchApiImpl extends ApiBase_1.ApiBase {
     getQuickSearchState() {
@@ -27,13 +27,13 @@ class QuickSearchApiImpl extends ApiBase_1.ApiBase {
         return this.getQuickSearchState().QuickSearchText;
     }
     getQuickSearchCellMatchStyle() {
-        return (0, QuickSearchStyleHelper_1.resolveQuickSearchCellMatchStyle)(this.getQuickSearchState());
+        return (0, QuickSearchHelper_1.resolveQuickSearchCellMatchStyle)(this.getQuickSearchState());
     }
     getQuickSearchTextMatchStyle() {
-        return (0, QuickSearchStyleHelper_1.resolveQuickSearchTextMatchStyle)(this.getQuickSearchState());
+        return (0, QuickSearchHelper_1.resolveQuickSearchTextMatchStyle)(this.getQuickSearchState());
     }
     getQuickSearchCurrentTextMatchStyle() {
-        return (0, QuickSearchStyleHelper_1.resolveQuickSearchCurrentTextMatchStyle)(this.getQuickSearchState());
+        return (0, QuickSearchHelper_1.resolveQuickSearchCurrentTextMatchStyle)(this.getQuickSearchState());
     }
     setQuickSearchCellMatchStyle(style) {
         this.dispatchAction(QuickSearchRedux.QuickSearchSetCellMatchingStyle(style));

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

@@ -5,10 +5,10 @@ const tslib_1 = require("tslib");
 const ThemeRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ThemeRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ApiBase_1 = require("./ApiBase");
-const themes_1 = require("../../themes");
 const ThemeInternalApi_1 = require("../Internal/ThemeInternalApi");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
+const ThemeHelper_1 = require("../../Utilities/Helpers/ThemeHelper");
 class ThemeApiImpl extends ApiBase_1.ApiBase {
     internalApi;
     constructor(_adaptable) {
@@ -38,32 +38,30 @@ class ThemeApiImpl extends ApiBase_1.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 = themes_1.StaticThemes.find((staticTheme) => staticTheme.Name === theme)?.Description ?? theme;
-                return {
-                    Name: theme,
-                    Description: description,
-                };
-            }
-            return theme;
-        });
+        return themes.map((theme) => (0, ThemeHelper_1.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() {
@@ -80,6 +78,7 @@ class ThemeApiImpl extends ApiBase_1.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();
@@ -88,11 +87,16 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         }
     }
     addUserTheme(theme) {
+        this.warnUserThemesDeprecated();
         AdaptableHelper_1.default.addAdaptableObjectPrimitives(theme);
         this.dispatchAction(ThemeRedux.ThemeAdd(theme));
     }
     deleteUserTheme(theme) {
+        this.warnUserThemesDeprecated();
         this.dispatchAction(ThemeRedux.ThemeDelete(theme));
     }
+    warnUserThemesDeprecated() {
+        (0, logDeprecation_1.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.');
+    }
 }
 exports.ThemeApiImpl = ThemeApiImpl;

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"));
@@ -126,7 +126,7 @@ class AlertInternalApi extends ApiBase_1.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

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

@@ -3,21 +3,81 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataSetInternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
 class DataSetInternalApi extends ApiBase_1.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;