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

package/src/Strategy/StyledColumnModule.js

@@ -15,27 +15,6 @@ class StyledColumnModule extends AdaptableModuleBase_1.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_1.default.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

@@ -27,14 +27,14 @@ class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             TeamSharingRedux_1.TEAMSHARING_LINK_ITEM,
             TeamSharingRedux_1.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

@@ -4,8 +4,6 @@ exports.ToolPanelModule = void 0;
 const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const Types_1 = require("../PredefinedConfig/Common/Types");
-const ToolPanelRedux_1 = require("../Redux/ActionsReducers/ToolPanelRedux");
 class ToolPanelModule extends AdaptableModuleBase_1.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);
@@ -16,26 +14,5 @@ class ToolPanelModule extends AdaptableModuleBase_1.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((0, ToolPanelRedux_1.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 }));
-            Types_1.ALL_TOOL_PANELS.forEach((moduleToolPanel) => defaultConfig.push({ Name: moduleToolPanel }));
-            this.api.internalApi.dispatchReduxAction((0, ToolPanelRedux_1.ToolPanelSetToolPanels)(defaultConfig));
-        }
-    }
 }
 exports.ToolPanelModule = ToolPanelModule;

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -15,4 +15,4 @@ exports.PredicateDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-predicate`
 exports.PrimaryKeyDocsLink = `${exports.HOST_URL_DOCS}/guide/getting-started-primary-key`;
 exports.LicenseDocsLink = `${exports.HOST_URL_DOCS}/guide/licensing`;
 exports.AdaptableOptionsDocsLink = `${exports.HOST_URL_DOCS}/guide/reference-options-overview`;
-exports.AgGridModulesDocsLink = `${exports.HOST_URL_DOCS}/TODO_TODO_TODO`;
+exports.AgGridModulesDocsLink = `${exports.HOST_URL_DOCS}/guide/dev-guide-aggrid-modules-overview`;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DOUBLE_DISPLAY_VALUE = exports.DEFAULT_INTEGER_DISPLAY_VALUE = exports.DEFAULT_STRING_DISPLAY_VALUE = exports.BLANK_DISTINCT_COLUMN_VALUE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_FDC3_COLUMN = exports.AB_ROW_ACTIONS_COLUMN = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.OS_THEME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = void 0;
+exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DOUBLE_DISPLAY_VALUE = exports.DEFAULT_INTEGER_DISPLAY_VALUE = exports.DEFAULT_STRING_DISPLAY_VALUE = exports.BLANK_DISTINCT_COLUMN_VALUE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.GROUP_PATH_SEPARATOR = exports.HALF_SECOND = exports.AB_FDC3_COLUMN = exports.AB_ROW_ACTIONS_COLUMN = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.OS_THEME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -30,6 +30,7 @@ exports.AB_SPECIAL_COLUMN = 'abSpecialColumn';
 exports.AB_ROW_ACTIONS_COLUMN = 'abRowActionsColumn';
 exports.AB_FDC3_COLUMN = 'abFdc3Column';
 exports.HALF_SECOND = 500;
+exports.GROUP_PATH_SEPARATOR = '/';
 exports.AG_GRID_GROUPED_COLUMN = 'ag-Grid-AutoColumn';
 exports.AG_GRID_PIVOT_COLUMN = 'pivot_';
 exports.AG_GRID_CHART_WINDOW = 'AG Grid Window';

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -17,13 +17,15 @@ exports.DEFAULT_SETTINGS_PANEL_NAVIGATION_ITEMS = [
     'StatusBar',
     '-',
     'Layout',
-    'Export',
     'CalculatedColumn',
     'FreeTextColumn',
     'CustomSort',
     'Alert',
     'SystemStatus',
     '-',
+    'Export',
+    'DataImport',
+    '-',
     'FormatColumn',
     'StyledColumn',
     'FlashingCell',
@@ -33,17 +35,16 @@ exports.DEFAULT_SETTINGS_PANEL_NAVIGATION_ITEMS = [
     'GridFilter',
     'ColumnFilter',
     'DataSet',
+    'NamedQuery',
     '-',
     'PlusMinus',
     'Shortcut',
     'DataChangeHistory',
     '-',
     'Charting',
-    'DataImport',
     'Schedule',
-    'NamedQuery',
-    'StateManagement',
     'TeamSharing',
     'Notes',
     'Comments',
+    'StateManagement',
 ];

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,68 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableHelper = exports.addUuidAndSource = exports.runAdaptableComparerFunction = exports.getAppropriateAccessLevel = exports.AdaptableObjectExistsInState = exports.checkValidPrimaryKey = exports.initPredefinedConfigWithUuids = exports.assignAdaptableOptions = void 0;
+exports.AdaptableHelper = exports.addUuidAndSource = exports.runAdaptableComparerFunction = exports.getAppropriateAccessLevel = exports.AdaptableObjectExistsInState = exports.checkValidPrimaryKey = 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"));
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
-const DefaultAdaptableOptions_1 = require("../Defaults/DefaultAdaptableOptions");
-function assignAdaptableOptions(adaptableOptions) {
-    var _a;
-    const returnedAdaptableOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions, adaptableOptions);
-    returnedAdaptableOptions.adaptableStateKey =
-        (_a = returnedAdaptableOptions.adaptableStateKey) !== null && _a !== void 0 ? _a : returnedAdaptableOptions.adaptableId;
-    returnedAdaptableOptions.dataImportOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dataImportOptions, adaptableOptions.dataImportOptions);
-    returnedAdaptableOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.expressionOptions, adaptableOptions.expressionOptions);
-    returnedAdaptableOptions.calendarOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.calendarOptions, adaptableOptions.calendarOptions);
-    returnedAdaptableOptions.columnOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnOptions, adaptableOptions.columnOptions);
-    returnedAdaptableOptions.customSortOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.customSortOptions, adaptableOptions.customSortOptions);
-    returnedAdaptableOptions.dataSetOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dataSetOptions, adaptableOptions.dataSetOptions);
-    returnedAdaptableOptions.cellSummaryOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.cellSummaryOptions, adaptableOptions.cellSummaryOptions);
-    returnedAdaptableOptions.predicateOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.predicateOptions, returnedAdaptableOptions.predicateOptions);
-    returnedAdaptableOptions.layoutOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.layoutOptions, adaptableOptions.layoutOptions);
-    returnedAdaptableOptions.notificationsOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.notificationsOptions, adaptableOptions.notificationsOptions);
-    returnedAdaptableOptions.alertOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.alertOptions, adaptableOptions.alertOptions);
-    returnedAdaptableOptions.flashingCellOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.flashingCellOptions, adaptableOptions.flashingCellOptions);
-    returnedAdaptableOptions.entitlementOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.entitlementOptions, adaptableOptions.entitlementOptions);
-    returnedAdaptableOptions.dashboardOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dashboardOptions, adaptableOptions.dashboardOptions);
-    returnedAdaptableOptions.editOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.editOptions, adaptableOptions.editOptions);
-    returnedAdaptableOptions.actionColumnOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionColumnOptions, adaptableOptions.actionColumnOptions);
-    // to do
-    returnedAdaptableOptions.actionRowOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionRowOptions, adaptableOptions.actionRowOptions);
-    returnedAdaptableOptions.actionRowOptions.actionRowButtonOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionRowOptions.actionRowButtonOptions, returnedAdaptableOptions.actionRowOptions.actionRowButtonOptions);
-    returnedAdaptableOptions.actionRowOptions.actionRowFormOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionRowOptions.actionRowFormOptions, returnedAdaptableOptions.actionRowOptions.actionRowFormOptions);
-    returnedAdaptableOptions.containerOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.containerOptions, adaptableOptions.containerOptions);
-    returnedAdaptableOptions.groupingOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.groupingOptions, adaptableOptions.groupingOptions);
-    returnedAdaptableOptions.quickSearchOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.quickSearchOptions, adaptableOptions.quickSearchOptions);
-    returnedAdaptableOptions.columnFilterOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnFilterOptions, adaptableOptions.columnFilterOptions);
-    returnedAdaptableOptions.columnFilterOptions.quickFilterOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnFilterOptions.quickFilterOptions, returnedAdaptableOptions.columnFilterOptions.quickFilterOptions);
-    returnedAdaptableOptions.columnFilterOptions.filterFormOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnFilterOptions.filterFormOptions, returnedAdaptableOptions.columnFilterOptions.filterFormOptions);
-    returnedAdaptableOptions.columnFilterOptions.valuesFilterOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnFilterOptions.valuesFilterOptions, returnedAdaptableOptions.columnFilterOptions.valuesFilterOptions);
-    returnedAdaptableOptions.gridFilterOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.gridFilterOptions, adaptableOptions.gridFilterOptions);
-    returnedAdaptableOptions.userInterfaceOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions, adaptableOptions.userInterfaceOptions);
-    returnedAdaptableOptions.userInterfaceOptions.dateInputOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions.dateInputOptions, returnedAdaptableOptions.userInterfaceOptions.dateInputOptions);
-    returnedAdaptableOptions.menuOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.menuOptions, adaptableOptions.menuOptions);
-    returnedAdaptableOptions.stateOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.stateOptions, adaptableOptions.stateOptions);
-    returnedAdaptableOptions.exportOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.exportOptions, adaptableOptions.exportOptions);
-    returnedAdaptableOptions.teamSharingOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.teamSharingOptions, adaptableOptions.teamSharingOptions);
-    returnedAdaptableOptions.toolPanelOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.toolPanelOptions, adaptableOptions.toolPanelOptions);
-    returnedAdaptableOptions.dataChangeHistoryOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dataChangeHistoryOptions, adaptableOptions.dataChangeHistoryOptions);
-    returnedAdaptableOptions.chartingOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.chartingOptions, adaptableOptions.chartingOptions);
-    returnedAdaptableOptions.chartingOptions.externalChartingOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.chartingOptions.externalChartingOptions, returnedAdaptableOptions.chartingOptions.externalChartingOptions);
-    returnedAdaptableOptions.settingsPanelOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.settingsPanelOptions, adaptableOptions.settingsPanelOptions);
-    returnedAdaptableOptions.fdc3Options = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.fdc3Options, adaptableOptions.fdc3Options);
-    returnedAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration, returnedAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration);
-    returnedAdaptableOptions.fdc3Options.uiControlsDefaultConfiguration = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.fdc3Options.uiControlsDefaultConfiguration, returnedAdaptableOptions.fdc3Options.uiControlsDefaultConfiguration);
-    const { predefinedConfig } = returnedAdaptableOptions;
-    if (predefinedConfig) {
-        returnedAdaptableOptions.predefinedConfig =
-            typeof predefinedConfig === 'string'
-                ? predefinedConfig
-                : initPredefinedConfigWithUuids(predefinedConfig);
-    }
-    return returnedAdaptableOptions;
-}
-exports.assignAdaptableOptions = assignAdaptableOptions;
 function initPredefinedConfigWithUuids(predefinedConfig) {
     const customizer = (value) => {
         // so whenever we clone a plain object,
@@ -155,7 +97,6 @@ function addUuidAndSource(adaptableObject) {
 }
 exports.addUuidAndSource = addUuidAndSource;
 exports.AdaptableHelper = {
-    assignAdaptableOptions,
     initPredefinedConfigWithUuids,
     checkValidPrimaryKey,
     AdaptableObjectExistsInState,

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

@@ -1,5 +1,6 @@
 export declare function objectExists(item: any): boolean;
 export declare function objectNotExists(item: any): boolean;
+export declare function objectHasKeys(item: any): boolean;
 export declare function getStringRepresentionFromKey(event: KeyboardEvent | any): string;
 export declare function cloneObject<T extends any>(obj: T): T;
 export declare const arrayToKeyMap: <T extends string | number | symbol>(arr?: T[]) => Record<T, boolean>;
@@ -20,6 +21,7 @@ export declare function clamp(value: any, boundOne: number, boundTwo: number): n
 export declare const Helper: {
     objectExists: typeof objectExists;
     objectNotExists: typeof objectNotExists;
+    objectHasKeys: typeof objectHasKeys;
     getStringRepresentionFromKey: typeof getStringRepresentionFromKey;
     cloneObject: typeof cloneObject;
     convertArrayToCsv: typeof convertArrayToCsv;

package/src/Utilities/Helpers/Helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Helper = exports.clamp = exports.modeNumberArray = exports.medianNumberArray = exports.meanNumberArray = exports.standardDeviationNumberArray = exports.sumNumberArray = exports.roundNumberTo4dp = exports.roundNumber = exports.isInputNotNullOrEmpty = exports.isInputNullOrEmpty = exports.returnItemCount = exports.copyToClipboard = exports.createDownloadedFile = exports.convertArrayToCsv = exports.arrayToKeyMap = exports.cloneObject = exports.getStringRepresentionFromKey = exports.objectNotExists = exports.objectExists = void 0;
+exports.Helper = exports.clamp = exports.modeNumberArray = exports.medianNumberArray = exports.meanNumberArray = exports.standardDeviationNumberArray = exports.sumNumberArray = exports.roundNumberTo4dp = exports.roundNumber = exports.isInputNotNullOrEmpty = exports.isInputNullOrEmpty = exports.returnItemCount = exports.copyToClipboard = exports.createDownloadedFile = exports.convertArrayToCsv = exports.arrayToKeyMap = exports.cloneObject = exports.getStringRepresentionFromKey = exports.objectHasKeys = exports.objectNotExists = exports.objectExists = void 0;
 const StringExtensions_1 = require("../Extensions/StringExtensions");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 function objectExists(item) {
@@ -11,6 +11,10 @@ function objectNotExists(item) {
     return !objectExists(item);
 }
 exports.objectNotExists = objectNotExists;
+function objectHasKeys(item) {
+    return Object.keys(item).length > 0;
+}
+exports.objectHasKeys = objectHasKeys;
 function getStringRepresentionFromKey(event) {
     if (event.key == null) {
         return event.char; // IE
@@ -249,6 +253,7 @@ exports.clamp = clamp;
 exports.Helper = {
     objectExists,
     objectNotExists,
+    objectHasKeys,
     getStringRepresentionFromKey,
     cloneObject,
     convertArrayToCsv,

package/src/Utilities/Services/AggregatedScalarLiveValue.js

@@ -41,7 +41,9 @@ class AggregatedScalarLiveValue {
     getAggregatedValueForRow(rowNode) {
         const aggregationValue = this.getAggregationValue(rowNode);
         if (aggregationValue == undefined) {
-            logOnce(`${this.aggregatedScalarExpression} :: aggregation value is NOT available!`, this.adaptableApi.logWarn);
+            logOnce(`${this.aggregatedScalarExpression} :: aggregation value is NOT available!`, (message) => {
+                this.adaptableApi.internalApi.getAdaptableInstance().logger.warn(message);
+            });
             return;
         }
         if (this.expressionEvaluation.rowValueGetter) {

package/src/Utilities/Services/CellPopupService.js

@@ -10,7 +10,6 @@ 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

@@ -42,18 +42,25 @@ const isDemoApp = () => {
 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 = (0, decode_1.decode)(licenseKey);
+                details = (0, decode_1.decode)(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

@@ -3,17 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetamodelService = void 0;
 const tslib_1 = require("tslib");
 const adaptable_metamodel_1 = require("../../metamodel/adaptable.metamodel");
-const DefaultAdaptableOptions_1 = require("../Defaults/DefaultAdaptableOptions");
 const DocumentationLinkConstants_1 = require("../Constants/DocumentationLinkConstants");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
+const defaultAdaptableOptions_1 = require("../../agGrid/defaultAdaptableOptions");
 const supportedMetamodelTypes = ['s', 'n', 'b', 'a', 'f', 'R'];
 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;
@@ -144,7 +147,7 @@ class MetamodelService {
         });
     }
     getAdaptableOptionsDefaultValues() {
-        return DefaultAdaptableOptions_1.DefaultAdaptableOptions;
+        return (0, defaultAdaptableOptions_1.getDefaultAdaptableOptions)();
     }
     getAdaptableMetamodel() {
         return adaptable_metamodel_1.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,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RowEditService = void 0;
-// @ts-ignore
 class RowEditService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
@@ -40,5 +39,8 @@ class RowEditService {
             adaptableApi.gridApi.addGridData([newRowData], config);
         }
     }
+    destroy() {
+        // nothing yet
+    }
 }
 exports.RowEditService = RowEditService;

package/src/View/AdaptableView.js

@@ -7,7 +7,6 @@ const react_redux_1 = require("react-redux");
 const ProgressIndicator_1 = require("../components/ProgressIndicator/ProgressIndicator");
 const Toastify_1 = require("../components/Toastify");
 const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
-const AdaptableLoadingScreen_1 = require("./Components/Popups/AdaptableLoadingScreen");
 const AdaptablePopup_1 = require("./Components/Popups/AdaptablePopup");
 const AdaptablePopupConfirmation_1 = require("./Components/Popups/AdaptablePopupConfirmation");
 const AdaptablePopupPrompt_1 = require("./Components/Popups/AdaptablePopupPrompt");
@@ -27,7 +26,6 @@ class AdaptableView extends React.Component {
             React.createElement(GridCellPopup_1.GridCellPopup, null),
             React.createElement(FloatingQuickSearch_1.QuickSearchDrawer, null),
             this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard_1.Dashboard, { api: this.props.AdaptableApi })),
-            this.props.AdaptableApi.optionsApi.getUserInterfaceOptions().showLoadingScreen && (React.createElement(AdaptableLoadingScreen_1.AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup })),
             this.props.PopupState.PromptPopup.ShowPromptPopup && (React.createElement(AdaptablePopupPrompt_1.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_1.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_1.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

@@ -11,7 +11,7 @@ const GridOptionsForm_1 = tslib_1.__importDefault(require("./GridOptionsForm"));
 const EntitlementsForm_1 = tslib_1.__importDefault(require("./EntitlementsForm"));
 const UiOptionsForm_1 = require("./UIOptions/UiOptionsForm");
 const AdaptableOptionsForm_1 = require("./AdaptableOptionsForm");
-const AdaptableHelper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/AdaptableHelper"));
+const defaultAdaptableOptions_1 = require("../../../agGrid/defaultAdaptableOptions");
 const ConfigurationWizard = (props) => {
     const [isPrimaryKeySelected, setIsValid] = React.useState(true);
     const [adaptableConfig, setAdaptableConfig] = (0, react_1.useState)(() => {
@@ -21,7 +21,7 @@ const ConfigurationWizard = (props) => {
             },
         };
         const gridOptions = Object.assign(Object.assign({}, gridOptionDefaults), props.adaptableConfig.gridOptions);
-        const adaptableOptions = AdaptableHelper_1.default.assignAdaptableOptions(props.adaptableConfig.adaptableOptions);
+        const adaptableOptions = (0, defaultAdaptableOptions_1.applyDefaultAdaptableOptions)(props.adaptableConfig.adaptableOptions);
         return { gridOptions, adaptableOptions };
     });
     const [selectedColumns, setSelectedColumns] = (0, react_1.useState)(() => {

package/src/View/BulkUpdate/BulkUpdatePopup.js

@@ -55,7 +55,7 @@ class BulkUpdatePopupComponent extends React.Component {
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All', onClick: () => {
                             this.onApplyClick();
                         }, variant: "raised", tone: "accent" }, "Apply to Grid")))) : (React.createElement(React.Fragment, null,
-                React.createElement(HelpBlock_1.default, { marginTop: 2, marginBottom: 2 }, "Select an existing column value from the dropdown, or enter a new value"),
+                React.createElement(HelpBlock_1.default, { marginTop: 2, marginBottom: 2 }, "Select an existing Column value from the dropdown, or enter a new value"),
                 React.createElement(rebass_1.Flex, { marginTop: 2, flexDirection: "row", alignItems: "center" },
                     React.createElement(rebass_1.Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 },
                         React.createElement(ColumnValueSelector_1.ColumnValueSelector, { selectedGridCells: this.props.SelectedGridCells, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: col, api: this.props.api, onColumnValueChange: (columns) => this.onColumnValueSelectedChanged(columns), style: { width: '100%', maxWidth: 'inherit' } })),

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

@@ -15,7 +15,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/Comments/CommentsPopup.js

@@ -33,8 +33,8 @@ const CellComments = (props) => {
                     return (0, dateUtils_1.formatDate)(params.data.Timestamp, 'MM.DD.YYYY HH:mm');
                 },
             },
-            message: {
-                header: 'Message',
+            text: {
+                header: 'Text',
                 field: 'Value',
                 defaultFlex: 3,
             },
@@ -42,15 +42,19 @@ const CellComments = (props) => {
         return columns;
     }, []);
     const cellValue = adaptable.api.gridApi.getCellDisplayValue(props.commentThread.PrimaryKeyValue, props.commentThread.ColumnId);
+    const primaryKeyHeader = React.useMemo(() => {
+        const primaryKey = adaptable.api.optionsApi.getPrimaryKey();
+        return adaptable.api.columnApi.getFriendlyNameForColumnId(primaryKey);
+    }, []);
     const columnFriendlyName = adaptable.api.columnApi.getFriendlyNameForColumnId(props.commentThread.ColumnId);
     return (React.createElement(Panel_1.default, { mb: 2, header: React.createElement(rebass_1.Flex, { width: "100%", alignItems: "center" },
             React.createElement(rebass_1.Box, { mr: 2 },
                 "Cell Value: ",
                 cellValue),
             React.createElement(rebass_1.Box, { mr: 2 },
-                "Primary Key: [",
-                props.commentThread.PrimaryKeyValue,
-                "]"),
+                primaryKeyHeader,
+                ": ",
+                props.commentThread.PrimaryKeyValue),
             React.createElement(rebass_1.Box, null,
                 "Column: ",
                 columnFriendlyName),
@@ -76,12 +80,12 @@ const CellComments = (props) => {
                 }, rowHeight: 30, columnHeaderHeight: 30, domProps: tableDOMProps, columns: columnsMap }))));
 };
 const CommentsPopup = (props) => {
-    const cellComments = (0, react_redux_1.useSelector)((state) => {
+    const commentThreads = (0, react_redux_1.useSelector)((state) => {
         return state.Comment.CommentThreads;
     });
-    return (React.createElement(PopupPanel_1.PopupPanel, { headerText: 'Comments', glyphicon: 'comments', infoLink: props.moduleInfo.HelpPage }, (cellComments !== null && cellComments !== void 0 ? cellComments : []).map((cellComments, index) => {
+    return (React.createElement(PopupPanel_1.PopupPanel, { headerText: 'Comments', glyphicon: 'comments', infoLink: props.moduleInfo.HelpPage }, (commentThreads !== null && commentThreads !== void 0 ? commentThreads : []).map((commentThread, index) => {
         var _a;
-        return React.createElement(CellComments, { key: (_a = cellComments === null || cellComments === void 0 ? void 0 : cellComments.Uuid) !== null && _a !== void 0 ? _a : index, commentThread: cellComments });
+        return React.createElement(CellComments, { key: (_a = commentThread === null || commentThread === void 0 ? void 0 : commentThread.Uuid) !== null && _a !== void 0 ? _a : index, commentThread: commentThread });
     })));
 };
 exports.CommentsPopup = CommentsPopup;

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;