@adaptabletools/adaptable-cjs 23.0.0-canary.3 → 23.0.0-canary.5

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

@@ -33,9 +33,10 @@ export interface CellDataChangedInfo<TData = any> {
      */
     rowData?: TData;
     /**
-     * What triggered the change - user, background change or a reverted change?
+     * What triggered the change - user, background change, a reverted change, or a
+     * derived update on a Calculated Column whose source value changed?
      */
-    trigger?: 'edit' | 'tick' | 'undo' | 'aggChange';
+    trigger?: 'edit' | 'tick' | 'undo' | 'aggChange' | 'calculatedColumnChange';
     /**
      * Whether the change was prevented by a validation rule
      */

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

@@ -1,4 +1,8 @@
 export type ScopeDataType = 'text' | 'number' | 'boolean' | 'date' | 'textArray' | 'numberArray';
+/**
+ * Scope data type for modules that only apply to numeric columns (e.g. Shortcut, Plus/Minus).
+ */
+export type NumberScopeDataType = 'number';
 export type ScopeAll = {
     All: true;
 };

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

@@ -38,21 +38,16 @@ export declare enum StatusColour {
 }
 export declare enum SummaryOperation {
     Sum = "Sum",
+    Max = "Max",
+    Min = "Min",
+    Count = "Count",
     Average = "Average",
+    Weighted_Average = "Weighted Average",
     Median = "Median",
     Mode = "Mode",
     Distinct = "Distinct",
-    Max = "Max",
-    Min = "Min",
-    Count = "Count",
     Std_Deviation = "Std Deviation",
-    Only = "Only",
-    Weighted_Average = "Weighted Avg"
-}
-export declare enum FilterOnDataChangeOptions {
-    Always = "Always",
-    Never = "Never",
-    Throttle = "Throttle"
+    Only = "Only"
 }
 export declare enum ChangeDirection {
     Up = "Up",

package/src/AdaptableState/Common/Enums.js

@@ -1,7 +1,7 @@
 "use strict";
 // General Enums
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeDirection = exports.FilterOnDataChangeOptions = exports.SummaryOperation = exports.StatusColour = exports.FontSize = exports.FontStyle = exports.FontWeight = exports.SelectionMode = exports.SortOrder = exports.ScheduleType = exports.MathOperation = void 0;
+exports.ChangeDirection = exports.SummaryOperation = exports.StatusColour = exports.FontSize = exports.FontStyle = exports.FontWeight = exports.SelectionMode = exports.SortOrder = exports.ScheduleType = exports.MathOperation = void 0;
 var MathOperation;
 (function (MathOperation) {
     MathOperation["Add"] = "Add";
@@ -53,23 +53,17 @@ var StatusColour;
 var SummaryOperation;
 (function (SummaryOperation) {
     SummaryOperation["Sum"] = "Sum";
+    SummaryOperation["Max"] = "Max";
+    SummaryOperation["Min"] = "Min";
+    SummaryOperation["Count"] = "Count";
     SummaryOperation["Average"] = "Average";
+    SummaryOperation["Weighted_Average"] = "Weighted Average";
     SummaryOperation["Median"] = "Median";
     SummaryOperation["Mode"] = "Mode";
     SummaryOperation["Distinct"] = "Distinct";
-    SummaryOperation["Max"] = "Max";
-    SummaryOperation["Min"] = "Min";
-    SummaryOperation["Count"] = "Count";
     SummaryOperation["Std_Deviation"] = "Std Deviation";
     SummaryOperation["Only"] = "Only";
-    SummaryOperation["Weighted_Average"] = "Weighted Avg";
 })(SummaryOperation || (exports.SummaryOperation = SummaryOperation = {}));
-var FilterOnDataChangeOptions;
-(function (FilterOnDataChangeOptions) {
-    FilterOnDataChangeOptions["Always"] = "Always";
-    FilterOnDataChangeOptions["Never"] = "Never";
-    FilterOnDataChangeOptions["Throttle"] = "Throttle";
-})(FilterOnDataChangeOptions || (exports.FilterOnDataChangeOptions = FilterOnDataChangeOptions = {}));
 var ChangeDirection;
 (function (ChangeDirection) {
     ChangeDirection["Up"] = "Up";

package/src/AdaptableState/PlusMinusState.d.ts

@@ -1,5 +1,5 @@
 import { BaseState } from './BaseState';
-import { ColumnScope } from './Common/ColumnScope';
+import { ColumnScope, NumberScopeDataType } from './Common/ColumnScope';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { SuspendableObject } from '../types';
 /**
@@ -20,9 +20,9 @@ export interface PlusMinusNudge extends SuspendableObject {
      */
     Name: string;
     /**
-     * Where Rule is applied
+     * Numeric columns where the nudge is applied
      */
-    Scope: ColumnScope;
+    Scope: ColumnScope<NumberScopeDataType>;
     /**
      * Amount by which to update cell when Rule is applied
      */

package/src/AdaptableState/ShortcutState.d.ts

@@ -1,5 +1,5 @@
 import { BaseState } from './BaseState';
-import { ColumnScope } from './Common/ColumnScope';
+import { ColumnScope, NumberScopeDataType } from './Common/ColumnScope';
 import { SuspendableObject } from '../types';
 /**
  * Adaptable State Section for Shortcut Module
@@ -10,10 +10,6 @@ export interface ShortcutState extends BaseState {
      */
     Shortcuts?: Shortcut[];
 }
-/**
- * Shortcut scope data type.
- */
-export type ShortcutScopeDataType = 'number';
 /**
  * Used to define a Shortcut as used in Shortcut State
  */
@@ -25,7 +21,7 @@ export interface Shortcut extends SuspendableObject {
     /**
      * Numeric Columns where Shortcut is applied
      */
-    Scope: ColumnScope<ShortcutScopeDataType>;
+    Scope: ColumnScope<NumberScopeDataType>;
     /**
      * Key which triggers the Shortcut when pressed
      */

package/src/AdaptableState/StyledColumnState.d.ts

@@ -233,8 +233,7 @@ export interface SparklineStyle {
      */
     options?: AgSparklineOptions;
     /**
-     * Optional cell box styling (background colour, border, border radius)
-     * applied to the cell behind the sparkline chart.
+     * Optional cell box styling applied to the cell behind the sparkline chart.
      *
      * When set, this property "claims" the Cell slice for the column: any
      * Format Column matching this column has its Cell-box properties stripped.
@@ -472,7 +471,7 @@ export interface BadgeStyle {
      */
     OverflowMode?: BadgeOverflowMode;
     /**
-     * Optional cell-box styling applied to grid cell **behind** the badges.   *
+     * Optional cell-box styling applied to grid cell **behind** the badges
      */
     Cell?: CellBoxStyle;
     /**
@@ -760,8 +759,7 @@ export interface RangeBarMarker {
     /**
      * Marker shape.
      *
-     * @defaultValue `'Diamond'` for the cell-value marker, `'Line'` for the
-     *   reference marker.
+     * @defaultValue `'Diamond'` for cell-value marker, `'Line'` for reference marker
      */
     Shape?: 'Line' | 'Triangle' | 'Dot' | 'Diamond';
     /**

package/src/AdaptableState/ThemeState.d.ts

@@ -1,57 +1,62 @@
 import { BaseState } from './BaseState';
 import { AdaptableObject } from './Common/AdaptableObject';
 import { TypeHint } from './Common/Types';
+/**
+ * Shipped AdapTable theme names.
+ */
+export type SystemThemeName = TypeHint<string, 'light' | 'dark' | 'os'>;
 /**
  * Theme section of Adaptable State
  */
 export interface ThemeState extends BaseState {
     /**
-     * Name of current theme (or theme to set at startup); leave blank if using 'Light Theme', set to 'dark' for 'Dark Theme' or provide name of Custom Theme
+     * Name of current Theme or theme set at startup; leave blank if using 'Light Theme', set to 'dark' for 'Dark Theme'
      */
-    CurrentTheme?: TypeHint<string, 'light' | 'dark' | 'os'>;
+    CurrentTheme?: SystemThemeName;
     /**
-     * Which, if any, of the 2 themes shipped by Adaptable should be available; leave unset to provide both, or an empty array to provide neither.
+     * Which shipped themes are available; pass theme name string, or `{ Name, AgThemeMode? }` to pair a custom AG Grid theme mode; leave unset for all shipped themes
      */
-    SystemThemes?: (AdaptableTheme | string)[];
+    SystemThemes?: (SystemThemeEntry | AdaptableTheme)[];
     /**
-     * Custom themes (of type AdaptableTheme) provided by developers
+     * Custom themes provided by developers (deprecated)
+     *
+     * @deprecated Will be removed in next major version. Customise shipped `light` / `dark` themes via CSS variable overrides instead.
      */
     UserThemes?: AdaptableTheme[];
 }
 /**
- * Used for creating User (i.e. Custom) Themes
+ * Pairing options between AG Grid and AdapTable themes
  */
-export interface AdaptableTheme extends AdaptableObject {
+export interface SystemThemeOptions {
     /**
-     * Name of the Theme as it appears in the Theme toolbar and tool panel
+     * Shipped theme this entry configures: `light`, `dark`, or `os`
      */
-    Name: string;
+    Name: SystemThemeName;
     /**
-     * Description of Theme - will appear in Theme Toolbar and Toolpanel
+     * AG Grid theme mode to apply when this theme is selected; valid values are `light`, `dark`, `dark-blue` or any custom theme mode defined in AG Grid
      */
-    Description: string;
+    AgThemeMode?: TypeHint<string, 'light' | 'dark' | 'dark-blue'>;
     /**
-     * Ag Grid theme to apply when loading theme; relevant only when using the legacy AG Grid themes
+     * Ag Grid theme to apply when loading theme; relevant only when using legacy AG Grid themes
      *
-     * @deprecated no longer used with the new AG Grid Theming API
+     * @deprecated no longer used with new AG Grid Theming API
      */
     AgGridClassName?: string;
-    /**
-     * Variables to be applied at runtime
-     */
+}
+/**
+ * Configures a shipped system theme: a theme name, or an object with AG Grid pairing options
+ */
+export type SystemThemeEntry = SystemThemeName | SystemThemeOptions;
+/**
+ * Used for creating Custom Themes (deprecated)
+ *
+ * @deprecated User-defined themes are deprecated; customise shipped themes via CSS variables and use SystemThemeOptions for AG Grid pairing
+ */
+export interface AdaptableTheme extends AdaptableObject {
+    Name: string;
+    Description: string;
+    AgGridClassName?: string;
     CSSVariables?: Record<string, string>;
-    /**
-     * Base theme variant to derive custom theme from.
-     * Use `light` to inherit from Adaptable Light Theme or `dark` for Adaptable Dark Theme.
-     * When creating custom themes, specifying a variant ensures proper inheritance of base theme styles.
-     */
     Variant?: 'light' | 'dark';
-    /**
-     * AG Grid theme mode to apply when this theme is selected.
-     * Valid values are `light`, `dark`, `dark-blue` or any custom theme mode defined in AG Grid.
-     * When set, adds a data-ag-theme-mode attribute to the document body.
-     *
-     * @see https://www.ag-grid.com/javascript-data-grid/theming-colors/#theme-modes
-     */
     AgThemeMode?: TypeHint<string, 'light' | 'dark' | 'dark-blue'>;
 }

package/src/Api/EventApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableReadyInfo, AdaptableStateChangedInfo, AdaptableStateReloadedInfo, BeforeAdaptableStateChangeInfo, AlertFiredInfo, CalculatedColumnChangedInfo, CellChangedInfo, CellSelectionChangedInfo, ChartChangedInfo, ColumnFilterAppliedInfo, CommentChangedInfo, CustomToolbarConfiguredInfo, DashboardChangedInfo, DataImportedInfo, DataSetSelectedInfo, Fdc3MessageInfo, FlashingCellDisplayedInfo, GridFilterAppliedInfo, GridSortedInfo, LayoutChangedInfo, LiveDataChangedInfo, RowChangedInfo, RowFormSubmittedInfo, RowSelectionChangedInfo, ReportScheduleRanInfo, SystemStatusMessageDisplayedInfo, TeamSharingEntityChangedInfo, ThemeChangedInfo } from '../types';
+import { AdaptableReadyInfo, AdaptableStateChangedInfo, AdaptableStateReloadedInfo, BeforeAdaptableStateChangeInfo, AlertFiredInfo, CalculatedColumnChangedInfo, CellChangedInfo, CellSelectionChangedInfo, ChartChangedInfo, ColumnFilterAppliedInfo, CommentChangedInfo, CustomToolbarConfiguredInfo, DashboardChangedInfo, DataImportedInfo, DataSetSelectedInfo, Fdc3MessageInfo, FlashingCellDisplayedInfo, GridFilterAppliedInfo, GridSortedInfo, LayoutChangedInfo, LiveDataChangedInfo, RowChangedInfo, RowFormSubmittedInfo, RowSelectionChangedInfo, ReportScheduleRanInfo, SystemStatusMessageDisplayedInfo, TeamSharingEntityChangedInfo, ThemeChangedInfo, ThemeSelectedInfo } from '../types';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */
@@ -115,15 +115,28 @@ export interface EventApi {
      * Unsubscribe from RowSelectionChanged
      */
     off(eventName: 'RowSelectionChanged', callback: (rowSelectionChangedInfo: RowSelectionChangedInfo) => void): void;
+    /**
+     * Event fired whenever a shipped theme (`light`, `dark`, or `os`) is selected or re-applied
+     * @param eventName ThemeSelected
+     * @param callback ThemeSelectedInfo containing the active system theme name
+     * @returns the unsubscribe function
+     */
+    on(eventName: 'ThemeSelected', callback: (themeSelectedInfo: ThemeSelectedInfo) => void): VoidFunction;
+    /**
+     * Unsubscribe from ThemeSelected
+     */
+    off(eventName: 'ThemeSelected', callback: (themeSelectedInfo: ThemeSelectedInfo) => void): void;
     /**
      * Event fired whenever the selected theme of AdapTable is changed
      * @param eventName ThemeChanged
      * @param callback ThemeChangedInfo which just contains the name of the current Theme
      * @returns the unsubscribe function
+     * @deprecated Use `ThemeSelected` instead. Will be removed in the next major version.
      */
     on(eventName: 'ThemeChanged', callback: (themeChangedInfo: ThemeChangedInfo) => void): VoidFunction;
     /**
      * Unsubscribe from ThemeChanged
+     * @deprecated Use `ThemeSelected` instead.
      */
     off(eventName: 'ThemeChanged', callback: (themeChangedInfo: ThemeChangedInfo) => void): void;
     /**

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/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/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,13 @@
 "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 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) {
@@ -94,6 +94,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 +268,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 +351,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 +407,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 +467,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 +519,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/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 ThemeHelpers_1 = require("../../Utilities/Helpers/ThemeHelpers");
 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, ThemeHelpers_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/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

@@ -80,8 +80,15 @@ class EventInternalApi extends ApiBase_1.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,