@adaptabletools/adaptable 18.0.0-canary.27 → 18.0.0-canary.29

package/src/AdaptableOptions/AdaptableFrameworkComponent.d.ts

@@ -44,6 +44,9 @@ export interface CustomRenderContext extends BaseContext {
      */
     element: HTMLDivElement;
 }
+export interface CustomRenderFunction {
+    (customRenderContext: CustomRenderContext): string | null;
+}
 /**
  * Config used to open a custom window
  */

package/src/AdaptableOptions/MenuOptions.d.ts

@@ -28,7 +28,7 @@ export interface CustomContextMenuContext<TData = any> extends ContextMenuContex
     /**
      * Default structure of Adaptable Menu Items
      */
-    defaultAdaptableMenuStructure: AdaptableSystemMenuItem[];
+    defaultAdaptableMenuStructure: (AdaptableSystemMenuItem | '-')[];
 }
 /**
  * Context info provided when building Custom Column Menus
@@ -45,7 +45,7 @@ export interface CustomColumnMenuContext<TData = any> extends ColumnMenuContext<
     /**
      * Default structure of Adaptable Menu Items
      */
-    defaultAdaptableMenuStructure: AdaptableSystemMenuItem[];
+    defaultAdaptableMenuStructure: (AdaptableSystemMenuItem | '-')[];
 }
 /**
  * Custom Context Menu Item
@@ -167,7 +167,7 @@ export interface MenuOrderContext extends BaseContext {
 /**
  * Defines AG Grid Context Menu Items
  */
-export type AgGridContextMenuItemType = 'autoSizeAll' | 'expandAll' | 'contractAll' | 'copy' | 'copyWithHeaders' | 'cut' | 'paste' | 'resetColumns' | 'export' | 'csvExport' | 'excelExport' | 'chartRange' | 'pivotChart';
+export type AgGridContextMenuItemType = 'autoSizeAll' | 'expandAll' | 'contractAll' | 'copy' | 'copyWithHeaders' | 'copyWithGroupHeaders' | 'cut' | 'paste' | 'resetColumns' | 'export' | 'csvExport' | 'excelExport' | 'chartRange' | 'pivotChart';
 /**
  * Defines AG Grid Column Menu Items
  */

package/src/Api/GridApi.d.ts

@@ -529,5 +529,8 @@ export interface GridApi {
      * Opens a window with a transposed view of Grid
      */
     showTransposedView(transposeConfig?: TransposeConfig): void;
-    getAllGridColumns(): Column<any>[];
+    /**
+     * Return all AG Grid columns
+     */
+    getAllAgGridColumns(): Column<any>[];
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -68,19 +68,19 @@ export class ColumnApiImpl extends ApiBase {
         return isAutoPivotColumn(columnId);
     }
     isCalculatedColumn(columnId) {
-        return (this.getAdaptableApi().calculatedColumnApi
-            .getCalculatedColumns()
+        return (this.getAdaptableApi()
+            .calculatedColumnApi.getCalculatedColumns()
             .find((cc) => cc.ColumnId == columnId) != null);
     }
     isFreeTextColumn(columnId) {
-        return (this.getAdaptableApi().freeTextColumnApi
-            .getFreeTextColumns()
+        return (this.getAdaptableApi()
+            .freeTextColumnApi.getFreeTextColumns()
             .find((cc) => cc.ColumnId == columnId) != null);
     }
     isActionColumn(columnId) {
         var _a;
-        return (((_a = this.getAdaptableApi().actionColumnApi
-            .getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) != null);
+        return (((_a = this.getAdaptableApi()
+            .actionColumnApi.getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) != null);
     }
     getColumnWithColumnId(columnId, logWarning) {
         if (columnId == undefined) {

package/src/Api/Implementation/ConfigApiImpl.js

@@ -135,7 +135,6 @@ export class ConfigApiImpl extends ApiBase {
                         .then(() => {
                         this.adaptable.updateColumnModelAndRefreshGrid({ skipColDefsRefresh: true });
                         this.adaptable.setLayout();
-                        this.getAdaptableApi().userInterfaceApi.hideLoadingScreen();
                     })
                         .then(() => {
                         // resolve main(result) promise

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -7,8 +7,8 @@ export class ExpressionApiImpl extends ApiBase {
         this.internalApi = new ExpressionInternalApi(adaptable);
     }
     isValidBooleanExpression(query, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateBoolean(query, module, { force: true });
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -16,8 +16,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidObservableExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateObservable(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -25,8 +25,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidAggregatedBooleanExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateAggregatedBoolean(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -34,8 +34,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidAggregatedScalarExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateAggregatedScalar(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -47,8 +47,8 @@ export class ExpressionApiImpl extends ApiBase {
     }
     getColumnsFromExpression(expression) {
         try {
-            const columnIds = this.getAdaptableApi().internalApi
-                .getQueryLanguageService()
+            const columnIds = this.getAdaptableApi()
+                .internalApi.getQueryLanguageService()
                 .getColumnsFromExpression(expression);
             columnIds.forEach((columnId) => {
                 const calculatedColumn = this.getAdaptableApi().calculatedColumnApi.getCalculatedColumnForColumnId(columnId);
@@ -79,8 +79,8 @@ export class ExpressionApiImpl extends ApiBase {
         return ((_d = (_c = (_b = (_a = query.BooleanExpression) !== null && _a !== void 0 ? _a : query.ScalarExpression) !== null && _b !== void 0 ? _b : query.ObservableExpression) !== null && _c !== void 0 ? _c : query.AggregatedBooleanExpression) !== null && _d !== void 0 ? _d : query.AggregatedScalarExpression);
     }
     getAdaptableQueryExpressionWithColumnFriendlyNames(query) {
-        return this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        return this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
     }
     useCaseSensitivity() {

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

@@ -134,5 +134,5 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getAgGridRowModelType(): RowModelType;
     getVisibleRowCount(): number;
     showTransposedView(transposeConfig?: TransposeConfig): void;
-    getAllGridColumns(): Column<any>[];
+    getAllAgGridColumns(): Column<any>[];
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -15,6 +15,11 @@ export class GridApiImpl extends ApiBase {
         return this.getAdaptableState().Grid;
     }
     loadGridData(dataSource) {
+        // we intentionally set an initial empty array,
+        // to prevent `cellchanged` events from being triggered for rows that have
+        // the same primary key with existing rows
+        // see #testprevent_cellchanged_event_on_load_grid_data
+        this.adaptable.agGridAdapter.setGridOption('rowData', []);
         this.adaptable.setGridData(dataSource);
         const allRowNodes = this.getAllRowNodes();
         this.internalApi.fireGridDataChangedEvent(dataSource, allRowNodes, 'Load');
@@ -215,8 +220,8 @@ export class GridApiImpl extends ApiBase {
     }
     selectCellRangeByQuery(query, gridCellRange, clearSelection) {
         const filteredRowNodes = [];
-        const isRowNodeInQuery = (rowNode) => this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        const isRowNodeInQuery = (rowNode) => this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .evaluateBooleanExpression(query, 'GridInfo', rowNode);
         if (gridCellRange) {
             const [startNode, endNode] = this.getSelectionStartEndNodes(gridCellRange);
@@ -549,7 +554,7 @@ export class GridApiImpl extends ApiBase {
             },
         });
     }
-    getAllGridColumns() {
+    getAllAgGridColumns() {
         return this.adaptable.getAllGridColumns();
     }
 }

package/src/Api/Implementation/ScopeApiImpl.js

@@ -53,8 +53,8 @@ export class ScopeApiImpl extends ApiBase {
         if ('ColumnIds' in scope) {
             return ((scope.ColumnIds.length > 1 ? 'Columns' : 'Column') +
                 ': ' +
-                this.getAdaptableApi().columnApi
-                    .getFriendlyNamesForColumnIds(scope.ColumnIds)
+                this.getAdaptableApi()
+                    .columnApi.getFriendlyNamesForColumnIds(scope.ColumnIds)
                     .map((c) => {
                     return '"' + c + '"';
                 })
@@ -135,8 +135,8 @@ export class ScopeApiImpl extends ApiBase {
         if ('ColumnIds' in scope) {
             let text = scope.ColumnIds.length == 1 ? 'Column: ' : 'Columns: ';
             return (text +
-                this.getAdaptableApi().columnApi
-                    .getFriendlyNamesForColumnIds(scope.ColumnIds)
+                this.getAdaptableApi()
+                    .columnApi.getFriendlyNamesForColumnIds(scope.ColumnIds)
                     .map((c) => {
                     return '"' + c + '"';
                 })

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

@@ -1,13 +1,14 @@
-import { ApiBase } from './ApiBase';
-import { UserInterfaceApi } from '../UserInterfaceApi';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
-import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
-import { AdaptableObjectTag, CustomWindowConfig, GridCell } from '../../types';
+import { AdaptableFrameworkComponent, AdaptableObjectTag, CustomRenderFunction, CustomWindowConfig, GridCell } from '../../types';
 import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { UserInterfaceApi } from '../UserInterfaceApi';
+import { ApiBase } from './ApiBase';
 export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfaceApi {
     internalApi: UserInterfaceInternalApi;
+    private showProgressIndicatorTimeout;
     constructor(adaptable: IAdaptable);
     getColorPalette(): string[];
     getStyleClassNames(): string[] | undefined;
@@ -29,6 +30,14 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getCustomIconDefinition(iconName: string): import("../../types").AdaptableIcon | import("../../types").CustomIcon;
     showLoadingScreen(): void;
     hideLoadingScreen(): void;
+    showProgressIndicator(config: {
+        text: string;
+        message?: string;
+        render?: CustomRenderFunction;
+        frameworkComponent?: AdaptableFrameworkComponent;
+        delay?: number;
+    }): void;
+    hideProgressIndicator(): void;
     openCustomWindowPopup(config: CustomWindowConfig): {
         close: () => void;
     };

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -1,11 +1,14 @@
-import { ApiBase } from './ApiBase';
 import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
+import { SystemProgressIndicatorHide, SystemProgressIndicatorShow, } from '../../Redux/ActionsReducers/SystemRedux';
 import { ArrayExtensions } from '../../Utilities/Extensions/ArrayExtensions';
-import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
+import { logDeprecation } from '../../Utilities/logDeprecation';
 import { CUSTOM_WINDOW_FACTORY_ID } from '../../View/Components/Popups/WindowPopups/WindowPopups';
+import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
+import { ApiBase } from './ApiBase';
 export class UserInterfaceApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
+        this.showProgressIndicatorTimeout = null;
         this.internalApi = new UserInterfaceInternalApi(adaptable);
     }
     getColorPalette() {
@@ -166,10 +169,29 @@ export class UserInterfaceApiImpl extends ApiBase {
         return customIcon;
     }
     showLoadingScreen() {
-        this.dispatchAction(PopupRedux.PopupShowLoading());
+        logDeprecation(this.adaptable.logger, 'UserInterfaceApi', 'showLoadingScreen', 'showProgressIndicator');
+        this.showProgressIndicator({ text: 'Loading' });
     }
     hideLoadingScreen() {
-        this.dispatchAction(PopupRedux.PopupHideLoading());
+        logDeprecation(this.adaptable.logger, 'UserInterfaceApi', 'hideLoadingScreen', 'hideProgressIndicator');
+        this.hideProgressIndicator();
+    }
+    showProgressIndicator(config) {
+        if (config.delay) {
+            this.showProgressIndicatorTimeout = setTimeout(() => {
+                this.dispatchAction(SystemProgressIndicatorShow(config));
+            }, config.delay);
+        }
+        else {
+            this.dispatchAction(SystemProgressIndicatorShow(config));
+        }
+    }
+    hideProgressIndicator() {
+        if (this.showProgressIndicatorTimeout) {
+            clearTimeout(this.showProgressIndicatorTimeout);
+            this.showProgressIndicatorTimeout = null;
+        }
+        this.dispatchAction(SystemProgressIndicatorHide());
     }
     openCustomWindowPopup(config) {
         const close = () => {

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

@@ -89,7 +89,6 @@ export declare class AdaptableInternalApi extends ApiBase {
     destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
     initializeDataChangeHistory(): void;
     executeWithProgressIndicator(label: string, executeFn: () => void, errorHandlingFn?: () => void): void;
-    hideProgressIndicator(): void;
     getCorrectEnglishVariant(wordToSpell: string): string;
     shouldDisplayTagSections(): boolean;
     getAvailableTags(): AdaptableObjectTag[] | undefined;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -1,6 +1,5 @@
 import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
 import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
-import { SystemProgressIndicatorHide, SystemProgressIndicatorShow, } from '../../Redux/ActionsReducers/SystemRedux';
 import * as GridRedux from '../../Redux/ActionsReducers/GridRedux';
 import * as DeadRedux from '../../Redux/DeadRedux';
 import { ApiBase } from '../Implementation/ApiBase';
@@ -249,7 +248,7 @@ export class AdaptableInternalApi extends ApiBase {
         }
     }
     executeWithProgressIndicator(label, executeFn, errorHandlingFn) {
-        this.dispatchReduxAction(SystemProgressIndicatorShow(label));
+        this.getAdaptableApi().userInterfaceApi.showProgressIndicator({ text: label, delay: 300 });
         // setTimeout required to give the ProgressIndicator rendering a head-start (see RAF in ProgressIndicator implementation)
         setTimeout(() => {
             try {
@@ -257,14 +256,11 @@ export class AdaptableInternalApi extends ApiBase {
             }
             catch (error) {
                 errorHandlingFn === null || errorHandlingFn === void 0 ? void 0 : errorHandlingFn();
-                this.hideProgressIndicator();
+                this.getUserInterfaceApi().hideProgressIndicator();
                 this.adaptable.logger.error('Unexpected error while executing a function with a progress indicator', error);
             }
         }, 16);
     }
-    hideProgressIndicator() {
-        this.dispatchReduxAction(SystemProgressIndicatorHide());
-    }
     getCorrectEnglishVariant(wordToSpell) {
         if (wordToSpell.includes('our')) {
             return this.getUserInterfaceOptions().englishVariant == 'GB'

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -124,8 +124,8 @@ export class ColumnFilterInternalApi extends ApiBase {
         const isClearAndPreviousWasActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR &&
             this.getAdaptableApi().columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isClearAllAtLeastOneActiveFilter = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL &&
-            this.getAdaptableApi().columnFilterApi
-                .getColumnFilters()
+            this.getAdaptableApi()
+                .columnFilterApi.getColumnFilters()
                 .some((columnFilter) => this.getAdaptableApi().columnFilterApi.isColumnFilterActive(columnFilter));
         let isEditTrigger = false;
         if (action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT) {

package/src/Api/Internal/DashboardInternalApi.js

@@ -51,8 +51,8 @@ export class DashboardInternalApi extends ApiBase {
         return false;
     }
     isToolbarCustom(toolbarName) {
-        return this.getAdaptableApi().dashboardApi
-            .getCustomToolbars()
+        return this.getAdaptableApi()
+            .dashboardApi.getCustomToolbars()
             .some((tb) => tb.name === toolbarName);
     }
     getCustomToolbarRenderContainerId(customToolbarName) {

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -3,6 +3,7 @@ import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import FormatHelper from '../../Utilities/Helpers/FormatHelper';
 import ObjectFactory from '../../Utilities/ObjectFactory';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+import { ROW_SUMMARY_ROW_ID } from '../../PredefinedConfig/Common/RowSummary';
 export class FormatColumnInternalApi extends ApiBase {
     /**
      * Retrieves all Format Columns in Adaptable State with the `Style` property set
@@ -154,7 +155,7 @@ export class FormatColumnInternalApi extends ApiBase {
      * @param params
      */
     isFormatColumnRelevantForColumn(formatColumn, column, params) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         // suspended is important to be first
         if (formatColumn.IsSuspended) {
             return false;
@@ -163,11 +164,14 @@ export class FormatColumnInternalApi extends ApiBase {
             this.getAdaptableApi().gridApi.isGroupRowNode(params.node)) {
             return false;
         }
+        if (!formatColumn.IncludeRowSummaries && ((_b = (_a = params.node) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[ROW_SUMMARY_ROW_ID])) {
+            return false;
+        }
         if (!formatColumn.Rule) {
             return true;
         }
         // first run the predicate
-        if (formatColumn.Rule.Predicates && ((_b = (_a = formatColumn.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length)) {
+        if (formatColumn.Rule.Predicates && ((_d = (_c = formatColumn.Rule) === null || _c === void 0 ? void 0 : _c.Predicates) === null || _d === void 0 ? void 0 : _d.length)) {
             const predicateDefHandlerContext = Object.assign({ value: params.value, oldValue: null, displayValue: params.value, node: params.node, column: column }, this.getAdaptableApi().internalApi.buildBaseContext());
             return this.evaluatePredicate(formatColumn, predicateDefHandlerContext);
         }
@@ -184,8 +188,8 @@ export class FormatColumnInternalApi extends ApiBase {
     evaluateExpression(formatColumn, node) {
         const isValidExpression = this.getAdaptableApi().expressionApi.isValidBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, `Invalid format column rule '${formatColumn.Rule.BooleanExpression}'`);
         return (isValidExpression &&
-            this.getAdaptableApi().internalApi
-                .getQueryLanguageService()
+            this.getAdaptableApi()
+                .internalApi.getQueryLanguageService()
                 .evaluateBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, node));
     }
     /**
@@ -235,7 +239,9 @@ export class FormatColumnInternalApi extends ApiBase {
         });
         const columnsThatNeedRefresh = new Set();
         this.getFormatColumnsDependentOnColumns(impactedColumnIds).forEach((formatColumn) => {
-            this.getAdaptableApi().scopeApi.getColumnsForScope(formatColumn.Scope).forEach((col) => {
+            this.getAdaptableApi()
+                .scopeApi.getColumnsForScope(formatColumn.Scope)
+                .forEach((col) => {
                 columnsThatNeedRefresh.add(col.columnId);
             });
         });

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

@@ -3,7 +3,7 @@ import { GridFilter } from '../../types';
 export declare class GridFilterInternalApi extends ApiBase {
     fireGridFilterAppliedEvent(): void;
     /**
-   * Compares to Grid Filters to see if they are identical
-   */
+     * Compares to Grid Filters to see if they are identical
+     */
     isGridFilterDifferent(oldFilter: GridFilter, newFilter: GridFilter): boolean;
 }

package/src/Api/Internal/GridFilterInternalApi.js

@@ -11,8 +11,8 @@ export class GridFilterInternalApi extends ApiBase {
         }
     }
     /**
-   * Compares to Grid Filters to see if they are identical
-   */
+     * Compares to Grid Filters to see if they are identical
+     */
     isGridFilterDifferent(oldFilter, newFilter) {
         return (oldFilter === null || oldFilter === void 0 ? void 0 : oldFilter.Expression) === (newFilter === null || newFilter === void 0 ? void 0 : newFilter.Expression);
     }

package/src/Api/Internal/LayoutInternalApi.js

@@ -58,7 +58,7 @@ export class LayoutInternalApi extends ApiBase {
             if (!layoutState.Layouts || !isLayoutDefined(DEFAULT_LAYOUT)) {
                 // augogroup columns are not in columns list
                 // the code that adds column ok grid state explicitly ignores autoColumns
-                const allGridColumns = this.getAdaptableApi().gridApi.getAllGridColumns();
+                const allGridColumns = this.getAdaptableApi().gridApi.getAllAgGridColumns();
                 let defaultLayout = ObjectFactory.CreateEmptyLayout({
                     Name: DEFAULT_LAYOUT,
                     Columns: defaultLayoutColumns.map((c) => c.columnId),

package/src/Api/UserInterfaceApi.d.ts

@@ -3,8 +3,8 @@ import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
 import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableIcon } from '../types';
-import { CustomWindowConfig } from '../AdaptableOptions/AdaptableFrameworkComponent';
+import { AdaptableFrameworkComponent, AdaptableIcon } from '../types';
+import { CustomRenderFunction, CustomWindowConfig } from '../AdaptableOptions/AdaptableFrameworkComponent';
 /**
  * Functions relating to User Interface section of Adaptable State
  */
@@ -72,12 +72,25 @@ export interface UserInterfaceApi {
     getCustomIconDefinition(name: string): AdaptableIcon | undefined;
     /**
      * Displays the popup that says getting data and initialising grid
+     * @deprecated use `showProgressIndicator()` instead
      */
     showLoadingScreen(): void;
     /**
      * Hides the popup that says getting data and initialising grid
+     * @deprecated use `hideProgressIndicator()` instead
      */
     hideLoadingScreen(): void;
+    /**
+     *
+     * @param config
+     */
+    showProgressIndicator(config: {
+        text?: string;
+        render?: CustomRenderFunction;
+        frameworkComponent?: AdaptableFrameworkComponent;
+        delay?: number;
+    }): void;
+    hideProgressIndicator(): void;
     /**
      * Opens window with custom content
      * @param config

package/src/PredefinedConfig/Common/AdaptableIcon.d.ts

@@ -54,4 +54,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable System Icon names
  */
-export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter' | 'rows';
+export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'copy' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'filter-off' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'select-all' | 'select-off' | 'select-fwd' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter' | 'grid-info' | 'rows';

package/src/PredefinedConfig/Common/Fdc3Intent.d.ts

@@ -74,7 +74,7 @@ export declare const Fdc3StandardIntents: ("StartCall" | "StartChat" | "StartEma
 /**
  * All FDC3 standard intents
  */
-export type Fdc3StandardIntentType = typeof Fdc3StandardIntents[number];
+export type Fdc3StandardIntentType = (typeof Fdc3StandardIntents)[number];
 /**
  * Custom FDC3 intent
  */
@@ -86,4 +86,4 @@ export type Fdc3IntentType = Fdc3StandardIntentType | Fdc3CustomIntentType;
 /**
  * Valid context for a given FDC3 intent
  */
-export type CompatibleContext<F extends Fdc3StandardIntentType> = typeof Fdc3IntentConfiguration[F]['contexts'][number];
+export type CompatibleContext<F extends Fdc3StandardIntentType> = (typeof Fdc3IntentConfiguration)[F]['contexts'][number];

package/src/PredefinedConfig/Common/Menu.d.ts

@@ -5,16 +5,16 @@ import { SelectedCellInfo } from '../Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../Selection/SelectedRowInfo';
 import { Column, IRowNode } from '@ag-grid-community/core';
 import { AdaptableIcon, BaseContext } from '../../types';
-export type AdaptableColumnMenuItemName = typeof ADAPTABLE_COLUMN_MENU_ITEMS[number];
-export type AdaptableContextMenuItemName = typeof ADAPTABLE_CONTEXT_MENU_ITEMS[number];
+export type AdaptableColumnMenuItemName = (typeof ADAPTABLE_COLUMN_MENU_ITEMS)[number];
+export type AdaptableContextMenuItemName = (typeof ADAPTABLE_CONTEXT_MENU_ITEMS)[number];
 /**
  * List of Shipped Adaptable Column Menu Items
  */
-export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-edit", "cell-summary-show", "column-filter-bar-hide", "column-filter-bar-show", "column-filter-clear", "column-filter-on-cell-value", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "custom-sort-add", "custom-sort-edit", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "flashing-cell-add", "flashing-cell-delete", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-info-show", "layout-column-caption-change", "layout-column-hide", "layout-edit", "layout-select-actions", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-select-all", "plus-minus-add", "settings-panel-open", "styled-column-badge-add", "styled-column-badge-edit", "styled-column-gradient-add", "styled-column-gradient-edit", "styled-column-percent-bar-add", "styled-column-percent-bar-edit", "styled-column-sparkline-add", "styled-column-sparkline-edit", "system-status-show", "_navbar"];
+export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-edit", "cell-summary-show", "column-group", "column-filter-group", "column-filter-bar-hide", "column-filter-bar-show", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "custom-sort-add", "custom-sort-edit", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "flashing-cell-add", "flashing-cell-delete", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-group", "grid-info-show", "layout-column-caption-change", "layout-column-hide", "layout-edit", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-grid-select", "plus-minus-add", "settings-panel-open", "styling-group", "styled-column-badge-add", "styled-column-badge-edit", "styled-column-gradient-add", "styled-column-gradient-edit", "styled-column-percent-bar-add", "styled-column-percent-bar-edit", "styled-column-sparkline-add", "styled-column-sparkline-edit", "system-status-show", "_navbar"];
 /**
  * List of Shipped Adaptable Context Menu Items
  */
-export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["menu-group-parent", "alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-filter-on-cell-value", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "export-cells-clipboard", "export-cells-csv", "export-cells-excel", "export-cells-json", "export-cells-table", "export-cells-custom-destination", "export-rows-clipboard", "export-rows-csv", "export-rows-excel", "export-rows-json", "export-rows-table", "export-rows-custom-destination", "fdc3-broadcast", "fdc3-raise-intent", "flashing-cell-clear", "flashing-row-clear", "grid-info-show", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-edit", "layout-select-all", "layout-grid-actions", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
+export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["menu-group", "alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-group", "column-filter-on-cell-value", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "edit-group", "export-visual-data-excel", "export-all-data-excel", "export-all-data-csv", "export-all-data-clipboard", "export-all-data-json", "export-all-data-table", "export-current-data-excel", "export-current-data-csv", "export-current-data-clipboard", "export-current-data-json", "export-current-data-table", "export-selected-cells-excel", "export-selected-cells-csv", "export-selected-cells-clipboard", "export-selected-cells-json", "export-selected-cells-table", "export-selected-rows-excel", "export-selected-rows-csv", "export-selected-rows-clipboard", "export-selected-rows-json", "export-selected-rows-table", "fdc3-broadcast", "fdc3-raise-intent", "flashing-cell-clear", "flashing-row-clear", "grid-group", "grid-info-show", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-edit", "layout-select-all", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
 /**
  * Menu item used by Adaptable in both Column and Context Menus
  */