@adaptabletools/adaptable 12.0.0 → 12.0.2

package/src/View/TeamSharing/SharedEntityObjectView.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSharedEntityStaleDepsItemView = exports.getSharedEntityActiveStatusObjectView = exports.SharedEntityTypeItemView = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const Tag_1 = require("../../components/Tag");
+const AdaptableContext_1 = require("../AdaptableContext");
+const AdaptableObjectList_1 = require("../Components/AdaptableObjectList/AdaptableObjectList");
+const SharedEntityTypeItemView = (props) => {
+    const [isExpanded, setIsExpanded] = React.useState(false);
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const moduleName = props.data.Module;
+    const module = adaptable.ModuleService.getModuleById(moduleName);
+    const sharedObject = props.data.Entity;
+    const item = module.toView(sharedObject);
+    return (React.createElement(React.Fragment, null,
+        React.createElement(rebass_1.Flex, { mb: 2, mt: 2 },
+            React.createElement(rebass_1.Flex, { mr: 2, alignItems: "center" },
+                React.createElement(Tag_1.Tag, { style: { margin: 0 } }, props.data.Module)),
+            isExpanded ? (React.createElement(SimpleButton_1.default, { onClick: () => setIsExpanded(false), icon: "arrow-up" }, "Collapse")) : (React.createElement(SimpleButton_1.default, { onClick: () => setIsExpanded(true), icon: "arrow-down" }, "Expand"))),
+        isExpanded && (React.createElement(rebass_1.Box, { as: "ul", padding: 0, className: "ab-Shared-Entity-Shared-Object" },
+            React.createElement(AdaptableObjectList_1.AdaptableObjectListItem, { hideControls: true, data: item, module: module })))));
+};
+exports.SharedEntityTypeItemView = SharedEntityTypeItemView;
+const getSharedEntityActiveStatusObjectView = (isDependency) => (props) => {
+    var _a, _b;
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const activeEntries = adaptable.api.internalApi.getState().TeamSharing.ActiveSharedEntityMap;
+    const sharedEntity = props.data;
+    const isAdaptableObjectPresentInLocalState = !!adaptable.api.internalApi
+        .getModuleService()
+        .getModuleById(sharedEntity.Module)
+        .getModuleAdaptableObjects()
+        .find((adaptableObject) => adaptableObject.Uuid === sharedEntity.Entity.Uuid);
+    const isUpToDateAndActive = isAdaptableObjectPresentInLocalState &&
+        sharedEntity.Type === 'Active' &&
+        ((_a = activeEntries[sharedEntity.Entity.Uuid]) === null || _a === void 0 ? void 0 : _a.Revision) === sharedEntity.Revision;
+    const staleActiveEntities = adaptable.api.internalApi
+        .getTeamSharingService()
+        .getStaleActiveSharedEntities();
+    const isStaleAndActive = isAdaptableObjectPresentInLocalState && !!staleActiveEntities[sharedEntity.Uuid];
+    let activeInfo = null;
+    if (isAdaptableObjectPresentInLocalState) {
+        const activeRevision = (_b = activeEntries === null || activeEntries === void 0 ? void 0 : activeEntries[sharedEntity.Entity.Uuid]) === null || _b === void 0 ? void 0 : _b.Revision;
+        if (sharedEntity.Type === 'Active') {
+            const newRevision = sharedEntity.Revision;
+            let statusInfo = null;
+            if (isUpToDateAndActive) {
+                statusInfo = (React.createElement(rebass_1.Box, { ml: 1, style: { color: 'var(--ab-color-success)' } },
+                    React.createElement("b", null, "up-to-date")));
+            }
+            if (isStaleAndActive) {
+                statusInfo = (React.createElement(rebass_1.Box, { ml: 1, style: { color: 'var(--ab-color-warn)' } }, ` (Rev. ${newRevision} available)`));
+            }
+            activeInfo = (React.createElement(React.Fragment, null,
+                `Imported Rev. ${activeRevision} ${isStaleAndActive ? 'is stale' : ''} `,
+                " ",
+                statusInfo));
+        }
+        else {
+            // snapshot
+            activeInfo = React.createElement(React.Fragment, null, `Imported Rev. ${activeRevision}`);
+        }
+    }
+    const sharedValue = `by ${sharedEntity.UserName} at ${new Date(sharedEntity.Timestamp).toLocaleString()}`;
+    return (React.createElement(React.Fragment, null,
+        !isDependency && React.createElement(Tag_1.Tag, null, sharedValue),
+        activeInfo && React.createElement(Tag_1.Tag, null, activeInfo)));
+};
+exports.getSharedEntityActiveStatusObjectView = getSharedEntityActiveStatusObjectView;
+const getSharedEntityStaleDepsItemView = (staleDependencies) => () => {
+    let staleDepsString = 'Shared entity has';
+    if ((staleDependencies === null || staleDependencies === void 0 ? void 0 : staleDependencies.length) === 1) {
+        staleDepsString += ` one (${staleDependencies[0].Module}) stale dependency`;
+    }
+    else {
+        staleDepsString += ` ${staleDependencies.length} stale dependencies`;
+    }
+    return (React.createElement(Tag_1.Tag, null,
+        React.createElement(rebass_1.Box, { ml: 1, style: { color: 'var(--ab-color-warn)' } }, staleDepsString)));
+};
+exports.getSharedEntityStaleDepsItemView = getSharedEntityStaleDepsItemView;

package/src/View/TeamSharing/TeamSharingApplyButton.d.ts

@@ -0,0 +1,6 @@
+import * as React from 'react';
+import { AccessLevel, SharedEntity } from '../../../types';
+export declare const TeamSharingApplyButton: React.FunctionComponent<{
+    data: SharedEntity;
+    accessLevel: AccessLevel;
+}>;

package/src/View/TeamSharing/TeamSharingApplyButton.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TeamSharingApplyButton = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const AdaptableContext_1 = require("../AdaptableContext");
+const TeamSharingApplyButton = (props) => {
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const handleImport = React.useCallback(() => {
+        adaptable.api.teamSharingApi.importSharedEntry(props.data);
+    }, []);
+    return (React.createElement(SimpleButton_1.default, { onClick: handleImport, variant: "text", tooltip: "Apply Adaptable Object", icon: "import-export" }));
+};
+exports.TeamSharingApplyButton = TeamSharingApplyButton;

package/src/View/UIHelper.d.ts

@@ -3,7 +3,7 @@ import { EditableConfigEntityState } from './Components/SharedProps/EditableConf
 import { StatusColour } from '../PredefinedConfig/Common/Enums';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
 import { Schedule, Weekday } from '../PredefinedConfig/Common/Schedule';
-import { AdaptableColumnDataType, AdaptableOptions } from '../types';
+import { AdaptableColumnDataType, AdaptableInternalIconName, AdaptableOptions } from '../types';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
 export declare const BLACK: string;
@@ -36,7 +36,7 @@ export declare function IsEmptyStyle(style: AdaptableStyle): boolean;
 export declare function IsNotEmptyStyle(style: AdaptableStyle): boolean;
 export declare function getMessageTypeByStatusColour(statusColour: StatusColour): AdaptableMessageType;
 export declare function getButtonToneByMessageType(messageType: AdaptableMessageType): 'success' | 'error' | 'neutral' | 'none' | 'warning' | 'info' | 'accent';
-export declare function getGlyphByMessageType(messageType: AdaptableMessageType): string;
+export declare function getGlyphByMessageType(messageType: AdaptableMessageType): AdaptableInternalIconName;
 export declare function getColorByMessageType(messageType: AdaptableMessageType): string;
 export declare function getStyleForStatusColour(statusColour: StatusColour): CSSProperties;
 export declare function getStyleForMessageType(messageType: AdaptableMessageType): CSSProperties;

package/src/agGrid/ActionColumnRenderer.js

@@ -45,14 +45,10 @@ class ActionColumnRenderer {
                     if (button.hidden && button.hidden(button, context)) {
                         return;
                     }
-                    const defaultIconProps = {
-                        style: {
-                            height: 15,
-                            width: 15,
-                        },
-                    };
-                    const buttonIcon = adaptableApi.internalApi.getIconForButton(button, context);
-                    const iconProps = buttonIcon && Object.assign({}, defaultIconProps, buttonIcon);
+                    const buttonIcon = adaptableApi.internalApi.getIconForButton(button, context, {
+                        height: 15,
+                        width: 15,
+                    });
                     const buttonStyle = adaptableApi.internalApi.getStyleForButton(button, context);
                     const buttonLabel = adaptableApi.internalApi.getLabelForButton(button, context);
                     const buttonTooltip = adaptableApi.internalApi.getTooltipForButton(button, context);
@@ -66,9 +62,7 @@ class ActionColumnRenderer {
                         }, 16);
                     };
                     const disabled = button.disabled && button.disabled(button, context);
-                    return (React.createElement(SimpleButton_1.default, { key: button.Uuid, "data-name": `action-button-${index + 1}`, variant: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant) !== null && _a !== void 0 ? _a : 'text', disabled: disabled, tooltip: buttonTooltip, tone: (_b = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _b !== void 0 ? _b : 'none', onClick: handleClick, className: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className, accessLevel: 'Full' },
-                        buttonIcon ? React.createElement("img", Object.assign({}, iconProps)) : null,
-                        buttonLabel));
+                    return (React.createElement(SimpleButton_1.default, { key: button.Uuid, "data-name": `action-button-${index + 1}`, variant: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant) !== null && _a !== void 0 ? _a : 'text', disabled: disabled, tooltip: buttonTooltip, icon: buttonIcon, tone: (_b = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _b !== void 0 ? _b : 'none', onClick: handleClick, className: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className, accessLevel: 'Full' }, buttonLabel));
                 })));
             };
             const eGui = this.eGui;

package/src/agGrid/Adaptable.d.ts

@@ -1,4 +1,4 @@
-import { ColDef, ColGroupDef, Column, ExcelStyle, GridOptions, Module, RowNode, ValueGetterParams, ValueSetterParams } from '@ag-grid-community/all-modules';
+import { ChartModel, ChartRef, ColDef, ColGroupDef, Column, ExcelStyle, GridOptions, Module, RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableNoCodeWizardOptions, IAdaptableNoCodeWizard } from '../AdaptableInterfaces/AdaptableNoCodeWizard';
 import { IAdaptable } from '../AdaptableInterfaces/IAdaptable';
 import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
@@ -18,7 +18,6 @@ import { SelectedRowInfo } from '../PredefinedConfig/Selection/SelectedRowInfo';
 import { AdaptableTheme } from '../PredefinedConfig/ThemeState';
 import { IAdaptableStore } from '../Redux/Store/Interface/IAdaptableStore';
 import { IModuleCollection } from '../Strategy/Interface/IModule';
-import { AdaptableColumnType } from '../types';
 import { EmitterCallback } from '../Utilities/Emitter';
 import { IPPStyle } from '../Utilities/Interface/IPPStyle';
 import { LicenseService } from '../Utilities/Services/LicenseService';
@@ -31,8 +30,6 @@ import { IModuleService } from '../Utilities/Services/Interface/IModuleService';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
 import { IAlertService } from '../Utilities/Services/Interface/IAlertService';
-import { AdaptableNumberEditor } from './editors/AdaptableNumberEditor';
-import { AdaptableDateEditor } from './editors/AdaptableDateEditor';
 import { ColumnSetupInfo } from './ColumnSetupInfo';
 import { CustomSort } from '../PredefinedConfig/CustomSortState';
 import { ColumnValuesComparer } from '../AdaptableOptions/GeneralOptions';
@@ -189,7 +186,7 @@ export declare class Adaptable implements IAdaptable {
     getDisplayValue(primaryKey: any, columnId: string): string | undefined;
     getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
     getDisplayValueFromRowNode(rowNode: RowNode, columnId: string): string | undefined;
-    getDisplayValueFromRawValue(columnId: string, rawValue: any): string | undefined;
+    getDisplayValueFromRawValue(rowNode: RowNode, columnId: string, rawValue: any): string | undefined;
     private getFormattedValue;
     private getNormalisedValueFromRowValue;
     getRawValueFromRowNode(rowNode: RowNode, columnId: string): any;
@@ -224,28 +221,7 @@ export declare class Adaptable implements IAdaptable {
      */
     private mapColumnDefs;
     private getColDefsForSpecialColumns;
-    getColDefsForFreeTextColumns(): {
-        headerName: string;
-        colId: string;
-        editable: boolean;
-        hide: boolean;
-        width: number;
-        enableValue: boolean;
-        filter: boolean;
-        floatingFilter: boolean;
-        resizable: boolean;
-        enableRowGroup: boolean;
-        sortable: boolean;
-        enablePivot: boolean;
-        suppressMenu: boolean;
-        suppressMovable: boolean;
-        headerTooltip: string;
-        cellEditor: string | typeof AdaptableNumberEditor | typeof AdaptableDateEditor;
-        type: AdaptableColumnType[];
-        valueSetter: (params: ValueSetterParams) => any;
-        cellRenderer: import("@ag-grid-community/all-modules").ICellRendererFunc;
-        valueGetter: (params: ValueGetterParams) => any;
-    }[];
+    getColDefsForFreeTextColumns(): ColDef[];
     setupColumnValueGetter({ col }: ColumnSetupInfo): void;
     setupColumnAggFunc({ col }: ColumnSetupInfo): void;
     private getColDefsForRowEditColumns;
@@ -378,6 +354,8 @@ export declare class Adaptable implements IAdaptable {
     private addSyntheticPrimaryKey;
     private addSyntheticPrimaryKeyIfMissing;
     initLicenseService(): LicenseService;
+    showCharts(charts: ChartModel[]): ChartRef[];
+    getChartModels(): ChartModel[];
 }
 export declare class AdaptableNoCodeWizard implements IAdaptableNoCodeWizard {
     private init;

package/src/agGrid/Adaptable.js

@@ -62,7 +62,6 @@ const StatusBarState_1 = require("../PredefinedConfig/StatusBarState");
 const createAgStatusPanelComponent_1 = require("./createAgStatusPanelComponent");
 const AdaptableStatusBar_1 = require("../View/StatusBar/AdaptableStatusBar");
 const RowEditService_1 = require("../Utilities/Services/RowEditService");
-const rowEditIcons_1 = require("./rowEditIcons");
 const tinycolor = require('tinycolor2');
 all_modules_1.ModuleRegistry.registerModules(all_modules_1.AllCommunityModules);
 const GROUP_PATH_SEPARATOR = '/';
@@ -1861,7 +1860,7 @@ class Adaptable {
         const abColumn = this.api.columnApi.getColumnFromId(columnId);
         const pkValue = this.getPrimaryKeyValueFromRowNode(rowNode);
         const rawValue = this.getRawValueFromRowNode(rowNode, columnId);
-        const displayValue = this.getDisplayValueFromRawValue(columnId, rawValue);
+        const displayValue = this.getDisplayValueFromRawValue(rowNode, columnId, rawValue);
         const normalisedvalue = this.getNormalisedValueFromRowValue(rawValue, abColumn);
         return {
             rawValue: rawValue,
@@ -1877,15 +1876,15 @@ class Adaptable {
             return undefined;
         }
         const rawValue = this.getRawValueFromRowNode(rowNode, columnId);
-        return this.getDisplayValueFromRawValue(columnId, rawValue);
+        return this.getDisplayValueFromRawValue(rowNode, columnId, rawValue);
     }
-    getDisplayValueFromRawValue(columnId, rawValue) {
+    getDisplayValueFromRawValue(rowNode, columnId, rawValue) {
         const abColumn = this.api.columnApi.getColumnFromId(columnId);
         const isRenderedColumn = this.api.columnApi.isFormatNumericStyleColumn(abColumn);
         if (isRenderedColumn) {
             const colDef = this.gridOptions.api.getColumnDef(columnId);
             if (typeof colDef.valueFormatter == 'function') {
-                return this.getFormattedValue(rawValue, columnId, colDef, colDef.valueFormatter);
+                return this.getFormattedValue(rowNode, rawValue, columnId, colDef, colDef.valueFormatter);
             }
             return this.agGridHelper.getCleanValue(rawValue);
         }
@@ -1896,7 +1895,7 @@ class Adaptable {
         const colDef = this.gridOptions.api.getColumnDef(columnId);
         if (colDef) {
             if (typeof colDef.valueFormatter == 'function') {
-                const formattedValue = this.getFormattedValue(rawValue, columnId, colDef, colDef.valueFormatter);
+                const formattedValue = this.getFormattedValue(rowNode, rawValue, columnId, colDef, colDef.valueFormatter);
                 // Never use cellRenderer:
                 // - when a string, you never know if it is HTML or a normal string
                 // - when an object, cannot be used
@@ -1911,14 +1910,14 @@ class Adaptable {
         }
         return this.agGridHelper.getCleanValue(rawValue);
     }
-    getFormattedValue(rawValue, columnId, colDef, formatterFn) {
+    getFormattedValue(rowNode, rawValue, columnId, colDef, formatterFn) {
         const column = this.gridOptions.columnApi
             .getAllColumns()
             .find((c) => c.getColId() == columnId);
         const params = {
             value: rawValue,
-            node: null,
-            data: null,
+            node: rowNode,
+            data: rowNode.data,
             colDef,
             column,
             api: this.gridOptions.api,
@@ -2132,7 +2131,6 @@ class Adaptable {
                 : freeTextColumn.DataType === 'Date'
                     ? AdaptableDateEditor_1.AdaptableDateEditor
                     : null;
-            LoggingHelper_1.LogAdaptableInfo('Setting up FreeText Column: ' + freeTextColumn.ColumnId);
             const columnTypes = [
                 GeneralConstants_1.AB_SPECIAL_COLUMN,
                 this.agGridHelper.getAgGridDataType(freeTextColumn.DataType),
@@ -2140,7 +2138,7 @@ class Adaptable {
             if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty((_a = freeTextColumn === null || freeTextColumn === void 0 ? void 0 : freeTextColumn.FreeTextColumnSettings) === null || _a === void 0 ? void 0 : _a.ColumnTypes)) {
                 columnTypes.push(...freeTextColumn.FreeTextColumnSettings.ColumnTypes);
             }
-            return {
+            const newColDef = {
                 headerName: freeTextColumn.FriendlyName || freeTextColumn.ColumnId,
                 colId: freeTextColumn.ColumnId,
                 editable: true,
@@ -2155,7 +2153,6 @@ class Adaptable {
                 enablePivot: freeTextColumnSettings.Pivotable,
                 suppressMenu: freeTextColumnSettings.SuppressMenu,
                 suppressMovable: freeTextColumnSettings.SuppressMovable,
-                headerTooltip: freeTextColumnSettings.HeaderToolTip,
                 cellEditor: dataTypeEditor !== null && dataTypeEditor !== void 0 ? dataTypeEditor : (freeTextColumn.TextEditor && freeTextColumn.TextEditor == 'Large'
                     ? 'agLargeTextCellEditor'
                     : 'agTextCellEditor'),
@@ -2168,6 +2165,11 @@ class Adaptable {
                     : undefined,
                 valueGetter: (params) => this.api.freeTextColumnApi.getFreeTextColumnValueFromRowNode(freeTextColumn, params.node),
             };
+            if (freeTextColumnSettings.HeaderToolTip) {
+                newColDef.headerTooltip = freeTextColumnSettings.HeaderToolTip;
+            }
+            LoggingHelper_1.LogAdaptableInfo('Setting up FreeText Column: ' + freeTextColumn.ColumnId);
+            return newColDef;
         });
     }
     setupColumnValueGetter({ col }) {
@@ -2193,57 +2195,55 @@ class Adaptable {
         }
         const editButtons = actionRowButtons
             .map((buttonName) => {
-            if (buttonName === 'create') {
-                // we need this dirty hack until ActionColumn support for custom icons is improved
-                const label = rowEditIcons_1.rowAddIcon;
-                return {
-                    label,
+            const button = buttonName === 'create'
+                ? {
+                    icon: {
+                        name: 'add-row',
+                    },
                     tooltip: 'Create',
                     onClick: () => {
                         this.api.actionApi.displayCreateActionRow();
                     },
-                };
-            }
-            if (buttonName === 'edit') {
-                // we need this dirty hack until ActionColumn support for custom icons is improved
-                const label = rowEditIcons_1.rowEditIcon;
-                return {
-                    label,
-                    tooltip: 'Edit',
-                    onClick: (button, context) => {
-                        this.api.actionApi.displayEditActionRow(context.primaryKeyValue);
-                    },
-                };
-            }
-            if (buttonName === 'clone') {
-                // we need this dirty hack until ActionColumn support for custom icons is improved
-                const label = rowEditIcons_1.rowCloneIcon;
-                return {
-                    label,
-                    tooltip: 'Clone',
-                    onClick: (button, context) => {
-                        this.api.actionApi.displayCloneActionRow(context.primaryKeyValue);
-                    },
-                };
-            }
-            if (buttonName === 'delete') {
-                // we need this dirty hack until ActionColumn support for custom icons is improved
-                const label = rowEditIcons_1.rowDeleteIcon;
-                return {
-                    label,
-                    tooltip: 'Delete',
-                    onClick: (button, context) => {
-                        var _a, _b;
-                        const eventInfo = {
-                            type: 'rowDeleted',
-                            rowNode: context.rowNode,
-                            adaptableApi: context.adaptableApi,
-                        };
-                        this.api.eventApi.emit('ActionRowSubmitted', eventInfo);
-                        (_b = (_a = this.adaptableOptions.actionOptions.actionRowFormOptions).onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
-                    },
-                };
-            }
+                }
+                : buttonName === 'edit'
+                    ? {
+                        icon: {
+                            name: 'edit',
+                        },
+                        tooltip: 'Edit',
+                        onClick: (button, context) => {
+                            this.api.actionApi.displayEditActionRow(context.primaryKeyValue);
+                        },
+                    }
+                    : buttonName === 'clone'
+                        ? {
+                            icon: {
+                                name: 'clone',
+                            },
+                            tooltip: 'Clone',
+                            onClick: (button, context) => {
+                                this.api.actionApi.displayCloneActionRow(context.primaryKeyValue);
+                            },
+                        }
+                        : buttonName === 'delete'
+                            ? {
+                                icon: {
+                                    name: 'delete',
+                                },
+                                tooltip: 'Delete',
+                                onClick: (button, context) => {
+                                    var _a, _b;
+                                    const eventInfo = {
+                                        type: 'rowDeleted',
+                                        rowNode: context.rowNode,
+                                        adaptableApi: context.adaptableApi,
+                                    };
+                                    this.api.eventApi.emit('ActionRowSubmitted', eventInfo);
+                                    (_b = (_a = this.adaptableOptions.actionOptions.actionRowFormOptions).onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
+                                },
+                            }
+                            : undefined;
+            return button;
         })
             .filter(Boolean);
         if (!editButtons.length) {
@@ -2402,6 +2402,7 @@ class Adaptable {
             ? this.adaptableOptions.filterOptions.enableFilterOnSpecialColumns
             : true;
         const defaultCalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(specialColumnsAreFilterable).CalculatedColumnSettings;
+        const isExternalEvaluation = !this.api.internalApi.runModuleInAdaptableQL('CalculatedColumn');
         return this.api.calculatedColumnApi.getAllCalculatedColumn().map((calculatedColumn) => {
             const calculatedColumnSettings = Object.assign(Object.assign({}, defaultCalculatedColumnSettings), calculatedColumn.CalculatedColumnSettings);
             if (!calculatedColumnSettings.DataType) {
@@ -2434,9 +2435,9 @@ class Adaptable {
                 suppressMovable: calculatedColumnSettings.SuppressMovable,
                 type: columnTypes,
                 valueGetter: (params) => {
-                    var _a, _b;
-                    if ((_a = calculatedColumn.CalculatedColumnSettings) === null || _a === void 0 ? void 0 : _a.ExternallyEvaluatedExpression) {
-                        return (_b = params.data) === null || _b === void 0 ? void 0 : _b[calculatedColumn.ColumnId];
+                    var _a;
+                    if (isExternalEvaluation) {
+                        return (_a = params.data) === null || _a === void 0 ? void 0 : _a[calculatedColumn.ColumnId];
                     }
                     return this.CalculatedColumnExpressionService.evaluateCalculatedColumnQuery(calculatedColumn, params.node);
                 },
@@ -2700,7 +2701,6 @@ class Adaptable {
         this.gridOptions.api.addGlobalListener((this.listenerGlobalColumnEventsThatTriggerStateChange = (type) => {
             if (columnEventsThatTriggersStateChange.indexOf(type) > -1) {
                 this.debouncedSetColumnIntoStore();
-                this.debouncedFilterGrid();
             }
         }));
         /**
@@ -3310,28 +3310,29 @@ class Adaptable {
             }
             if (formatColumn.DisplayFormat) {
                 let valueFormatter;
+                const options = formatColumn.DisplayFormat.Options;
                 if (formatColumn.DisplayFormat.Formatter === 'NumberFormatter') {
                     // change the Number format - if the scope allows it
                     if (this.api.scopeApi.isColumnInNumericScope(abColumn, formatColumn.Scope)) {
-                        const options = formatColumn.DisplayFormat.Options;
                         valueFormatter = (params) => {
-                            let value = params.value;
-                            return this.api.formatColumnApi.getNumberFormattedValue(value, options);
+                            return this.api.formatColumnApi.getNumberFormattedValue(params.value, params.node, abColumn, options);
                         };
                     }
                 }
                 if (formatColumn.DisplayFormat.Formatter === 'DateFormatter') {
                     // change the Date format - if the scope allows it
                     if (this.api.scopeApi.isColumnInDateScope(abColumn, formatColumn.Scope)) {
-                        const options = formatColumn.DisplayFormat.Options;
-                        valueFormatter = (params) => this.api.formatColumnApi.getDateFormattedValue(params.value, options);
+                        valueFormatter = (params) => {
+                            return this.api.formatColumnApi.getDateFormattedValue(params.value, params.node, abColumn, options);
+                        };
                     }
                 }
                 if (formatColumn.DisplayFormat.Formatter === 'StringFormatter') {
-                    // change the Date format - if the scope allows it
+                    // change the String format - if the scope allows it
                     if (this.api.scopeApi.isColumnInStringsScope(abColumn, formatColumn.Scope)) {
-                        const options = formatColumn.DisplayFormat.Options;
-                        valueFormatter = (params) => this.api.formatColumnApi.getStringFormattedValue(params.value, options);
+                        valueFormatter = (params) => {
+                            return this.api.formatColumnApi.getStringFormattedValue(params.value, params.node, abColumn, options);
+                        };
                     }
                 }
                 return valueFormatter;
@@ -4534,7 +4535,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
                 rawValue = numericRawValue;
             }
         }
-        return this.ReportService.getCellExportValueFromRawValue(rawValue, columnId);
+        return this.ReportService.getCellExportValueFromRawValue(rowNode, rawValue, columnId);
     }
     hasAutogeneratedPrimaryKey() {
         return this.adaptableOptions.autogeneratePrimaryKey;
@@ -4561,6 +4562,20 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
             publishedAt: publishTimestamp_1.default,
         });
     }
+    showCharts(charts) {
+        if (!this.gridOptions.api) {
+            LoggingHelper_1.ConsoleLogError('Adaptable must be instantiated before calling showCharts');
+            return [];
+        }
+        return charts.map((chart) => this.gridOptions.api.restoreChart(chart));
+    }
+    getChartModels() {
+        if (!this.gridOptions.api) {
+            LoggingHelper_1.ConsoleLogError('Adaptable must be instantiated before calling getChartModels');
+            return [];
+        }
+        return this.gridOptions.api.getChartModels();
+    }
 }
 exports.Adaptable = Adaptable;
 class AdaptableNoCodeWizard {

package/src/agGrid/agGridMenuHelper.d.ts

@@ -12,6 +12,7 @@ export declare class agGridMenuHelper {
     createAgGridMenuDefFromAdaptableMenu(adaptableMenuItem: AdaptableMenuItem): MenuItemDef;
     createAgGridColumnMenuDefFromUserMenu(menuItem: UserMenuItem<ColumnMenuContext>, menuContext: ColumnMenuContext): MenuItemDef;
     createAgGridContextMenuDefFromUserMenu(menuItem: UserMenuItem<ContextMenuContext>, menuContext: ContextMenuContext): MenuItemDef;
+    private mapAdaptableIconToAgGridIcon;
     createAdaptableColumnMenuItemFromUserMenu(menuItem: UserMenuItem<ColumnMenuContext>, menuContext: ColumnMenuContext): AdaptableMenuItem;
     createAgGridColumnMenuItems(originalgetMainMenuItems: GetMainMenuItems, params: GetMainMenuItemsParams): (string | MenuItemDef)[] | undefined;
     createGroupedColumnMenuItem(): MenuItemDef | undefined;

package/src/agGrid/agGridMenuHelper.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const icons_1 = require("../components/icons");
 const flatten_1 = tslib_1.__importDefault(require("lodash/flatten"));
+const AdaptableIconComponent_1 = require("../components/AdaptableIconComponent");
 // tslint:disable-next-line: class-name
 class agGridMenuHelper {
     constructor(adaptable, gridOptions) {
@@ -106,7 +107,7 @@ class agGridMenuHelper {
             action: x.onClick
                 ? x.onClick
                 : () => this.adaptable.api.internalApi.dispatchReduxAction(x.reduxAction),
-            icon: icons_1.iconToString(x.icon, {
+            icon: this.mapAdaptableIconToAgGridIcon(x.icon, {
                 fill: 'var(--ab-color-text-on-primary)',
             }),
         };
@@ -124,7 +125,7 @@ class agGridMenuHelper {
                 : adaptableMenuItem.reduxAction
                     ? () => this.adaptable.api.internalApi.dispatchReduxAction(adaptableMenuItem.reduxAction)
                     : undefined,
-            icon: icons_1.iconToString(adaptableMenuItem.icon, {
+            icon: this.mapAdaptableIconToAgGridIcon(adaptableMenuItem.icon, {
                 fill: 'var(--ab-color-text-on-primary)',
             }),
             subMenu: subMenuItems,
@@ -136,7 +137,7 @@ class agGridMenuHelper {
         return {
             name: this.getLabelFromUserColumnMenuItem(menuItem, menuContext),
             action: () => (fn ? fn(menuContext) : null),
-            icon: icons_1.iconToString(menuItem.icon, {
+            icon: this.mapAdaptableIconToAgGridIcon(menuItem.icon, {
                 fill: 'var(--ab-color-text-on-primary)',
             }),
             disabled: disabled,
@@ -153,7 +154,7 @@ class agGridMenuHelper {
         return {
             name: this.getLabelFromUserContextMenuItem(menuItem, menuContext),
             action: () => (fn ? fn(menuContext) : null),
-            icon: icons_1.iconToString(menuItem.icon, {
+            icon: this.mapAdaptableIconToAgGridIcon(menuItem.icon, {
                 fill: 'var(--ab-color-text-on-primary)',
             }),
             disabled: disabled,
@@ -164,6 +165,16 @@ class agGridMenuHelper {
                 }),
         };
     }
+    mapAdaptableIconToAgGridIcon(adaptableIcon, style) {
+        if (AdaptableIconComponent_1.isAdaptableElementIcon(adaptableIcon)) {
+            return adaptableIcon.element;
+        }
+        else {
+            return icons_1.iconToString(adaptableIcon, {
+                fill: 'var(--ab-color-text-on-primary)',
+            });
+        }
+    }
     createAdaptableColumnMenuItemFromUserMenu(menuItem, menuContext) {
         const fn = menuItem.onClick;
         let adaptableMenuItem = {

package/src/components/AdaptableFormComponent/AdaptableFormComponent.js

@@ -13,22 +13,16 @@ const react_1 = require("react");
 function AdaptableFormComponentButtons({ formDef, onClick, defaultTone, disabledButtons, api, context, focusFirstButton = true, }) {
     return (React.createElement(React.Fragment, null, formDef.buttons.map((button, index) => {
         var _a;
-        const defaultIconProps = {
-            style: {
-                height: 15,
-                width: 15,
-            },
-        };
-        const buttonIcon = api.internalApi.getIconForButton(button, context);
-        const iconProps = buttonIcon && Object.assign({}, defaultIconProps, buttonIcon);
+        const buttonIcon = api.internalApi.getIconForButton(button, context, {
+            height: 15,
+            width: 15,
+        });
         let buttonStyle = api.internalApi.getStyleForButton(button, context ? context : { adaptableApi: api });
         let buttonLabel = api.internalApi.getLabelForButton(button, context ? context : { adaptableApi: api });
         let buttonTooltip = api.internalApi.getTooltipForButton(button, context ? context : { adaptableApi: api });
-        return (React.createElement(SimpleButton_1.default, { autoFocus: focusFirstButton && index === 0, disabled: disabledButtons[index], key: index, tooltip: buttonTooltip, tone: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _a !== void 0 ? _a : defaultTone, variant: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant, "data-text": buttonLabel, className: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className, marginLeft: index ? 2 : 0, onClick: () => {
+        return (React.createElement(SimpleButton_1.default, { autoFocus: focusFirstButton && index === 0, disabled: disabledButtons[index], key: index, tooltip: buttonTooltip, icon: buttonIcon, tone: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _a !== void 0 ? _a : defaultTone, variant: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant, "data-text": buttonLabel, className: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className, marginLeft: index ? 2 : 0, onClick: () => {
                 onClick(button);
-            } },
-            buttonIcon ? React.createElement("img", Object.assign({}, iconProps)) : null,
-            buttonLabel));
+            } }, buttonLabel));
     })));
 }
 exports.AdaptableFormComponentButtons = AdaptableFormComponentButtons;

package/src/components/AdaptableIconComponent/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { AdaptableExternalIcon, AdaptableIcon, AdaptableInternalIcon } from '../../PredefinedConfig/Common/AdaptableIcon';
+import { AdaptableElementIcon, AdaptableExternalIcon, AdaptableIcon, AdaptableInternalIcon } from '../../PredefinedConfig/Common/AdaptableIcon';
 export interface AdaptableIconComponentProps {
     icon: AdaptableIcon;
     iconClassName?: string;
@@ -7,4 +7,5 @@ export interface AdaptableIconComponentProps {
 export declare const AdaptableIconComponent: (props: AdaptableIconComponentProps) => JSX.Element;
 export declare const isAdaptableInternalIcon: (icon: unknown) => icon is AdaptableInternalIcon;
 export declare const isAdaptableExternalIcon: (icon: unknown) => icon is AdaptableExternalIcon;
+export declare const isAdaptableElementIcon: (icon: unknown) => icon is AdaptableElementIcon;
 export declare const isAdaptableIcon: (icon: unknown) => icon is AdaptableIcon;