@adaptabletools/adaptable 11.2.3 → 11.3.0

package/src/View/SmartEdit/SmartEditPopup.js

@@ -27,7 +27,6 @@ class SmartEditPopupComponent extends React.Component {
         this.props.onSmartEditCheckSelectedCells();
     }
     render() {
-        var _a, _b, _c;
         let col;
         if (this.props.PreviewInfo) {
             col = this.props.PreviewInfo.column;
@@ -43,7 +42,7 @@ class SmartEditPopupComponent extends React.Component {
                 },
             };
         });
-        const customOperations = (_c = (_b = (_a = this.props.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.editOptions) === null || _b === void 0 ? void 0 : _b.smartEdit) === null || _c === void 0 ? void 0 : _c.customOperations;
+        const customOperations = this.props.api.smartEditApi.getSmartEditCustomOperations();
         if (customOperations === null || customOperations === void 0 ? void 0 : customOperations.length) {
             operationMenuItems.push(...customOperations.map((operation) => {
                 return {

package/src/View/SmartEdit/SmartEditViewPanel.d.ts

@@ -3,7 +3,7 @@ import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
 import * as React from 'react';
-import { SmartEditOperation } from '../../AdaptableOptions/SmartEdit';
+import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
 export interface SmartEditViewPanelComponentProps extends ViewPanelProps {
     SmartEditValue: number | undefined;
     SmartEditOperation: SmartEditOperation | undefined;

package/src/View/SmartEdit/SmartEditViewPanel.js

@@ -39,7 +39,6 @@ class SmartEditViewPanelComponent extends React.Component {
         (_a = this.cleanupEvent) === null || _a === void 0 ? void 0 : _a.call(this);
     }
     render() {
-        var _a, _b, _c;
         let statusColour = this.getStatusColour();
         let selectedColumn = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.state.SelectedColumnId)
             ? this.props.api.columnApi.getColumnFromId(this.state.SelectedColumnId)
@@ -51,7 +50,7 @@ class SmartEditViewPanelComponent extends React.Component {
                 label: mathOperation,
             };
         });
-        const customOperations = (_c = (_b = (_a = this.props.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.editOptions) === null || _b === void 0 ? void 0 : _b.smartEdit) === null || _c === void 0 ? void 0 : _c.customOperations;
+        const customOperations = this.props.api.smartEditApi.getSmartEditCustomOperations();
         if (customOperations === null || customOperations === void 0 ? void 0 : customOperations.length) {
             operationMenuItems.push(...customOperations.map((operation) => {
                 return {

package/src/agGrid/ActionColumnRenderer.d.ts

@@ -1,10 +1,15 @@
 import { ICellRendererComp, ICellRendererParams } from '@ag-grid-community/all-modules';
+import { ActionColumn } from '../AdaptableOptions/UserInterfaceOptions';
+interface ActionColumnCellRendererParams extends ICellRendererParams {
+    actionColumn?: ActionColumn;
+}
 export declare class ActionColumnRenderer implements ICellRendererComp {
     private eGui;
     private eventListener;
-    init(params: ICellRendererParams): void;
+    init(params: ActionColumnCellRendererParams): void;
     render(): void;
     getGui(): HTMLElement;
     refresh(params: ICellRendererParams): boolean;
     destroy(): void;
 }
+export {};

package/src/agGrid/ActionColumnRenderer.js

@@ -11,8 +11,10 @@ class ActionColumnRenderer {
     init(params) {
         var _a;
         const adaptable = params.api.__adaptable;
-        const actionCol = (_a = adaptable.api.userInterfaceApi
-            .getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((ac) => ac.columnId == params.colDef.colId);
+        const actionCol = params.actionColumn
+            ? params.actionColumn
+            : (_a = adaptable.api.userInterfaceApi
+                .getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((ac) => ac.columnId == params.colDef.colId);
         if (actionCol && actionCol.actionColumnButton) {
             let actionButtons = Array.isArray(actionCol.actionColumnButton)
                 ? actionCol.actionColumnButton
@@ -38,7 +40,7 @@ class ActionColumnRenderer {
                 adaptableApi: adaptable.api,
             };
             const renderActionButtons = (buttons, adaptableApi, context) => {
-                return (React.createElement(React.Fragment, null, buttons.map((button) => {
+                return (React.createElement(React.Fragment, null, buttons.map((button, index) => {
                     var _a, _b;
                     if (button.hidden && button.hidden(button, context)) {
                         return;
@@ -63,7 +65,7 @@ class ActionColumnRenderer {
                         }, 16);
                     };
                     const disabled = button.disabled && button.disabled(button, context);
-                    return (React.createElement(SimpleButton_1.default, { key: button.Uuid, 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' },
+                    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' },
                         button.icon ? React.createElement("img", Object.assign({}, iconProps)) : null,
                         buttonLabel));
                 })));

package/src/agGrid/Adaptable.d.ts

@@ -36,6 +36,7 @@ import { ColumnSetupInfo } from './ColumnSetupInfo';
 import { CustomSort } from '../PredefinedConfig/CustomSortState';
 import { ColumnValuesComparer } from '../AdaptableOptions/GeneralOptions';
 import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelService';
+import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 declare type RuntimeConfig = {
     waitForAgGrid?: boolean;
     modules?: Module[];
@@ -55,6 +56,7 @@ export declare class Adaptable implements IAdaptable {
     AlertService: IAlertService;
     TeamSharingService: ITeamSharingService;
     MetamodelService: IMetamodelService;
+    RowEditService: IRowEditService;
     private LicenseService;
     embedColumnMenu: boolean;
     gridOptions: GridOptions;
@@ -243,6 +245,7 @@ export declare class Adaptable implements IAdaptable {
     }[];
     setupColumnValueGetter({ col }: ColumnSetupInfo): void;
     setupColumnAggFunc({ col }: ColumnSetupInfo): void;
+    private getColDefsForRowEditColumns;
     getColDefsForActionColumns(): ColDef[];
     updateColDefsForSpecialColumns(): void;
     private cleanupFloatingFilters_WORKAROUND;

package/src/agGrid/Adaptable.js

@@ -26,7 +26,7 @@ const AdaptableHelper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/
 const FormatHelper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/FormatHelper"));
 const Helper_1 = require("../Utilities/Helpers/Helper");
 const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
-const ObjectFactory_1 = tslib_1.__importStar(require("../Utilities/ObjectFactory"));
+const ObjectFactory_1 = require("../Utilities/ObjectFactory");
 // services
 const CalculatedColumnExpressionService_1 = require("../Utilities/Services/CalculatedColumnExpressionService");
 const DataService_1 = require("../Utilities/Services/DataService");
@@ -61,6 +61,8 @@ const DateHelper_1 = require("../Utilities/Helpers/DateHelper");
 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 = '/';
@@ -391,6 +393,7 @@ class Adaptable {
         this.QueryLanguageService = new QueryLanguageService_1.QueryLanguageService(this.api);
         this.AlertService = new AlertService_1.AlertService(this.api);
         this.TeamSharingService = new TeamSharingService_1.TeamSharingService(this.api);
+        this.RowEditService = new RowEditService_1.RowEditService(this.api);
         this.MetamodelService = new MetamodelService_1.MetamodelService(this.api);
         this.forPlugins((plugin) => plugin.afterInitServices(this));
         // Set up Modules - we set up all the Modules suitable for AG Grid
@@ -1106,6 +1109,7 @@ class Adaptable {
         return isCellReadonly ? readonlyCellStyle.ClassName : null;
     }
     isQuickSearchActive(abColumn, params) {
+        var _a;
         if (abColumn.isExcludedFromQuickSearch) {
             return false;
         }
@@ -1116,8 +1120,11 @@ class Adaptable {
         if (StringExtensions_1.StringExtensions.IsNullOrEmpty(quickSearchValue)) {
             return false;
         }
-        const columnFilter = ObjectFactory_1.default.CreateColumnFilter(abColumn.columnId, 'Contains', [quickSearchValue]);
-        return this.api.filterApi.evaluateColumnFilter(columnFilter, params.node);
+        const displayValue = (_a = this.api.gridApi.getDisplayValueFromRowNode(params.node, abColumn.columnId)) !== null && _a !== void 0 ? _a : '';
+        const ignoreCase = !this.api.internalApi.isTextComparisonCaseSensitive();
+        const v = ignoreCase ? String(displayValue).toLocaleLowerCase() : String(displayValue);
+        const i = ignoreCase ? String(quickSearchValue).toLocaleLowerCase() : String(quickSearchValue);
+        return v.indexOf(i) !== -1;
     }
     getPrimaryKeyValueFromRowNode(rowNode) {
         var _a;
@@ -1201,6 +1208,12 @@ class Adaptable {
             layout = this.api.layoutApi.getCurrentLayout();
         }
         layout.Columns = layout.Columns || [];
+        const rowEditActionColumn = this.getColDefsForRowEditColumns()[0];
+        if (rowEditActionColumn) {
+            layout.Columns.push(rowEditActionColumn.colId);
+            layout.PinnedColumnsMap = layout.PinnedColumnsMap || {};
+            layout.PinnedColumnsMap[rowEditActionColumn.colId] = rowEditActionColumn.pinned;
+        }
         const layoutColumnsMap = layout.Columns.reduce((acc, colId) => {
             acc[colId] = true;
             return acc;
@@ -1240,7 +1253,7 @@ class Adaptable {
         let newColState = this.getSortedColumnStateForVisibleColumns(columnsToShow, columnsState);
         newColState = newColState
             .map((colState) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             const { colId } = colState;
             const oldColState = columnsStateMap[colId];
             const hide = this.api.columnApi.isAutoPivotColumn(colId)
@@ -1279,10 +1292,16 @@ class Adaptable {
                 newColState.aggFunc =
                     aggregationFunctionsColumnsMap[colId] === true
                         ? // if we have true, it means - take the default aggFunc from colDef
-                         (_d = (_c = 
+                         (_e = (_d = (_c = 
                         // NOTE: colState gives us the current aggFunc, which can be null,
                         // while the colDef gives us the initially configured aggFunc for that column
-                        colState.aggFunc) !== null && _c !== void 0 ? _c : colDef === null || colDef === void 0 ? void 0 : colDef.aggFunc) !== null && _d !== void 0 ? _d : 'sum' : aggregationFunctionsColumnsMap[colId];
+                        colState.aggFunc) !== null && _c !== void 0 ? _c : colDef === null || colDef === void 0 ? void 0 : colDef.aggFunc) !== null && _d !== void 0 ? _d : 
+                        // @ts-ignore available only wth ag-Grid v27.3.x
+                        colDef === null || 
+                        // @ts-ignore available only wth ag-Grid v27.3.x
+                        colDef === void 0 ? void 0 : 
+                        // @ts-ignore available only wth ag-Grid v27.3.x
+                        colDef.defaultAggFunc) !== null && _e !== void 0 ? _e : 'sum' : aggregationFunctionsColumnsMap[colId];
             }
             if (sortModelMap[colId]) {
                 newColState.sort = sortModelMap[colId].sort;
@@ -1807,7 +1826,7 @@ class Adaptable {
         const pkValue = this.getPrimaryKeyValueFromRowNode(rowNode);
         const rawValue = this.getRawValueFromRowNode(rowNode, columnId);
         const displayValue = this.getDisplayValueFromRawValue(columnId, rawValue);
-        const normalisedvalue = this.getNormalisedValueFromRowValue(rawValue, displayValue, abColumn);
+        const normalisedvalue = this.getNormalisedValueFromRowValue(rawValue, abColumn);
         return {
             rawValue: rawValue,
             displayValue: displayValue,
@@ -1872,35 +1891,28 @@ class Adaptable {
         };
         return formatterFn(params);
     }
-    getNormalisedValueFromRowValue(rawValue, displayValue, column) {
-        // not sure if the current implementation is correct:
-        // the returned "normalised value" is actually the displayed value in almost all cases?!
-        // ex. how to read the following: if 'rawValue' is NOT a number, return normalised version of rawValue, but if rawValue IS a number, return displayedValue of it (which will almost certainly will NOT be a number)
-        //   if (dataType === 'Number') {
-        //     return typeof rawValue !== 'number' ? Number(rawValue) : returnValue;
-        //   }
-        // anyway, it seems to work so far (as of v11.1.3), so I'm leaving it for now :)
+    getNormalisedValueFromRowValue(rawValue, column) {
         if (!column) {
             return rawValue;
         }
-        const returnValue = this.isCustomRenderedColumn(column) ? rawValue : displayValue;
-        if (returnValue === undefined || returnValue === null) {
+        // prevents from null
+        if (rawValue === undefined || rawValue === null) {
             return rawValue;
         }
         const dataType = column.dataType;
         if (dataType === 'String') {
-            return typeof rawValue !== 'string' ? String(rawValue) : returnValue;
+            return typeof rawValue !== 'string' ? String(rawValue) : rawValue;
         }
         if (dataType === 'Number') {
-            return typeof rawValue !== 'number' ? Number(rawValue) : returnValue;
+            return typeof rawValue !== 'number' ? Number(rawValue) : rawValue;
         }
         if (dataType === 'Boolean') {
-            return typeof rawValue !== 'boolean' ? Boolean(rawValue) : returnValue;
+            return typeof rawValue !== 'boolean' ? Boolean(rawValue) : rawValue;
         }
         if (dataType === 'Date') {
             return rawValue instanceof Date ? rawValue : DateHelper_1.parseDateValue(rawValue);
         }
-        return returnValue;
+        return rawValue;
     }
     getRawValueFromRowNode(rowNode, columnId) {
         if (rowNode == null) {
@@ -2070,6 +2082,7 @@ class Adaptable {
             ...this.getColDefsForCalculatedColumns(),
             ...this.getColDefsForActionColumns(),
             ...this.getColDefsForFreeTextColumns(),
+            ...this.getColDefsForRowEditColumns(),
         ];
     }
     getColDefsForFreeTextColumns() {
@@ -2137,6 +2150,87 @@ class Adaptable {
             });
         }
     }
+    getColDefsForRowEditColumns() {
+        var _a;
+        if (!((_a = this.adaptableOptions.userInterfaceOptions.rowActionButtons) === null || _a === void 0 ? void 0 : _a.length)) {
+            return [];
+        }
+        const editButtons = this.adaptableOptions.userInterfaceOptions.rowActionButtons
+            .map((buttonName) => {
+            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.gridApi.openEditRowForm(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.gridApi.openCloneRowForm(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('RowFormSubmitted', eventInfo);
+                        (_b = (_a = this.adaptableOptions.editOptions.rowFormOptions).onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
+                    },
+                };
+            }
+        })
+            .filter(Boolean);
+        if (!editButtons.length) {
+            return [];
+        }
+        const rowEditActionColumn = {
+            columnId: 'adaptableRowEditButtons',
+            actionColumnButton: editButtons,
+        };
+        return [
+            {
+                headerName: '',
+                colId: 'adaptableRowEditButtons',
+                hide: false,
+                editable: false,
+                width: editButtons.length * 42,
+                resizable: false,
+                suppressMenu: true,
+                suppressMovable: true,
+                filter: false,
+                sortable: false,
+                enableRowGroup: false,
+                pinned: this.adaptableOptions.userInterfaceOptions.rowActionButtonsPosition === 'pinnedRight'
+                    ? 'right'
+                    : 'left',
+                cellRenderer: ActionColumnRenderer_1.ActionColumnRenderer,
+                cellRendererParams: {
+                    actionColumn: rowEditActionColumn,
+                },
+                cellClass: 'adaptableRowEditButtons',
+                type: [GeneralConstants_1.AB_SPECIAL_COLUMN, 'abColDefObject'],
+            },
+        ];
+    }
     getColDefsForActionColumns() {
         const defaultActionColumnSettings = {
             resizable: true,
@@ -2289,6 +2383,10 @@ 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];
+                    }
                     return this.CalculatedColumnExpressionService.evaluateCalculatedColumnQuery(calculatedColumn, params.node);
                 },
             };
@@ -2350,7 +2448,7 @@ class Adaptable {
         return this.gridOptions.api.getDisplayedRowAtIndex(firstDisplayedRowIndex);
     }
     destroy(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
         if (this.gridOptions && this.gridOptions.api) {
             this.gridOptions.api.removeEventListener(all_modules_1.Events.EVENT_FIRST_DATA_RENDERED, this.listenerFirstDataRendered);
             this.gridOptions.api.removeEventListener(all_modules_1.Events.EVENT_COLUMN_PIVOT_MODE_CHANGED, this.listenerPivotModeChanged);
@@ -2410,27 +2508,29 @@ class Adaptable {
         this.adaptableStore = null;
         this.gridOptions = null;
         this.adaptableOptions = null;
-        (_b = this.CalculatedColumnExpressionService) === null || _b === void 0 ? void 0 : _b.destroy();
+        (_c = (_b = this.CalculatedColumnExpressionService) === null || _b === void 0 ? void 0 : _b.destroy) === null || _c === void 0 ? void 0 : _c.call(_b);
         this.CalculatedColumnExpressionService = null;
-        (_c = this.DataService) === null || _c === void 0 ? void 0 : _c.destroy();
+        (_e = (_d = this.DataService) === null || _d === void 0 ? void 0 : _d.destroy) === null || _e === void 0 ? void 0 : _e.call(_d);
         this.DataService = null;
-        (_d = this.EntitlementService) === null || _d === void 0 ? void 0 : _d.destroy();
+        (_g = (_f = this.EntitlementService) === null || _f === void 0 ? void 0 : _f.destroy) === null || _g === void 0 ? void 0 : _g.call(_f);
         this.EntitlementService = null;
-        (_e = this.ReportService) === null || _e === void 0 ? void 0 : _e.destroy();
+        (_j = (_h = this.ReportService) === null || _h === void 0 ? void 0 : _h.destroy) === null || _j === void 0 ? void 0 : _j.call(_h);
         this.ReportService = null;
-        (_f = this.ModuleService) === null || _f === void 0 ? void 0 : _f.destroy();
+        (_l = (_k = this.ModuleService) === null || _k === void 0 ? void 0 : _k.destroy) === null || _l === void 0 ? void 0 : _l.call(_k);
         this.ModuleService = null;
-        (_g = this.ValidationService) === null || _g === void 0 ? void 0 : _g.destroy();
+        (_o = (_m = this.ValidationService) === null || _m === void 0 ? void 0 : _m.destroy) === null || _o === void 0 ? void 0 : _o.call(_m);
         this.ValidationService = null;
-        (_h = this.QueryLanguageService) === null || _h === void 0 ? void 0 : _h.destroy();
+        (_q = (_p = this.QueryLanguageService) === null || _p === void 0 ? void 0 : _p.destroy) === null || _q === void 0 ? void 0 : _q.call(_p);
         this.QueryLanguageService = null;
-        (_j = this.AlertService) === null || _j === void 0 ? void 0 : _j.destroy();
+        (_s = (_r = this.AlertService) === null || _r === void 0 ? void 0 : _r.destroy) === null || _s === void 0 ? void 0 : _s.call(_r);
         this.AlertService = null;
-        (_k = this.TeamSharingService) === null || _k === void 0 ? void 0 : _k.destroy();
+        (_u = (_t = this.TeamSharingService) === null || _t === void 0 ? void 0 : _t.destroy) === null || _u === void 0 ? void 0 : _u.call(_t);
         this.TeamSharingService = null;
-        (_l = this.MetamodelService) === null || _l === void 0 ? void 0 : _l.destroy();
+        (_w = (_v = this.RowEditService) === null || _v === void 0 ? void 0 : _v.destroy) === null || _w === void 0 ? void 0 : _w.call(_v);
+        this.RowEditService = null;
+        (_y = (_x = this.MetamodelService) === null || _x === void 0 ? void 0 : _x.destroy) === null || _y === void 0 ? void 0 : _y.call(_x);
         this.MetamodelService = null;
-        (_m = this.LicenseService) === null || _m === void 0 ? void 0 : _m.destroy();
+        (_0 = (_z = this.LicenseService) === null || _z === void 0 ? void 0 : _z.destroy) === null || _0 === void 0 ? void 0 : _0.call(_z);
         this.LicenseService = null;
         this.isDestroyed = true;
     }
@@ -2946,7 +3046,7 @@ class Adaptable {
                 fontSize: null,
                 borderColor: null,
             };
-            const formatColumn = this.api.formatColumnApi.getFormatColumnForColumn(abColumn);
+            const formatColumn = this.api.formatColumnApi.getActiveFormatColumnForColumn(abColumn);
             const conditionalStyles = this.api.conditionalStyleApi.getConditionalStylesForColumn(abColumn);
             const quickSearchStyle = this.getQuickSearchCellStyle();
             const hasQuickSearchStyle = quickSearchStyle != undefined;
@@ -3013,7 +3113,7 @@ class Adaptable {
         const hasRichSelectCellEditor = this.isModulePresent('rich-select');
         this.setColDefProperty(col, 'cellEditor', () => {
             var _a;
-            const formatColumn = this.api.formatColumnApi.getFormatColumnForColumn(adaptableColumn);
+            const formatColumn = this.api.formatColumnApi.getActiveFormatColumnForColumn(adaptableColumn);
             if (formatColumn && !(formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.IsSuspended) && ((_a = formatColumn.ColumnStyle) === null || _a === void 0 ? void 0 : _a.CheckBoxStyle)) {
                 return CheckboxRenderer_1.CheckboxEditor;
             }
@@ -3041,7 +3141,7 @@ class Adaptable {
     }
     setupColumnCellRenderer({ col, colId, abColumn }) {
         this.setColDefProperty(col, 'cellRenderer', () => {
-            const formatColumn = this.api.formatColumnApi.getFormatColumnForColumn(abColumn);
+            const formatColumn = this.api.formatColumnApi.getActiveFormatColumnForColumn(abColumn);
             if (formatColumn && !(formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.IsSuspended) && formatColumn.ColumnStyle) {
                 if (formatColumn.ColumnStyle.PercentBarStyle) {
                     return this.agGridHelper.createPercentBarRendererComp(formatColumn);
@@ -3168,21 +3268,24 @@ class Adaptable {
                     // change the Number format - if the scope allows it
                     if (this.api.scopeApi.isColumnInNumericScope(abColumn, formatColumn.Scope)) {
                         const options = formatColumn.DisplayFormat.Options;
-                        valueFormatter = (params) => FormatHelper_1.default.NumberFormatter(params.value, options);
+                        valueFormatter = (params) => {
+                            let value = params.value;
+                            return this.api.formatColumnApi.getNumberFormattedValue(value, 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) => FormatHelper_1.default.DateFormatter(params.value, options);
+                        valueFormatter = (params) => this.api.formatColumnApi.getDateFormattedValue(params.value, options);
                     }
                 }
                 if (formatColumn.DisplayFormat.Formatter === 'StringFormatter') {
                     // change the Date format - if the scope allows it
                     if (this.api.scopeApi.isColumnInStringsScope(abColumn, formatColumn.Scope)) {
                         const options = formatColumn.DisplayFormat.Options;
-                        valueFormatter = (params) => FormatHelper_1.default.StringFormatter(params.value, options);
+                        valueFormatter = (params) => this.api.formatColumnApi.getStringFormattedValue(params.value, options);
                     }
                 }
                 return valueFormatter;

package/src/agGrid/rowEditIcons.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+export declare const rowEditIcon: JSX.Element;
+export declare const rowCloneIcon: JSX.Element;
+export declare const rowDeleteIcon: JSX.Element;

package/src/agGrid/rowEditIcons.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rowDeleteIcon = exports.rowCloneIcon = exports.rowEditIcon = void 0;
+const tslib_1 = require("tslib");
+const icons_1 = require("../components/icons");
+const React = tslib_1.__importStar(require("react"));
+exports.rowEditIcon = React.createElement(icons_1.Icon, { name: "edit" });
+exports.rowCloneIcon = React.createElement(icons_1.Icon, { name: "clone" });
+exports.rowDeleteIcon = React.createElement(icons_1.Icon, { name: "delete" });

package/src/components/AdaptableFormComponent/AdaptableFormComponent.js

@@ -63,17 +63,7 @@ function AdaptableFormComponent({ formDef, data, onChange, onButtonClick, displa
                     label: item.label,
                     onClick: () => setFieldValue(field.name, item.value),
                 }));
-                return (
-                /*
-                  <Dropdown
-                    options={field.Options || []}
-                    value={value}
-                    onChange={(value) => {
-                      setFieldValue(field.Name, value);
-                    }}
-                  ></Dropdown>
-                  */
-                React.createElement(DropdownButton_1.default, { style: {
+                return (React.createElement(DropdownButton_1.default, { style: {
                         width: '100%',
                         whiteSpace: 'nowrap',
                         overflow: 'hidden',
@@ -85,7 +75,7 @@ function AdaptableFormComponent({ formDef, data, onChange, onButtonClick, displa
                         setFieldValue(field.name, event.target.checked);
                     } }));
             case 'textOutput':
-                return React.createElement(rebass_1.Box, { style: { textAlign: 'center' } }, value);
+                return (React.createElement(rebass_1.Box, { paddingLeft: 2, style: { textAlign: 'left' } }, value));
             default:
                 return React.createElement("div", null,
                     "Unknown field type: ",
@@ -95,9 +85,9 @@ function AdaptableFormComponent({ formDef, data, onChange, onButtonClick, displa
     // by default we have 2 columns: label & input
     const columns = (_b = (_a = formDef.config) === null || _a === void 0 ? void 0 : _a.columns) !== null && _b !== void 0 ? _b : [1, 2];
     return (React.createElement(React.Fragment, null,
-        displayTitle && formDef.title && (React.createElement(rebass_1.Box, { fontSize: 5, mb: 2, style: { fontWeight: 'bold' } }, formDef.title)),
-        formDef.description && React.createElement(rebass_1.Box, { mb: 3 }, formDef.description),
-        React.createElement(FormLayout_1.default, { columns: columns }, (_c = formDef.fields) === null || _c === void 0 ? void 0 : _c.map((field, index) => {
+        displayTitle && formDef.title && (React.createElement(rebass_1.Box, { "data-name": "form-title", fontSize: 5, mb: 2, style: { fontWeight: 'bold' } }, formDef.title)),
+        formDef.description && (React.createElement(rebass_1.Box, { "data-name": "form-description", mb: 3 }, formDef.description)),
+        React.createElement(FormLayout_1.default, { "data-name": "form-content", columns: columns, style: { overflow: 'auto' }, paddingRight: 1 }, (_c = formDef.fields) === null || _c === void 0 ? void 0 : _c.map((field, index) => {
             if (Array.isArray(field)) {
                 const rowFields = {};
                 field.map((fieldItem, index) => {
@@ -113,7 +103,7 @@ function AdaptableFormComponent({ formDef, data, onChange, onButtonClick, displa
                     renderField(field)));
             }
         })),
-        formDef.buttons ? (React.createElement(rebass_1.Flex, { marginTop: 3, flexDirection: "row", alignItems: "center", justifyContent: "center" },
+        formDef.buttons ? (React.createElement(rebass_1.Flex, { "data-name": "form-buttons", marginTop: 3, flexDirection: "row", alignItems: "center", justifyContent: "center" },
             React.createElement(AdaptableFormComponentButtons, { focusFirstButton: focusFirstButton, onClick: onButtonClick, disabledButtons: disabledButtons, defaultTone: "success", formDef: formDef, api: api, context: context }))) : null));
 }
 exports.AdaptableFormComponent = AdaptableFormComponent;

package/src/components/Datepicker/index.js

@@ -86,22 +86,23 @@ exports.Datepicker = React.forwardRef((props, ref) => {
             clearValue();
         }, accessLevel: 'Full' })) : null;
     const calendarButton = (React.createElement(SimpleButton_1.default, { disabled: disabled, variant: "text", icon: "calendar", tooltip: "Date", iconSize: 20, px: 0, py: 0, onClick: () => setVisible(true) }));
-    return (React.createElement(OverlayTrigger_1.default, { visible: visible, alignHorizontal: 'left', render: () => (React.createElement(DatepickerOverlay, { onHide: () => setVisible(false), onKeyDown: (e) => {
-                if (e.key === 'Escape' || e.key === 'Enter') {
-                    setVisible(false, e.key);
-                }
-            } },
-            React.createElement(react_day_picker_1.DayPicker, Object.assign({ fixedWeeks: true }, dayPickerProps, { showWeekNumber: showWeekNumber, showOutsideDays: showOutsideDays, mode: "single", month: isNaN(+month) ? new Date() : month, onMonthChange: setMonth, components: { Caption: Caption_1.Caption, CaptionLabel: CaptionLabel_1.CaptionLabel }, onSelect: updateValue, footer: React.createElement(rebass_1.Flex, { justifyContent: "space-between", mt: 2, flexWrap: 'wrap' }, footerButtons) })))) },
-        React.createElement(FieldWrap_1.default, Object.assign({}, boxProps, { style: {
-                borderRadius: style === null || style === void 0 ? void 0 : style.borderRadius,
-                width: style === null || style === void 0 ? void 0 : style.width,
-                maxWidth: style === null || style === void 0 ? void 0 : style.maxWidth,
-            }, onFocus: () => {
-                if (!visible) {
-                    setVisible(true);
-                }
-            } }),
-            React.createElement(Input_1.default, { value: inputValue, placehoder: placeholder !== null && placeholder !== void 0 ? placeholder : dateProps.format, style: style, disabled: disabled, readOnly: true, ref: ref }),
-            !!inputValue ? clearButton : null,
-            calendarButton)));
+    return (React.createElement(rebass_1.Flex, null,
+        React.createElement(OverlayTrigger_1.default, { visible: visible, alignHorizontal: 'left', render: () => (React.createElement(DatepickerOverlay, { onHide: () => setVisible(false), onKeyDown: (e) => {
+                    if (e.key === 'Escape' || e.key === 'Enter') {
+                        setVisible(false, e.key);
+                    }
+                } },
+                React.createElement(react_day_picker_1.DayPicker, Object.assign({ fixedWeeks: true }, dayPickerProps, { showWeekNumber: showWeekNumber, showOutsideDays: showOutsideDays, mode: "single", month: isNaN(+month) ? new Date() : month, onMonthChange: setMonth, components: { Caption: Caption_1.Caption, CaptionLabel: CaptionLabel_1.CaptionLabel }, onSelect: updateValue, footer: React.createElement(rebass_1.Flex, { justifyContent: "space-between", mt: 2, flexWrap: 'wrap' }, footerButtons) })))) },
+            React.createElement(FieldWrap_1.default, Object.assign({}, boxProps, { style: {
+                    borderRadius: style === null || style === void 0 ? void 0 : style.borderRadius,
+                    width: style === null || style === void 0 ? void 0 : style.width,
+                    maxWidth: style === null || style === void 0 ? void 0 : style.maxWidth,
+                }, onFocus: () => {
+                    if (!visible) {
+                        setVisible(true);
+                    }
+                } }),
+                React.createElement(Input_1.default, { value: inputValue, placehoder: placeholder !== null && placeholder !== void 0 ? placeholder : dateProps.format, style: style, disabled: disabled, readOnly: true, ref: ref }),
+                !!inputValue ? clearButton : null,
+                calendarButton))));
 });

package/src/components/WindowModal/WindowModal.d.ts

@@ -10,6 +10,8 @@ export declare type WindowModalPosition = {
 export interface WindowModalProps {
     handleSelector: string;
     size: WindowModalSize;
+    minWidth?: number;
+    minHeight?: number;
     position?: WindowModalPosition;
     onChange: (settings: {
         size: {

package/src/components/WindowModal/WindowModal.js

@@ -100,7 +100,7 @@ exports.WindowModal = (props) => {
     return react_dom_1.createPortal(React.createElement("div", { style: style, 
         //@ts-ignore
         ref: targetRef, onMouseDown: stacking.bringInFront },
-        React.createElement(re_resizable_1.Resizable, { onResizeStop: handleResizeStop, onResize: handleResize, bounds: "window", defaultSize: {
+        React.createElement(re_resizable_1.Resizable, { minWidth: props.minWidth, minHeight: props.minHeight, onResizeStop: handleResizeStop, onResize: handleResize, bounds: "window", defaultSize: {
                 width: props.size.width,
                 height: props.size.height,
             } }, props.children)), portalElement);