@adaptabletools/adaptable-cjs 20.0.0-canary.4 → 20.0.0-canary.6

package/package.json

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -31,6 +31,7 @@ import { AgGridMenuAdapter } from '../agGrid/AgGridMenuAdapter';
 import { RowFormService } from '../Utilities/Services/RowFormService';
 import { FlashingCellService } from '../Utilities/Services/FlashingCellService';
 import { AgGridExportAdapter } from '../agGrid/AgGridExportAdapter';
+import { AgGridThemeAdapter } from '../agGrid/AgGridThemeAdapter';
 /**
  * Contains AG Grid Options and Modules - used when instantiating AdapTable vanilla
  */
@@ -66,6 +67,7 @@ export interface IAdaptable {
     agGridMenuAdapter: AgGridMenuAdapter;
     agGridColumnAdapter: AgGridColumnAdapter;
     agGridExportAdapter: AgGridExportAdapter;
+    agGridThemeAdapter: AgGridThemeAdapter;
     hasAdaptableToolPanel: boolean;
     renderReactRoot: RenderReactRootFn;
     /**
@@ -244,7 +246,6 @@ export interface IAdaptable {
     isGridRangeSelectable(): boolean;
     isGridRowSelectable(): boolean;
     isGridGroupingActive(): boolean;
-    getAgGridCurrentThemeName(): string;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
     setRowGroupColumns(columnIds: string[]): void;
     getAllGridColumns(): Column<any>[];

package/src/AdaptableOptions/DefaultAdaptableOptions.js

@@ -298,6 +298,7 @@ const DefaultAdaptableOptions = {
         styleClassNames: GeneralConstants_1.EMPTY_ARRAY,
         showDocumentationLinks: true,
         showAdapTableVersion: true,
+        showAgGridVersion: true,
     },
 };
 function applyDefaultAdaptableOptions(adaptableOptions) {

package/src/AdaptableOptions/EditOptions.d.ts

@@ -39,17 +39,28 @@ export interface EditOptions<TData = any> {
  */
 export interface CustomEditColumnValuesContext<TData = any> extends AdaptableColumnContext<TData> {
     /**
-     * Current distinct values in Cell
+     * Current distinct values in Column
      */
     defaultValues: Required<CustomEditColumnValueInfo>[];
+    /**
+     * Search text in Edit - used when fetching values from server
+     */
     currentSearchValue: string;
     /**
      * Currently edited Grid Cell
      */
     gridCell: GridCell;
 }
+/**
+ * Information about items in the Edit Controls
+ */
 export interface CustomEditColumnValueInfo {
-    label?: string;
+    /**
+     * Item's label
+     */ label?: string;
+    /**
+     * Value of Item being shown
+     */
     value: any;
 }
 /**

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -68,6 +68,13 @@ export interface UserInterfaceOptions<TData = any> {
      * @gridInfoItem
      */
     showAdapTableVersion?: boolean;
+    /**
+     * Displays the AG Grid version in Grid Info section of Settings Panel
+     *
+     * @defaultValue true
+     * @gridInfoItem
+     */
+    showAgGridVersion?: boolean;
     /**
      * English variant to use in AdapTable UI
      *

package/src/Api/Fdc3Api.d.ts

@@ -1,5 +1,5 @@
 import { IRowNode } from 'ag-grid-enterprise';
-import { AppIdentifier, Context, ContextType, DesktopAgent, Intent, IntentResolution } from '@finos/fdc3';
+import { AppIdentifier, Channel, Context, ContextType, DesktopAgent, Intent, IntentResolution } from '@finos/fdc3';
 /**
  * Provides run-time access to AdapTable's FDC3 functionality
  */
@@ -59,14 +59,16 @@ export interface Fdc3Api {
      * Broadcasts the given Context from the given Row Node
      * @param rowNode - The Row Node
      * @param contextType - The FDC3 Context Type
+     * @param channel - (optional) Channel to broadcast to; if not provided, the Context will be broadcast to whatever User Channel the app is joined to
      */
-    broadcastFromRow(rowNode: IRowNode, contextType: ContextType): Promise<void>;
+    broadcastFromRow(rowNode: IRowNode, contextType: ContextType, channel?: Channel): Promise<void>;
     /**
      * Broadcasts the given Context from the given Row Node with the given Primary Key Value
      * @param primaryKeyValue - The Primary Key Value
      * @param contextType - The FDC3 Context Type
+     * @param channel - (optional) Channel to broadcast to; if not provided, the Context will be broadcast to whatever User Channel the app is joined to
      */
-    broadcastFromPrimaryKey(primaryKeyValue: string | number, contextType: ContextType): Promise<void> | undefined;
+    broadcastFromPrimaryKey(primaryKeyValue: string | number, contextType: ContextType, channel?: Channel): Promise<void> | undefined;
     /**
      * Checks if the given Context Type is a FDC3 standard Context Type
      */

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

@@ -1,5 +1,5 @@
 import { IRowNode } from 'ag-grid-enterprise';
-import { Context, ContextType, DesktopAgent, Intent, IntentResolution, StandardContextType, StandardIntent } from '@finos/fdc3';
+import { Channel, Context, ContextType, DesktopAgent, Intent, IntentResolution, StandardContextType, StandardIntent } from '@finos/fdc3';
 import { ApiBase } from './ApiBase';
 import { Fdc3Api } from '../Fdc3Api';
 import { Fdc3InternalApi } from '../Internal/Fdc3InternalApi';
@@ -15,8 +15,8 @@ export declare class Fdc3ApiImpl extends ApiBase implements Fdc3Api {
     raiseIntentFromRow(rowNode: IRowNode, intent: Intent, contextType: ContextType, appIdentifier?: AppIdentifier): Promise<IntentResolution>;
     raiseIntentForContextFromRow(rowNode: IRowNode, contextType: ContextType, appIdentifier?: AppIdentifier): Promise<IntentResolution>;
     raiseIntentForContextFromPrimaryKey(primaryKeyValue: string | number, contextType: ContextType, appIdentifier?: AppIdentifier): Promise<IntentResolution> | undefined;
-    broadcastFromRow(rowNode: IRowNode, contextType: ContextType): Promise<void>;
-    broadcastFromPrimaryKey(primaryKeyValue: string | number, contextType: ContextType): Promise<void> | undefined;
+    broadcastFromRow(rowNode: IRowNode, contextType: ContextType, channel?: Channel): Promise<void>;
+    broadcastFromPrimaryKey(primaryKeyValue: string | number, contextType: ContextType, channel?: Channel): Promise<void> | undefined;
     getContextLabel(contextType: ContextType): string;
     isStandardContextType(contextType: string): contextType is StandardContextType;
     isStandardIntentType(intentType: string): intentType is StandardIntent;

package/src/Api/Implementation/Fdc3ApiImpl.js

@@ -47,17 +47,17 @@ class Fdc3ApiImpl extends ApiBase_1.ApiBase {
         }
         return this.raiseIntentForContextFromRow(rowNode, contextType, appIdentifier);
     }
-    broadcastFromRow(rowNode, contextType) {
+    broadcastFromRow(rowNode, contextType, channel) {
         const contextData = this.buildContextDataFromRow(contextType, rowNode);
-        return this.getFdc3Service().broadcast(contextData);
+        return this.getFdc3Service().broadcast(contextData, channel);
     }
-    broadcastFromPrimaryKey(primaryKeyValue, contextType) {
+    broadcastFromPrimaryKey(primaryKeyValue, contextType, channel) {
         const rowNode = this.getGridApi().getRowNodeForPrimaryKey(primaryKeyValue);
         if (!rowNode) {
             this.logWarn(`No row found for primary key value '${primaryKeyValue}'`);
             return undefined;
         }
-        return this.broadcastFromRow(rowNode, contextType);
+        return this.broadcastFromRow(rowNode, contextType, channel);
     }
     getContextLabel(contextType) {
         return this.isStandardContextType(contextType)

package/src/Api/Implementation/LayoutHelpers.js

@@ -7,6 +7,7 @@ const isPivotLayoutModel_1 = require("../../layout-manager/src/isPivotLayoutMode
 const normalizeLayoutModel_1 = require("../../layout-manager/src/normalizeLayoutModel");
 const simplifyLayoutModel_1 = require("../../layout-manager/src/simplifyLayoutModel");
 const AggregationColumns_1 = require("../../PredefinedConfig/Common/AggregationColumns");
+const AdaptableHelper_1 = require("../../Utilities/Helpers/AdaptableHelper");
 const layoutStateToLayoutModel = (layout) => {
     if ((0, exports.isPivotLayout)(layout)) {
         return (0, exports.pivotLayoutToPivotLayoutModel)(layout);
@@ -24,44 +25,23 @@ exports.layoutModelToLayoutState = layoutModelToLayoutState;
 function cleanupAdaptableObjectPrimitives(layout) {
     if (layout.TableAggregationColumns) {
         layout.TableAggregationColumns.forEach((AggValue) => {
-            // @ts-ignore
-            delete AggValue.Source;
-            // @ts-ignore
-            delete AggValue.Uuid;
-            // @ts-ignore
-            delete AggValue.AdaptableVersion;
+            (0, AdaptableHelper_1.removeAdaptableObjectPrimitivesInline)(AggValue);
             if (typeof AggValue.AggFunc === 'object' && AggValue.AggFunc) {
-                // @ts-ignore
-                delete AggValue.AggFunc.Source;
-                // @ts-ignore
-                delete AggValue.AggFunc.Uuid;
-                // @ts-ignore
-                delete AggValue.AggFunc.AdaptableVersion;
+                (0, AdaptableHelper_1.removeAdaptableObjectPrimitivesInline)(AggValue.AggFunc);
             }
         });
     }
     if (layout.ColumnHeaders) {
-        delete layout.ColumnHeaders.Source;
-        delete layout.ColumnHeaders.Uuid;
-        delete layout.ColumnHeaders.AdaptableVersion;
+        (0, AdaptableHelper_1.removeAdaptableObjectPrimitivesInline)(layout.ColumnHeaders);
     }
     if (layout.ColumnVisibility) {
-        delete layout.ColumnVisibility.Source;
-        delete layout.ColumnVisibility.Uuid;
-        delete layout.ColumnVisibility.AdaptableVersion;
+        (0, AdaptableHelper_1.removeAdaptableObjectPrimitivesInline)(layout.ColumnVisibility);
     }
     if (layout.ColumnWidths) {
-        delete layout.ColumnWidths.Source;
-        delete layout.ColumnWidths.Uuid;
-        delete layout.ColumnWidths.AdaptableVersion;
+        (0, AdaptableHelper_1.removeAdaptableObjectPrimitivesInline)(layout.ColumnWidths);
     }
     if (layout.RowGroupValues) {
-        // @ts-ignore
-        delete layout.RowGroupValues.Source;
-        // @ts-ignore
-        delete layout.RowGroupValues.Uuid;
-        // @ts-ignore
-        delete layout.RowGroupValues.AdaptableVersion;
+        (0, AdaptableHelper_1.removeAdaptableObjectPrimitivesInline)(layout.RowGroupValues);
     }
 }
 /**
@@ -271,6 +251,7 @@ const tableLayoutModelToTableLayout = (layoutModel, defaults) => {
     else {
         delete tableLayout.TableAggregationColumns;
     }
+    cleanupAdaptableObjectPrimitives(tableLayout);
     return tableLayout;
 };
 exports.tableLayoutModelToTableLayout = tableLayoutModelToTableLayout;

package/src/Api/Implementation/ThemeApiImpl.js

@@ -8,6 +8,7 @@ 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");
 class ThemeApiImpl extends ApiBase_1.ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
@@ -74,7 +75,8 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.ThemeModuleId);
     }
     getAgGridCurrentThemeName() {
-        return this._adaptable.getAgGridCurrentThemeName();
+        (0, logDeprecation_1.logDeprecation)(this._adaptable.logger, 'ThemeApi', 'getAgGridCurrentThemeName', null, `This is required only for AG Grid's legacy themes. See https://www.ag-grid.com/javascript-data-grid/theming-v32/`);
+        return this._adaptable.agGridThemeAdapter.getAgGridCurrentThemeClassNames();
     }
     editTheme(theme) {
         this.dispatchAction(ThemeRedux.ThemeEdit(theme));

package/src/Api/Internal/RowFormInternalApi.js

@@ -190,7 +190,7 @@ class RowFormInternalApi extends ApiBase_1.ApiBase {
         }
         const returnValues = this.getGridApi().internalApi.getDistinctDisplayValuesForColumnOld(column.columnId);
         // FIXME add support for asynchronous custom select cell editor values
-        // it involves refactoring the AdaptableForm & AdapatableFormComponent
+        // it involves refactoring the AdaptableForm & adaptableFormComponent
         // await this.getSelectCellEditorValuesForColumn(
         //   column,
         //   gridCell

package/src/Api/ThemeApi.d.ts

@@ -81,6 +81,8 @@ export interface ThemeApi {
     openThemeSettingsPanel(): void;
     /**
      * Get the name of the current AG Grid theme
+     *
+     * @deprecated required only for legacy AG Grid themes, see https://www.ag-grid.com/javascript-data-grid/theming-v32/
      */
     getAgGridCurrentThemeName(): string;
 }

package/src/PredefinedConfig/AlertState.d.ts

@@ -150,4 +150,4 @@ export type SystemAlertPredicateIds = SystemAlertPredicateId[];
 /**
  * List of System Predicates available for Alerts
  */
-export type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'IsNotNumeric' | 'In' | 'NotIn' | 'AnyChange';
+export type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'In' | 'NotIn' | 'AnyChange';

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -270,22 +270,6 @@ exports.SystemPredicateDefs = [
         toString: ({ inputs }) => `Not Between ${inputs[0] ?? ''}:${inputs[1]}`,
         shortcuts: ['!:'],
     },
-    {
-        id: 'IsNumeric',
-        label: 'Is Numeric',
-        icon: { text: '1' },
-        columnScope: { DataTypes: ['number'] },
-        moduleScope: ['alert', 'flashingcell'],
-        handler: ({ value }) => !isNaN(Number(value)),
-    },
-    {
-        id: 'IsNotNumeric',
-        label: 'Is Not Numeric',
-        icon: { text: '1' },
-        columnScope: { DataTypes: ['number'] },
-        moduleScope: ['alert', 'flashingcell'],
-        handler: ({ value }) => isNaN(Number(value)),
-    },
     // String System Filters
     {
         id: 'Is',

package/src/PredefinedConfig/FlashingCellState.d.ts

@@ -72,4 +72,4 @@ export type SystemFlashingCellPredicateIds = SystemFlashingCellPredicateId[];
 /**
  * List of System Predicates available for Flashing Cells
  */
-export type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'IsNotNumeric' | 'In' | 'NotIn' | 'AnyChange';
+export type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'In' | 'NotIn' | 'AnyChange';

package/src/PredefinedConfig/LayoutState.d.ts

@@ -51,7 +51,7 @@ export interface LayoutBase extends AdaptableObject {
      */
     ColumnHeaders?: ColumnStringMap;
     /**
-     * Whether to include aggFunc name in the Column header: e.g. 'sum(Price)' will just be 'Price'
+     * Whether to include aggFunc name in Column header: e.g. 'sum(Price)' becomes 'Price'
      */
     SuppressAggFuncInHeader?: boolean;
     /**
@@ -88,7 +88,7 @@ export interface TableLayout extends LayoutBase {
      */
     RowSummaries?: RowSummary[];
     /**
-     * Columns showing aggregated values in Group Rows; 1st value in record is Column name, 2nd is either aggfunc (e.g. sum, avg etc.) or 'true' (to use default aggfunc)
+     * Columns showing aggregated values in Grouped Rows; a record of ColumnId and aggfunc (e.g. sum) or 'true' (to use default aggfunc)
      */
     TableAggregationColumns?: TableAggregationColumns;
     /**

package/src/Utilities/Helpers/AdaptableHelper.d.ts

@@ -4,6 +4,7 @@ import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
 export declare function initPredefinedConfigWithUuids(predefinedConfig: PredefinedConfig): PredefinedConfig;
 export declare function getAccessLevelForObject(adaptableObject: AdaptableObject, moduleAccessLevel: AccessLevel): AccessLevel;
 export declare function addAdaptableObjectPrimitives<T extends AdaptableObject>(adaptableObject: T): T;
+export declare function removeAdaptableObjectPrimitivesInline(target: any): any;
 export declare function removeAdaptableObjectPrimitives<T extends AdaptableObject>(adaptableObject: T): T;
 export declare function isAdaptableObject(object: unknown): object is AdaptableObject;
 export declare const AdaptableHelper: {
@@ -11,6 +12,7 @@ export declare const AdaptableHelper: {
     getAccessLevelForObject: typeof getAccessLevelForObject;
     addAdaptableObjectPrimitives: typeof addAdaptableObjectPrimitives;
     removeAdaptableObjectPrimitives: typeof removeAdaptableObjectPrimitives;
+    removeAdaptableObjectPrimitivesInline: typeof removeAdaptableObjectPrimitivesInline;
     isAdaptableObject: typeof isAdaptableObject;
 };
 export default AdaptableHelper;

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableHelper = exports.isAdaptableObject = exports.removeAdaptableObjectPrimitives = exports.addAdaptableObjectPrimitives = exports.getAccessLevelForObject = exports.initPredefinedConfigWithUuids = void 0;
+exports.AdaptableHelper = exports.isAdaptableObject = exports.removeAdaptableObjectPrimitives = exports.removeAdaptableObjectPrimitivesInline = exports.addAdaptableObjectPrimitives = exports.getAccessLevelForObject = exports.initPredefinedConfigWithUuids = void 0;
 const tslib_1 = require("tslib");
 const cloneDeepWith_1 = tslib_1.__importDefault(require("lodash/cloneDeepWith"));
 const isPlainObject_1 = tslib_1.__importDefault(require("lodash/isPlainObject"));
@@ -50,6 +50,16 @@ function addAdaptableObjectPrimitives(adaptableObject) {
     return adaptableObject;
 }
 exports.addAdaptableObjectPrimitives = addAdaptableObjectPrimitives;
+function removeAdaptableObjectPrimitivesInline(target) {
+    if (!target || typeof target !== 'object') {
+        return target;
+    }
+    delete target.Source;
+    delete target.Uuid;
+    delete target.AdaptableVersion;
+    return target;
+}
+exports.removeAdaptableObjectPrimitivesInline = removeAdaptableObjectPrimitivesInline;
 function removeAdaptableObjectPrimitives(adaptableObject) {
     const clonedObject = structuredClone(adaptableObject);
     const sanitiseObject = (object) => {
@@ -79,6 +89,7 @@ exports.AdaptableHelper = {
     getAccessLevelForObject,
     addAdaptableObjectPrimitives,
     removeAdaptableObjectPrimitives,
+    removeAdaptableObjectPrimitivesInline,
     isAdaptableObject,
 };
 exports.default = exports.AdaptableHelper;

package/src/Utilities/Services/Fdc3Service.d.ts

@@ -1,7 +1,7 @@
 import { IAdaptableService } from './Interface/IAdaptableService';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
-import { AppIdentifier, DesktopAgent, IntentResolution } from '@finos/fdc3';
+import { AppIdentifier, Channel, DesktopAgent, IntentResolution } from '@finos/fdc3';
 import { Context } from '@finos/fdc3/dist/context/ContextTypes';
 export declare class Fdc3Service implements IAdaptableService {
     private adaptableApi;
@@ -15,7 +15,7 @@ export declare class Fdc3Service implements IAdaptableService {
     destroy(): void;
     raiseIntent(intent: string, context: Context, app?: AppIdentifier): Promise<IntentResolution>;
     raiseIntentForContext(context: Context, app?: AppIdentifier): Promise<IntentResolution>;
-    broadcast(context: Context): Promise<void>;
+    broadcast(context: Context, channel?: Channel): Promise<void>;
     private logFdc3Event;
     private logFdc3Error;
     private getFdc3Api;

package/src/Utilities/Services/Fdc3Service.js

@@ -134,7 +134,7 @@ class Fdc3Service {
             this.logFdc3Error(error);
         }
     }
-    broadcast(context) {
+    broadcast(context, channel) {
         if (!this.getDesktopAgent()) {
             return;
         }
@@ -147,7 +147,12 @@ class Fdc3Service {
                 context,
             };
             this.adaptableApi.eventApi.emit('Fdc3Message', payload);
-            return this.getDesktopAgent().broadcast(context);
+            if (channel) {
+                return channel.broadcast(context);
+            }
+            else {
+                return this.getDesktopAgent().broadcast(context);
+            }
         }
         catch (error) {
             this.logFdc3Error(error);

package/src/Utilities/Services/ThemeService.d.ts

@@ -5,10 +5,10 @@ export declare class ThemeService implements IThemeService {
     private unsubscribe;
     private styleSheetObject;
     constructor(api: AdaptableApi);
+    destroy(): void;
     subscribe(): void;
     onThemeChanged: () => void;
     applyNewThemeVariables(theme: AdaptableTheme): void;
-    destroy(): void;
     showMissingThemeFiles(theme: AdaptableTheme): void;
     getDOMPrefferedColorScheme(): 'dark' | 'light';
     mapOsTheme(theme: AdaptableTheme | string): AdaptableTheme;

package/src/Utilities/Services/ThemeService.js

@@ -23,6 +23,11 @@ class ThemeService {
             ];
         }
     }
+    destroy() {
+        this.api = null;
+        this.unsubscribe();
+        document.adoptedStyleSheets = [...document.adoptedStyleSheets].filter((sheet) => sheet !== this.styleSheetObject);
+    }
     subscribe() {
         const themeChangedUnsubscribe = this.api.eventApi.on('ThemeChanged', this.onThemeChanged);
         const prefferedColorSchemeUnsubscribe = this.attachPrefferedColorSchemeListener();
@@ -47,11 +52,6 @@ class ThemeService {
         str += '}';
         this.styleSheetObject.replaceSync(str);
     }
-    destroy() {
-        this.api = null;
-        this.unsubscribe();
-        document.adoptedStyleSheets = [...document.adoptedStyleSheets].filter((sheet) => sheet !== this.styleSheetObject);
-    }
     showMissingThemeFiles(theme) {
         // run time defined theme
         // because it may be an empty theme

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.js

@@ -46,6 +46,47 @@ const ConfigurationWizard = (props) => {
                 delete newColumn.caption;
                 return newColumn;
             });
+            const columnDefs = adaptableConfig.gridOptions.columnDefs;
+            // handle the layout creation
+            let Layouts = newAdaptableOptions.predefinedConfig?.Layout?.Layouts || [];
+            const NewLayout = {
+                TableColumns: columnDefs.map((col) => col.colId ?? col.field),
+                Name: 'Default Layout',
+            };
+            let currentLayoutName = NewLayout.Name;
+            let found = false;
+            if (!Layouts.length) {
+                // no layouts, make this the only one
+                Layouts = [NewLayout];
+            }
+            else {
+                Layouts = Layouts.map((layout) => {
+                    if (found) {
+                        return layout;
+                    }
+                    if (layout.TableColumns?.length === 0) {
+                        // when finding the first empty layout
+                        // set its column to be those of the new layout
+                        found = true;
+                        // and grab the name so we can put it in the Layout.CurrentLayout state
+                        currentLayoutName = layout.Name;
+                        layout = { ...layout };
+                        layout.TableColumns = NewLayout.TableColumns;
+                    }
+                    return layout;
+                });
+                if (!found) {
+                    Layouts.push(NewLayout);
+                }
+            }
+            newAdaptableOptions.predefinedConfig = {
+                ...newAdaptableOptions.predefinedConfig,
+                Layout: {
+                    ...newAdaptableOptions.predefinedConfig.Layout,
+                    Layouts: Layouts,
+                    CurrentLayout: currentLayoutName,
+                },
+            };
             newAdaptableOptions.primaryKey = columnsHandle.current.getPrimaryKey();
         }
         const newAdaptableConfig = {

package/src/View/DataChangeHistory/DataChangeHistoryPopup.js

@@ -58,7 +58,10 @@ class DataChangeHistoryPopupComponent extends React.Component {
                 this.props.api.dataChangeHistoryApi.clearDataChangeHistoryEntry(changeToBeUndone);
             }
         };
-        const currentAgGridTheme = this.props.api.themeApi.getAgGridCurrentThemeName();
+        const agGridThemeMode = this.props.api.internalApi
+            .getAdaptableInstance()
+            .agGridThemeAdapter.getAgGridThemeMode();
+        const currentAgGridTheme = agGridThemeMode === 'legacy' ? this.props.api.themeApi.getAgGridCurrentThemeName() : '';
         return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
             React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPopup", flexDirection: "column", style: { height: '100%' } },
                 React.createElement(rebass_1.Flex, { style: {

package/src/View/GridInfo/GridInfoPopup/GridInfoPopup.js

@@ -14,7 +14,9 @@ const AdaptableObjectRow_1 = require("../../Components/AdaptableObjectRow");
 const PopupPanel_1 = require("../../Components/Popups/AdaptablePopup/PopupPanel");
 const AdaptableObjectsSummary_1 = require("./AdaptableObjectsSummary");
 const EnvVars_1 = require("../../../EnvVars");
-const version = EnvVars_1.ADAPTABLE_VERSION;
+const agGridModules_1 = require("../../../agGrid/agGridModules");
+const adaptableVersion = EnvVars_1.ADAPTABLE_VERSION;
+const agGridVersion = agGridModules_1.AG_GRID_VERSION;
 const GridInfoPopup = (props) => {
     const api = props.api;
     const CreateGridSummaries = (colItems) => {
@@ -37,7 +39,10 @@ const GridInfoPopup = (props) => {
             : null;
         const selectedRowInfo = api.gridApi.getSelectedRowInfo();
         if (api.optionsApi.getUserInterfaceOptions()?.showAdapTableVersion) {
-            returnRows.push(createReadOnlyColItem(colItems, 'AdapTable Version', version));
+            returnRows.push(createReadOnlyColItem(colItems, 'AdapTable Version', adaptableVersion));
+        }
+        if (api.optionsApi.getUserInterfaceOptions()?.showAgGridVersion) {
+            returnRows.push(createReadOnlyColItem(colItems, 'AG Grid Version', agGridVersion));
         }
         returnRows.push(createReadOnlyColItem(colItems, 'Sorted Columns', ArrayExtensions_1.default.IsNotNullOrEmpty(sorts) ? sorts.join('; ') : 'None'));
         returnRows.push(createReadOnlyColItem(colItems, 'Column Filters', columnFilterDescription));

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -29,6 +29,7 @@ import { RowFormService } from '../Utilities/Services/RowFormService';
 import { GridCellWithCount } from '../PredefinedConfig/Selection/GridCell';
 import { FlashingCellService } from '../Utilities/Services/FlashingCellService';
 import { AgGridExportAdapter } from './AgGridExportAdapter';
+import { AgGridThemeAdapter } from './AgGridThemeAdapter';
 export type AdaptableLifecycleState = 'initial' | 'preprocessOptions' | 'initAdaptableState' | 'setupAgGrid' | 'initAgGrid' | 'agGridReady' | 'available' | 'ready' | 'preDestroyed';
 type RenderAgGridFrameworkComponentResult = false | GridApi;
 interface AdaptableInitInternalConfig<TData = any> {
@@ -70,6 +71,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     agGridColumnAdapter: AgGridColumnAdapter;
     agGridMenuAdapter: AgGridMenuAdapter;
     agGridExportAdapter: AgGridExportAdapter;
+    agGridThemeAdapter: AgGridThemeAdapter;
     private DANGER_USE_GETTER_adaptableContainerElement;
     private DANGER_USE_GETTER_agGridContainerElement;
     api: AdaptableApi;
@@ -295,8 +297,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     isGridGroupingActive(): boolean;
     setAgGridQuickSearch(searchText: string): void;
     clearAgGridQuickSearch(): void;
-    getAgGridCurrentThemeName(): string;
-    private getAgGridLightThemeName;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
     setRowGroupColumns(columnIds: string[]): void;
     getAllGridColumns(): Column<any>[];