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

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

@@ -1,31 +1,33 @@
 import { ApiBase } from './ApiBase';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableScope, ScopeDataType } from '../../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope, ScopeDataType } from '../../PredefinedConfig/Common/ColumnScope';
 import { ScopeApi } from '../ScopeApi';
 import { CellColorRange } from '../../PredefinedConfig/StyledColumnState';
 export declare class ScopeApiImpl extends ApiBase implements ScopeApi {
-    isColumnInScope(column: AdaptableColumn | undefined, scope: AdaptableScope | undefined): boolean;
-    getColumnsForScope(scope: AdaptableScope): AdaptableColumn[];
-    getScopeDescription(scope: AdaptableScope): string;
-    scopeIsEmpty(scope: AdaptableScope): boolean;
-    scopeIsAll(scope: AdaptableScope): boolean;
-    scopeHasDataType(scope: AdaptableScope): boolean;
-    scopeHasOnlyBooleanDataType(scope: AdaptableScope): boolean;
-    scopeHasColumns(scope: AdaptableScope): boolean;
-    isSingleColumnScope(scope: AdaptableScope): boolean;
-    getSingleColumnInScope(scope: AdaptableScope): string | undefined;
-    isSingleNumericColumnScope(scope: AdaptableScope): boolean;
-    isSingleBooleanColumnScope(scope: AdaptableScope): boolean;
-    areAllBooleanColumnsInScope(scope: AdaptableScope): boolean;
-    isColumnInScopeColumns(column: AdaptableColumn, scope: AdaptableScope): boolean;
-    isPrimaryKeyColumnInScopeColumns(scope: AdaptableScope): boolean;
-    getScopeToString(scope: AdaptableScope): string;
-    getColumnIdsInScope(scope: AdaptableScope): string[] | undefined;
-    getDataTypesInScope(scope: AdaptableScope): ScopeDataType[] | undefined;
-    isColumnInNumericScope(column: AdaptableColumn, scope: AdaptableScope): boolean;
-    isColumnInStringsScope(column: AdaptableColumn, scope: AdaptableScope): boolean;
-    isColumnInDateScope(column: AdaptableColumn, scope: AdaptableScope): boolean;
-    isScopeInScope(a: AdaptableScope, b: AdaptableScope): boolean;
-    createCellColorRangesForScope(scope: AdaptableScope): CellColorRange[];
+    isColumnInScope(column: AdaptableColumn | undefined, scope: ColumnScope | undefined): boolean;
+    getColumnsForScope(scope: ColumnScope): AdaptableColumn[];
+    getScopeDescription(scope: ColumnScope): string;
+    scopeIsEmpty(scope: ColumnScope): boolean;
+    scopeIsAll(scope: ColumnScope): boolean;
+    scopeHasDataType(scope: ColumnScope): boolean;
+    scopeHasColumnType(scope: ColumnScope): boolean;
+    scopeHasOnlyBooleanDataType(scope: ColumnScope): boolean;
+    scopeHasColumns(scope: ColumnScope): boolean;
+    isSingleColumnScope(scope: ColumnScope): boolean;
+    getSingleColumnInScope(scope: ColumnScope): string | undefined;
+    isSingleNumericColumnScope(scope: ColumnScope): boolean;
+    isSingleBooleanColumnScope(scope: ColumnScope): boolean;
+    areAllBooleanColumnsInScope(scope: ColumnScope): boolean;
+    isColumnInScopeColumns(column: AdaptableColumn, scope: ColumnScope): boolean;
+    isPrimaryKeyColumnInScopeColumns(scope: ColumnScope): boolean;
+    getScopeToString(scope: ColumnScope): string;
+    getColumnIdsInScope(scope: ColumnScope): string[] | undefined;
+    getColumnTypesInScope(scope: ColumnScope): string[] | undefined;
+    getDataTypesInScope(scope: ColumnScope): ScopeDataType[] | undefined;
+    isColumnInNumericScope(column: AdaptableColumn, scope: ColumnScope): boolean;
+    isColumnInStringsScope(column: AdaptableColumn, scope: ColumnScope): boolean;
+    isColumnInDateScope(column: AdaptableColumn, scope: ColumnScope): boolean;
+    isScopeInScope(a: ColumnScope, b: ColumnScope): boolean;
+    createCellColorRangesForScope(scope: ColumnScope): CellColorRange[];
     private distinctColumnValuesAreEmpty;
 }

package/src/Api/Implementation/ScopeApiImpl.js

@@ -17,6 +17,10 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
         if ('DataTypes' in scope && scope.DataTypes.includes(column.dataType)) {
             return true;
         }
+        if ('ColumnTypes' in scope &&
+            scope.ColumnTypes.some((columnType) => { var _a; return (_a = column.columnTypes) === null || _a === void 0 ? void 0 : _a.includes(columnType); })) {
+            return true;
+        }
         if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
             return true;
         }
@@ -26,18 +30,12 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
         if (scope == undefined) {
             return [];
         }
-        const columns = this.adaptable.api.columnApi.getColumns();
+        const columns = this.getAdaptableApi().columnApi.getColumns();
         if ('All' in scope) {
             return columns;
         }
         return columns.filter((c) => {
-            if ('DataTypes' in scope && scope.DataTypes.includes(c.dataType)) {
-                return true;
-            }
-            if ('ColumnIds' in scope && scope.ColumnIds.includes(c.columnId)) {
-                return true;
-            }
-            return false;
+            return this.isColumnInScope(c, scope);
         });
     }
     getScopeDescription(scope) {
@@ -48,14 +46,19 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             // do we need a true check here?
             return 'Columns: All';
         }
+        if ('ColumnTypes' in scope) {
+            return ((scope.ColumnTypes.length > 0 ? 'ColumnTypes' : 'ColumnType') +
+                ': ' +
+                scope.ColumnTypes.join(', '));
+        }
         if ('DataTypes' in scope) {
             return ((scope.DataTypes.length > 0 ? 'DataTypes' : 'DataType') + ': ' + scope.DataTypes.join(', '));
         }
         if ('ColumnIds' in scope) {
             return ((scope.ColumnIds.length > 1 ? 'Columns' : 'Column') +
                 ': ' +
-                this.adaptable.api.columnApi
-                    .getFriendlyNamesForColumnIds(scope.ColumnIds)
+                this.getAdaptableApi()
+                    .columnApi.getFriendlyNamesForColumnIds(scope.ColumnIds)
                     .map((c) => {
                     return '"' + c + '"';
                 })
@@ -71,6 +74,9 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
     scopeHasDataType(scope) {
         return scope !== undefined && 'DataTypes' in scope;
     }
+    scopeHasColumnType(scope) {
+        return scope !== undefined && 'ColumnTypes' in scope;
+    }
     scopeHasOnlyBooleanDataType(scope) {
         var _a;
         return 'DataTypes' in scope && ((_a = scope.DataTypes) === null || _a === void 0 ? void 0 : _a.length) == 1 && scope.DataTypes[0] == 'Boolean';
@@ -94,7 +100,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             !this.scopeIsAll(scope) &&
             'ColumnIds' in scope &&
             scope.ColumnIds.length == 1 &&
-            this.adaptable.api.columnApi.hasNumberDataType(scope.ColumnIds[0]));
+            this.getAdaptableApi().columnApi.hasNumberDataType(scope.ColumnIds[0]));
     }
     isSingleBooleanColumnScope(scope) {
         return (this.scopeHasColumns(scope) &&
@@ -102,7 +108,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             !this.scopeIsAll(scope) &&
             'ColumnIds' in scope &&
             scope.ColumnIds.length == 1 &&
-            this.adaptable.api.columnApi.hasBooleanDataType(scope.ColumnIds[0]));
+            this.getAdaptableApi().columnApi.hasBooleanDataType(scope.ColumnIds[0]));
     }
     areAllBooleanColumnsInScope(scope) {
         return (this.scopeHasColumns(scope) &&
@@ -110,7 +116,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             !this.scopeIsAll(scope) &&
             'ColumnIds' in scope &&
             scope.ColumnIds.length &&
-            scope.ColumnIds.every((columnId) => this.adaptable.api.columnApi.hasBooleanDataType(columnId)));
+            scope.ColumnIds.every((columnId) => this.getAdaptableApi().columnApi.hasBooleanDataType(columnId)));
     }
     isColumnInScopeColumns(column, scope) {
         return this.scopeHasColumns(scope) && this.isColumnInScope(column, scope);
@@ -118,20 +124,23 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
     isPrimaryKeyColumnInScopeColumns(scope) {
         return ('ColumnIds' in scope &&
             scope.ColumnIds.length == 1 &&
-            scope.ColumnIds.find((c) => c == this.adaptable.api.optionsApi.getPrimaryKey()) != null);
+            scope.ColumnIds.find((c) => c == this.getAdaptableApi().optionsApi.getPrimaryKey()) != null);
     }
     getScopeToString(scope) {
         if ('All' in scope) {
             return 'Columns: All';
         }
+        if ('ColumnTypes' in scope) {
+            return 'ColumnTypes: ' + scope.ColumnTypes.join(',');
+        }
         if ('DataTypes' in scope) {
             return 'DataTypes: ' + scope.DataTypes.join(',');
         }
         if ('ColumnIds' in scope) {
             let text = scope.ColumnIds.length == 1 ? 'Column: ' : 'Columns: ';
             return (text +
-                this.adaptable.api.columnApi
-                    .getFriendlyNamesForColumnIds(scope.ColumnIds)
+                this.getAdaptableApi()
+                    .columnApi.getFriendlyNamesForColumnIds(scope.ColumnIds)
                     .map((c) => {
                     return '"' + c + '"';
                 })
@@ -144,6 +153,12 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
         }
         return undefined;
     }
+    getColumnTypesInScope(scope) {
+        if (scope !== undefined && 'ColumnTypes' in scope) {
+            return scope.ColumnTypes;
+        }
+        return undefined;
+    }
     getDataTypesInScope(scope) {
         if (scope !== undefined && 'DataTypes' in scope) {
             return scope.DataTypes;
@@ -151,6 +166,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
         return undefined;
     }
     isColumnInNumericScope(column, scope) {
+        var _a, _b;
         // if column is not even numeric then return false
         if (column == null || column == undefined || column.dataType !== 'Number') {
             return false;
@@ -167,9 +183,14 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
         if ('DataTypes' in scope && scope.DataTypes.includes('Number')) {
             return true;
         }
+        if ('ColumnTypes' in scope &&
+            ((_b = (_a = scope.ColumnTypes) === null || _a === void 0 ? void 0 : _a.some) === null || _b === void 0 ? void 0 : _b.call(_a, (scopeColumnType) => { var _a, _b; return (_b = (_a = column.columnTypes) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, scopeColumnType); }))) {
+            return true;
+        }
         return false;
     }
     isColumnInStringsScope(column, scope) {
+        var _a, _b;
         // if column is not even string then return false
         if (column == null || column == undefined || column.dataType !== 'String') {
             return false;
@@ -186,9 +207,14 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
         if ('DataTypes' in scope && scope.DataTypes.includes('String')) {
             return true;
         }
+        if ('ColumnTypes' in scope &&
+            ((_b = (_a = scope.ColumnTypes) === null || _a === void 0 ? void 0 : _a.some) === null || _b === void 0 ? void 0 : _b.call(_a, (scopeColumnType) => { var _a, _b; return (_b = (_a = column.columnTypes) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, scopeColumnType); }))) {
+            return true;
+        }
         return false;
     }
     isColumnInDateScope(column, scope) {
+        var _a, _b;
         // if column is not even numeric then return false
         if (column == null || column == undefined || column.dataType !== 'Date') {
             return false;
@@ -205,6 +231,10 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
         if ('DataTypes' in scope && scope.DataTypes.includes('Date')) {
             return true;
         }
+        if ('ColumnTypes' in scope &&
+            ((_b = (_a = scope.ColumnTypes) === null || _a === void 0 ? void 0 : _a.some) === null || _b === void 0 ? void 0 : _b.call(_a, (scopeColumnType) => { var _a, _b; return (_b = (_a = column.columnTypes) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, scopeColumnType); }))) {
+            return true;
+        }
         return false;
     }
     isScopeInScope(a, b) {
@@ -227,14 +257,30 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             'DataTypes' in b &&
             a.ColumnIds.every((columnId) => {
                 var _a;
-                return b.DataTypes.includes((_a = this.adaptable.api.columnApi.getColumnWithColumnId(columnId)) === null || _a === void 0 ? void 0 : _a.dataType);
+                return b.DataTypes.includes((_a = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId)) === null || _a === void 0 ? void 0 : _a.dataType);
             })) {
             return true;
         }
+        if ('ColumnTypes' in a &&
+            'ColumnTypes' in b &&
+            a.ColumnTypes.every((columnType) => b.ColumnTypes.includes(columnType))) {
+            return true;
+        }
+        // check if each colum in a has column types in b
+        if ('ColumnIds' in a && 'ColumnTypes' in b) {
+            const inScope = a.ColumnIds.every((columnId) => {
+                const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+                // check if at least one column-type is in scope
+                return column.columnTypes.some((columnColumnType) => b.ColumnTypes.includes(columnColumnType));
+            });
+            if (inScope) {
+                return true;
+            }
+        }
         return false;
     }
     createCellColorRangesForScope(scope) {
-        let distinctColumnsValues = this.adaptable.api.gridApi.internalApi.getDistinctRawValuesForColumn(this.adaptable.api.scopeApi.getSingleColumnInScope(scope));
+        let distinctColumnsValues = this.getAdaptableApi().gridApi.internalApi.getDistinctRawValuesForColumn(this.getAdaptableApi().scopeApi.getSingleColumnInScope(scope));
         let minValue = Math.min(...distinctColumnsValues);
         let maxValue = Math.max(...distinctColumnsValues);
         const ranges = [];

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

@@ -5,6 +5,5 @@ import { StatusPanelDef } from '@ag-grid-community/core';
 export declare class StatusBarApiImpl extends ApiBase implements StatusBarApi {
     getAdaptableStatusBars(): AdaptableStatusBar[];
     getAgGridStatusPanels(): StatusPanelDef[];
-    getAgGridStatusBar(): StatusPanelDef[];
     setStatusBarPanels(statusPanels: AdaptableStatusBar[]): void;
 }

package/src/Api/Implementation/StatusBarApiImpl.js

@@ -10,9 +10,6 @@ class StatusBarApiImpl extends ApiBase_1.ApiBase {
     getAgGridStatusPanels() {
         return this.adaptable.getAgGridStatusPanels();
     }
-    getAgGridStatusBar() {
-        return this.adaptable.getAgGridStatusPanels();
-    }
     setStatusBarPanels(statusPanels) {
         this.dispatchAction((0, StatusBarRedux_1.StatusBarSetPanels)(statusPanels));
     }

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -19,11 +19,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
             return [];
         }
         const teamSharingOptions = this.adaptable.adaptableOptions.teamSharingOptions;
-        const sharedEntitiesContext = {
-            adaptableId: this.adaptable.adaptableOptions.adaptableId,
-            userName: this.adaptable.adaptableOptions.userName,
-            adaptableApi: this.getAdaptableApi(),
-        };
+        const sharedEntitiesContext = this.getAdaptableApi().internalApi.buildBaseContext();
         let loadedSharedEntities = await teamSharingOptions.loadSharedEntities(sharedEntitiesContext);
         // with v15 we introduced 2 types of SharedEntity: AdaptableSharedEntity (basically the old one) and the new CustomSharedEntity
         // for backwards compatibility, we add default the 'EntityType' property to 'adaptableEntity'
@@ -44,11 +40,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
             return false;
         }
         const teamSharingOptions = this.adaptable.adaptableOptions.teamSharingOptions;
-        const sharedEntitiesContext = {
-            adaptableId: this.adaptable.adaptableOptions.adaptableId,
-            userName: this.adaptable.adaptableOptions.userName,
-            adaptableApi: this.getAdaptableApi(),
-        };
+        const sharedEntitiesContext = this.getAdaptableApi().internalApi.buildBaseContext();
         const sharedEntitiesAfterCustomisation = teamSharingOptions.saveSharedEntities(sharedEntities, sharedEntitiesContext);
         await teamSharingOptions.persistSharedEntities(sharedEntitiesAfterCustomisation, sharedEntitiesContext);
         return true;
@@ -104,11 +96,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
                 this.logError(`Could NOT import custom shared entity because 'TeamSharingOptions.handleCustomSharedEntityImport(...)' is NOT defined!`, sharedEntity);
                 return;
             }
-            customSharedEntityImportHandler(sharedEntity, {
-                adaptableApi: this.getAdaptableApi(),
-                adaptableId: this.adaptable.adaptableOptions.adaptableId,
-                userName: this.adaptable.adaptableOptions.userName,
-            });
+            customSharedEntityImportHandler(sharedEntity, this.getAdaptableApi().internalApi.buildBaseContext());
         }
     }
     getTeamSharingState() {

package/src/Api/Implementation/ThemeApiImpl.js

@@ -61,13 +61,8 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
             return;
         }
         this.adaptable.applyAdaptableTheme(currentTheme);
-        let themeChangedInfo = {
-            adaptableApi: this.getAdaptableApi(),
-            theme: currentTheme,
-            userName: this.adaptable.api.optionsApi.getUserName(),
-            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-        };
-        this.adaptable.api.eventApi.emit('ThemeChanged', themeChangedInfo);
+        let themeChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { theme: currentTheme });
+        this.getAdaptableApi().eventApi.emit('ThemeChanged', themeChangedInfo);
     }
     getUserThemes() {
         var _a;

package/src/Api/Implementation/ToolPanelApiImpl.js

@@ -14,15 +14,15 @@ class ToolPanelApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.ToolPanelModuleId);
     }
     openAdapTableToolPanel() {
-        let gridOptions = this.getGridApi().getAgGridInstance();
-        if (gridOptions) {
-            gridOptions.api.openToolPanel('adaptable');
+        const agGridApi = this.getAdaptableApi().agGridApi;
+        if (agGridApi) {
+            agGridApi.openToolPanel('adaptable');
         }
     }
     closeAdapTableToolPanel() {
-        let gridOptions = this.getGridApi().getAgGridInstance();
-        if (gridOptions) {
-            gridOptions.api.closeToolPanel();
+        const agGridApi = this.getAdaptableApi().agGridApi;
+        if (agGridApi) {
+            agGridApi.closeToolPanel();
         }
     }
     getCustomToolPanels() {

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

@@ -1,14 +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 { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../../PredefinedConfig/Common/Menu';
-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;
@@ -24,14 +24,20 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getEditLookUpItems(): EditLookUpPermittedValues[];
     getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
     getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
-    addColumnMenuItem(userMenuItem: UserMenuItem<ColumnMenuContext>): void;
-    addContextMenuItem(userMenuItem: UserMenuItem<ContextMenuContext>): void;
     getEditableCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
     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

@@ -2,14 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserInterfaceApiImpl = void 0;
 const tslib_1 = require("tslib");
-const ApiBase_1 = require("./ApiBase");
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
+const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
-const UserInterfaceInternalApi_1 = require("../Internal/UserInterfaceInternalApi");
+const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const WindowPopups_1 = require("../../View/Components/Popups/WindowPopups/WindowPopups");
+const UserInterfaceInternalApi_1 = require("../Internal/UserInterfaceInternalApi");
+const ApiBase_1 = require("./ApiBase");
 class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
+        this.showProgressIndicatorTimeout = null;
         this.internalApi = new UserInterfaceInternalApi_1.UserInterfaceInternalApi(adaptable);
     }
     getColorPalette() {
@@ -57,7 +60,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         }
         permittedValuesItem = permittedValues.find((permittedValue) => {
             return ('All' in permittedValue.scope &&
-                this.adaptable.api.scopeApi.isColumnInScope(column, permittedValue.scope));
+                this.getAdaptableApi().scopeApi.isColumnInScope(column, permittedValue.scope));
         });
         if (permittedValuesItem) {
             return permittedValuesItem;
@@ -77,12 +80,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         // first do the function then get hardcoded items
         if (permittedValues != null && typeof permittedValues === 'function') {
             if (column) {
-                const permittedValuesParams = {
-                    adaptableApi: this.getAdaptableApi(),
-                    userName: this.getOptions().userName,
-                    adaptableId: this.getOptions().adaptableId,
-                    column: column,
-                };
+                const permittedValuesParams = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { column: column });
                 return permittedValues(permittedValuesParams);
             }
         }
@@ -144,15 +142,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         if (!editLookUpItem || !gridCell || !gridCell.column) {
             return undefined;
         }
-        return this.adaptable.api.gridApi.internalApi.getEditLookUpValuesForColumn(editLookUpItem, gridCell.column, gridCell);
-    }
-    addColumnMenuItem(userMenuItem) {
-        var _a;
-        (_a = this.getMenuOptions().columnMenuItems) === null || _a === void 0 ? void 0 : _a.push(userMenuItem);
-    }
-    addContextMenuItem(userMenuItem) {
-        var _a;
-        (_a = this.getMenuOptions().contextMenuItems) === null || _a === void 0 ? void 0 : _a.push(userMenuItem);
+        return this.getAdaptableApi().gridApi.internalApi.getEditLookUpValuesForColumn(editLookUpItem, gridCell.column, gridCell);
     }
     getEditableCellStyle() {
         return this.getUserInterfaceOptions().editableCellStyle;
@@ -163,11 +153,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     getAdaptableObjectTags() {
         const objectTags = this.getUserInterfaceOptions().objectTags;
         if (objectTags != null && typeof objectTags === 'function') {
-            return objectTags({
-                adaptableApi: this.adaptable.api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            });
+            return objectTags(this.getAdaptableApi().internalApi.buildBaseContext());
         }
         else {
             let arr = objectTags;
@@ -187,10 +173,29 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         return customIcon;
     }
     showLoadingScreen() {
-        this.dispatchAction(PopupRedux.PopupShowLoading());
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'UserInterfaceApi', 'showLoadingScreen', 'showProgressIndicator');
+        this.showProgressIndicator({ text: 'Loading' });
     }
     hideLoadingScreen() {
-        this.dispatchAction(PopupRedux.PopupHideLoading());
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'UserInterfaceApi', 'hideLoadingScreen', 'hideProgressIndicator');
+        this.hideProgressIndicator();
+    }
+    showProgressIndicator(config) {
+        if (config.delay) {
+            this.showProgressIndicatorTimeout = setTimeout(() => {
+                this.dispatchAction((0, SystemRedux_1.SystemProgressIndicatorShow)(config));
+            }, config.delay);
+        }
+        else {
+            this.dispatchAction((0, SystemRedux_1.SystemProgressIndicatorShow)(config));
+        }
+    }
+    hideProgressIndicator() {
+        if (this.showProgressIndicatorTimeout) {
+            clearTimeout(this.showProgressIndicatorTimeout);
+            this.showProgressIndicatorTimeout = null;
+        }
+        this.dispatchAction((0, SystemRedux_1.SystemProgressIndicatorHide)());
     }
     openCustomWindowPopup(config) {
         const close = () => {

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

@@ -1,7 +1,9 @@
-import { IRowNode } from '@ag-grid-community/core';
+import { ColDef, IRowNode } from '@ag-grid-community/core';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
 import { CreateActionRowFormContext, EditActionRowFormContext } from '../../AdaptableOptions/ActionRowOptions';
+import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
 import { ApiBase } from '../Implementation/ApiBase';
+import { ActionColumnContext } from '../../AdaptableOptions/ActionColumnOptions';
 export declare class ActionRowInternalApi extends ApiBase {
     buildRowEditForm(rowNode: IRowNode): AdaptableForm<EditActionRowFormContext>;
     buildRowCreateForm(clonedRowNode?: IRowNode): AdaptableForm<CreateActionRowFormContext>;
@@ -14,6 +16,7 @@ export declare class ActionRowInternalApi extends ApiBase {
     private buildActionRowFields;
     private showColumnInActionRowForm;
     private buidActionRowButtons;
+    private prepareCreateData;
     private prepareEditData;
     private isColumnEditable;
     private buildFormField;
@@ -21,4 +24,6 @@ export declare class ActionRowInternalApi extends ApiBase {
     private buildFormFieldLabelContext;
     private getFieldTypeFromColumnType;
     private getFieldValueOptions;
+    getColDefsForActionRowColumns(): ColDef[];
+    getActionRowButtonDefs(): AdaptableButton<ActionColumnContext<any>>[];
 }