@adaptabletools/adaptable 12.0.1 → 12.0.4

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LayoutReducer = exports.getColumnFilterSelector = exports.LayoutReady = exports.LayoutUpdateCurrentDraft = exports.LayoutSelect = exports.LayouRemoveColumn = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LAYOUT_READY = exports.LAYOUT_UPDATE_CURRENT_DRAFT = exports.LAYOUT_SET_COLUMN_CAPTION = exports.LayoutColumnFilterClear = exports.LayoutColumnFilterClearAll = exports.LayoutColumnFilterSet = exports.LayoutColumnFilterEdit = exports.LayoutColumnFilterAdd = exports.LAYOUT_COLUMN_FILTER_CLEAR = exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_COLUMN_FILTER_SET = exports.LAYOUT_COLUMN_FILTER_EDIT = exports.LAYOUT_COLUMN_FILTER_ADD = exports.LAYOUT_REMOVE_COLUMN = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = void 0;
+exports.LayoutReducer = exports.getColumnFilterSelector = exports.LayoutReady = exports.LayoutSelect = exports.LayoutRemoveColumn = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LAYOUT_READY = exports.LAYOUT_SET_COLUMN_CAPTION = exports.LayoutColumnFilterClear = exports.LayoutColumnFilterClearAll = exports.LayoutColumnFilterSet = exports.LayoutColumnFilterEdit = exports.LayoutColumnFilterAdd = exports.LAYOUT_COLUMN_FILTER_CLEAR = exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_COLUMN_FILTER_SET = exports.LAYOUT_COLUMN_FILTER_EDIT = exports.LAYOUT_COLUMN_FILTER_ADD = exports.LAYOUT_REMOVE_COLUMN = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
@@ -24,6 +24,9 @@ exports.LAYOUT_SELECT = 'LAYOUT_SELECT';
  * @ReduxAction A Layout has been (auto)saved
  */
 exports.LAYOUT_SAVE = 'LAYOUT_SAVE';
+/**
+ * @ReduxAction A Column has been removed
+ */
 exports.LAYOUT_REMOVE_COLUMN = 'LAYOUT_REMOVE_COLUMN';
 /**
  * @ReduxAction A Column Filter has been added
@@ -74,7 +77,6 @@ exports.LayoutColumnFilterClear = LayoutColumnFilterClear;
  * @ReduxAction A new caption / header has been set for a Column in the Layout
  */
 exports.LAYOUT_SET_COLUMN_CAPTION = 'LAYOUT_SET_COLUMN_CAPTION';
-exports.LAYOUT_UPDATE_CURRENT_DRAFT = 'LAYOUT_UPDATE_CURRENT_DRAFT';
 /**
  * @ReduxAction Layout Module is ready
  */
@@ -101,22 +103,17 @@ const LayoutSetColumnCaption = (layoutName, columnId, caption) => ({
     caption,
 });
 exports.LayoutSetColumnCaption = LayoutSetColumnCaption;
-const LayouRemoveColumn = (layoutName, columnId) => ({
+const LayoutRemoveColumn = (layoutName, columnId) => ({
     type: exports.LAYOUT_REMOVE_COLUMN,
     layoutName,
     columnId,
 });
-exports.LayouRemoveColumn = LayouRemoveColumn;
+exports.LayoutRemoveColumn = LayoutRemoveColumn;
 const LayoutSelect = (layoutName) => ({
     type: exports.LAYOUT_SELECT,
     layoutName,
 });
 exports.LayoutSelect = LayoutSelect;
-const LayoutUpdateCurrentDraft = (layout) => ({
-    type: exports.LAYOUT_UPDATE_CURRENT_DRAFT,
-    layout,
-});
-exports.LayoutUpdateCurrentDraft = LayoutUpdateCurrentDraft;
 const LayoutReady = (layoutState) => ({
     type: exports.LAYOUT_READY,
     layoutState,
@@ -124,7 +121,10 @@ const LayoutReady = (layoutState) => ({
 exports.LayoutReady = LayoutReady;
 const getColumnFilterSelector = (state) => {
     var _a, _b, _c, _d;
-    const currentLayout = (_c = (_b = (_a = state.Layout) === null || _a === void 0 ? void 0 : _a.Layouts) === null || _b === void 0 ? void 0 : _b.find) === null || _c === void 0 ? void 0 : _c.call(_b, (layout) => layout.Name === state.Layout.CurrentLayout);
+    // in case of non-saving Layouts, we load the current Layout(possibly draft) from GridState
+    const currentLayout = state.Grid.CurrentLayout
+        ? state.Grid.CurrentLayout
+        : (_c = (_b = (_a = state.Layout) === null || _a === void 0 ? void 0 : _a.Layouts) === null || _b === void 0 ? void 0 : _b.find) === null || _c === void 0 ? void 0 : _c.call(_b, (layout) => layout.Name === state.Layout.CurrentLayout);
     return (_d = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : [];
 };
 exports.getColumnFilterSelector = getColumnFilterSelector;

package/src/Redux/Store/AdaptableStore.js

@@ -33,6 +33,7 @@ const ScheduleRedux = tslib_1.__importStar(require("../ActionsReducers/ScheduleR
 const TeamSharingRedux = tslib_1.__importStar(require("../ActionsReducers/TeamSharingRedux"));
 const QueryRedux = tslib_1.__importStar(require("../ActionsReducers/QueryRedux"));
 const StatusBarRedux = tslib_1.__importStar(require("../ActionsReducers/StatusBarRedux"));
+const ChartingRedux = tslib_1.__importStar(require("../ActionsReducers/ChartingRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ConfigConstants = tslib_1.__importStar(require("../../Utilities/Constants/ConfigConstants"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
@@ -146,6 +147,7 @@ class AdaptableStore {
             Theme: ThemeRedux.ThemeReducer,
             ToolPanel: ToolPanelRedux.ToolPanelReducer,
             Query: QueryRedux.QueryReducer,
+            Charting: ChartingRedux.ChartingReducer,
             // dead reducers
             PercentBar: DeadRedux.PercentBarReducer,
             UpdatedRow: DeadRedux.UpdatedRowReducer,
@@ -279,7 +281,7 @@ exports.AdaptableStore = AdaptableStore;
 const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
     return function (next) {
         return function (action) {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             switch (action.type) {
                 /*******************
                  * NAMED QUERY ACTIONS
@@ -680,12 +682,18 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     if (adaptable.adaptableOptions.searchOptions.filterResultsAfterQuickSearch) {
                         const actionTyped = action;
                         const searchText = actionTyped.quickSearchText;
+                        //  const gridOptions = adaptable.api.gridApi.getAgGridInstance();
                         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(searchText)) {
+                            // Currently using this but any searchable would allow us to limit the cols checked
                             const queryText = 'ANY_CONTAINS("' + searchText + '") ';
+                            // const queryText = 'ANY_SEARCHABLE_CONTAINS("' + searchText + '") ';
                             adaptable.api.queryApi.setCurrentQuery(queryText);
+                            // Better still would be to use ag grid if that is possible?
+                            //    gridOptions.api.setQuickFilter(searchText);
                         }
                         else {
                             adaptable.api.queryApi.clearCurrentQuery();
+                            //  gridOptions.api.setQuickFilter('');
                         }
                     }
                     return returnAction;
@@ -712,9 +720,38 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_ADD:
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_SET:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR: {
-                    let returnAction = next(action);
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL: {
+                    let returnAction;
+                    if ((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts) {
+                        returnAction = next(action);
+                    }
+                    else {
+                        if (!middlewareAPI.getState().Grid.CurrentLayout) {
+                            const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
+                            middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
+                        }
+                        // we have a layout draft, we have to update that state
+                        let draftLayoutAction;
+                        switch (action.type) {
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_ADD:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterAdd(action.columnFilter);
+                                break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterEdit(action.columnFilter);
+                                break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_SET:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterSet(action.columnFilter);
+                                break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterClear(action.columnFilter);
+                                break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterClearAll();
+                                break;
+                        }
+                        returnAction = next(draftLayoutAction);
+                    }
                     setTimeout(() => adaptable.applyGridFiltering(), 5);
                     adaptable.api.gridApi.fireSearchChangedEvent('Filter');
                     return returnAction;
@@ -838,18 +875,18 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             // tell grid the layout has been selected
                             adaptable.setLayout(currentLayout);
                         }
-                        if (!((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts)) {
-                            middlewareAPI.dispatch(LayoutRedux.LayoutUpdateCurrentDraft(currentLayout));
+                        if (!((_h = adaptable.adaptableOptions.layoutOptions) === null || _h === void 0 ? void 0 : _h.autoSaveLayouts)) {
+                            middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
                         }
                     }
                     if (returnAction.type == LayoutRedux.LAYOUT_ADD ||
                         returnAction.type == LayoutRedux.LAYOUT_SAVE) {
                         const actionTyped = action;
                         // if autosave is false
-                        if (!((_h = adaptable.adaptableOptions.layoutOptions) === null || _h === void 0 ? void 0 : _h.autoSaveLayouts)) {
+                        if (!((_j = adaptable.adaptableOptions.layoutOptions) === null || _j === void 0 ? void 0 : _j.autoSaveLayouts)) {
                             // and the current layout is saved, make sure we also update the draft
                             if (actionTyped.layout.Name === newLayoutState.CurrentLayout) {
-                                middlewareAPI.dispatch(LayoutRedux.LayoutUpdateCurrentDraft(actionTyped.layout));
+                                middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(actionTyped.layout));
                             }
                         }
                     }

package/src/Strategy/AlertModule.js

@@ -30,10 +30,10 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
                 'formattedValue') {
-                const { oldValue, newValue } = cellDataChangedInfo;
+                const { oldValue, newValue, rowNode } = cellDataChangedInfo;
                 const columnId = cellDataChangedInfo.column.columnId;
-                const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
-                const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, newValue);
+                const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, oldValue);
+                const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
                     // if the formattedValues are identical, then no alert is fired
                     return;

package/src/Strategy/ChartingModule.js

@@ -6,7 +6,7 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.ChartingModuleId, 'Charts', 'chart', 'ChartPopup', 'Create Charts in order to see Adaptable Data visually', api);
+        super(ModuleConstants.ChartingModuleId, 'Charts', 'chart', 'ChartPopup', 'Create AG Grid Charts in order to see Adaptable Data visually', api);
     }
     isModuleAvailable() {
         return this.api.chartingApi.isChartingEnabled() && super.isModuleAvailable();

package/src/Strategy/FlashingCellModule.js

@@ -29,10 +29,10 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // - flash for the underlying small data changes, but the visual does not
             if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
                 'formattedValue') {
-                const { oldValue, newValue } = cellDataChangedInfo;
+                const { oldValue, newValue, rowNode } = cellDataChangedInfo;
                 const columnId = cellDataChangedInfo.column.columnId;
-                const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
-                const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, newValue);
+                const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, oldValue);
+                const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
                     // if the formattedValues are identical, then no alert is fired
                     return;

package/src/Strategy/FormatColumnModule.js

@@ -247,7 +247,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Display Format',
-                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn, this.api.formatColumnApi)],
+                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn, this.api)],
                 },
                 getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems(formatColumn),
                 getObjectTagsViewItems_1.getObjectTagsViewItems(formatColumn, this.api),

package/src/Strategy/LayoutModule.js

@@ -10,6 +10,7 @@ const LayoutRadioSelector_1 = require("../View/Layout/LayoutRadioSelector");
 const LayoutStatusBarSubPanelPopover_1 = require("../View/Layout/LayoutStatusBarSubPanelPopover");
 const EditCurrentLayoutButton_1 = require("../View/Layout/EditCurrentLayoutButton");
 const LayoutCloneButton_1 = require("../View/Layout/LayoutCloneButton");
+const SaveLayoutButton_1 = require("../View/Layout/SaveLayoutButton");
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, 'Layout', 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
@@ -293,7 +294,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     content: text,
                     popover: popover,
                     popoverMinWidth: 150,
-                    extraActions: [EditCurrentLayoutButton_1.EditCurrentLayoutButton],
+                    extraActions: [EditCurrentLayoutButton_1.EditCurrentLayoutButton, SaveLayoutButton_1.SaveLayoutButton],
                 };
             },
         };

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -28,6 +28,7 @@ export declare const AG_GRID_GROUPED_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS = "adaptableRowActionButtons";
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = "(ActionRowButtons)";
+export declare const DEFAULT_DATE_FORMAT_PATTERN = "dd-MM-yyyy";
 export declare const SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE: number;
 export declare const QUICK_SEARCH_DEFAULT_BACK_COLOR: string;
 export declare const QUICK_SEARCH_DEFAULT_FORE_COLOR: string;

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = void 0;
+exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -31,6 +31,7 @@ exports.AG_GRID_GROUPED_COLUMN = 'ag-Grid-AutoColumn';
 exports.AG_GRID_PIVOT_COLUMN = 'pivot_';
 exports.ADAPTABLE_ROW_ACTION_BUTTONS = 'adaptableRowActionButtons';
 exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = '(ActionRowButtons)';
+exports.DEFAULT_DATE_FORMAT_PATTERN = 'dd-MM-yyyy';
 /*
 Redux / State Defaults
 Try to put all our Redux / State defaults here and ONLY reference from here - avoid magic numbers / strings.

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.d.ts

@@ -1,4 +1,7 @@
 import { ExpressionFunction } from '../../parser/src/types';
+/**
+ * List of all the Aggregation Functions available in AdaptableQL
+ */
 export declare type AggregationFunctionName = 'WHERE' | 'COL' | AggregationFunction | ComparisonFunction;
 declare type AggregationFunction = 'SUM';
 declare type ComparisonFunction = 'EQ' | 'NEQ' | 'LT' | 'GT' | 'LTE' | 'GTE';

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.d.ts

@@ -2,6 +2,9 @@ import { ExpressionFunction } from '../../parser/src/types';
 import { BaseParameter } from './expressionFunctionUtils';
 import { RowNode } from '@ag-grid-community/all-modules';
 import { AggregateParams } from './scalarAggregationHelper';
+/**
+ * List of all the AggregatedScalar Functions available in AdaptableQL
+ */
 export declare type AggregatedScalarFunctionName = AggregationFunction | OperandFunction;
 declare type AggregationFunction = 'SUM' | 'PERCENTAGE' | 'AVG' | 'MIN' | 'MAX' | 'CUMUL';
 declare type OperandFunction = 'COL' | 'OVER' | 'GROUP_BY';

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.d.ts

@@ -1,3 +1,6 @@
 import { ExpressionFunction } from '../../parser/src/types';
+/**
+ * List of all the Boolean Functions available in AdaptableQL
+ */
 export declare type BooleanFunctionName = 'EQ' | 'NEQ' | 'GT' | 'LT' | 'GTE' | 'LTE' | 'AND' | 'OR' | 'NOT' | 'BETWEEN' | 'IN' | 'IS_BLANK' | 'CONTAINS' | 'STARTS_WITH' | 'ENDS_WITH' | 'ANY_CONTAINS' | 'QUERY';
 export declare const booleanExpressionFunctions: Record<BooleanFunctionName, ExpressionFunction>;

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -233,10 +233,32 @@ exports.booleanExpressionFunctions = {
             });
         },
         isPredicate: true,
-        description: 'Returns true if any column contains input',
+        description: 'Returns true if any Column contains input',
         signatures: ['ANY_CONTAINS(value)'],
         examples: ['ANY_CONTAINS("abc")'],
     },
+    /*
+    ANY_SEARCHABLE_CONTAINS: {
+      handler(args, context) {
+        const searchTerm = getStringValue(context, String(args[0]));
+        return context.api?.columnApi
+          .getVisibleColumns()
+          .filter((c) => !c.isExcludedFromQuickSearch)
+          .some((column) => {
+            const value = context.api?.gridApi.getDisplayValueFromRowNode(
+              context.node,
+              column.columnId
+            );
+            const columnValue = getStringValue(context, String(value));
+            return columnValue.indexOf(searchTerm) !== -1;
+          });
+      },
+      isPredicate: true,
+      description: 'Returns true if any Searchable Column contains input',
+      signatures: ['ANY_SEARCHABLE_CONTAINS(value)'],
+      examples: ['ANY_SEARCHABLE_CONTAINS("abc")'],
+    },
+  */
     QUERY: {
         handler(args, context) {
             var _a, _b;

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.d.ts

@@ -1,4 +1,7 @@
 import { ExpressionFunction } from '../../parser/src/types';
+/**
+ * List of all the Observable Functions available in AdaptableQL
+ */
 export declare type ObservableFunctionName = 'WHERE' | 'COL' | 'TIMEFRAME' | ObservableFunction | ChangeFunction;
 declare type ObservableFunction = 'ROW_CHANGE' | 'GRID_CHANGE';
 declare type ChangeFunction = 'MAX' | 'MIN' | 'NONE' | 'COUNT';

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.d.ts

@@ -1,3 +1,6 @@
 import { ExpressionFunction } from '../../parser/src/types';
+/**
+ * List of all the Scalar Functions available in AdaptableQL
+ */
 export declare type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'TODAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'COL';
 export declare const scalarExpressionFunctions: Record<ScalarFunctionName, ExpressionFunction>;

package/src/Utilities/Helpers/FormatHelper.d.ts

@@ -1,6 +1,6 @@
 import { NumberFormatterOptions, DateFormatterOptions, AdaptableFormat, StringFormatterOptions } from '../../PredefinedConfig/Common/AdaptableFormat';
 export declare function Format(input: any, format: AdaptableFormat): string;
-export declare function NumberFormatter(input: number, options?: NumberFormatterOptions): string;
+export declare function NumberFormatter(input: number | string, options?: NumberFormatterOptions): string;
 export declare function DateFormatter(input: number | Date | string, options: DateFormatterOptions): string | undefined;
 export declare function StringFormatter(input: string, options?: StringFormatterOptions): string;
 declare const _default: {

package/src/Utilities/Helpers/FormatHelper.js

@@ -6,6 +6,7 @@ const tslib_1 = require("tslib");
 // import dateFnsFormat from 'date-fns/format';
 const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 const sentence_case_1 = require("sentence-case");
+const GeneralConstants_1 = require("../Constants/GeneralConstants");
 function Format(input, format) {
     if (format.Formatter === 'NumberFormatter') {
         return NumberFormatter(input, format.Options);
@@ -20,9 +21,12 @@ function NumberFormatter(input, options = {}) {
     if (input == null || input == undefined) {
         return undefined;
     }
+    if (typeof input === 'string') {
+        return input;
+    }
     let n = Number(input);
     if (isNaN(n)) {
-        return undefined;
+        return input.toString();
     }
     const fractionsSepatator = options.FractionSeparator ? options.FractionSeparator : '.';
     let multiplier = options.Multiplier ? options.Multiplier : 1;
@@ -68,17 +72,18 @@ function NumberFormatter(input, options = {}) {
 }
 exports.NumberFormatter = NumberFormatter;
 function DateFormatter(input, options) {
-    if (input == null || input == undefined) {
+    if (input == null || input == undefined || input == 'Invalid Date') {
         return undefined;
     }
     try {
+        // not sure if this is right if using a custom formatter...
         if (typeof input === 'string') {
             input = new Date(input);
         }
-        return format_1.default(input, options.Pattern || '');
+        return format_1.default(input, (options === null || options === void 0 ? void 0 : options.Pattern) || GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN);
     }
     catch (error) {
-        return undefined;
+        return input;
     }
 }
 exports.DateFormatter = DateFormatter;

package/src/Utilities/Helpers/Helper.js

@@ -128,7 +128,7 @@ function ReturnItemCount(items, itemName) {
 }
 exports.ReturnItemCount = ReturnItemCount;
 function IsInputNullOrEmpty(itemToCheck) {
-    if (itemToCheck == 'Invalid Date') {
+    if (itemToCheck == 'Invalid Date ') {
         return true;
     }
     if (typeof itemToCheck === 'string') {

package/src/Utilities/ObjectFactory.d.ts

@@ -24,8 +24,10 @@ import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessag
 import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { ColumnFilter, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
+import { ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
 import { ToastOptions } from 'react-toastify';
+import { RowNode } from '@ag-grid-community/all-modules';
+import { AdaptableApi } from '../../types';
 export declare function CreateEmptyCustomSort(): CustomSort;
 export declare function CreateEmptyCalculatedColumn(isFilterable: boolean): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
@@ -61,6 +63,7 @@ export declare function CreateEmptyStyle(): AdaptableStyle;
 export declare function CreateSystemStatusMessageInfo(message: string, type: AdaptableMessageType, furtherInfo?: string): SystemStatusMessageInfo;
 export declare function CreateEmptyCellSummmary(): CellSummmary;
 export declare function CreateColumnFilter(ColumnId: string, PredicateId: SystemFilterPredicateId, Inputs: any[]): ColumnFilter;
+export declare function CreateCustomDisplayFormatterContext(value: any, node: RowNode, abColumn: AdaptableColumn, api: AdaptableApi): CustomDisplayFormatterContext;
 export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose, containerId }: {
     onClose?: VoidFunction;
     containerId: string;
@@ -100,5 +103,6 @@ export declare const ObjectFactory: {
     CreateEmptyGlue42Report: typeof CreateEmptyGlue42Report;
     CreateSystemStatusMessageInfo: typeof CreateSystemStatusMessageInfo;
     CreateToastOptions: typeof CreateToastOptions;
+    CreateCustomDisplayFormatterContext: typeof CreateCustomDisplayFormatterContext;
 };
 export default ObjectFactory;

package/src/Utilities/ObjectFactory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateCustomDisplayFormatterContext = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -304,7 +304,7 @@ function CreateEmptyFreeTextColumn(isFilterable) {
 }
 exports.CreateEmptyFreeTextColumn = CreateEmptyFreeTextColumn;
 function CreateEmptyLayout(layout, adaptableColumns) {
-    return Object.assign(Object.assign({}, layout), { Uuid: Uuid_1.createUuid(), Columns: layout.Columns || [], ColumnSorts: layout.ColumnSorts || [], 
+    return Object.assign(Object.assign({}, layout), { Uuid: Uuid_1.createUuid(), Columns: layout.Columns || [], ColumnSorts: layout.ColumnSorts || [], ColumnFilters: layout.ColumnFilters || [], 
         //  ColumnFlexMap: layout.ColumnFlexMap || {},
         ColumnWidthMap: layout.ColumnWidthMap || {}, RowGroupedColumns: layout.RowGroupedColumns ||
             (adaptableColumns ? adaptableColumns.filter((c) => c.isGrouped).map((c) => c.columnId) : []) });
@@ -355,6 +355,15 @@ function CreateColumnFilter(ColumnId, PredicateId, Inputs) {
     };
 }
 exports.CreateColumnFilter = CreateColumnFilter;
+function CreateCustomDisplayFormatterContext(value, node, abColumn, api) {
+    return {
+        adaptableColumn: abColumn,
+        cellValue: value,
+        rowNode: node,
+        adaptableApi: api,
+    };
+}
+exports.CreateCustomDisplayFormatterContext = CreateCustomDisplayFormatterContext;
 function CreateToastOptions(notificationsOptions, { onClose, containerId }) {
     const adaptableToastPosition = notificationsOptions.position;
     const position = getToastPosition(adaptableToastPosition);
@@ -443,5 +452,6 @@ exports.ObjectFactory = {
     CreateEmptyGlue42Report,
     CreateSystemStatusMessageInfo,
     CreateToastOptions,
+    CreateCustomDisplayFormatterContext,
 };
 exports.default = exports.ObjectFactory;

package/src/Utilities/Services/Interface/IReportService.d.ts

@@ -17,6 +17,6 @@ export interface IReportService extends IAdaptableService {
     getReportDataAsArray(report: Report, includePrimaryKey?: boolean): any[][];
     convertReportDataToArray(reportData: ReportData): any[][];
     getCellExportValueFromRowNode(rowNode: RowNode, columnId: string): any;
-    getCellExportValueFromRawValue(rawValue: any, columnId: string): any;
+    getCellExportValueFromRawValue(rowNode: RowNode, rawValue: any, columnId: string): any;
     getReportFileName(reportName: string): string;
 }

package/src/Utilities/Services/ReportService.d.ts

@@ -21,7 +21,7 @@ export declare class ReportService implements IReportService {
     getRowObjectForColumnIds(rowNode: RowNode, columnIds: string[]): Record<string, any>;
     PublishLiveLiveDataChangedEvent(reportDestination: 'ipushpull' | 'Glue42', liveDataTrigger: 'Connected' | 'Disconnected' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
     getCellExportValueFromRowNode(rowNode: RowNode, columnId: string): any;
-    getCellExportValueFromRawValue(cellRawValue: any, columnId: string): any;
+    getCellExportValueFromRawValue(rowNode: RowNode, cellRawValue: any, columnId: string): any;
     getReportFileName(reportName: string): string;
     destroy(): void;
     private getCustomExportDateFormat;

package/src/Utilities/Services/ReportService.js

@@ -300,9 +300,9 @@ class ReportService {
         this.adaptableApi.eventApi.emit('LiveDataChanged', liveDataChangedInfo);
     }
     getCellExportValueFromRowNode(rowNode, columnId) {
-        return this.getCellExportValueFromRawValue(this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, columnId), columnId);
+        return this.getCellExportValueFromRawValue(rowNode, this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, columnId), columnId);
     }
-    getCellExportValueFromRawValue(cellRawValue, columnId) {
+    getCellExportValueFromRawValue(rowNode, cellRawValue, columnId) {
         if (StringExtensions_1.default.IsNullOrEmpty(cellRawValue)) {
             return cellRawValue;
         }
@@ -316,7 +316,7 @@ class ReportService {
         }
         // otherwise check the general export format types
         let cellExportFormat = this.computeCellExportValueFormat(columnType);
-        return this.getCellExportValueFromRawValueByType(cellRawValue, columnId, cellExportFormat);
+        return this.getCellExportValueFromRawValueByType(rowNode, cellRawValue, columnId, cellExportFormat);
     }
     getReportFileName(reportName) {
         let fileName = StringExtensions_1.default.ReplaceEmptySpacesWithUnderscore(reportName);
@@ -333,13 +333,13 @@ class ReportService {
     getCustomExportDateFormat() {
         return this.adaptableApi.internalApi.getAdaptableOptions().exportOptions.exportDateFormat;
     }
-    getCellExportValueFromRawValueByType(cellRawValue, columnId, 
+    getCellExportValueFromRawValueByType(rowNode, cellRawValue, columnId, 
     // default to rawValue if, for some reason, the configs provide invalid values
     type = 'rawValue') {
         return type === 'rawValue'
             ? cellRawValue
             : // type === formattedValue
-                this.adaptableApi.gridApi.getFormattedValueFromRawValue(columnId, cellRawValue);
+                this.adaptableApi.gridApi.getFormattedValueFromRawValue(rowNode, columnId, cellRawValue);
     }
     computeCellExportValueFormat(columnDataType) {
         const exportOptions = this.adaptableApi.internalApi.getAdaptableOptions().exportOptions;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.js

@@ -74,7 +74,7 @@ const CalculatedColumnSettingsWizardSection = (props) => {
     const ColumnName = data.FriendlyName;
     const ColumnId = data.ColumnId;
     let { DataType: dataType } = (_a = data.CalculatedColumnSettings) !== null && _a !== void 0 ? _a : {};
-    const { Width, ShowToolTip, HeaderToolTip, ExternallyEvaluatedExpression } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
+    const { Width, ShowToolTip, HeaderToolTip } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
     const handleSpecialColumnSettingsChange = (settings) => {
         props.onChange(Object.assign(Object.assign({}, data), { CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), settings) }));
     };
@@ -119,14 +119,7 @@ const CalculatedColumnSettingsWizardSection = (props) => {
                                 }) })),
                         ' ',
                         React.createElement(FormLayout_1.FormRow, { label: "" },
-                            React.createElement(CheckBox_1.CheckBox, { "data-name": "column-show-tooltip", onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Cell Tooltip")),
-                        React.createElement(FormLayout_1.FormRow, { label: "" },
-                            React.createElement(CheckBox_1.CheckBox, { "data-name": "column-external-expression-evaluation", onChange: (checked) => handleSpecialColumnSettingsChange({ ExternallyEvaluatedExpression: checked }), checked: ExternallyEvaluatedExpression }, "Suppress Expression Evaluation"),
-                            ExternallyEvaluatedExpression && (React.createElement(rebass_1.Box, { "data-name": "note-external-expression-evaluation", p: 2, style: {
-                                    background: 'var(--ab-color-primary)',
-                                    borderRadius: 'var(--ab__border-radius)',
-                                    whiteSpace: 'pre-wrap',
-                                } }, "The column value is loaded from the row data property with the same name as the ColumnId"))))))),
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "column-show-tooltip", onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Cell Tooltip")))))),
         ErrorMessage ? React.createElement(ErrorBox_1.default, { marginTop: 2 }, ErrorMessage) : null,
         React.createElement(SpecialColumnSettingsWizardStep_1.SpecialColumnSettingsWizardStep, { isEditable: false, settings: data.CalculatedColumnSettings, onChange: handleSpecialColumnSettingsChange })));
 };

package/src/View/Filter/FilterSummary.d.ts

@@ -5,7 +5,7 @@ import * as LayoutRedux from '../../Redux/ActionsReducers/LayoutRedux';
 import { ColumnFilter } from '../../types';
 export interface FilterSummaryProps extends Omit<ModuleSummaryProps<FilterSummaryComponent>, 'onClosePopup' | 'modalContainer'> {
     ColumnFilters: ColumnFilter[];
-    onClearFilter: (columnFilter: ColumnFilter) => LayoutRedux.LayoutFilterClearAction;
+    onClearFilter: (columnFilter: ColumnFilter) => LayoutRedux.LayoutColumnFilterClearAction;
 }
 export declare class FilterSummaryComponent extends React.Component<FilterSummaryProps, EditableConfigEntityState> {
     constructor(props: FilterSummaryProps);

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.d.ts

@@ -3,7 +3,6 @@ import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
 import { AdaptableFormat } from '../../../PredefinedConfig/Common/AdaptableFormat';
 import { AdaptableScope } from '../../../PredefinedConfig/Common/AdaptableScope';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
-import { FormatColumnApi } from '../../../types';
 export declare type FormatColumnFormatWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
 };
@@ -11,7 +10,7 @@ export interface FormatColumnFormatWizardState {
     DisplayFormat: AdaptableFormat;
     NumericFormat?: 'Percent' | 'Thousand' | 'Million' | 'Dollar' | 'Sterling' | undefined;
 }
-export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn, formattedColumnApi: FormatColumnApi) => string;
+export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn, api: AdaptableApi) => string;
 export declare const renderFormatColumnFormatSummary: (data: FormatColumn, api: AdaptableApi) => JSX.Element;
 export declare const getFormatDisplayTypeForScope: (scope: AdaptableScope, api: AdaptableApi) => 'Number' | 'Date' | 'String' | undefined;
 export declare const FormatColumnFormatWizardSection: (props: FormatColumnFormatWizardSectionProps) => JSX.Element;