@adaptabletools/adaptable 18.0.0-canary.4 → 18.0.0-canary.6

package/src/Strategy/LayoutModule.js

@@ -18,39 +18,8 @@ import { getGridFilterViewItems } from '../View/Layout/Wizard/getGridFilterPrevi
 export class LayoutModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'grid', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
-        this.clearUnsuportedFeaturesFromLayout = (layout) => {
-            const layoutSupportedFeatures = this.api.layoutApi.internalApi.getLayoutSupportedFeatures();
-            let needsUpdate = false;
-            const layoutToSave = Object.assign({}, layout);
-            if (!layoutSupportedFeatures.RowGroupedColumns && layout.RowGroupedColumns) {
-                delete layoutToSave.RowGroupedColumns;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.AggregationColumns && layout.AggregationColumns) {
-                delete layoutToSave.AggregationColumns;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.PivotColumns && layout.PivotColumns) {
-                delete layoutToSave.PivotColumns;
-                delete layoutToSave.EnablePivot;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.ColumnFilters && layout.ColumnFilters) {
-                delete layoutToSave.ColumnFilters;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.GridFilter && layout.GridFilter) {
-                delete layoutToSave.GridFilter;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.ColumnSorts && layout.ColumnSorts) {
-                delete layoutToSave.ColumnSorts;
-                needsUpdate = true;
-            }
-            if (needsUpdate) {
-                this.api.layoutApi.createOrUpdateLayout(layoutToSave);
-            }
-        };
+    }
+    onAdaptableReady() {
         this.api.eventApi.on('LayoutChanged', (layoutChangedInfo) => {
             var _a;
             if (layoutChangedInfo.newLayoutState.CurrentLayout !==
@@ -59,17 +28,9 @@ export class LayoutModule extends AdaptableModuleBase {
                 this.handleLayoutChange();
             }
         });
-    }
-    updateOldConfig() {
-        /**
-         * Viewport mode does not support a few
-         * features instead of complicating the
-         * logic where layout is applied, it is easier and
-         * less error prone to just remove it.
-         */
-        if (this.api.gridApi.getAgGridRowModelType() === 'viewport') {
-            this.api.layoutApi.getLayouts().forEach(this.clearUnsuportedFeaturesFromLayout);
-        }
+        requestAnimationFrame(() => {
+            this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
+        });
     }
     getModuleAdaptableObjects() {
         return this.api.layoutApi.getLayouts();
@@ -137,11 +98,6 @@ export class LayoutModule extends AdaptableModuleBase {
     hasNamedQueryReferences() {
         return true;
     }
-    handleAdaptableReady() {
-        requestAnimationFrame(() => {
-            this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
-        });
-    }
     addColumnMenuItems(column) {
         var _a, _b;
         let returnColumnMenuItems = [];
@@ -435,7 +391,7 @@ export class LayoutModule extends AdaptableModuleBase {
             .setUpScheduleJobs();
         // CustomSort, FlashingCell, FormatColumn
         // we need to refresh the column defs, as some configs may have changed
-        this.api.internalApi.getAdaptableInstance().setupColumns();
+        this.api.internalApi.getAdaptableInstance().updateColumnModelAndRefreshGrid();
     }
     getReferencedNamedQueryNames(layout) {
         var _a;

package/src/Strategy/NamedQueryModule.d.ts

@@ -8,7 +8,6 @@ import { IModule } from './Interface/IModule';
 export declare class NamedQueryModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(): AdaptableObject[];
-    updateOldConfig(): void;
     getTeamSharingAction(): TeamSharingImportInfo<NamedQuery>;
     getExplicitlyReferencedColumnIds(namedQuery: NamedQuery): string[];
     getReferencedNamedQueryNames(namedQuery: NamedQuery): string[];

package/src/Strategy/NamedQueryModule.js

@@ -1,6 +1,5 @@
 import * as NamedQueryRedux from '../Redux/ActionsReducers/NamedQueryRedux';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import { EditGridFilterButton } from '../View/NamedQuery/EditCurrentQueryButton';
 import { NamedQueryWizard } from '../View/NamedQuery/Wizard/NamedQueryWizard';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
@@ -12,24 +11,6 @@ export class NamedQueryModule extends AdaptableModuleBase {
     getModuleAdaptableObjects() {
         return this.api.namedQueryApi.getNamedQueries();
     }
-    updateOldConfig() {
-        // - move named queries from old Query State to this Module
-        // Note: GridFilter Module moves the "old" CurrentQuery into Layout
-        const oldQueryState = this.api.internalApi.getAdaptableState().Query;
-        const oldNamedQueries = oldQueryState.NamedQueries;
-        if (ArrayExtensions.IsNotNullOrEmpty(oldNamedQueries)) {
-            const currentNamedQueries = this.api.namedQueryApi.getNamedQueries();
-            oldNamedQueries.forEach((oldNamedQuery) => {
-                const currentQuery = currentNamedQueries.find((q) => q.Name === oldNamedQuery.Name);
-                if (!currentQuery) {
-                    this.api.namedQueryApi.addNamedQuery(oldNamedQuery);
-                }
-            });
-        }
-        if (oldQueryState) {
-            this.api.namedQueryApi.internalApi.cleanupQueryRedux();
-        }
-    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.namedQueryApi.getNamedQueries(),

package/src/Strategy/PlusMinusModule.d.ts

@@ -17,7 +17,7 @@ export declare class PlusMinusModule extends AdaptableModuleBase implements IPlu
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(plusMinusNudge: PlusMinusNudge): string[];
     getReferencedNamedQueryNames(plusMinusNudge: PlusMinusNudge): string[];
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     checkListenToKeyDown(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     private handleKeyDown;

package/src/Strategy/PlusMinusModule.js

@@ -33,7 +33,7 @@ export class PlusMinusModule extends AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames((_b = plusMinusNudge.Rule) === null || _b === void 0 ? void 0 : _b.BooleanExpression);
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         let plusMinusNudges = this.api.plusMinusApi.getAllPlusMinus();
         this.shouldHandleKeyDown = ArrayExtensions.IsNotNullOrEmpty(plusMinusNudges);
         if (this.shouldHandleKeyDown) {

package/src/Strategy/ScheduleModule.d.ts

@@ -6,7 +6,7 @@ import { IScheduleModule } from './Interface/IScheduleModule';
 export declare class ScheduleModule extends AdaptableModuleBase implements IScheduleModule {
     private scheduleJobs;
     constructor(api: AdaptableApi);
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     setUpScheduleJobs(): void;
     private addSchedule;
     private addMidnightRefreshSchedule;

package/src/Strategy/ScheduleModule.js

@@ -36,7 +36,7 @@ export class ScheduleModule extends AdaptableModuleBase {
         this.scheduleJobs = [];
         this.addMidnightRefreshSchedule();
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         this.setUpScheduleJobs();
     }
     setUpScheduleJobs() {

package/src/Strategy/ShortcutModule.d.ts

@@ -14,7 +14,7 @@ export declare class ShortcutModule extends AdaptableModuleBase implements IShor
     }): AdaptableObject[];
     hasNamedQueryReferences(): boolean;
     getTeamSharingAction(): TeamSharingImportInfo<Shortcut>;
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     checkListenToKeyDown(): void;
     private handleKeyDown;
     private calculateShortcut;

package/src/Strategy/ShortcutModule.js

@@ -27,7 +27,7 @@ export class ShortcutModule extends AdaptableModuleBase {
             EditAction: ShortcutRedux.ShortcutEdit,
         };
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         this.checkListenToKeyDown();
         this.adaptable._on('CellEditorKeyDown', (cellEditorKeyDownEvent) => {
             this.handleKeyDown(cellEditorKeyDownEvent);

package/src/Strategy/StyledColumnModule.d.ts

@@ -9,7 +9,6 @@ import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 export declare class StyledColumnModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
     getModuleAdaptableObjects(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): AdaptableObject[];

package/src/Strategy/StyledColumnModule.js

@@ -11,27 +11,6 @@ export class StyledColumnModule extends AdaptableModuleBase {
         super(ModuleConstants.StyledColumnModuleId, ModuleConstants.StyledColumnFriendlyName, 'brush', 'StyledColumnPopup', // to change
         'Create a Special Column Style e.g Gradient or Percent Bar', api);
     }
-    updateOldConfig() {
-        const formatColumnsWithColumnStyles = this.api.formatColumnApi
-            .getFormatColumns()
-            .filter((formatColumn) => formatColumn.ColumnStyle);
-        if (!formatColumnsWithColumnStyles.length) {
-            return;
-        }
-        this.api.logInfo(`Converting ${formatColumnsWithColumnStyles.length} FormatColumns Styles to Styled Columns`, formatColumnsWithColumnStyles);
-        formatColumnsWithColumnStyles.forEach((formatColumn) => {
-            this.api.formatColumnApi.deleteFormatColumn(formatColumn);
-        });
-        const styledColumns = formatColumnsWithColumnStyles
-            .map((formatColumn) => {
-            if (!('ColumnIds' in formatColumn.Scope)) {
-                return null;
-            }
-            return Object.assign(Object.assign(Object.assign({}, ObjectFactory.CreateEmptyStyledColumn()), { ColumnId: formatColumn.Scope.ColumnIds[0] }), formatColumn.ColumnStyle);
-        })
-            .filter(Boolean);
-        styledColumns.forEach((styledColumn) => this.api.styledColumnApi.addStyledColumn(styledColumn));
-    }
     getModuleAdaptableObjects(config) {
         return this.api.styledColumnApi.getStyledColumns(config);
     }

package/src/Strategy/TeamSharingModule.d.ts

@@ -5,6 +5,7 @@ import { AdaptableSharedEntity } from '../PredefinedConfig/TeamSharingState';
 export declare class TeamSharingModule extends AdaptableModuleBase implements IModule {
     private SKIP_TEAMSHARING_UPDATE_ACTIONS;
     constructor(api: AdaptableApi);
+    onAdaptableReady(): void;
     isModuleAvailable(): boolean;
     isModuleObjectsShareable(): boolean;
     getPopupMaxWidth(): number | undefined;

package/src/Strategy/TeamSharingModule.js

@@ -23,14 +23,14 @@ export class TeamSharingModule extends AdaptableModuleBase {
             TEAMSHARING_LINK_ITEM,
             TEAMSHARING_UPDATE_ITEM,
         ];
-        this.api.eventApi.on('AdaptableStateChanged', (adaptableStateChangedInfo) => this.handleStateChanged(adaptableStateChangedInfo));
-        this.api.eventApi.on('AdaptableReady', () => {
-            // make sure there is no zombie import process remaining (in case a previous import crashed)
-            this.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingCommitImport());
-        });
+    }
+    onAdaptableReady() {
+        // make sure there is no zombie import process remaining (in case a previous import crashed)
+        this.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingCommitImport());
         if (this.api.teamSharingApi.isTeamSharingAvailable()) {
             this.api.teamSharingApi.refreshTeamSharing();
         }
+        this.api.eventApi.on('AdaptableStateChanged', (adaptableStateChangedInfo) => this.handleStateChanged(adaptableStateChangedInfo));
     }
     isModuleAvailable() {
         return super.isModuleAvailable() && this.api.teamSharingApi.isTeamSharingAvailable();

package/src/Strategy/ToolPanelModule.d.ts

@@ -4,5 +4,4 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class ToolPanelModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;
-    updateOldConfig(): void;
 }

package/src/Strategy/ToolPanelModule.js

@@ -1,7 +1,5 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-import { ALL_TOOL_PANELS } from '../PredefinedConfig/Common/Types';
-import { ToolPanelSetToolPanels } from '../Redux/ActionsReducers/ToolPanelRedux';
 export class ToolPanelModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ToolPanelModuleId, ModuleConstants.ToolPanelFriendlyName, 'clipboard', 'ToolPanelPopup', 'An alternative to using the Dashboard is the AdapTable Tool Panel, the Tool Panel is the collapsible area to the right of the Grid.', api);
@@ -12,25 +10,4 @@ export class ToolPanelModule extends AdaptableModuleBase {
         }
         return this.api.internalApi.getAdaptableInstance().hasAdaptableToolPanel;
     }
-    updateOldConfig() {
-        const deprecatedToolPanelConfigs = this.api.toolPanelApi.getToolPanelState().VisibleToolPanels;
-        if (deprecatedToolPanelConfigs === null || deprecatedToolPanelConfigs === void 0 ? void 0 : deprecatedToolPanelConfigs.length) {
-            this.api.logWarn(`Updating Obsolete VisibleToolPanels Config for ToolPanelState: [${deprecatedToolPanelConfigs}]`);
-            const migratedToolPanelConfigs = deprecatedToolPanelConfigs.map((toolPanel) => ({
-                Name: toolPanel,
-                State: 'collapsed',
-            }));
-            this.api.internalApi.dispatchReduxAction(ToolPanelSetToolPanels(migratedToolPanelConfigs));
-        }
-        else if (!this.api.toolPanelApi.getToolPanelState().ToolPanels) {
-            // no predefined config provided, we will display all the panels collapsed (custom & module)
-            this.api.logInfo(`No predefined ToolPanels provided, displaying all available ones (custom&system)`);
-            const defaultConfig = [];
-            this.api.toolPanelApi
-                .getCustomToolPanels()
-                .forEach((customToolPanel) => defaultConfig.push({ Name: customToolPanel.name }));
-            ALL_TOOL_PANELS.forEach((moduleToolPanel) => defaultConfig.push({ Name: moduleToolPanel }));
-            this.api.internalApi.dispatchReduxAction(ToolPanelSetToolPanels(defaultConfig));
-        }
-    }
 }

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -27,6 +27,7 @@ export declare const AB_SPECIAL_COLUMN: AdaptableColumnType;
 export declare const AB_ROW_ACTIONS_COLUMN: AdaptableColumnType;
 export declare const AB_FDC3_COLUMN: AdaptableColumnType;
 export declare const HALF_SECOND: number;
+export declare const GROUP_PATH_SEPARATOR: string;
 export declare const AG_GRID_GROUPED_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
 export declare const AG_GRID_CHART_WINDOW = "AG Grid Window";

package/src/Utilities/Constants/GeneralConstants.js

@@ -26,6 +26,7 @@ export const AB_SPECIAL_COLUMN = 'abSpecialColumn';
 export const AB_ROW_ACTIONS_COLUMN = 'abRowActionsColumn';
 export const AB_FDC3_COLUMN = 'abFdc3Column';
 export const HALF_SECOND = 500;
+export const GROUP_PATH_SEPARATOR = '/';
 export const AG_GRID_GROUPED_COLUMN = 'ag-Grid-AutoColumn';
 export const AG_GRID_PIVOT_COLUMN = 'pivot_';
 export const AG_GRID_CHART_WINDOW = 'AG Grid Window';

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

@@ -1,10 +1,8 @@
 import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableComparerFunction } from '../../PredefinedConfig/Common/AdaptableComparerFunction';
 import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
 import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
-export declare function assignAdaptableOptions(adaptableOptions: AdaptableOptions): AdaptableOptions;
 export declare function initPredefinedConfigWithUuids(predefinedConfig: PredefinedConfig): PredefinedConfig;
 export declare function checkValidPrimaryKey(adaptable: IAdaptable): boolean;
 export declare function AdaptableObjectExistsInState(array: AdaptableObject[], itemToCheck: AdaptableObject): boolean;
@@ -12,7 +10,6 @@ export declare function getAppropriateAccessLevel(adaptableObject: AdaptableObje
 export declare function runAdaptableComparerFunction(columnId: string, columnValues: any[], adaptable: IAdaptable): AdaptableComparerFunction;
 export declare function addUuidAndSource(adaptableObject: AdaptableObject): AdaptableObject;
 export declare const AdaptableHelper: {
-    assignAdaptableOptions: typeof assignAdaptableOptions;
     initPredefinedConfigWithUuids: typeof initPredefinedConfigWithUuids;
     checkValidPrimaryKey: typeof checkValidPrimaryKey;
     AdaptableObjectExistsInState: typeof AdaptableObjectExistsInState;

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -1,63 +1,6 @@
 import cloneDeepWith from 'lodash/cloneDeepWith';
 import isPlainObject from 'lodash/isPlainObject';
 import { createUuid } from '../../PredefinedConfig/Uuid';
-import { DefaultAdaptableOptions } from '../Defaults/DefaultAdaptableOptions';
-export function assignAdaptableOptions(adaptableOptions) {
-    var _a;
-    const returnedAdaptableOptions = Object.assign({}, DefaultAdaptableOptions, adaptableOptions);
-    returnedAdaptableOptions.adaptableStateKey =
-        (_a = returnedAdaptableOptions.adaptableStateKey) !== null && _a !== void 0 ? _a : returnedAdaptableOptions.adaptableId;
-    returnedAdaptableOptions.dataImportOptions = Object.assign({}, DefaultAdaptableOptions.dataImportOptions, adaptableOptions.dataImportOptions);
-    returnedAdaptableOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions.expressionOptions, adaptableOptions.expressionOptions);
-    returnedAdaptableOptions.calendarOptions = Object.assign({}, DefaultAdaptableOptions.calendarOptions, adaptableOptions.calendarOptions);
-    returnedAdaptableOptions.columnOptions = Object.assign({}, DefaultAdaptableOptions.columnOptions, adaptableOptions.columnOptions);
-    returnedAdaptableOptions.customSortOptions = Object.assign({}, DefaultAdaptableOptions.customSortOptions, adaptableOptions.customSortOptions);
-    returnedAdaptableOptions.dataSetOptions = Object.assign({}, DefaultAdaptableOptions.dataSetOptions, adaptableOptions.dataSetOptions);
-    returnedAdaptableOptions.cellSummaryOptions = Object.assign({}, DefaultAdaptableOptions.cellSummaryOptions, adaptableOptions.cellSummaryOptions);
-    returnedAdaptableOptions.predicateOptions = Object.assign({}, DefaultAdaptableOptions.predicateOptions, returnedAdaptableOptions.predicateOptions);
-    returnedAdaptableOptions.layoutOptions = Object.assign({}, DefaultAdaptableOptions.layoutOptions, adaptableOptions.layoutOptions);
-    returnedAdaptableOptions.notificationsOptions = Object.assign({}, DefaultAdaptableOptions.notificationsOptions, adaptableOptions.notificationsOptions);
-    returnedAdaptableOptions.alertOptions = Object.assign({}, DefaultAdaptableOptions.alertOptions, adaptableOptions.alertOptions);
-    returnedAdaptableOptions.flashingCellOptions = Object.assign({}, DefaultAdaptableOptions.flashingCellOptions, adaptableOptions.flashingCellOptions);
-    returnedAdaptableOptions.entitlementOptions = Object.assign({}, DefaultAdaptableOptions.entitlementOptions, adaptableOptions.entitlementOptions);
-    returnedAdaptableOptions.dashboardOptions = Object.assign({}, DefaultAdaptableOptions.dashboardOptions, adaptableOptions.dashboardOptions);
-    returnedAdaptableOptions.editOptions = Object.assign({}, DefaultAdaptableOptions.editOptions, adaptableOptions.editOptions);
-    returnedAdaptableOptions.actionColumnOptions = Object.assign({}, DefaultAdaptableOptions.actionColumnOptions, adaptableOptions.actionColumnOptions);
-    // to do
-    returnedAdaptableOptions.actionRowOptions = Object.assign({}, DefaultAdaptableOptions.actionRowOptions, adaptableOptions.actionRowOptions);
-    returnedAdaptableOptions.actionRowOptions.actionRowButtonOptions = Object.assign({}, DefaultAdaptableOptions.actionRowOptions.actionRowButtonOptions, returnedAdaptableOptions.actionRowOptions.actionRowButtonOptions);
-    returnedAdaptableOptions.actionRowOptions.actionRowFormOptions = Object.assign({}, DefaultAdaptableOptions.actionRowOptions.actionRowFormOptions, returnedAdaptableOptions.actionRowOptions.actionRowFormOptions);
-    returnedAdaptableOptions.containerOptions = Object.assign({}, DefaultAdaptableOptions.containerOptions, adaptableOptions.containerOptions);
-    returnedAdaptableOptions.groupingOptions = Object.assign({}, DefaultAdaptableOptions.groupingOptions, adaptableOptions.groupingOptions);
-    returnedAdaptableOptions.quickSearchOptions = Object.assign({}, DefaultAdaptableOptions.quickSearchOptions, adaptableOptions.quickSearchOptions);
-    returnedAdaptableOptions.columnFilterOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions, adaptableOptions.columnFilterOptions);
-    returnedAdaptableOptions.columnFilterOptions.quickFilterOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions.quickFilterOptions, returnedAdaptableOptions.columnFilterOptions.quickFilterOptions);
-    returnedAdaptableOptions.columnFilterOptions.filterFormOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions.filterFormOptions, returnedAdaptableOptions.columnFilterOptions.filterFormOptions);
-    returnedAdaptableOptions.columnFilterOptions.valuesFilterOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions.valuesFilterOptions, returnedAdaptableOptions.columnFilterOptions.valuesFilterOptions);
-    returnedAdaptableOptions.gridFilterOptions = Object.assign({}, DefaultAdaptableOptions.gridFilterOptions, adaptableOptions.gridFilterOptions);
-    returnedAdaptableOptions.userInterfaceOptions = Object.assign({}, DefaultAdaptableOptions.userInterfaceOptions, adaptableOptions.userInterfaceOptions);
-    returnedAdaptableOptions.userInterfaceOptions.dateInputOptions = Object.assign({}, DefaultAdaptableOptions.userInterfaceOptions.dateInputOptions, returnedAdaptableOptions.userInterfaceOptions.dateInputOptions);
-    returnedAdaptableOptions.menuOptions = Object.assign({}, DefaultAdaptableOptions.menuOptions, adaptableOptions.menuOptions);
-    returnedAdaptableOptions.stateOptions = Object.assign({}, DefaultAdaptableOptions.stateOptions, adaptableOptions.stateOptions);
-    returnedAdaptableOptions.exportOptions = Object.assign({}, DefaultAdaptableOptions.exportOptions, adaptableOptions.exportOptions);
-    returnedAdaptableOptions.teamSharingOptions = Object.assign({}, DefaultAdaptableOptions.teamSharingOptions, adaptableOptions.teamSharingOptions);
-    returnedAdaptableOptions.toolPanelOptions = Object.assign({}, DefaultAdaptableOptions.toolPanelOptions, adaptableOptions.toolPanelOptions);
-    returnedAdaptableOptions.dataChangeHistoryOptions = Object.assign({}, DefaultAdaptableOptions.dataChangeHistoryOptions, adaptableOptions.dataChangeHistoryOptions);
-    returnedAdaptableOptions.chartingOptions = Object.assign({}, DefaultAdaptableOptions.chartingOptions, adaptableOptions.chartingOptions);
-    returnedAdaptableOptions.chartingOptions.externalChartingOptions = Object.assign({}, DefaultAdaptableOptions.chartingOptions.externalChartingOptions, returnedAdaptableOptions.chartingOptions.externalChartingOptions);
-    returnedAdaptableOptions.settingsPanelOptions = Object.assign({}, DefaultAdaptableOptions.settingsPanelOptions, adaptableOptions.settingsPanelOptions);
-    returnedAdaptableOptions.fdc3Options = Object.assign({}, DefaultAdaptableOptions.fdc3Options, adaptableOptions.fdc3Options);
-    returnedAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration = Object.assign({}, DefaultAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration, returnedAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration);
-    returnedAdaptableOptions.fdc3Options.uiControlsDefaultConfiguration = Object.assign({}, DefaultAdaptableOptions.fdc3Options.uiControlsDefaultConfiguration, returnedAdaptableOptions.fdc3Options.uiControlsDefaultConfiguration);
-    const { predefinedConfig } = returnedAdaptableOptions;
-    if (predefinedConfig) {
-        returnedAdaptableOptions.predefinedConfig =
-            typeof predefinedConfig === 'string'
-                ? predefinedConfig
-                : initPredefinedConfigWithUuids(predefinedConfig);
-    }
-    return returnedAdaptableOptions;
-}
 export function initPredefinedConfigWithUuids(predefinedConfig) {
     const customizer = (value) => {
         // so whenever we clone a plain object,
@@ -144,7 +87,6 @@ export function addUuidAndSource(adaptableObject) {
     return adaptableObject;
 }
 export const AdaptableHelper = {
-    assignAdaptableOptions,
     initPredefinedConfigWithUuids,
     checkValidPrimaryKey,
     AdaptableObjectExistsInState,

package/src/Utilities/Services/CellPopupService.js

@@ -6,7 +6,6 @@ export class CellPopupService {
     constructor(api) {
         this.api = api;
         this.adaptable = api.internalApi.getAdaptableInstance();
-        this.adaptable = api.internalApi.getAdaptableInstance();
         this.adaptable.api.eventApi.on('AdaptableReady', () => this.handleAdaptableReady());
     }
     getAdaptableState() {

package/src/Utilities/Services/LicenseService/index.d.ts

@@ -13,9 +13,12 @@ export declare enum LicenseValidityType {
 }
 export declare class LicenseService implements ILicenseService {
     private adaptable;
+    private licenseKey;
+    private packageDetails;
     constructor(adaptable: IAdaptable, licenseKey: string | undefined, packageDetails: {
         publishedAt: number | Date;
     });
+    init(): void;
     getValidityType(details: LicenseDetails | Error | null, packageDetails: {
         publishedAt: number | Date;
     }): LicenseValidityType;

package/src/Utilities/Services/LicenseService/index.js

@@ -38,18 +38,25 @@ const isDemoApp = () => {
 export class LicenseService {
     constructor(adaptable, licenseKey, packageDetails) {
         this.adaptable = adaptable;
+        this.licenseKey = licenseKey;
+        this.packageDetails = packageDetails;
         this.adaptable = adaptable;
+        this.adaptable.api.eventApi.on('AdaptableReady', () => {
+            this.init();
+        });
+    }
+    init() {
         let details = null;
-        if (licenseKey) {
+        if (this.licenseKey) {
             try {
-                details = decodeLicense(licenseKey);
+                details = decodeLicense(this.licenseKey);
             }
             catch (error) {
                 details = error;
             }
         }
         if (!isInsideSandpack() && !isInsideSandbox() && !isDemoApp()) {
-            this.handleLicenseValidation(details, this.getValidityType(details, packageDetails));
+            this.handleLicenseValidation(details, this.getValidityType(details, this.packageDetails));
         }
     }
     getValidityType(details, packageDetails) {

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

@@ -3,7 +3,7 @@ import { AdaptableOptions } from '../../../types';
 export declare class MetamodelService implements IMetamodelService {
     private gridInfoOptions;
     getAdaptableOptions: () => AdaptableOptions;
-    constructor(getAdaptableOptions: () => AdaptableOptions);
+    constructor(getAdaptableOptions: () => AdaptableOptions, validateOptions?: boolean);
     getGridInfoOptions(): GridInfoOptions;
     getGridInfoNoCodeOptions(): GridInfoOptions;
     validateAdaptableOptionsValues(): void;

package/src/Utilities/Services/MetamodelService.js

@@ -1,15 +1,18 @@
 import { ADAPTABLE_METAMODEL } from '../../metamodel/adaptable.metamodel';
-import { DefaultAdaptableOptions } from '../Defaults/DefaultAdaptableOptions';
 import { AdaptableOptionsDocsLink } from '../Constants/DocumentationLinkConstants';
 import StringExtensions from '../Extensions/StringExtensions';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
+import { getDefaultAdaptableOptions } from '../../agGrid/defaultAdaptableOptions';
 const supportedMetamodelTypes = ['s', 'n', 'b', 'a', 'f', 'R'];
 export class MetamodelService {
-    constructor(getAdaptableOptions) {
+    constructor(getAdaptableOptions, validateOptions) {
         this.gridInfoOptions = new Map();
         this.getAdaptableOptions = () => null;
         this.getAdaptableOptions = getAdaptableOptions;
         this.gridInfoOptions = this.buildGridInfoOptions();
+        if (validateOptions) {
+            this.validateAdaptableOptionsValues();
+        }
     }
     getGridInfoOptions() {
         return this.gridInfoOptions;
@@ -140,7 +143,7 @@ export class MetamodelService {
         });
     }
     getAdaptableOptionsDefaultValues() {
-        return DefaultAdaptableOptions;
+        return getDefaultAdaptableOptions();
     }
     getAdaptableMetamodel() {
         return ADAPTABLE_METAMODEL;

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

@@ -1,7 +1,8 @@
-import { IRowEditService } from './Interface/IRowEditService';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-export declare class RowEditService implements IRowEditService {
+import { IAdaptableService } from './Interface/IAdaptableService';
+export declare class RowEditService implements IAdaptableService {
     private adaptableApi;
     constructor(adaptableApi: AdaptableApi);
     private autoHandleActionRowButtons;
+    destroy(): void;
 }

package/src/Utilities/Services/RowEditService.js

@@ -1,4 +1,3 @@
-// @ts-ignore
 export class RowEditService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
@@ -37,4 +36,7 @@ export class RowEditService {
             adaptableApi.gridApi.addGridData([newRowData], config);
         }
     }
+    destroy() {
+        // nothing yet
+    }
 }

package/src/View/AdaptableView.js

@@ -3,7 +3,6 @@ import { connect } from 'react-redux';
 import { ProgressIndicator } from '../components/ProgressIndicator/ProgressIndicator';
 import { ToastContainer } from '../components/Toastify';
 import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
-import { AdaptableLoadingScreen } from './Components/Popups/AdaptableLoadingScreen';
 import { AdaptablePopup } from './Components/Popups/AdaptablePopup';
 import { AdaptablePopupConfirmation } from './Components/Popups/AdaptablePopupConfirmation';
 import { AdaptablePopupPrompt } from './Components/Popups/AdaptablePopupPrompt';
@@ -23,7 +22,6 @@ class AdaptableView extends React.Component {
             React.createElement(GridCellPopup, null),
             React.createElement(QuickSearchDrawer, null),
             this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard, { api: this.props.AdaptableApi })),
-            this.props.AdaptableApi.optionsApi.getUserInterfaceOptions().showLoadingScreen && (React.createElement(AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup })),
             this.props.PopupState.PromptPopup.ShowPromptPopup && (React.createElement(AdaptablePopupPrompt, { message: this.props.PopupState.PromptPopup.Message, header: this.props.PopupState.PromptPopup.Header, onClose: this.props.onClosePromptPopup, onConfirm: this.props.onConfirmPromptPopup, onConfirmActionCreator: this.props.PopupState.PromptPopup.ConfirmActionCreator, defaultValue: this.props.PopupState.PromptPopup.DefaultValue })),
             Boolean(this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup) && (React.createElement(AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi })),
             Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && (React.createElement(AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })),

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

@@ -7,7 +7,7 @@ import GridOptionsForm from './GridOptionsForm';
 import EntitlementsForm from './EntitlementsForm';
 import { UIElementsForm } from './UIOptions/UiOptionsForm';
 import { AdaptableOptionsForm } from './AdaptableOptionsForm';
-import AdaptableHelper from '../../../Utilities/Helpers/AdaptableHelper';
+import { applyDefaultAdaptableOptions } from '../../../agGrid/defaultAdaptableOptions';
 export const ConfigurationWizard = (props) => {
     const [isPrimaryKeySelected, setIsValid] = React.useState(true);
     const [adaptableConfig, setAdaptableConfig] = useState(() => {
@@ -17,7 +17,7 @@ export const ConfigurationWizard = (props) => {
             },
         };
         const gridOptions = Object.assign(Object.assign({}, gridOptionDefaults), props.adaptableConfig.gridOptions);
-        const adaptableOptions = AdaptableHelper.assignAdaptableOptions(props.adaptableConfig.adaptableOptions);
+        const adaptableOptions = applyDefaultAdaptableOptions(props.adaptableConfig.adaptableOptions);
         return { gridOptions, adaptableOptions };
     });
     const [selectedColumns, setSelectedColumns] = useState(() => {

package/src/View/CalculatedColumn/utils.d.ts

@@ -1,2 +1,2 @@
 import { AdaptableApi, CalculatedColumn } from '../../types';
-export declare const getExpressionType: (calculatedColumn: CalculatedColumn, api: AdaptableApi) => "ScalarExpression" | "AggregatedScalarExpression" | "CumulativeAggregatedExpression" | "QuantileAggregatedExpression";
+export declare const getExpressionType: (calculatedColumn: CalculatedColumn, api: AdaptableApi) => "AggregatedScalarExpression" | "ScalarExpression" | "CumulativeAggregatedExpression" | "QuantileAggregatedExpression";

package/src/View/CellSummary/CellSummaryPopup.js

@@ -11,7 +11,7 @@ class CellSummaryPopupComponent extends React.Component {
             // afterwards, we will go on with the cell summary logic, as that will evaluate the current(column) cell selection
             this.props.api.columnApi.selectColumn((_c = this.props.popupParams) === null || _c === void 0 ? void 0 : _c.column.columnId);
             // we also need to update the internal state of the selected cells
-            this.props.api.internalApi.getAdaptableInstance().setSelectedCells();
+            this.props.api.internalApi.getAdaptableInstance().refreshSelectedCellsState();
         }
         this.props.onCreateCellSummary();
     }

package/src/View/Components/Popups/AdaptableLoadingScreen.d.ts

@@ -1,8 +1,9 @@
-import * as React from 'react';
-export interface IAdaptableLoadingScreenProps extends React.ClassAttributes<AdaptableLoadingScreen> {
+/// <reference types="react" />
+export interface IAdaptableLoadingScreenProps {
     showLoadingScreen: boolean;
+    loadingScreenDelay?: number;
+    loadingScreenTitle?: string;
+    loadingScreenText?: string;
     onClose?: () => {};
 }
-export declare class AdaptableLoadingScreen extends React.Component<IAdaptableLoadingScreenProps, {}> {
-    render(): JSX.Element;
-}
+export declare function AdaptableLoadingScreen(props: IAdaptableLoadingScreenProps): JSX.Element;