@adaptabletools/adaptable 11.2.4 → 11.3.0

package/src/PredefinedConfig/Common/AdaptableObject.d.ts

@@ -21,15 +21,6 @@ export interface AdaptableObject {
     Tags?: AdaptableObjectTag[];
 }
 /**
- * Object Tag - defined as a label and a value
+ * AdaptableObjectTag Object Tague - currently supporting only plain string values, but open for future extensions, if ever needed.
  */
-export declare type AdaptableObjectTag = string | {
-    /**
-     * Label for the Tag
-     */
-    label: string;
-    /**
-     * Value for the Tag - string or number
-     */
-    value: string | number;
-};
+export declare type AdaptableObjectTag = string;

package/src/PredefinedConfig/Common/BaseContext.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableApi } from '../../types';
 /**
- * Base Context object used in many functions provided by AdapTable
+ * Base Context used in many functions provided by developers and invoked as needed by AdapTable
  */
 export interface BaseContext {
     /**

package/src/PredefinedConfig/SystemState.d.ts

@@ -1,7 +1,7 @@
 import { PreviewInfo } from '../Utilities/Interface/Preview';
 import { InternalState } from './InternalState';
 import { BulkUpdateValidationResult } from '../Strategy/Interface/IBulkUpdateModule';
-import { CellDataChangedInfo, GridCell } from '../types';
+import { CellDataChangedInfo, GridCell, SmartEditOperation } from '../types';
 import type { IPushPullState, IPushPullReport, IPushPullDomain } from './IPushPullState';
 import { Glue42State, Glue42Report } from './Glue42State';
 import { OpenFinState, OpenFinReport } from './OpenFinState';
@@ -13,7 +13,6 @@ import { CachedQuery } from './QueryState';
 import { AdaptableFlashingCell } from './Common/AdaptableFlashingCell';
 import { TypeUuid } from './Uuid';
 import { SummaryOperation } from './Common/Enums';
-import { SmartEditOperation } from '../AdaptableOptions/SmartEdit';
 export type { IPushPullReport, IPushPullDomain };
 export type { Glue42Report };
 export type { OpenFinReport };

package/src/Redux/ActionsReducers/SystemRedux.d.ts

@@ -13,7 +13,7 @@ import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFl
 import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
-import { SmartEditOperation } from '../../AdaptableOptions/SmartEdit';
+import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
 export declare const FLASHING_CELL_ROW_KEY = "__ROW";
 export declare const SYSTEM_ALERT_ADD = "SYSTEM_ALERT_ADD";
 export declare const SYSTEM_ALERT_DELETE = "SYSTEM_ALERT_DELETE";

package/src/Strategy/SmartEditModule.d.ts

@@ -6,7 +6,7 @@ import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
-import { SmartEditOperation } from '../AdaptableOptions/SmartEdit';
+import { SmartEditOperation } from '../AdaptableOptions/EditOptions';
 export declare class SmartEditModule extends AdaptableModuleBase implements ISmartEditModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;

package/src/Strategy/SmartEditModule.js

@@ -123,13 +123,12 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     selectedCellInfo.gridCells.forEach((selectedCell) => {
                         let newValue;
                         if (typeof smartEditOperation === 'object') {
-                            newValue = smartEditOperation.Operation({
-                                smartEditValue,
-                                column,
-                                adaptableApi: this.api,
+                            const context = {
+                                smartEditValue: smartEditValue,
                                 currentCell: selectedCell,
-                                value: selectedCell.rawValue,
-                            });
+                                adaptableApi: this.api,
+                            };
+                            newValue = smartEditOperation.Operation(context);
                         }
                         else {
                             switch (smartEditOperation) {

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -89,6 +89,13 @@ exports.DefaultAdaptableOptions = {
         validateOnServer: undefined,
         displayServerValidationMessages: true,
         isCellEditable: undefined,
+        rowFormOptions: {
+            formTitle: undefined,
+            formDescription: undefined,
+            formFieldLabel: undefined,
+            formButtons: undefined,
+            onFormSubmit: undefined,
+        },
     },
     entitlementOptions: {
         defaultAccessLevel: 'Full',
@@ -221,6 +228,8 @@ exports.DefaultAdaptableOptions = {
         showDocumentationLinks: true,
         gridInfoSections: ['GridSummary', 'AdaptableOptions', 'ColumnInfo'],
         showAdapTableVersion: true,
+        rowActionButtons: undefined,
+        rowActionButtonsPosition: 'pinnedLeft',
     },
     toolPanelOptions: {
         showAdaptableToolPanel: true,

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -20,6 +20,7 @@ function assignAdaptableOptions(adaptableOptions) {
     returnedAdaptableOptions.entitlementOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.entitlementOptions, adaptableOptions.entitlementOptions);
     returnedAdaptableOptions.dashboardOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dashboardOptions, adaptableOptions.dashboardOptions);
     returnedAdaptableOptions.editOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.editOptions, adaptableOptions.editOptions);
+    returnedAdaptableOptions.editOptions.rowFormOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.editOptions.rowFormOptions, returnedAdaptableOptions.editOptions.rowFormOptions);
     returnedAdaptableOptions.containerOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.containerOptions, adaptableOptions.containerOptions);
     returnedAdaptableOptions.generalOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.generalOptions, adaptableOptions.generalOptions);
     returnedAdaptableOptions.searchOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.searchOptions, adaptableOptions.searchOptions);

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

@@ -0,0 +1,8 @@
+import { RowNode } from '@ag-grid-community/all-modules';
+import { IAdaptableService } from './IAdaptableService';
+import { AdaptableForm } from '../../../PredefinedConfig/Common/AdaptableForm';
+import { CreateRowFormContext, EditRowFormContext } from '../../../AdaptableOptions/EditOptions';
+export interface IRowEditService extends IAdaptableService {
+    buildRowEditForm(rowNode: RowNode): AdaptableForm<EditRowFormContext>;
+    buildRowCreateForm(clonedRowNode?: RowNode): AdaptableForm<CreateRowFormContext>;
+}

package/src/Utilities/Services/Interface/IRowEditService.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,25 @@
+import { IRowEditService } from './Interface/IRowEditService';
+import { RowNode } from '@ag-grid-community/all-modules';
+import { AdaptableApi } from '../../Api/AdaptableApi';
+import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
+import { CreateRowFormContext, EditRowFormContext } from '../../AdaptableOptions/EditOptions';
+export declare class RowEditService implements IRowEditService {
+    private adaptableApi;
+    private adaptableInstance;
+    private rowEditFormOptions;
+    constructor(adaptableApi: AdaptableApi);
+    buildRowEditForm(rowNode: RowNode): AdaptableForm<EditRowFormContext>;
+    buildRowCreateForm(clonedRowNode?: RowNode): AdaptableForm<CreateRowFormContext>;
+    private buildRowForm;
+    private getFormTitle;
+    private getFormDescription;
+    private buildFormParamContext;
+    private buildRowFormFields;
+    private buildRowFormButtons;
+    private isColumnEditable;
+    private buildFormField;
+    private getFormFieldLabel;
+    private buildFormFieldLabelContext;
+    private getFieldTypeFromColumnType;
+    private getFieldValueOptions;
+}

package/src/Utilities/Services/RowEditService.js

@@ -0,0 +1,165 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RowEditService = void 0;
+class RowEditService {
+    constructor(adaptableApi) {
+        this.adaptableApi = adaptableApi;
+        this.adaptableInstance = this.adaptableApi.internalApi.getAdaptableInstance();
+        this.rowEditFormOptions =
+            this.adaptableApi.internalApi.getAdaptableInstance().adaptableOptions.editOptions.rowFormOptions;
+    }
+    buildRowEditForm(rowNode) {
+        return this.buildRowForm('rowEdited', rowNode);
+    }
+    buildRowCreateForm(clonedRowNode) {
+        return this.buildRowForm('rowCreated', clonedRowNode);
+    }
+    buildRowForm(type, rowNode) {
+        const formFields = this.buildRowFormFields(type, rowNode);
+        const formButtons = this.buildRowFormButtons(type, rowNode);
+        const formTitle = this.getFormTitle(type, rowNode);
+        const formDescription = this.getFormDescription(type, rowNode);
+        const rowForm = {
+            title: formTitle,
+            description: formDescription,
+            fields: formFields,
+            buttons: formButtons,
+        };
+        return rowForm;
+    }
+    getFormTitle(type, rowNode) {
+        if (this.rowEditFormOptions.formTitle == undefined) {
+            return type === 'rowCreated' ? 'Create New Row' : 'Edit Row';
+        }
+        return typeof this.rowEditFormOptions.formTitle === 'function'
+            ? this.rowEditFormOptions.formTitle(this.buildFormParamContext(type, rowNode))
+            : this.rowEditFormOptions.formTitle;
+    }
+    getFormDescription(type, rowNode) {
+        return typeof this.rowEditFormOptions.formDescription === 'function'
+            ? this.rowEditFormOptions.formDescription(this.buildFormParamContext(type, rowNode))
+            : this.rowEditFormOptions.formDescription;
+    }
+    buildFormParamContext(type, rowNode) {
+        return {
+            rowNode,
+            adaptableApi: this.adaptableApi,
+            type: type,
+        };
+    }
+    buildRowFormFields(type, rowNode) {
+        const relevantColumns = this.adaptableApi.columnApi.getColumns().filter((column) => {
+            // if there is NO rowNode, do NOT display the non-editable fields as they will be empty
+            return !!rowNode || this.isColumnEditable(column, rowNode);
+        });
+        return relevantColumns.map((column) => this.buildFormField(type, column, rowNode));
+    }
+    buildRowFormButtons(type, rowNode) {
+        // 1. check if there are custom user provided buttons
+        if (Array.isArray(this.rowEditFormOptions.formButtons)) {
+            return this.rowEditFormOptions.formButtons;
+        }
+        // 2. else return the standard ones
+        const cancelButton = {
+            label: 'Cancel',
+            buttonStyle: {
+                variant: 'raised',
+                tone: 'neutral',
+            },
+        };
+        const saveButton = {
+            label: 'Save',
+            buttonStyle: {
+                variant: 'raised',
+                tone: 'success',
+            },
+            onClick: (button, context) => {
+                var _a, _b;
+                const eventInfo = type === 'rowCreated'
+                    ? {
+                        type: 'rowCreated',
+                        formData: context.formData,
+                        adaptableApi: context.adaptableApi,
+                        clonedRowNode: rowNode,
+                    }
+                    : {
+                        type: 'rowEdited',
+                        formData: context.formData,
+                        rowNode: rowNode,
+                        adaptableApi: context.adaptableApi,
+                    };
+                this.adaptableApi.eventApi.emit('RowFormSubmitted', eventInfo);
+                (_b = (_a = this.adaptableInstance.adaptableOptions.editOptions.rowFormOptions).onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
+            },
+        };
+        return [cancelButton, saveButton];
+    }
+    isColumnEditable(column, rowNode) {
+        return rowNode
+            ? this.adaptableInstance.isCellEditable(rowNode, this.adaptableInstance.getAgGridColumnForColumnId(column.columnId))
+            : !column.readOnly;
+    }
+    buildFormField(type, column, rowNode) {
+        const isColumnEditable = this.isColumnEditable(column, rowNode);
+        const fieldValueOptions = this.getFieldValueOptions(column, rowNode);
+        const fieldType = isColumnEditable
+            ? !!(fieldValueOptions === null || fieldValueOptions === void 0 ? void 0 : fieldValueOptions.length)
+                ? 'select'
+                : this.getFieldTypeFromColumnType(column)
+            : 'textOutput';
+        const defaultValue = rowNode
+            ? isColumnEditable
+                ? this.adaptableInstance.getRawValueFromRowNode(rowNode, column.columnId)
+                : this.adaptableInstance.getDisplayValueFromRowNode(rowNode, column.columnId)
+            : null;
+        return {
+            label: this.getFormFieldLabel(type, column, rowNode),
+            name: column.columnId,
+            defaultValue,
+            fieldType,
+            options: fieldValueOptions,
+        };
+    }
+    getFormFieldLabel(type, column, rowNode) {
+        const customFieldLabel = typeof this.rowEditFormOptions.formFieldLabel === 'function'
+            ? this.rowEditFormOptions.formFieldLabel(this.buildFormFieldLabelContext(type, column, rowNode))
+            : undefined;
+        return customFieldLabel !== null && customFieldLabel !== void 0 ? customFieldLabel : column.friendlyName;
+    }
+    buildFormFieldLabelContext(type, column, rowNode) {
+        return {
+            rowNode,
+            column,
+            adaptableApi: this.adaptableApi,
+            type: type,
+        };
+    }
+    getFieldTypeFromColumnType(column) {
+        switch (column.dataType) {
+            case 'Boolean':
+                return 'checkbox';
+            case 'Date':
+                return 'date';
+            case 'Number':
+                return 'number';
+            default:
+                // everything else is a plain text input
+                return 'text';
+        }
+    }
+    getFieldValueOptions(column, rowNode) {
+        const editLookUpItem = this.adaptableApi.userInterfaceApi.getEditLookUpItemForColumn(column);
+        if (!editLookUpItem) {
+            return;
+        }
+        const gridCell = rowNode
+            ? this.adaptableInstance.getGridCellFromRowNode(rowNode, column.columnId)
+            : undefined;
+        const editLookUpValues = this.adaptableApi.internalApi.getEditLookUpValuesForColumn(editLookUpItem, column, gridCell);
+        return editLookUpValues === null || editLookUpValues === void 0 ? void 0 : editLookUpValues.map((value) => ({
+            value,
+            label: value,
+        }));
+    }
+}
+exports.RowEditService = RowEditService;

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

@@ -73,7 +73,7 @@ exports.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 } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
+    const { Width, ShowToolTip, HeaderToolTip, ExternallyEvaluatedExpression } = (_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) }));
     };
@@ -118,7 +118,14 @@ exports.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(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"))))))),
         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/Components/AdaptableObjectList/AdaptableObjectCompactList.js

@@ -36,6 +36,6 @@ exports.AdaptableObjectCompactListItem = (props) => {
 };
 exports.AdaptableObjectCompactList = (props) => {
     return (React.createElement("div", { className: baseClassName }, props.abObjects.map((abObject) => {
-        return React.createElement(exports.AdaptableObjectCompactListItem, { abObject: abObject, module: props.module });
+        return (React.createElement(exports.AdaptableObjectCompactListItem, { key: abObject.Uuid, abObject: abObject, module: props.module }));
     })));
 };

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopupDialog.js

@@ -32,6 +32,8 @@ const WindowDialog = (props) => {
         handleSelector: isActionModule
             ? `.${baseClassName} .ab-Panel__header`
             : '.ab-Adaptable-Popup__TopBar',
+        minHeight: 460,
+        minWidth: 400,
         size: popupSettings.size,
         position: popupSettings.position,
         onChange: handleWindowSettings,

package/src/View/Components/Popups/FormPopups/FormPopups.js

@@ -20,8 +20,8 @@ exports.FormDialog = ({ id, formProps, form, prepareContext, }) => {
         dispatch(PopupRedux_1.PopupHideForm(id));
     };
     const context = Object.assign({ adaptableApi: adaptable.api, formData: data }, formProps);
-    return (React.createElement(Dialog_1.default, { isOpen: true, showCloseButton: false, style: { minHeight: 'auto', minWidth: 400 }, onDismiss: handleDismiss },
-        React.createElement(rebass_1.Box, { padding: 4 },
+    return (React.createElement(Dialog_1.default, { isOpen: true, showCloseButton: false, style: { minHeight: 'auto', minWidth: 400, maxHeight: '80vh' }, onDismiss: handleDismiss },
+        React.createElement(rebass_1.Flex, { flexDirection: 'column', "data-name": "form-dialog", padding: 4, height: '100%' },
             React.createElement(AdaptableFormComponent_1.AdaptableFormComponent, { formDef: form, data: data, context: context, onChange: setData, api: adaptable.api, displayTitle: true, onButtonClick: async (button) => {
                     var _a;
                     handleDismiss();

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

@@ -102,14 +102,14 @@ function splitArrayInTwo(arr) {
 const renderCustomFormatter = (data, customFormatter, setFormatOption) => {
     var _a, _b, _c;
     return (React.createElement(FormLayout_1.FormRow, { key: customFormatter.id, label: (_a = customFormatter.label) !== null && _a !== void 0 ? _a : customFormatter.id },
-        React.createElement(CheckBox_1.CheckBox, { checked: (_c = (_b = data.DisplayFormat.Options.CustomDisplayFormats) === null || _b === void 0 ? void 0 : _b.some) === null || _c === void 0 ? void 0 : _c.call(_b, (item) => item.Id === customFormatter.id), onChange: (checked) => {
+        React.createElement(CheckBox_1.CheckBox, { checked: (_c = (_b = data.DisplayFormat.Options.CustomDisplayFormats) === null || _b === void 0 ? void 0 : _b.some) === null || _c === void 0 ? void 0 : _c.call(_b, (item) => item === customFormatter.id), onChange: (checked) => {
                 var _a, _b, _c;
                 let newCustomFormats = (_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.DisplayFormat) === null || _a === void 0 ? void 0 : _a.Options) === null || _b === void 0 ? void 0 : _b.CustomDisplayFormats) !== null && _c !== void 0 ? _c : [];
                 if (checked) {
-                    newCustomFormats = [...newCustomFormats, { Id: customFormatter.id }];
+                    newCustomFormats = [...newCustomFormats, customFormatter.id];
                 }
                 else {
-                    newCustomFormats = newCustomFormats.filter((item) => item.Id !== customFormatter.id);
+                    newCustomFormats = newCustomFormats.filter((item) => item !== customFormatter.id);
                 }
                 setFormatOption('CustomDisplayFormats', newCustomFormats);
             } })));
@@ -369,16 +369,14 @@ exports.FormatColumnFormatWizardSection = (props) => {
         update({ DisplayFormat });
     };
     const Type = data.DisplayFormat && data.DisplayFormat.Formatter;
+    const customNumberFormatters = customDisplayFormatters.filter((displayFormatter) => adaptable.api.scopeApi.isScopeInScope(displayFormatter.scope, data.Scope));
     if (Type === 'NumberFormatter') {
-        const customNumberFormatters = customDisplayFormatters.filter((displayFormatter) => displayFormatter.type === 'Number');
         return renderNumberFormat(data, update, setFormatOption, customNumberFormatters, formatColumnApi);
     }
     if (Type === 'DateFormatter') {
-        const customNumberFormatters = customDisplayFormatters.filter((displayFormatter) => displayFormatter.type === 'Date');
         return renderDateFormat(data, update, setFormatOption, customNumberFormatters, formatColumnApi);
     }
     if (Type === 'StringFormatter') {
-        const customNumberFormatters = customDisplayFormatters.filter((displayFormatter) => displayFormatter.type === 'String');
         return renderStringFormat(data, update, setFormatOption, customNumberFormatters, formatColumnApi);
     }
     return (React.createElement(HelpBlock_1.default, { margin: 3 },

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

@@ -43,7 +43,7 @@ export declare class LayoutEditorWizard extends React.Component<LayoutEditorWiza
         Uuid?: string;
         Source?: "Config" | "User";
         IsReadOnly?: boolean;
-        Tags?: import("../../../types").AdaptableObjectTag[];
+        Tags?: string[];
     };
     canNext(): boolean;
     canBack(): boolean;

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

@@ -3,7 +3,7 @@ import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
 import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
-import { SmartEditOperation } from '../../AdaptableOptions/SmartEdit';
+import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
 interface SmartEditPopupProps extends ModuleViewPopupProps<SmartEditPopupComponent> {
     SmartEditValue: number;
     SmartEditOperation: SmartEditOperation;

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;