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

package/src/Api/Internal/ChartingInternalApi.js

@@ -13,52 +13,52 @@ export class ChartingInternalApi extends ApiBase {
     }
     getContainerElemetnByName(containerName) {
         var _a, _b, _c;
-        const chartContainers = (_c = (_b = (_a = this.adaptable.api.optionsApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers) !== null && _c !== void 0 ? _c : [];
+        const chartContainers = (_c = (_b = (_a = this.getAdaptableApi().optionsApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers) !== null && _c !== void 0 ? _c : [];
         const chartContainer = chartContainers.find((container) => container.name === containerName);
         return this.getContainerElement(chartContainer);
     }
     getUniqueChartName() {
-        const charts = this.adaptable.api.chartingApi.getChartDefinitions();
-        const externalCharts = this.adaptable.api.chartingApi.getExternalChartDefinitions();
+        const charts = this.getAdaptableApi().chartingApi.getChartDefinitions();
+        const externalCharts = this.getAdaptableApi().chartingApi.getExternalChartDefinitions();
         return `Chart ${charts.length + externalCharts.length + 1}`;
     }
     // External lib charting service
     isExternalChartOpened(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.isChartOpened)) {
             return false;
         }
         if (!chartDefinition) {
             return false;
         }
-        return externalChartingOptions.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.adaptable.api)));
+        return externalChartingOptions.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.getAdaptableApi())));
     }
     onHideExternalChart(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onHideChart)) {
             return;
         }
-        externalChartingOptions.onHideChart(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.adaptable.api)));
+        externalChartingOptions.onHideChart(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.getAdaptableApi())));
     }
     onShowExternalChart(chartDefinition, container) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onShowChart)) {
             return;
         }
-        externalChartingOptions.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.adaptable.api)));
+        externalChartingOptions.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.getAdaptableApi())));
     }
     onPreviewExternalChart(chartDefinition, container) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onPreviewChart)) {
             return;
         }
-        return externalChartingOptions.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.adaptable.api)));
+        return externalChartingOptions.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.getAdaptableApi())));
     }
     onDeleteExternalChart(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onDeleteChart)) {
             return;
         }
-        externalChartingOptions.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.adaptable.api)));
+        externalChartingOptions.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.getAdaptableApi())));
     }
 }

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

@@ -49,6 +49,7 @@ export declare class ColumnFilterInternalApi extends ApiBase {
      * Fires Column Filter Applied Event - typically used to enable filtering on the server
      */
     fireColumnFilterAppliedEvent(): void;
+    fireGridFilterAppliedEvent(): void;
     /**
      * Compares to sets of Column Filters to see if they are identical
      * @param filters1
@@ -56,4 +57,5 @@ export declare class ColumnFilterInternalApi extends ApiBase {
      */
     areColumnFiltersDifferent(oldFilters: ColumnFilter[], newFilters: ColumnFilter[]): boolean;
     getPredicateDefShortcuts(predicateDef: AdaptablePredicateDef): string[];
+    getFilterValuesMaxNumberOfItems(column: AdaptableColumn): number | undefined;
 }

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -43,7 +43,7 @@ export class ColumnFilterInternalApi extends ApiBase {
         const filter = {
             ColumnId: column.columnId,
             Predicate: {
-                PredicateId: this.adaptable.api.predicateApi.internalApi.getEqualityPredicateForDataType(column.dataType),
+                PredicateId: this.getAdaptableApi().predicateApi.internalApi.getEqualityPredicateForDataType(column.dataType),
                 Inputs: [...new Set([gridCell.rawValue])],
             },
         };
@@ -55,11 +55,11 @@ export class ColumnFilterInternalApi extends ApiBase {
      * @param columnFilter Column Filter to use
      */
     columnFilterToString(columnFilter) {
-        const friendlyName = this.adaptable.api.columnApi.getFriendlyNameForColumnId(columnFilter.ColumnId);
+        const friendlyName = this.getAdaptableApi().columnApi.getFriendlyNameForColumnId(columnFilter.ColumnId);
         return ('[' +
             friendlyName +
             '] ' +
-            this.adaptable.api.predicateApi.predicateToString(columnFilter.Predicate));
+            this.getAdaptableApi().predicateApi.predicateToString(columnFilter.Predicate));
     }
     /**
      * Retrieves descriptions of given Column Filters
@@ -99,17 +99,9 @@ export class ColumnFilterInternalApi extends ApiBase {
             return true;
         }
         let value = gridCell.normalisedValue;
-        const predicateDefHandlerContext = {
-            value: value,
-            oldValue: null,
-            displayValue: gridCell.displayValue,
-            node,
-            column,
-            adaptableApi: this.getAdaptableApi(),
-            userName: this.getAdaptableApi().optionsApi.getUserName(),
-            adaptableId: this.getAdaptableApi().optionsApi.getAdaptableId(),
-        };
-        return this.adaptable.api.predicateApi.handlePredicate(columnFilter.Predicate, predicateDefHandlerContext, true);
+        const predicateDefHandlerContext = Object.assign({ value: value, oldValue: null, displayValue: gridCell.displayValue, node,
+            column }, this.getAdaptableApi().internalApi.buildBaseContext());
+        return this.getAdaptableApi().predicateApi.handlePredicate(columnFilter.Predicate, predicateDefHandlerContext, true);
     }
     /**
      * Checks if the filter action should trigger Column Filtering
@@ -128,32 +120,32 @@ export class ColumnFilterInternalApi extends ApiBase {
         // filter -> suspend changes
         var _a, _b;
         const isNewAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_ADD &&
-            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
+            this.getAdaptableApi().columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isClearAndPreviousWasActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR &&
-            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
+            this.getAdaptableApi().columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isClearAllAtLeastOneActiveFilter = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL &&
-            this.adaptable.api.columnFilterApi
-                .getColumnFilters()
-                .some((columnFilter) => this.adaptable.api.columnFilterApi.isColumnFilterActive(columnFilter));
+            this.getAdaptableApi()
+                .columnFilterApi.getColumnFilters()
+                .some((columnFilter) => this.getAdaptableApi().columnFilterApi.isColumnFilterActive(columnFilter));
         let isEditTrigger = false;
         if (action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT) {
             const newFilter = action.columnFilter;
-            const previous = this.adaptable.api.columnFilterApi.getColumnFilterForColumn(newFilter.ColumnId);
+            const previous = this.getAdaptableApi().columnFilterApi.getColumnFilterForColumn(newFilter.ColumnId);
             // same filter edit, so always trigger
             if (((_a = previous === null || previous === void 0 ? void 0 : previous.Predicate) === null || _a === void 0 ? void 0 : _a.PredicateId) === ((_b = newFilter === null || newFilter === void 0 ? void 0 : newFilter.Predicate) === null || _b === void 0 ? void 0 : _b.PredicateId)) {
                 isEditTrigger = true;
                 // new filter is active
             }
-            else if (this.adaptable.api.columnFilterApi.isColumnFilterActive(newFilter)) {
+            else if (this.getAdaptableApi().columnFilterApi.isColumnFilterActive(newFilter)) {
                 isEditTrigger = true;
             }
-            else if (this.adaptable.api.columnFilterApi.isColumnFilterActive(previous)) {
+            else if (this.getAdaptableApi().columnFilterApi.isColumnFilterActive(previous)) {
                 // previous filter was active
                 isEditTrigger = true;
             }
         }
         const isSetAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_SET &&
-            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
+            this.getAdaptableApi().columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isSuspendChanged = [
             LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND,
             LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND_ALL,
@@ -171,15 +163,17 @@ export class ColumnFilterInternalApi extends ApiBase {
      * Fires Column Filter Applied Event - typically used to enable filtering on the server
      */
     fireColumnFilterAppliedEvent() {
-        if (this.adaptable.isLive) {
+        if (this.adaptable.isReady) {
+            const adaptableApi = this.getAdaptableApi();
+            const columnFilterAppliedInfo = Object.assign({ columnFilters: this.getColumnFilterApi().getColumnFilters() }, this.getAdaptableApi().internalApi.buildBaseContext());
+            this.getAdaptableApi().eventApi.emit('ColumnFilterApplied', columnFilterAppliedInfo);
+        }
+    }
+    fireGridFilterAppliedEvent() {
+        if (this.adaptable.isReady) {
             const adaptableApi = this.getAdaptableApi();
-            const columnFilterAppliedInfo = {
-                columnFilters: this.getColumnFilterApi().getColumnFilters(),
-                adaptableApi: adaptableApi,
-                userName: adaptableApi.optionsApi.getUserName(),
-                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-            };
-            this.adaptable.api.eventApi.emit('ColumnFilterApplied', columnFilterAppliedInfo);
+            const gridFilterAppliedInfo = Object.assign({ columnFilters: this.getColumnFilterApi().getColumnFilters() }, this.getAdaptableApi().internalApi.buildBaseContext());
+            this.getAdaptableApi().eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
         }
     }
     /**
@@ -202,4 +196,14 @@ export class ColumnFilterInternalApi extends ApiBase {
         }
         return predicateShortcuts;
     }
+    getFilterValuesMaxNumberOfItems(column) {
+        const maxFilterValues = this.getColumnFilterOptions().valuesFilterOptions.maxFilterValuesToDisplay;
+        if (typeof maxFilterValues === 'function') {
+            const columnFilterContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { column: column });
+            return maxFilterValues(columnFilterContext);
+        }
+        else {
+            return maxFilterValues;
+        }
+    }
 }

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

@@ -1,5 +1,8 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { Column } from '@ag-grid-community/core';
+import { Column, IRowNode } from '@ag-grid-community/core';
+import { CustomSort } from '../../PredefinedConfig/CustomSortState';
+import { ColumnValuesComparer } from '../../AdaptableOptions/CustomSortOptions';
+export declare function getAutoRowGroupColumnIdFor(columnId: string): string;
 export declare class ColumnInternalApi extends ApiBase {
     /**
      * Retrieves 'ColumnType' property for a given Column
@@ -13,6 +16,7 @@ export declare class ColumnInternalApi extends ApiBase {
      * Retrieves a list providing the Friendly Name / Caption for all columns
      */
     getAllColumnFriendlyNames(): string[];
+    getAutoRowGroupColumnIdFor(columnId: string): string;
     /**
      * Retrieves AG Grid's field property for the column
      * @param columnId columnId to look up
@@ -24,4 +28,5 @@ export declare class ColumnInternalApi extends ApiBase {
      */
     getAgGridColumnForAdaptableColumn(columnId: string): Column;
     isActionRowButtonColumn(columnId: string): boolean;
+    getActiveColumnComparator(columnId: string, customSort?: CustomSort, customSortComparer?: ColumnValuesComparer): (valueA: any, valueB: any, nodeA?: IRowNode, nodeB?: IRowNode, isInverted?: boolean) => number | undefined;
 }

package/src/Api/Internal/ColumnInternalApi.js

@@ -1,5 +1,8 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { ADAPTABLE_ROW_ACTION_BUTTONS } from '../../Utilities/Constants/GeneralConstants';
+import { ADAPTABLE_ROW_ACTION_BUTTONS, AG_GRID_GROUPED_COLUMN, } from '../../Utilities/Constants/GeneralConstants';
+export function getAutoRowGroupColumnIdFor(columnId) {
+    return `${AG_GRID_GROUPED_COLUMN}-${columnId}`;
+}
 export class ColumnInternalApi extends ApiBase {
     /**
      * Retrieves 'ColumnType' property for a given Column
@@ -21,6 +24,9 @@ export class ColumnInternalApi extends ApiBase {
             return c.friendlyName;
         });
     }
+    getAutoRowGroupColumnIdFor(columnId) {
+        return getAutoRowGroupColumnIdFor(columnId);
+    }
     /**
      * Retrieves AG Grid's field property for the column
      * @param columnId columnId to look up
@@ -39,4 +45,16 @@ export class ColumnInternalApi extends ApiBase {
     isActionRowButtonColumn(columnId) {
         return columnId === ADAPTABLE_ROW_ACTION_BUTTONS;
     }
+    getActiveColumnComparator(columnId, customSort, customSortComparer) {
+        if ((!customSort || (customSort === null || customSort === void 0 ? void 0 : customSort.IsSuspended)) && !customSortComparer) {
+            // defaults to AG-Grid column definition comparator if no CustomSort is defined&active
+            const colDefComparator = this.adaptable.agGridColumnAdapter.getUserColDefProperty(columnId, 'comparator');
+            return colDefComparator;
+        }
+        // CustomSort Comparer function takes precedence over CustomSort SortedValues
+        const comparerFunction = customSortComparer
+            ? customSortComparer.comparer
+            : this.getCustomSortApi().internalApi.getDefaultCustomSortComparer(customSort.ColumnId, customSort.SortedValues);
+        return comparerFunction;
+    }
 }

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

@@ -0,0 +1,4 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export declare class CommentsInternalApi extends ApiBase {
+    areCommentsSupported(): boolean;
+}

package/src/Api/Internal/CommentsInternalApi.js

@@ -0,0 +1,14 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export class CommentsInternalApi extends ApiBase {
+    areCommentsSupported() {
+        var _a;
+        const currentLayout = this.getLayoutApi().getCurrentLayout();
+        if (currentLayout.EnablePivot) {
+            return false;
+        }
+        if ((_a = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.RowGroupedColumns) === null || _a === void 0 ? void 0 : _a.length) {
+            return false;
+        }
+        return true;
+    }
+}

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

@@ -1,6 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnValuesComparer } from '../../AdaptableOptions/CustomSortOptions';
+import { AdaptableComparerFunction } from '../../PredefinedConfig/Common/AdaptableComparerFunction';
 export declare class CustomSortInternalApi extends ApiBase {
-    getCustomSortComparer(column: AdaptableColumn): ColumnValuesComparer | undefined;
+    getCustomSortComparer(columnId: string): ColumnValuesComparer | undefined;
+    getDefaultCustomSortComparer(columnId: string, columnValues: any[]): AdaptableComparerFunction;
 }

package/src/Api/Internal/CustomSortInternalApi.js

@@ -1,7 +1,38 @@
 import { ApiBase } from '../Implementation/ApiBase';
 export class CustomSortInternalApi extends ApiBase {
-    getCustomSortComparer(column) {
+    getCustomSortComparer(columnId) {
         var _a;
-        return (_a = this.getCustomSortOptions().customSortComparers) === null || _a === void 0 ? void 0 : _a.find((csc) => this.adaptable.api.scopeApi.isColumnInScope(column, csc.scope));
+        const column = this.getColumnApi().getColumnWithColumnId(columnId);
+        return (_a = this.getCustomSortOptions().customSortComparers) === null || _a === void 0 ? void 0 : _a.find((csc) => this.getAdaptableApi().scopeApi.isColumnInScope(column, csc.scope));
+    }
+    getDefaultCustomSortComparer(columnId, columnValues) {
+        // have to return a function that may not have access to this
+        const adaptable = this.adaptable;
+        return function compareItemsOfCustomSort(valueA, valueB, nodeA, nodeB) {
+            var _a, _b;
+            let firstElementValueString = (_a = (nodeA && adaptable.getDisplayValueFromRowNode(nodeA, columnId))) !== null && _a !== void 0 ? _a : valueA;
+            let secondElementValueString = (_b = (nodeB && adaptable.getDisplayValueFromRowNode(nodeB, columnId))) !== null && _b !== void 0 ? _b : valueB;
+            let indexFirstElement = columnValues.indexOf(firstElementValueString);
+            let containsFirstElement = indexFirstElement >= 0;
+            let indexSecondElement = columnValues.indexOf(secondElementValueString);
+            let containsSecondElement = indexSecondElement >= 0;
+            //if none of the element are in the list we jsut return normal compare
+            if (!containsFirstElement && !containsSecondElement) {
+                if (valueA == valueB) {
+                    return 0;
+                }
+                return valueA < valueB ? -1 : 1;
+            }
+            //if first item not in the list make sure we put it after the second item
+            if (!containsFirstElement) {
+                return 1;
+            }
+            //if second item not in the list make sure we put it after the first item
+            if (!containsSecondElement) {
+                return -1;
+            }
+            //return the comparison from the list if the two items are in the list
+            return indexFirstElement - indexSecondElement;
+        };
     }
 }

package/src/Api/Internal/DashboardInternalApi.js

@@ -26,18 +26,12 @@ export class DashboardInternalApi extends ApiBase {
             }
             return visibleInOldState && !visibleInNewState;
         };
-        const dashboardChangedInfo = {
-            adaptableApi: this.adaptable.api,
-            actionName: trigger,
-            oldDashboardState,
+        const dashboardChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { actionName: trigger, oldDashboardState,
             newDashboardState,
             isToolbarStateChangedToVisible,
-            isToolbarStateChangedToHidden,
-            userName: this.adaptable.api.optionsApi.getUserName(),
-            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-        };
+            isToolbarStateChangedToHidden });
         if (!isEqual(oldDashboardState, newDashboardState)) {
-            setTimeout(() => this.adaptable.api.eventApi.emit('DashboardChanged', dashboardChangedInfo));
+            setTimeout(() => this.getAdaptableApi().eventApi.emit('DashboardChanged', dashboardChangedInfo));
         }
     }
     isToolbarInActiveTab(toolbarName, dashboardState) {
@@ -57,8 +51,8 @@ export class DashboardInternalApi extends ApiBase {
         return false;
     }
     isToolbarCustom(toolbarName) {
-        return this.adaptable.api.dashboardApi
-            .getCustomToolbars()
+        return this.getAdaptableApi()
+            .dashboardApi.getCustomToolbars()
             .some((tb) => tb.name === toolbarName);
     }
     getCustomToolbarRenderContainerId(customToolbarName) {

package/src/Api/Internal/DataImportInternalApi.js

@@ -52,16 +52,10 @@ export class DataImportInternalApi extends ApiBase {
      * @param gridDataRows Rows that were imported
      */
     publishDataImportedEvent(importData, addedRows, updatedRows) {
-        const adaptableApi = this.getAdaptableApi();
-        const dataImportedInfo = {
-            adaptableApi: adaptableApi,
-            importData,
+        const dataImportedInfo = Object.assign({ importData,
             addedRows,
-            updatedRows,
-            userName: adaptableApi.optionsApi.getUserName(),
-            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-        };
-        this.adaptable.api.internalApi.dispatchReduxAction(SystemRedux.DataImportCompleted(dataImportedInfo));
+            updatedRows }, this.getAdaptableApi().internalApi.buildBaseContext());
+        this.getAdaptableApi().internalApi.dispatchReduxAction(SystemRedux.DataImportCompleted(dataImportedInfo));
         this.getEventApi().emit('DataImported', dataImportedInfo);
     }
 }

package/src/Api/Internal/DataSetInternalApi.js

@@ -5,14 +5,9 @@ export class DataSetInternalApi extends ApiBase {
      * @param dataSet Data Set which has been selected
      */
     fireDataSetSelectedEvent(dataSet) {
-        if (this.adaptable.isLive) {
-            const dataSetSelectedInfo = {
-                adaptableApi: this.adaptable.api,
-                dataSet,
-                userName: this.adaptable.api.optionsApi.getUserName(),
-                adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-            };
-            this.adaptable.api.eventApi.emit('DataSetSelected', dataSetSelectedInfo);
+        if (this.adaptable.isReady) {
+            const dataSetSelectedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { dataSet });
+            this.getAdaptableApi().eventApi.emit('DataSetSelected', dataSetSelectedInfo);
         }
     }
 }

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

@@ -2,7 +2,7 @@ import { ApiBase } from '../Implementation/ApiBase';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { Report } from '../../PredefinedConfig/ExportState';
 import { AdaptableColumnType } from '../../PredefinedConfig/Common/Types';
-import { ExcelDataType } from '@ag-grid-community/core';
+import { ExcelDataType, ExcelStyle } from '@ag-grid-community/core';
 import { AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { DataFormatType } from '../../AdaptableOptions/ExportOptions';
 export declare class ExportInternalApi extends ApiBase {
@@ -17,4 +17,5 @@ export declare class ExportInternalApi extends ApiBase {
     isDateCellExportedAsFormattedValue(): boolean;
     getCellExportFormatType(columnDataType: AdaptableColumnDataType): DataFormatType;
     isDestinationEnabled(destination: string): boolean;
+    getExcelStylesForVisualDataExport(original_excelStyles: ExcelStyle[]): ExcelStyle[];
 }

package/src/Api/Internal/ExportInternalApi.js

@@ -21,12 +21,12 @@ export class ExportInternalApi extends ApiBase {
                 break;
             case 'ScopeColumns':
                 // use the Scope object which will tell us if the Column is relevant
-                if (!this.adaptable.api.scopeApi.isColumnInScopeColumns(cellDataChangedInfo.column, report.Scope)) {
+                if (!this.getAdaptableApi().scopeApi.isColumnInScopeColumns(cellDataChangedInfo.column, report.Scope)) {
                     return false;
                 }
                 break;
             case 'SelectedColumns':
-                let selectedCellInfo = this.adaptable.api.gridApi.getSelectedCellInfo();
+                let selectedCellInfo = this.getAdaptableApi().gridApi.getSelectedCellInfo();
                 if (selectedCellInfo) {
                     if (selectedCellInfo.columns.find((c) => c.columnId == cellDataChangedInfo.column.columnId) == null) {
                         return false;
@@ -47,7 +47,7 @@ export class ExportInternalApi extends ApiBase {
             case 'ExpressionRows':
                 return true; // TODO this is the only difficult one - do we check AdapTableQL?  if we can then that is good as we can then do a delta after all...
             case 'SelectedCellRows':
-                let selectedCellInfo = this.adaptable.api.gridApi.getSelectedCellInfo();
+                let selectedCellInfo = this.getAdaptableApi().gridApi.getSelectedCellInfo();
                 if (selectedCellInfo && selectedCellInfo.gridCells) {
                     if (selectedCellInfo.gridCells.find((gc) => gc.primaryKeyValue == cellDataChangedInfo.primaryKeyValue)) {
                         return true;
@@ -55,7 +55,7 @@ export class ExportInternalApi extends ApiBase {
                 }
                 return false;
             case 'SelectedRows':
-                let selectedRowInfo = this.adaptable.api.gridApi.getSelectedRowInfo();
+                let selectedRowInfo = this.getAdaptableApi().gridApi.getSelectedRowInfo();
                 if (selectedRowInfo && selectedRowInfo.gridRows) {
                     if (selectedRowInfo.gridRows.find((gr) => gr.primaryKeyValue == cellDataChangedInfo.primaryKeyValue)) {
                         return true;
@@ -92,7 +92,7 @@ export class ExportInternalApi extends ApiBase {
         }
     }
     isVisualDataExportInProgress() {
-        return this.getAdaptableState().System.Export.inProgressVisualData;
+        return this.getAdaptableState().System.Export.visualDataExportInProgress;
     }
     isDateCellExportedAsFormattedValue() {
         return (!!this.getExportOptions().exportDateFormat ||
@@ -123,4 +123,7 @@ export class ExportInternalApi extends ApiBase {
         }
         return true;
     }
+    getExcelStylesForVisualDataExport(original_excelStyles) {
+        return [];
+    }
 }

package/src/Api/Internal/ExpressionInternalApi.js

@@ -15,12 +15,7 @@ export class ExpressionInternalApi extends ApiBase {
         if (typeof evaluateExpressionExternallyFn !== 'function') {
             return true;
         }
-        const context = {
-            adaptableApi: this.getAdaptableApi(),
-            userName: this.getOptions().userName,
-            adaptableId: this.getOptions().adaptableId,
-            module,
-        };
+        const context = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { module });
         if (object) {
             context.object = object;
         }
@@ -38,12 +33,7 @@ export class ExpressionInternalApi extends ApiBase {
         if (typeof evaluateExpressionExternallyFn !== 'function') {
             return true;
         }
-        const context = {
-            adaptableApi: this.getAdaptableApi(),
-            userName: this.getAdaptableApi().optionsApi.getUserName(),
-            adaptableId: this.getAdaptableApi().optionsApi.getAdaptableId(),
-            module,
-        };
+        const context = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { module });
         if (object) {
             context.object = object;
         }

package/src/Api/Internal/Fdc3InternalApi.js

@@ -39,7 +39,7 @@ export class Fdc3InternalApi extends ApiBase {
                 editable: false,
                 width: actionColumnConfig.width,
                 resizable: actionColumnConfig.resizable,
-                suppressMenu: true,
+                suppressHeaderMenuButton: true,
                 suppressMovable: !actionColumnConfig.movable,
                 filter: false,
                 sortable: false,
@@ -59,7 +59,7 @@ export class Fdc3InternalApi extends ApiBase {
                 editable: false,
                 width: actionColumnConfig.defaultWidth,
                 resizable: true,
-                suppressMenu: true,
+                suppressHeaderMenuButton: true,
                 suppressMovable: false,
                 filter: false,
                 sortable: false,
@@ -265,16 +265,7 @@ export class Fdc3InternalApi extends ApiBase {
     }
     mapFdc3ButtonConfigToAdaptableButton(fdc3AdaptableButton, fdcInfo) {
         const buildFdc3Context = (context) => {
-            return {
-                context: this.mapRowToContextData(fdcInfo.contextType, context.rowNode),
-                intent: fdcInfo.action === 'raiseIntent' ? fdcInfo.intent : null,
-                rowNode: context.rowNode,
-                rowData: context.data,
-                adaptableId: context.adaptableId,
-                primaryKeyValue: context.primaryKeyValue,
-                userName: context.userName,
-                adaptableApi: context.adaptableApi,
-            };
+            return Object.assign({ context: this.mapRowToContextData(fdcInfo.contextType, context.rowNode), intent: fdcInfo.action === 'raiseIntent' ? fdcInfo.intent : null, rowNode: context.rowNode, rowData: context.data, primaryKeyValue: context.primaryKeyValue }, this.getAdaptableApi().internalApi.buildBaseContext());
         };
         return {
             onClick: (_button, context) => {

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

@@ -1,4 +1,4 @@
-import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, AdaptableScope, FormatColumn, StringFormatterOptions } from '../../types';
+import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, ColumnScope, FormatColumn, StringFormatterOptions } from '../../types';
 import { ApiBase } from '../Implementation/ApiBase';
 import { IRowNode } from '@ag-grid-community/core';
 export declare class FormatColumnInternalApi extends ApiBase {
@@ -76,7 +76,7 @@ export declare class FormatColumnInternalApi extends ApiBase {
      * Returns all Predicates appropriate for the given Scope
      * @param scope Scope to check
      */
-    getFormatColumnDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFormatColumnDefsForScope(scope: ColumnScope): AdaptablePredicateDef[];
     /**
      * Checks if format column is relevant for a given cell (intersection of given AdaptableColumn and RowNode)
      *
@@ -84,10 +84,7 @@ export declare class FormatColumnInternalApi extends ApiBase {
      * @param column
      * @param params
      */
-    isFormatColumnRelevantForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
-        node: IRowNode;
-        value: any;
-    }): boolean;
+    formatColumnShouldRender(formatColumn: FormatColumn, column: AdaptableColumn, rowNode: IRowNode, cellValue: any): boolean;
     private evaluatePredicate;
     private evaluateExpression;
     /**