@adaptabletools/adaptable 20.3.0 → 21.0.0-canary.1

package/src/Api/Implementation/LayoutApiImpl.js

@@ -2,8 +2,6 @@ import * as LayoutRedux from '../../Redux/ActionsReducers/LayoutRedux';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { ApiBase } from './ApiBase';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
-import ObjectFactory from '../../Utilities/ObjectFactory';
-import Helper from '../../Utilities/Helpers/Helper';
 import { createUuid } from '../../AdaptableState/Uuid';
 import { PopupShowPrompt } from '../../Redux/ActionsReducers/PopupRedux';
 import { LayoutInternalApi } from '../Internal/LayoutInternalApi';
@@ -89,14 +87,113 @@ export class LayoutApiImpl extends ApiBase {
             }
         }
     }
+    createOrUpdateExtendedLayout(extendedLayoutInfo) {
+        const config = {
+            includeLayoutNotExtendedObjects: true,
+        };
+        // Alerts
+        const alertExtensions = extendedLayoutInfo.Extensions.filter((e) => {
+            return e.Module == 'Alert';
+        });
+        alertExtensions.forEach((le) => {
+            const alertDefinition = le.Object;
+            const existingAlertDefinition = this.getAlertApi().getAlertDefinitionById(alertDefinition.Uuid, config);
+            if (!existingAlertDefinition) {
+                this.getAlertApi().addAlertDefinition(alertDefinition);
+            }
+        });
+        // Custom Sorts
+        const customSortExtensions = extendedLayoutInfo.Extensions.filter((e) => {
+            return e.Module == 'CustomSort';
+        });
+        customSortExtensions.forEach((le) => {
+            const customSort = le.Object;
+            const existingCustomSort = this.getCustomSortApi().getCustomSortById(customSort.Uuid, config);
+            if (!existingCustomSort) {
+                this.getCustomSortApi().addCustomSort(customSort);
+            }
+        });
+        // Flashing Cells
+        const flashingCellExtensions = extendedLayoutInfo.Extensions.filter((e) => {
+            return e.Module == 'FlashingCell';
+        });
+        flashingCellExtensions.forEach((le) => {
+            const flashingCellDefinition = le.Object;
+            const existingflashingCellDefinition = this.getFlashingCellApi().getFlashingCellDefinitionById(flashingCellDefinition.Uuid, config);
+            if (!existingflashingCellDefinition) {
+                this.getFlashingCellApi().addFlashingCellDefinition(flashingCellDefinition);
+            }
+        });
+        // FormatColumns
+        const formatColumnExtensions = extendedLayoutInfo.Extensions.filter((e) => {
+            return e.Module == 'FormatColumn';
+        });
+        formatColumnExtensions.forEach((le) => {
+            const formatColumn = le.Object;
+            const existingFormatColumn = this.getFormatColumnApi().getFormatColumnByUuId(formatColumn.Uuid, config);
+            if (!existingFormatColumn) {
+                this.getFormatColumnApi().addFormatColumn(formatColumn);
+            }
+        });
+        // Plus Minus
+        const plusMinusExtensions = extendedLayoutInfo.Extensions.filter((e) => {
+            return e.Module == 'PlusMinus';
+        });
+        plusMinusExtensions.forEach((le) => {
+            const plusMinusNudge = le.Object;
+            const existingPlusMinusNudge = this.getPlusMinusApi().getPlusMinusById(plusMinusNudge.Uuid, config);
+            if (!existingPlusMinusNudge) {
+                this.getPlusMinusApi().addPlusMinusNudge(plusMinusNudge);
+            }
+        });
+        // Schedule
+        const scheduleExtensions = extendedLayoutInfo.Extensions.filter((e) => {
+            return e.Module == 'Schedule';
+        });
+        scheduleExtensions.forEach((le) => {
+            const schedule = le.Object;
+            const existingSchedule = this.getScheduleApi().getScheduleById(schedule.Uuid, config);
+            if (!existingSchedule) {
+                if (existingSchedule.ScheduleType == 'Reminder') {
+                    this.getScheduleApi().addReminderSchedule(schedule);
+                }
+                if (existingSchedule.ScheduleType == 'Report') {
+                    this.getScheduleApi().addReportSchedule(schedule);
+                }
+            }
+        });
+        // Shortcut
+        const shortCutExtensions = extendedLayoutInfo.Extensions.filter((e) => {
+            return e.Module == 'Shortcut';
+        });
+        shortCutExtensions.forEach((le) => {
+            const shortcut = le.Object;
+            const existingShortcut = this.getShortcutApi().getShortcutById(shortcut.Uuid, config);
+            if (!existingShortcut) {
+                this.getShortcutApi().addShortcut(shortcut);
+            }
+        });
+        // StyledColumn
+        const styledColumnExtensions = extendedLayoutInfo.Extensions.filter((e) => {
+            return e.Module == 'StyledColumn';
+        });
+        styledColumnExtensions.forEach((le) => {
+            const styledColumn = le.Object;
+            const existingStyledColumn = this.getStyledColumnApi().getStyledColumnById(styledColumn.Uuid, config);
+            if (!existingStyledColumn) {
+                this.getStyledColumnApi().addStyledColumn(styledColumn);
+            }
+        });
+        this.createOrUpdateLayout(extendedLayoutInfo.Layout);
+    }
     getExtendedLayoutByName(layoutName) {
         const layout = this.getLayoutByName(layoutName);
         if (!layout) {
             return undefined;
         }
         const config = {
-            includeLayoutNotAssociatedObjects: true,
-            associatedWithLayout: layoutName,
+            includeLayoutNotExtendedObjects: false,
+            extendedLayoutName: layoutName,
         };
         // cannot see a better way than to go through this module by module...
         let extensions = [];
@@ -130,11 +227,6 @@ export class LayoutApiImpl extends ApiBase {
             .forEach((obj) => {
             extensions.push({ Module: 'Schedule', Object: obj });
         });
-        this.getScheduleApi()
-            .getReportSchedules(config)
-            .forEach((obj) => {
-            extensions.push({ Module: 'Schedule', Object: obj });
-        });
         this.getShortcutApi()
             .getShortcuts(config)
             .forEach((obj) => {
@@ -181,7 +273,7 @@ export class LayoutApiImpl extends ApiBase {
             this.logError("Cannot create layout with the Name: '" + layoutToCreate.Name + "' as it already exists");
             return false;
         }
-        const newLayout = ObjectFactory.CreateEmptyLayout({ ...layoutToCreate });
+        const newLayout = this.internalApi.buildInitialLayout(layoutToCreate);
         this.addUidToAdaptableObject(newLayout);
         this.dispatchAction(LayoutRedux.LayoutAdd(newLayout));
         return newLayout;
@@ -198,9 +290,11 @@ export class LayoutApiImpl extends ApiBase {
             this.logError("Cannot clone layout with Name: '" + layoutName + "' as other Layout does not exist");
             return false;
         }
-        const newLayout = Helper.cloneObject(layoutToClone);
-        newLayout.Uuid = createUuid();
-        newLayout.Name = layoutName;
+        const newLayout = {
+            ...this.internalApi.cloneLayout(layoutToClone),
+            Name: layoutName,
+            Uuid: createUuid(),
+        };
         this.dispatchAction(LayoutRedux.LayoutAdd(newLayout));
         return this.getLayoutById(newLayout.Uuid);
     }

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

@@ -1,5 +1,6 @@
 import { TableLayout, PivotLayout, Layout } from '../../types';
 import { LayoutModel, TableLayoutModel, PivotLayoutModel } from '../../layout-manager/src/LayoutManagerModel';
+export declare function columnWidthsToColumnSizing(columnWidths: Record<string, number>): TableLayout['ColumnSizing'];
 export declare const layoutStateToLayoutModel: (layout: TableLayout | PivotLayout) => LayoutModel;
 export declare const layoutModelToLayoutState: (layoutModel: LayoutModel) => TableLayout | PivotLayout;
 /**

package/src/Api/Implementation/LayoutHelpers.js

@@ -4,6 +4,15 @@ import { normalizeTableLayoutModel, normalizePivotLayoutModel, } from '../../lay
 import { simplifyTableLayoutModel, simplifyPivotLayoutModel, } from '../../layout-manager/src/simplifyLayoutModel';
 import { isWeightedAverageAggregation, WEIGHTED_AVERAGE_AGG_FN_NAME, isWeightedAverageAggFuncName, } from '../../AdaptableState/Common/AggregationColumns';
 import { removeAdaptableObjectPrimitivesInlineDeep } from '../../Utilities/Helpers/AdaptableHelper';
+export function columnWidthsToColumnSizing(columnWidths) {
+    if (!columnWidths) {
+        return undefined;
+    }
+    return Object.keys(columnWidths).reduce((acc, colId) => {
+        acc[colId] = { Width: columnWidths[colId] };
+        return acc;
+    }, {});
+}
 export const layoutStateToLayoutModel = (layout) => {
     if (isPivotLayout(layout)) {
         return pivotLayoutToPivotLayoutModel(layout);
@@ -153,6 +162,8 @@ export const checkForDuplicateColumns = (layout) => {
 };
 export const tableLayoutToTableLayoutModel = (tableLayout) => {
     tableLayout = structuredClone(tableLayout);
+    tableLayout.ColumnSizing =
+        tableLayout.ColumnSizing ?? columnWidthsToColumnSizing(tableLayout.ColumnWidths);
     cleanupAdaptableObjectPrimitives(tableLayout);
     const TableAggregationColumns = (tableLayout.TableAggregationColumns || []).map(({ ColumnId, AggFunc }) => {
         return {
@@ -164,7 +175,7 @@ export const tableLayoutToTableLayoutModel = (tableLayout) => {
         Name: tableLayout.Name,
         SuppressAggFuncInHeader: tableLayout.SuppressAggFuncInHeader,
         TableColumns: tableLayout.TableColumns,
-        ColumnWidths: tableLayout.ColumnWidths,
+        ColumnSizing: tableLayout.ColumnSizing,
         ColumnVisibility: tableLayout.ColumnVisibility,
         ColumnSorts: tableLayout.ColumnSorts,
         RowGroupedColumns: tableLayout.RowGroupedColumns,
@@ -224,11 +235,13 @@ export const tableLayoutToTableLayoutModel = (tableLayout) => {
 };
 export const pivotLayoutToPivotLayoutModel = (pivotLayout) => {
     pivotLayout = structuredClone(pivotLayout);
+    pivotLayout.ColumnSizing =
+        pivotLayout.ColumnSizing ?? columnWidthsToColumnSizing(pivotLayout.ColumnWidths);
     cleanupAdaptableObjectPrimitives(pivotLayout);
     const result = simplifyPivotLayoutModel({
         Name: pivotLayout.Name,
         SuppressAggFuncInHeader: pivotLayout.SuppressAggFuncInHeader,
-        ColumnWidths: pivotLayout.ColumnWidths,
+        ColumnSizing: pivotLayout.ColumnSizing,
         ColumnSorts: pivotLayout.ColumnSorts,
         PivotGroupedColumns: pivotLayout.PivotGroupedColumns,
         ColumnPinning: pivotLayout.ColumnPinning,
@@ -257,6 +270,9 @@ export const pivotLayoutToPivotLayoutModel = (pivotLayout) => {
                 }
             : undefined,
     });
+    if (pivotLayout.RowGroupDisplayType) {
+        result.RowGroupDisplayType = pivotLayout.RowGroupDisplayType;
+    }
     if (pivotLayout.ColumnFilters) {
         result.Ignore_ColumnFilters = pivotLayout.ColumnFilters;
     }
@@ -299,7 +315,7 @@ export const tableLayoutModelToTableLayout = (layoutModel) => {
     const tableLayout = {
         Name: layoutModel.Name,
         TableColumns: layoutModel.TableColumns,
-        ColumnWidths: layoutModel.ColumnWidths,
+        ColumnSizing: layoutModel.ColumnSizing,
         ColumnVisibility: layoutModel.ColumnVisibility,
         ColumnSorts: layoutModel.ColumnSorts,
     };
@@ -406,7 +422,7 @@ export const pivotLayoutModelToPivotLayout = (layoutModel) => {
         Name: layoutModel.Name,
         PivotColumns: layoutModel.PivotColumns,
         TableColumns: layoutModel.TableColumns,
-        ColumnWidths: layoutModel.ColumnWidths,
+        ColumnSizing: layoutModel.ColumnSizing,
         ColumnSorts: layoutModel.ColumnSorts,
         ColumnPinning: layoutModel.ColumnPinning,
         PivotExpandLevel: layoutModel.PivotExpandLevel,
@@ -495,6 +511,9 @@ export const pivotLayoutModelToPivotLayout = (layoutModel) => {
             pivotLayout.ColumnGroupValues.ExceptionGroupKeys = layoutModel.ColumnGroupValues.Values;
         }
     }
+    if (layoutModel.RowGroupDisplayType) {
+        pivotLayout.RowGroupDisplayType = layoutModel.RowGroupDisplayType;
+    }
     return pivotLayout;
 };
 export const isPivotLayout = (layout) => Array.isArray(layout.PivotColumns);

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

@@ -1,17 +1,19 @@
-import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
+import { ApiBase } from './ApiBase';
 import { PlusMinusNudge, PlusMinusState } from '../../AdaptableState/PlusMinusState';
 import { PlusMinusApi } from '../PlusMinusApi';
 import { CellUpdateRequest, GridCell } from '../../AdaptableState/Selection/GridCell';
+import { LayoutExtendedConfig } from '../../AdaptableState/Common/ExtendedLayout';
 export declare class PlusMinusApiImpl extends ApiBase implements PlusMinusApi {
     getPlusMinusState(): PlusMinusState;
-    getAllPlusMinus(config?: LayoutAssociatedObjectLoadConfig): PlusMinusNudge[];
-    getPlusMinusById(id: PlusMinusNudge['Uuid']): PlusMinusNudge;
-    getAllActivePlusMinus(): PlusMinusNudge[];
-    getAllSuspendedPlusMinus(): PlusMinusNudge[];
+    getAllPlusMinus(config?: LayoutExtendedConfig): PlusMinusNudge[];
+    getPlusMinusById(id: PlusMinusNudge['Uuid'], config?: LayoutExtendedConfig): PlusMinusNudge;
+    getAllActivePlusMinus(config?: LayoutExtendedConfig): PlusMinusNudge[];
+    getAllSuspendedPlusMinus(config?: LayoutExtendedConfig): PlusMinusNudge[];
     runPlusMinusNudge(plusMinusNudge: PlusMinusNudge, cellsToUpdate: GridCell[], direction: 'up' | 'down'): void;
     applyPlusMinus(cellUpdateRequests: CellUpdateRequest[]): void;
     openPlusMinusSettingsPanel(): void;
     editPlusMinusNudge(plusMinusNudge: PlusMinusNudge): PlusMinusNudge;
+    deletePlusMinusNudge(plusMinusNudge: PlusMinusNudge): void;
     suspendPlusMinusNudge(plusMinusNudge: PlusMinusNudge): PlusMinusNudge;
     unSuspendPlusMinusNudge(plusMinusNudge: PlusMinusNudge): PlusMinusNudge;
     addPlusMinusNudge(plusMinusNudge: PlusMinusNudge): PlusMinusNudge;

package/src/Api/Implementation/PlusMinusApiImpl.js

@@ -6,17 +6,17 @@ export class PlusMinusApiImpl extends ApiBase {
         return this.getAdaptableState().PlusMinus;
     }
     getAllPlusMinus(config) {
-        const layoutSpecificPlusMinusNudges = this.handleLayoutAssociatedObjects(this.getPlusMinusState().PlusMinusNudges, 'PlusMinus', config) ?? [];
+        const layoutSpecificPlusMinusNudges = this.handleLayoutExtensionObjects(this.getPlusMinusState().PlusMinusNudges, 'PlusMinus', config) ?? [];
         return layoutSpecificPlusMinusNudges.filter((plusMinusNudge) => plusMinusNudge.Rule == undefined || plusMinusNudge.Rule.BooleanExpression != undefined);
     }
-    getPlusMinusById(id) {
-        return this.getAllPlusMinus().find((plusMinus) => plusMinus?.Uuid === id);
+    getPlusMinusById(id, config) {
+        return this.getAllPlusMinus(config).find((plusMinus) => plusMinus?.Uuid === id);
     }
-    getAllActivePlusMinus() {
-        return this.getAllPlusMinus().filter((plusMinusNudge) => !plusMinusNudge.IsSuspended);
+    getAllActivePlusMinus(config) {
+        return this.getAllPlusMinus(config).filter((plusMinusNudge) => !plusMinusNudge.IsSuspended);
     }
-    getAllSuspendedPlusMinus() {
-        return this.getAllPlusMinus().filter((plusMinusNudge) => plusMinusNudge.IsSuspended);
+    getAllSuspendedPlusMinus(config) {
+        return this.getAllPlusMinus(config).filter((plusMinusNudge) => plusMinusNudge.IsSuspended);
     }
     runPlusMinusNudge(plusMinusNudge, cellsToUpdate, direction) {
         let plusMinusModule = (this.getAdaptableInternalApi().getModules().get(ModuleConstants.PlusMinusModuleId));
@@ -32,6 +32,9 @@ export class PlusMinusApiImpl extends ApiBase {
         this.dispatchAction(PlusMinusRedux.PlusMinusNudgeEdit(plusMinusNudge));
         return this.getPlusMinusById(plusMinusNudge.Uuid);
     }
+    deletePlusMinusNudge(plusMinusNudge) {
+        this.dispatchAction(PlusMinusRedux.PlusMinusNudgeDelete(plusMinusNudge));
+    }
     suspendPlusMinusNudge(plusMinusNudge) {
         this.dispatchAction(PlusMinusRedux.PlusMinusNudgeSuspend(plusMinusNudge));
         return this.getPlusMinusById(plusMinusNudge.Uuid);

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

@@ -6,24 +6,21 @@ import { IPushPullSchedule } from '../../AdaptableState/IPushPullState';
 import { OpenFinSchedule } from '../../AdaptableState/OpenFinState';
 import { ReminderSchedule, ScheduleState } from '../../AdaptableState/ScheduleState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { LayoutExtendedConfig } from '../../types';
 export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     constructor(_adaptable: IAdaptable);
     getScheduleState(): ScheduleState;
-    getSchedules(): BaseSchedule[];
-    getReminderSchedules(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): ReminderSchedule[];
-    getScheduleById(id: BaseSchedule['Uuid']): BaseSchedule;
-    getActiveReminderSchedules(): ReminderSchedule[];
-    getSuspendedReminderSchedules(): ReminderSchedule[];
+    getSchedules(config?: LayoutExtendedConfig): BaseSchedule[];
+    getReminderSchedules(config?: LayoutExtendedConfig): ReminderSchedule[];
+    getScheduleById(id: BaseSchedule['Uuid'], config?: LayoutExtendedConfig): BaseSchedule;
+    getActiveReminderSchedules(config?: LayoutExtendedConfig): ReminderSchedule[];
+    getSuspendedReminderSchedules(config?: LayoutExtendedConfig): ReminderSchedule[];
     addReminderSchedule(schedule: ReminderSchedule): ReminderSchedule;
     deleteReminderSchedule(schedule: ReminderSchedule): void;
     editReminderSchedule(schedule: ReminderSchedule): ReminderSchedule;
     suspendReminderSchedule(schedule: ReminderSchedule): ReminderSchedule;
     unSuspendReminderSchedule(schedule: ReminderSchedule): ReminderSchedule;
-    getReportSchedules(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): ReportSchedule[];
+    getReportSchedules(config?: LayoutExtendedConfig): ReportSchedule[];
     getActiveReportSchedules(): ReportSchedule[];
     getSuspendedReportSchedules(): ReportSchedule[];
     addReportSchedule(schedule: ReportSchedule): ReportSchedule;
@@ -31,9 +28,7 @@ export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     deleteReportSchedule(schedule: ReportSchedule): void;
     suspendReportSchedule(schedule: ReportSchedule): ReportSchedule;
     unSuspendReportSchedule(schedule: ReportSchedule): ReportSchedule;
-    getIPushPullSchedules(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): IPushPullSchedule[];
+    getIPushPullSchedules(config?: LayoutExtendedConfig): IPushPullSchedule[];
     getActiveIPushPullSchedules(): IPushPullSchedule[];
     getSuspendedIPushPullSchedules(): IPushPullSchedule[];
     addIPushPullSchedule(schedule: IPushPullSchedule): IPushPullSchedule;
@@ -41,9 +36,7 @@ export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     deleteIPushPullSchedule(schedule: IPushPullSchedule): void;
     suspendIPushPullSchedule(schedule: IPushPullSchedule): IPushPullSchedule;
     unSuspendIPushPullSchedule(schedule: IPushPullSchedule): IPushPullSchedule;
-    getOpenFinSchedules(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): OpenFinSchedule[];
+    getOpenFinSchedules(config?: LayoutExtendedConfig): OpenFinSchedule[];
     getActiveOpenFinSchedules(): OpenFinSchedule[];
     getSuspendedOpenFinSchedules(): OpenFinSchedule[];
     addOpenFinSchedule(schedule: OpenFinSchedule): OpenFinSchedule;

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -8,26 +8,25 @@ export class ScheduleApiImpl extends ApiBase {
     getScheduleState() {
         return this.getAdaptableState().Schedule;
     }
-    getSchedules() {
+    getSchedules(config) {
         let allSchedules = [];
-        allSchedules.push(...this.getReminderSchedules());
-        allSchedules.push(...this.getReportSchedules());
-        allSchedules.push(...this.getIPushPullSchedules());
-        allSchedules.push(...this.getOpenFinSchedules());
+        allSchedules.push(...this.getReminderSchedules(config));
+        allSchedules.push(...this.getReportSchedules(config));
+        allSchedules.push(...this.getIPushPullSchedules(config));
+        allSchedules.push(...this.getOpenFinSchedules(config));
         return allSchedules;
     }
     getReminderSchedules(config) {
-        return (this.handleLayoutAssociatedObjects(this.getScheduleState().Reminders, 'Schedule', config) ??
-            []);
+        return (this.handleLayoutExtensionObjects(this.getScheduleState().Reminders, 'Schedule', config) ?? []);
     }
-    getScheduleById(id) {
-        return this.getSchedules().find((schedule) => schedule?.Uuid === id);
+    getScheduleById(id, config) {
+        return this.getSchedules(config).find((schedule) => schedule?.Uuid === id);
     }
-    getActiveReminderSchedules() {
-        return this.getReminderSchedules().filter((schedule) => !schedule.IsSuspended);
+    getActiveReminderSchedules(config) {
+        return this.getReminderSchedules(config).filter((schedule) => !schedule.IsSuspended);
     }
-    getSuspendedReminderSchedules() {
-        return this.getReminderSchedules().filter((schedule) => schedule.IsSuspended);
+    getSuspendedReminderSchedules(config) {
+        return this.getReminderSchedules(config).filter((schedule) => schedule.IsSuspended);
     }
     addReminderSchedule(schedule) {
         this.dispatchAction(ScheduleRedux.ReminderScheduleAdd(schedule));
@@ -49,7 +48,7 @@ export class ScheduleApiImpl extends ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getReportSchedules(config) {
-        return (this.handleLayoutAssociatedObjects(this.getAdaptableState().Schedule.ReportSchedules, 'Schedule', config) ?? []);
+        return (this.handleLayoutExtensionObjects(this.getAdaptableState().Schedule.ReportSchedules, 'Schedule', config) ?? []);
     }
     getActiveReportSchedules() {
         return this.getReportSchedules().filter((schedule) => !schedule.IsSuspended);
@@ -78,7 +77,7 @@ export class ScheduleApiImpl extends ApiBase {
     }
     getIPushPullSchedules(config) {
         const ippApi = this.getAdaptableApi().pluginsApi.getipushpullPluginApi();
-        return (this.handleLayoutAssociatedObjects(ippApi?.getIPushPullSchedules(), 'Schedule', config) ?? []);
+        return (this.handleLayoutExtensionObjects(ippApi?.getIPushPullSchedules(), 'Schedule', config) ?? []);
     }
     getActiveIPushPullSchedules() {
         return this.getIPushPullSchedules().filter((schedule) => !schedule.IsSuspended);
@@ -107,8 +106,7 @@ export class ScheduleApiImpl extends ApiBase {
     }
     getOpenFinSchedules(config) {
         const openFinApi = this.getAdaptableApi().pluginsApi.getOpenFinPluginApi();
-        return (this.handleLayoutAssociatedObjects(openFinApi?.getOpenFinSchedules(), 'Schedule', config) ??
-            []);
+        return (this.handleLayoutExtensionObjects(openFinApi?.getOpenFinSchedules(), 'Schedule', config) ?? []);
     }
     getActiveOpenFinSchedules() {
         return this.getOpenFinSchedules().filter((schedule) => !schedule.IsSuspended);

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

@@ -1,14 +1,13 @@
 import { ApiBase } from './ApiBase';
 import { ShortcutApi } from '../ShortcutApi';
 import { Shortcut, ShortcutState } from '../../AdaptableState/ShortcutState';
+import { LayoutExtendedConfig } from '../../types';
 export declare class ShortcutApiImpl extends ApiBase implements ShortcutApi {
     getShortcutState(): ShortcutState;
-    getShortcuts(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): Shortcut[];
-    getShortcutById(id: Shortcut['Uuid']): Shortcut;
-    getActiveShortcuts(): Shortcut[];
-    getSuspendedShortcuts(): Shortcut[];
+    getShortcuts(config?: LayoutExtendedConfig): Shortcut[];
+    getShortcutById(id: Shortcut['Uuid'], config?: LayoutExtendedConfig): Shortcut;
+    getActiveShortcuts(config?: LayoutExtendedConfig): Shortcut[];
+    getSuspendedShortcuts(config?: LayoutExtendedConfig): Shortcut[];
     addShortcut(shortcut: Shortcut): Shortcut;
     deleteShortcut(shortcut: Shortcut): void;
     deleteAllShortcuts(): void;

package/src/Api/Implementation/ShortcutApiImpl.js

@@ -6,17 +6,16 @@ export class ShortcutApiImpl extends ApiBase {
         return this.getAdaptableState().Shortcut;
     }
     getShortcuts(config) {
-        return (this.handleLayoutAssociatedObjects(this.getShortcutState().Shortcuts, 'Shortcut', config) ??
-            []);
+        return (this.handleLayoutExtensionObjects(this.getShortcutState().Shortcuts, 'Shortcut', config) ?? []);
     }
-    getShortcutById(id) {
-        return this.getShortcuts().find((shortcut) => shortcut?.Uuid === id);
+    getShortcutById(id, config) {
+        return this.getShortcuts(config).find((shortcut) => shortcut?.Uuid === id);
     }
-    getActiveShortcuts() {
-        return this.getShortcuts().filter((shortcut) => !shortcut.IsSuspended);
+    getActiveShortcuts(config) {
+        return this.getShortcuts(config).filter((shortcut) => !shortcut.IsSuspended);
     }
-    getSuspendedShortcuts() {
-        return this.getShortcuts().filter((shortcut) => shortcut.IsSuspended);
+    getSuspendedShortcuts(config) {
+        return this.getShortcuts(config).filter((shortcut) => shortcut.IsSuspended);
     }
     addShortcut(shortcut) {
         this.addUidToAdaptableObject(shortcut);

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

@@ -1,21 +1,20 @@
 import { ApiBase } from './ApiBase';
 import { StyledColumnApi } from '../StyledColumnApi';
 import { StyledColumn, StyledColumnState } from '../../AdaptableState/StyledColumnState';
-import { AdaptableColumn } from '../../types';
+import { AdaptableColumn, LayoutExtendedConfig } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { StyledColumnInternalApi } from '../Internal/StyledColumnInternalApi';
 export declare class StyledColumnApiImpl extends ApiBase implements StyledColumnApi {
     internalApi: StyledColumnInternalApi;
     constructor(_adaptable: IAdaptable);
     getStyledColumnState(): StyledColumnState;
-    getStyledColumns(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): StyledColumn[];
-    getStyledColumnById(id: StyledColumn['Uuid']): StyledColumn;
-    getStyledColumnForColumnId(columnId: StyledColumn['ColumnId']): StyledColumn;
-    getActiveStyledColumns(): StyledColumn[];
-    getSuspendedStyledColumns(): StyledColumn[];
+    getStyledColumns(config?: LayoutExtendedConfig): StyledColumn[];
+    getStyledColumnById(id: StyledColumn['Uuid'], config?: LayoutExtendedConfig): StyledColumn;
+    getStyledColumnForColumnId(columnId: StyledColumn['ColumnId'], config?: LayoutExtendedConfig): StyledColumn;
+    getActiveStyledColumns(config?: LayoutExtendedConfig): StyledColumn[];
+    getSuspendedStyledColumns(config?: LayoutExtendedConfig): StyledColumn[];
     deleteStyledColumn(styledColumn: StyledColumn): void;
+    deleteAllStyledColumns(): void;
     addStyledColumn(styledColumn: StyledColumn): void;
     isSparklineStyleStyledColumn(column: AdaptableColumn): boolean;
     getActiveStyledColumnForColumn(column: AdaptableColumn): StyledColumn | undefined;

package/src/Api/Implementation/StyledColumnApiImpl.js

@@ -11,23 +11,26 @@ export class StyledColumnApiImpl extends ApiBase {
         return this.getAdaptableState().StyledColumn;
     }
     getStyledColumns(config) {
-        return (this.handleLayoutAssociatedObjects(this.getStyledColumnState().StyledColumns, 'StyledColumn', config) ?? []);
+        return (this.handleLayoutExtensionObjects(this.getStyledColumnState().StyledColumns, 'StyledColumn', config) ?? []);
     }
-    getStyledColumnById(id) {
-        return this.getStyledColumns().find((styledcolumn) => styledcolumn.Uuid === id);
+    getStyledColumnById(id, config) {
+        return this.getStyledColumns(config).find((styledcolumn) => styledcolumn.Uuid === id);
     }
-    getStyledColumnForColumnId(columnId) {
-        return this.getStyledColumns().find((styledcolumn) => styledcolumn.ColumnId === columnId);
+    getStyledColumnForColumnId(columnId, config) {
+        return this.getStyledColumns(config).find((styledcolumn) => styledcolumn.ColumnId === columnId);
     }
-    getActiveStyledColumns() {
-        return this.getStyledColumns().filter((styledcolumn) => !styledcolumn.IsSuspended);
+    getActiveStyledColumns(config) {
+        return this.getStyledColumns(config).filter((styledcolumn) => !styledcolumn.IsSuspended);
     }
-    getSuspendedStyledColumns() {
-        return this.getStyledColumns().filter((styledcolumn) => styledcolumn.IsSuspended);
+    getSuspendedStyledColumns(config) {
+        return this.getStyledColumns(config).filter((styledcolumn) => styledcolumn.IsSuspended);
     }
     deleteStyledColumn(styledColumn) {
         this.dispatchAction(StyledColumnRedux.StyledColumnDelete(styledColumn));
     }
+    deleteAllStyledColumns() {
+        this.dispatchAction(StyledColumnRedux.StyledColumnDeleteAll());
+    }
     addStyledColumn(styledColumn) {
         this.dispatchAction(StyledColumnRedux.StyledColumnAdd(styledColumn));
     }

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -42,10 +42,7 @@ export class TeamSharingApiImpl extends ApiBase {
         return true;
     }
     isTeamSharingAvailable() {
-        return (!this.getEntitlementApi().isModuleHiddenEntitlement(ModuleConstants.TeamSharingModuleId) &&
-            this.getTeamSharingOptions()?.enableTeamSharing &&
-            !!this.getTeamSharingOptions()?.loadSharedEntities &&
-            !!this.getTeamSharingOptions()?.persistSharedEntities);
+        return this._adaptable.ModuleService.isAdapTableModulePresent('TeamSharing');
     }
     hasTeamSharingFullRights() {
         return this.getEntitlementApi().isModuleFullEntitlement(ModuleConstants.TeamSharingModuleId);

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

@@ -1,4 +1,5 @@
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { CustomIcon } from '../../AdaptableOptions/UserInterfaceOptions';
 import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
 import { AdaptableModule, AdaptableObject, AdaptableObjectTag, CustomWindowConfig } from '../../types';
 import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
@@ -10,13 +11,13 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     private showProgressIndicatorTimeout;
     constructor(_adaptable: IAdaptable);
     getColorPalette(): string[];
+    getCustomIcons(): CustomIcon[];
     getStyleClassNames(): string[] | undefined;
     getEditableCellStyle(): AdaptableStyle | undefined;
     getEditedCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
     getAdaptableObjectsWithTag(tag: AdaptableObjectTag, adaptableModule?: AdaptableModule): AdaptableObject[] | undefined;
-    getCustomIconDefinition(iconName: string): import("../../types").AdaptableIcon | import("../../types").CustomIcon;
     showProgressIndicator(config: ProgressIndicatorConfig): {
         close: () => void;
     };

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -26,6 +26,16 @@ export class UserInterfaceApiImpl extends ApiBase {
         }
         return [];
     }
+    getCustomIcons() {
+        let customIconsProp = this.getUserInterfaceOptions().customIcons;
+        if (customIconsProp != null) {
+            // first do the function then get hardcoded items
+            return typeof customIconsProp === 'function'
+                ? customIconsProp()
+                : customIconsProp;
+        }
+        return [];
+    }
     getStyleClassNames() {
         return this.getUserInterfaceOptions().styleClassNames;
     }
@@ -73,15 +83,6 @@ export class UserInterfaceApiImpl extends ApiBase {
             return returnObjects;
         }
     }
-    getCustomIconDefinition(iconName) {
-        let customIcon = undefined;
-        const customIcons = this.getUserInterfaceOptions().customIcons ?? [];
-        customIcon = customIcons.find((icon) => icon.name === iconName);
-        if (customIcon) {
-            return customIcon.icon;
-        }
-        return customIcon;
-    }
     showProgressIndicator(config) {
         const close = () => {
             this.hideProgressIndicator();

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

@@ -30,6 +30,7 @@ import { RowFormService } from '../../Utilities/Services/RowFormService';
 import { WindowModalPosition, WindowModalSize } from '../../components/WindowModal';
 import { FlashingCellService } from '../../Utilities/Services/FlashingCellService';
 import { AgGridAdapter } from '../../agGrid/AgGridAdapter';
+import { AgGridModulesAdapter } from '../../agGrid/AgGridModulesAdapter';
 export declare class AdaptableInternalApi extends ApiBase {
     getInternalState(): InternalState;
     getAdaptableJSXElement(): React.JSX.Element;
@@ -62,6 +63,7 @@ export declare class AdaptableInternalApi extends ApiBase {
     buildRowDataChangedInfo(dataRows: any[], rowNodes: IRowNode[], rowTrigger: RowDataChangeTrigger): RowDataChangedInfo;
     getAdaptableInstance(): IAdaptable;
     getAgGridAdapter(): AgGridAdapter;
+    getAgGridModulesAdapter(): AgGridModulesAdapter;
     getInitialState(): InitialState;
     getState(): AdaptableState;
     getValidationService(): IValidationService;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -72,6 +72,9 @@ export class AdaptableInternalApi extends ApiBase {
     getAgGridAdapter() {
         return this._adaptable.agGridAdapter;
     }
+    getAgGridModulesAdapter() {
+        return this._adaptable.agGridModulesAdapter;
+    }
     getInitialState() {
         return this.getOptions().initialState;
     }