@adaptabletools/adaptable 12.0.1-canary.0 → 12.0.3

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.js

@@ -18,6 +18,7 @@ const Tabs_1 = require("../../../components/Tabs");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
 const Tag_1 = require("../../../components/Tag");
 const AdaptableContext_1 = require("../../AdaptableContext");
+const FormatHelper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/FormatHelper"));
 const DOLLAR_OPTIONS = {
     FractionDigits: 2,
     FractionSeparator: '.',
@@ -84,13 +85,16 @@ const getFormatColumnFormatSummaryValue = (data, formattedColumnApi) => {
     }
     else {
         if (data.DisplayFormat.Formatter === 'NumberFormatter') {
-            content = formattedColumnApi.getNumberFormattedValue(12345.6789, data.DisplayFormat.Options);
+            content = FormatHelper_1.default.NumberFormatter(12345.6789, data.DisplayFormat.Options);
+            //formattedColumnApi.getNumberFormattedValue(12345.6789, data.DisplayFormat.Options);
         }
         if (data.DisplayFormat.Formatter === 'DateFormatter') {
-            content = formattedColumnApi.getDateFormattedValue(new Date(), data.DisplayFormat.Options);
+            content = FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options);
+            //formattedColumnApi.getDateFormattedValue(new Date(), data.DisplayFormat.Options);
         }
         if (data.DisplayFormat.Formatter === 'StringFormatter') {
-            content = formattedColumnApi.getStringFormattedValue('Hello World ', data.DisplayFormat.Options);
+            content = FormatHelper_1.default.StringFormatter('Hello World ', data.DisplayFormat.Options);
+            //formattedColumnApi.getStringFormattedValue('Hello World ', data.DisplayFormat.Options);
         }
     }
     return content;
@@ -169,7 +173,7 @@ const renderDateFormat = (data, _onChange, setFormatOption, customFormatters, fo
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "Pattern" },
                         React.createElement(Input_1.default, { value: data.DisplayFormat.Options.Pattern, onChange: (e) => setFormatOption('Pattern', e.currentTarget.value), mr: 2 }),
-                        React.createElement("span", null, formatColumnApi.getDateFormattedValue(new Date(), data.DisplayFormat.Options))),
+                        React.createElement("span", null, FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options))),
                     customFormatters.map((formatter) => renderCustomFormatter(data, formatter, setFormatOption))))),
         React.createElement(Tabs_1.Tabs, { marginTop: 2 },
             React.createElement(Tabs_1.Tabs.Tab, null, "Presets"),
@@ -182,7 +186,7 @@ const renderDateFormat = (data, _onChange, setFormatOption, customFormatters, fo
                 DateFormatPresets.map((Pattern, index) => (React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { key: index, colItems: [
                         { Content: Pattern, Size: 1 },
                         {
-                            Content: formatColumnApi.getDateFormattedValue(new Date(), { Pattern }),
+                            Content: FormatHelper_1.default.DateFormatter(new Date(), { Pattern }),
                             Size: 1,
                         },
                         {
@@ -299,21 +303,21 @@ const renderNumberFormat = (data, onChange, setFormatOption, customFormatters, f
                 React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { colItems: [
                         { Content: '12345.6789', Size: 1 },
                         {
-                            Content: formatColumnApi.getNumberFormattedValue(12345.6789, data.DisplayFormat.Options),
+                            Content: FormatHelper_1.default.NumberFormatter(12345.6789, data.DisplayFormat.Options),
                             Size: 1,
                         },
                     ] }),
                 React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { colItems: [
                         { Content: '-12345.6789', Size: 1 },
                         {
-                            Content: formatColumnApi.getNumberFormattedValue(-12345.6789, data.DisplayFormat.Options),
+                            Content: FormatHelper_1.default.NumberFormatter(-12345.6789, data.DisplayFormat.Options),
                             Size: 1,
                         },
                     ] }),
                 React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { colItems: [
                         { Content: '0.123', Size: 1 },
                         {
-                            Content: formatColumnApi.getNumberFormattedValue(0.123, data.DisplayFormat.Options),
+                            Content: FormatHelper_1.default.NumberFormatter(0.123, data.DisplayFormat.Options),
                             Size: 1,
                         },
                     ] })))));
@@ -350,7 +354,7 @@ const renderStringFormat = (data, _onChange, setFormatOption, customFormatters,
                         { Content: '"Hello World "', Size: 1 },
                         {
                             Content: '"' +
-                                formatColumnApi.getStringFormattedValue('Hello World ', data.DisplayFormat.Options) +
+                                FormatHelper_1.default.StringFormatter('Hello World ', data.DisplayFormat.Options) +
                                 '"',
                             Size: 1,
                         },

package/src/View/Layout/LayoutEditorStandalonePopup.js

@@ -70,7 +70,9 @@ const LayoutEditorStandalonePopup = (props) => {
     }, []);
     const finishDisabled = !layoutData.Name;
     return (React.createElement(rebass_1.Flex, { height: "100%", flexDirection: "column" },
-        React.createElement(LayoutEditorWizard_1.LayoutEditorWizard, { data: layoutData, api: adaptable.api, Layouts: layouts, moduleInfo: layoutModule.moduleInfo, onLayoutChange: setStateLayout, updateGoBackState: () => null }),
+        React.createElement(LayoutEditorWizard_1.LayoutEditorWizard, { data: layoutData, api: adaptable.api, Layouts: layouts, moduleInfo: layoutModule.moduleInfo, onLayoutChange: setStateLayout, 
+            // @ts-ignore
+            updateGoBackState: () => null }),
         React.createElement(PanelFooter_1.PanelFooter, { acceptDisabled: finishDisabled, onAccept: handleAccept, onCancel: handleCancel })));
 };
 exports.LayoutEditorStandalonePopup = LayoutEditorStandalonePopup;

package/src/View/Layout/LayoutPopup.d.ts

@@ -28,5 +28,5 @@ declare class LayoutPopupComponent extends React.Component<LayoutPopupProps, Edi
     canFinishWizard(): boolean;
     private getCurrentLayout;
 }
-export declare let LayoutPopup: import("react-redux").ConnectedComponent<typeof LayoutPopupComponent, import("react-redux").Omit<React.ClassAttributes<LayoutPopupComponent> & LayoutPopupProps, "ref" | "key" | "api" | "onSuspend" | "accessLevel" | "popupParams" | "onClearPopupParams" | "teamSharingActivated" | "onClosePopup" | "moduleInfo" | "onUnSuspend" | "modalContainer" | "onShare" | "Layouts" | "onSelectLayout" | "onSaveLayout" | "CurrentLayoutName" | "CurrentLayoutDraft" | "onAddLayout">>;
+export declare let LayoutPopup: import("react-redux").ConnectedComponent<typeof LayoutPopupComponent, import("react-redux").Omit<React.ClassAttributes<LayoutPopupComponent> & LayoutPopupProps, "ref" | "key" | "api" | "onSuspend" | "accessLevel" | "popupParams" | "onClearPopupParams" | "teamSharingActivated" | "onClosePopup" | "moduleInfo" | "onUnSuspend" | "modalContainer" | "onShare" | "onSelectLayout" | "onSaveLayout" | "Layouts" | "CurrentLayoutName" | "CurrentLayoutDraft" | "onAddLayout">>;
 export {};

package/src/View/Layout/LayoutViewPanel.d.ts

@@ -15,5 +15,5 @@ declare class LayoutViewPanelComponent extends React.Component<LayoutViewPanelCo
     render(): any;
     private onSaveLayout;
 }
-export declare let LayoutViewPanelControl: import("react-redux").ConnectedComponent<typeof LayoutViewPanelComponent, import("react-redux").Omit<React.ClassAttributes<LayoutViewPanelComponent> & LayoutViewPanelComponentProps, "api" | "accessLevel" | "moduleInfo" | "viewType" | "Layouts" | "onSelectLayout" | "onSaveLayout" | "CurrentDraftLayout" | "CanSave" | "CurrentLayoutName"> & LayoutViewPanelComponentProps>;
+export declare let LayoutViewPanelControl: import("react-redux").ConnectedComponent<typeof LayoutViewPanelComponent, import("react-redux").Omit<React.ClassAttributes<LayoutViewPanelComponent> & LayoutViewPanelComponentProps, "api" | "accessLevel" | "moduleInfo" | "viewType" | "onSelectLayout" | "onSaveLayout" | "Layouts" | "CurrentDraftLayout" | "CanSave" | "CurrentLayoutName"> & LayoutViewPanelComponentProps>;
 export {};

package/src/View/Layout/LayoutViewPanel.js

@@ -15,6 +15,7 @@ const ButtonNew_1 = require("../Components/Buttons/ButtonNew");
 const ButtonDelete_1 = require("../Components/Buttons/ButtonDelete");
 const react_redux_1 = require("react-redux");
 const ButtonClone_1 = require("../Components/Buttons/ButtonClone");
+const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
 exports.COMPONENT_LAYOUT_POPUP_NAME = 'LayoutEditorStandalonePopup';
 class LayoutViewPanelComponent extends React.Component {
     render() {
@@ -63,7 +64,7 @@ function mapDispatchToProps(dispatch) {
         onSelectLayout: (layoutName) => dispatch(LayoutRedux.LayoutSelect(layoutName)),
         onSaveLayout: (layout) => {
             dispatch(LayoutRedux.LayoutSave(layout));
-            dispatch(LayoutRedux.LayoutUpdateCurrentDraft(null));
+            dispatch(GridRedux.LayoutUpdateCurrentDraft(null));
         },
     };
 }

package/src/View/Layout/Wizard/LayoutEditorWizard.d.ts

@@ -10,7 +10,7 @@ export interface LayoutEditorWizardState {
     layout: Layout;
     errorMessage: string;
 }
-export declare class LayoutEditorWizard extends React.Component<LayoutEditorWizardProps, LayoutEditorWizardState> implements AdaptableWizardStep {
+export declare class LayoutEditorWizard extends React.Component<any, any> implements AdaptableWizardStep {
     constructor(props: LayoutEditorWizardProps);
     render(): any;
     onLayoutNameChange: (event: React.FormEvent<any>) => void;
@@ -20,32 +20,7 @@ export declare class LayoutEditorWizard extends React.Component<LayoutEditorWiza
     }) => string;
     updateLayout: (layout: Partial<Layout>) => void;
     onLayoutChange: (layout: Layout) => void;
-    getLayout: () => {
-        Name: string;
-        Columns: string[];
-        ColumnWidthMap?: {
-            [columnId: string]: number;
-        };
-        ColumnSorts?: import("../../../types").ColumnSort[];
-        ColumnFilters?: import("../../../types").ColumnFilter[];
-        RowGroupedColumns?: string[];
-        ExpandedRowGroupValues?: any[];
-        AggregationColumns?: Record<string, string | true>;
-        EnablePivot?: boolean;
-        PivotColumns?: string[];
-        PinnedColumnsMap?: {
-            [columnId: string]: "left" | "right";
-        };
-        AutoSave?: boolean;
-        ColumnHeadersMap?: {
-            [columnId: string]: string;
-        };
-        SuppressAggFuncInHeader?: boolean;
-        Uuid?: string;
-        Source?: "Config" | "User";
-        IsReadOnly?: boolean;
-        Tags?: string[];
-    };
+    getLayout: () => any;
     canNext(): boolean;
     canBack(): boolean;
     next(): void;

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

@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { SharedEntity } from '../../../types';
+export declare const Dependencies: React.FunctionComponent<{
+    sharedEntity: SharedEntity;
+}>;
+export declare const SharedEntityDependencies: React.FunctionComponent<{
+    data: SharedEntity;
+}>;

package/src/View/TeamSharing/SharedEntityDependencies.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SharedEntityDependencies = exports.Dependencies = 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 AdaptableContext_1 = require("../AdaptableContext");
+const AdaptableObjectList_1 = require("../Components/AdaptableObjectList/AdaptableObjectList");
+const Dependencies = (props) => {
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const dependencies = adaptable.api.teamSharingApi.getSharedEntryDependencies(props.sharedEntity);
+    return (React.createElement(React.Fragment, null, dependencies.map((sharedEntity) => {
+        const module = adaptable.ModuleService.getModuleById('TeamSharing');
+        const itemView = module.toView(sharedEntity);
+        return (React.createElement(rebass_1.Box, { as: "ul", padding: 0, key: sharedEntity.Uuid, className: "ab-Shared-Entity-Shared-Object", mb: 2 },
+            React.createElement(AdaptableObjectList_1.AdaptableObjectListItem, { deleteTooltip: 'Cannot delete dependencies.', deleteDisabled: true, module: module, data: itemView })));
+    })));
+};
+exports.Dependencies = Dependencies;
+const SharedEntityDependencies = (props) => {
+    const [isExpanded, setIsExpanded] = React.useState(false);
+    return (React.createElement(React.Fragment, null,
+        React.createElement(rebass_1.Box, { mb: 3, mt: 2 }, 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(exports.Dependencies, { sharedEntity: props.data })));
+};
+exports.SharedEntityDependencies = SharedEntityDependencies;

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

@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { SharedEntity } from '../../../types';
+export declare const SharedEntityTypeItemView: React.FunctionComponent<{
+    data: SharedEntity;
+}>;
+export declare const getSharedEntityActiveStatusObjectView: (isDependency: boolean) => (props: {
+    data: SharedEntity;
+}) => JSX.Element;
+export declare const getSharedEntityStaleDepsItemView: (staleDependencies: SharedEntity[]) => () => JSX.Element;

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/agGrid/Adaptable.d.ts

@@ -1,4 +1,4 @@
-import { ColDef, ColGroupDef, Column, ExcelStyle, GridOptions, Module, RowNode } 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';
@@ -186,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;
@@ -354,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

@@ -1860,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,
@@ -1876,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);
         }
@@ -1895,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
@@ -1910,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,
@@ -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();
             }
         }));
         /**
@@ -2760,7 +2760,7 @@ class Adaptable {
             all_modules_1.Events.EVENT_ROW_GROUP_OPENED,
             all_modules_1.Events.EVENT_COLUMN_VALUE_CHANGED,
         ];
-        // ADD filter event
+        // no need to add filter event, it is handled by AdaptableStore side-effects
         this.gridOptions.api.addGlobalListener((this.listenerGlobalColumnEventsThatTriggerAutoLayoutSave = (type) => {
             if (columnEventsThatTriggersAutoLayoutSave.indexOf(type) > -1) {
                 this.debouncedSaveGridLayout();
@@ -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/components/icons/index.js

@@ -52,7 +52,6 @@ const column_chooser_1 = tslib_1.__importDefault(require("./column-chooser"));
 const column_add_1 = tslib_1.__importDefault(require("./column-add"));
 const cell_validation_1 = tslib_1.__importDefault(require("./cell-validation"));
 const column_filter_1 = tslib_1.__importDefault(require("./column-filter"));
-const column_info_1 = tslib_1.__importDefault(require("./column-info"));
 const custom_sort_1 = tslib_1.__importDefault(require("./custom-sort"));
 const system_status_1 = tslib_1.__importDefault(require("./system-status"));
 const data_set_1 = tslib_1.__importDefault(require("./data-set"));
@@ -168,7 +167,6 @@ const allIcons = {
     'cell-validation': cell_validation_1.default,
     'conditional-style': conditional_style_1.default,
     chat: chat_1.default,
-    'column-info': column_info_1.default,
     'custom-sort': custom_sort_1.default,
     dashboard: dashboard_1.default,
     'flashing-cell': flashing_cell_1.default,
@@ -191,8 +189,6 @@ const allIcons = {
     // others
     edit: edit_1.default,
     'tab-unselected': tab_unselected_1.default,
-    'check-box': check_box_1.default,
-    'check-box-outline': check_box_outline_1.default,
     unchecked: check_box_outline_1.default,
     checked: check_box_1.default,
     'boolean-list': boolean_list_1.default,