@adaptabletools/adaptable 11.2.4 → 11.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "11.2.4",
+  "version": "11.3.0",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1653160464222;
+declare const _default: 1653559619721;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1653160464222;
+exports.default = 1653559619721;

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -26,6 +26,7 @@ import { ITeamSharingService } from '../Utilities/Services/Interface/ITeamSharin
 import { AdaptableFrameworkComponent } from '../AdaptableOptions/AdaptableFrameworkComponent';
 import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelService';
 import { ColumnValuesComparer } from '../AdaptableOptions/GeneralOptions';
+import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 /**
  *  The only interface for Adaptable
  *
@@ -67,6 +68,7 @@ export interface IAdaptable {
     AlertService: IAlertService;
     TeamSharingService: ITeamSharingService;
     MetamodelService: IMetamodelService;
+    RowEditService: IRowEditService;
     /**
      * INTERNAL ADAPTABLE EVENTS
      * These are not called externally - for that we use eventapi

package/src/AdaptableOptions/EditOptions.d.ts

@@ -1,6 +1,8 @@
+import { RowNode } from '@ag-grid-community/all-modules';
+import { AdaptableButton, AdaptableColumn, AdaptableFormData, BaseContext, RowFormSubmittedInfo, RowFormType } from '../../types';
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
+import { MathOperation } from '../PredefinedConfig/Common/Enums';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
-import { SmartEditCustomOperation } from './SmartEdit';
 /**
  * Options related to Editing in Adaptable.
  *
@@ -22,9 +24,14 @@ export interface EditOptions {
      * Function which checks if given Grid Cell is editable
      */
     isCellEditable?: (gridCell: GridCell) => boolean;
-    smartEdit?: {
-        customOperations?: SmartEditCustomOperation[];
-    };
+    /**
+     * Custom Operations to use in Smart Edit
+     */
+    smartEditCustomOperations?: SmartEditCustomOperation[];
+    /**
+     * Options for editing (create/update/delete) row entries in the grid.
+     */
+    rowFormOptions?: RowFormOptions;
 }
 /**
  * Used for Server Validation ie. after an edit has been made in Adaptable which should be checked on the Server
@@ -39,3 +46,84 @@ export interface ValidationResult {
      */
     NewValue?: any;
 }
+/**
+ * Custom Operation used in Smart Edit Module
+ */
+export declare type SmartEditCustomOperation = {
+    /**
+     * Name of the Custom Operation (as appears in AdapTable UI)
+     */
+    Name: string;
+    /**
+     * Custom Operation function - returns a number
+     */
+    Operation: (context: SmartEditOperationContext) => number;
+};
+export declare type SmartEditOperation = SmartEditCustomOperation | MathOperation;
+/**
+ * Context used in Custom Smart Edit Operations
+ */
+export interface SmartEditOperationContext extends BaseContext {
+    /**
+     * Smart Edit value
+     */
+    smartEditValue: number;
+    /**
+     * Current selected grid cell - contains column, row and cell value information
+     */
+    currentCell: GridCell;
+}
+/**
+ * Options for editing (create/update/delete) row entries in the grid
+ */
+export interface RowFormOptions {
+    /**
+     * Custom form title provider
+     *
+     * @defaultValue 'Create New Row'/'Edit Row'
+     */
+    formTitle?: string | ((context: FormParamContext) => string);
+    /**
+     * Custom form description provider
+     *
+     * @defaultValue undefined
+     */
+    formDescription?: string | ((context: FormParamContext) => string);
+    /**
+     * Custom form field label provider
+     *
+     * @defaultValue undefined
+     */
+    formFieldLabel?: (context: FormFieldLabelContext) => string;
+    /**
+     * Custom form buttons provider. If provided, the custom implementation is responsible for firing the 'RowFormSubmitted' and/or invoking the 'onFormSubmit' callback (if necessary).
+     */
+    formButtons?: AdaptableButton<RowFormContext>[];
+    /**
+     * Function which is invoked when a row form is submitted via a standard button (provided by AdapTable). This is not invoked when custom form buttons are provided!
+     *
+     * @param rowFormSubmittedInfo the form submitted info
+     * @defaultValue undefined
+     */
+    onFormSubmit?: (rowFormSubmittedInfo: RowFormSubmittedInfo) => void;
+}
+export declare type RowFormContext = CreateRowFormContext | EditRowFormContext;
+export interface CreateRowFormContext extends BaseContext {
+    type: Extract<RowFormType, 'rowCreated'>;
+    formData: AdaptableFormData;
+    clonedRowNode?: RowNode;
+}
+export interface EditRowFormContext extends BaseContext {
+    type: Extract<RowFormType, 'rowEdited'>;
+    formData: AdaptableFormData;
+    rowNode: RowNode;
+}
+export interface FormParamContext extends BaseContext {
+    type: Extract<RowFormType, 'rowEdited' | 'rowCreated'>;
+    rowNode?: RowNode;
+}
+export interface FormFieldLabelContext extends BaseContext {
+    type: Extract<RowFormType, 'rowEdited' | 'rowCreated'>;
+    column: AdaptableColumn;
+    rowNode?: RowNode;
+}

package/src/AdaptableOptions/FormatColumnOptions.d.ts

@@ -1,8 +1,9 @@
+import { AdaptableScope } from '../../types';
 export declare type CustomDisplayFormatter = {
     id: string;
     label?: string;
     handler: (value: any) => any;
-    type: 'Date' | 'Number' | 'String';
+    scope: AdaptableScope;
 };
 export interface FormatColumnOptions {
     customDisplayFormatters?: CustomDisplayFormatter[];

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -6,7 +6,7 @@ import { AdaptableButton } from '../PredefinedConfig/Common/AdaptableButton';
 import { RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableObject, AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { AdaptableApi, BaseContext, GridCell } from '../../types';
+import { BaseContext, GridCell } from '../../types';
 /**
  * Options for managing the User Interface of AdapTable
  */
@@ -73,7 +73,7 @@ export interface UserInterfaceOptions {
     /**
      * Optional list of AdaptableObjectTags that can be associated with AdaptableObjects
      */
-    objectTags?: AdaptableObjectTag[] | ((adaptableApi: AdaptableApi) => AdaptableObjectTag[]);
+    objectTags?: AdaptableObjectTag[] | ((context: ObjectTagsContext) => AdaptableObjectTag[]);
     /**
      * Optional list of Column Types - used primarily for special columns
      *
@@ -99,6 +99,18 @@ export interface UserInterfaceOptions {
      * @gridInfoItem
      */
     showAdapTableVersion?: boolean;
+    /**
+     * Action buttons to display for each row.
+     *
+     * @defaultValue undefined
+     */
+    rowActionButtons?: ('clone' | 'edit' | 'delete')[];
+    /**
+     * Position of the action buttons
+     *
+     * @defaultValue 'pinnedLeft'
+     */
+    rowActionButtonsPosition?: 'pinnedLeft' | 'pinnedRight';
 }
 export interface BasePermittedValues {
     /**
@@ -223,7 +235,7 @@ export interface EditLookUpContext extends BaseContext {
     /**
      * Cell being edited
      */
-    gridCell: GridCell;
+    gridCell?: GridCell;
 }
 export interface PermittedValuesContext extends BaseContext {
     /**
@@ -253,3 +265,5 @@ export interface BulkUpdatePermittedValuesContext extends BaseContext {
 }
 export declare type GridInfoSections = GridInfoSection[];
 export declare type GridInfoSection = 'GridSummary' | 'AdaptableOptions' | 'ColumnInfo' | 'AdaptableObjectsSummary';
+export interface ObjectTagsContext extends BaseContext {
+}

package/src/Api/EventApi.d.ts

@@ -14,6 +14,7 @@ import { AdaptableStateChangedInfo } from './Events/AdaptableStateChanged';
 import { FlashingCellDisplayedInfo } from './Events/FlashingCellDisplayed';
 import { GridDataChangedInfo } from './Events/GridDataChanged';
 import { TeamSharingEntityChangedInfo } from './Events/TeamSharingEntityChanged';
+import { RowFormSubmittedInfo } from './Events/RowFormSubmitted';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */
@@ -193,6 +194,8 @@ export interface EventApi {
      * Unsubscribe from LiveDataChanged
      */
     off(eventName: 'LiveDataChanged', callback: (liveDataChangedInfo: LiveDataChangedInfo) => void): void;
+    on(eventName: 'RowFormSubmitted', callback: (rowEditedFormInfo: RowFormSubmittedInfo) => void): () => void;
+    off(eventName: 'RowFormSubmitted', callback: (rowEditedFormInfo: RowFormSubmittedInfo) => void): void;
     /**
      * Fired when Adaptable is up and running - has no arguments.
      * @param eventName - AdaptableReady
@@ -224,6 +227,6 @@ export interface EventApi {
     emitSync(eventName: 'DashboardChanged', data?: any): any[];
     emitSync(eventName: 'FlashingCellDisplayed', data?: any): any[];
     emitSync(eventName: 'AdaptableDestroy'): any[];
-    emit(eventName: 'AdaptableReady' | 'AlertFired' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'AdaptableStateChanged' | 'DashboardChanged' | 'CellChanged' | 'GridDataChanged' | 'LayoutChanged' | 'LiveDataChanged' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'FDC3MessageSent', data?: any): Promise<any>;
+    emit(eventName: 'AdaptableReady' | 'AlertFired' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'AdaptableStateChanged' | 'DashboardChanged' | 'CellChanged' | 'GridDataChanged' | 'LayoutChanged' | 'LiveDataChanged' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'FDC3MessageSent' | 'RowFormSubmitted', data?: any): Promise<any>;
     destroy(): void;
 }

package/src/Api/Events/RowFormSubmitted.d.ts

@@ -0,0 +1,19 @@
+import { BaseEventInfo } from './BaseEventInfo';
+import { AdaptableFormData } from '../../PredefinedConfig/Common/AdaptableForm';
+import { RowNode } from '@ag-grid-community/all-modules';
+export declare type RowFormSubmittedInfo = CreatedRowFormInfo | EditedRowFormInfo | DeletedRowFormInfo;
+export declare type RowFormType = 'rowCreated' | 'rowEdited' | 'rowDeleted';
+export interface CreatedRowFormInfo extends BaseEventInfo {
+    type: 'rowCreated';
+    formData: AdaptableFormData;
+    clonedRowNode?: RowNode;
+}
+export interface EditedRowFormInfo extends BaseEventInfo {
+    type: 'rowEdited';
+    formData: AdaptableFormData;
+    rowNode: RowNode;
+}
+export interface DeletedRowFormInfo extends BaseEventInfo {
+    type: 'rowDeleted';
+    rowNode: RowNode;
+}

package/src/Api/FormatColumnApi.d.ts

@@ -104,6 +104,12 @@ export interface FormatColumnApi {
      * Opens Settings Panel with Format Column section selected and visible
      */
     showFormatColumnPopup(): void;
+    /**
+     * Gets an active Format Column, if any, for given Column
+     * @param column The Column for which to retrieve the Format Column
+     * @returns format column
+     */
+    getActiveFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
     /**
      * Gets Format Column, if any, for given Column
      * @param column The Column for which to retrieve the Format Column

package/src/Api/GridApi.d.ts

@@ -464,4 +464,18 @@ export interface GridApi {
      * Opens Settings Panel with Grid Info section selected and visible
      */
     showGridInfoPopup(): void;
+    /**
+     * Open edit dialog for row with the given primary key value
+     * @param primaryKey - the primary key of the edited row
+     */
+    openEditRowForm(primaryKey: any): void;
+    /**
+     * Open create dialog for a new row
+     */
+    openCreateRowForm(): void;
+    /**
+     * Open create dialog for cloning an existing row
+     * @param clonedRowNodePrimaryKey - the primary key of the duplicated row
+     */
+    openCloneRowForm(clonedRowNodePrimaryKey?: any): void;
 }

package/src/Api/Implementation/FormatColumnApiImpl.d.ts

@@ -28,6 +28,7 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     suspendFormatColumn(formatColumn: FormatColumn): FormatColumn;
     unSuspendFormatColumn(formatColumn: FormatColumn): FormatColumn;
     applyFormatColumnDisplayFormats(): void;
+    getActiveFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
     getFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
     getFormatColumnForColumnId(columnId: string): FormatColumn | undefined;
     getFormatColumnWithStyleForColumn(column: AdaptableColumn): FormatColumn | undefined;

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -106,6 +106,10 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     applyFormatColumnDisplayFormats() {
         throw 'This API method is deprecated - it is not needed anymore.';
     }
+    getActiveFormatColumnForColumn(column) {
+        const formatColumns = this.getAllActiveFormatColumn();
+        return this.getAppropriateFormatColumn(formatColumns, column);
+    }
     getFormatColumnForColumn(column) {
         const formatColumns = this.getAllFormatColumn();
         return this.getAppropriateFormatColumn(formatColumns, column);
@@ -278,7 +282,8 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         }
         const adaptableOptions = this.adaptable.adaptableOptions;
         const customFormattersFromOptions = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.formatColumnOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters;
-        const customFormatters = columnCustomFormatters.map((customFormatter) => customFormattersFromOptions === null || customFormattersFromOptions === void 0 ? void 0 : customFormattersFromOptions.find((customFormatterOption) => customFormatterOption.id === customFormatter.Id));
+        // formatters are applied in the order they are defined in the options
+        const customFormatters = customFormattersFromOptions.filter((customFormatterOption) => columnCustomFormatters.includes(customFormatterOption.id));
         return customFormatters.reduce((acc, formatter) => {
             if (formatter && formatter.handler) {
                 return formatter.handler(acc);

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -103,6 +103,9 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     refreshRowNode(rowNode: RowNode): void;
     refreshRowNodes(rowNodes: RowNode[]): void;
     areCellsEditable(gridCells: GridCell[]): boolean;
+    openEditRowForm(primaryKey: any): void;
+    openCreateRowForm(duplicatedRowNodePrimaryKey?: any): void;
+    openCloneRowForm(clonedRowNodePrimaryKey?: any): void;
     getRowCount(): number;
     getVisibleRowCount(): number;
     getRowsInViewport(): RowNode[];

package/src/Api/Implementation/GridApiImpl.js

@@ -7,6 +7,7 @@ const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/Grid
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
 class GridApiImpl extends ApiBase_1.ApiBase {
     getGridState() {
         return this.getAdaptableState().Grid;
@@ -372,6 +373,45 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         }
         return true;
     }
+    openEditRowForm(primaryKey) {
+        const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(primaryKey);
+        if (!rowNode) {
+            LoggingHelper_1.LogAdaptableWarning(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
+        }
+        const editForm = this.adaptable.api.internalApi.getRowEditService().buildRowEditForm(rowNode);
+        this.dispatchAction(PopupRedux_1.PopupShowForm({
+            Id: 'edit_row_form',
+            Form: editForm,
+            // formProps are added to the formContext
+            FormProps: {
+                rowNode,
+            },
+        }));
+    }
+    openCreateRowForm(duplicatedRowNodePrimaryKey) {
+        const createForm = this.adaptable.api.internalApi.getRowEditService().buildRowCreateForm();
+        this.dispatchAction(PopupRedux_1.PopupShowForm({
+            Id: 'create_row_form',
+            Form: createForm,
+        }));
+    }
+    openCloneRowForm(clonedRowNodePrimaryKey) {
+        const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(clonedRowNodePrimaryKey);
+        if (!rowNode) {
+            LoggingHelper_1.LogAdaptableWarning(`Can NOT clone row: rowNode not found for primaryKey ${clonedRowNodePrimaryKey}`);
+        }
+        const createForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowCreateForm(rowNode);
+        this.dispatchAction(PopupRedux_1.PopupShowForm({
+            Id: 'create_row_form',
+            Form: createForm,
+            // formProps are added to the formContext
+            FormProps: {
+                clonedRowNode: rowNode,
+            },
+        }));
+    }
     getRowCount() {
         return this.adaptable.getRowCount();
     }

package/src/Api/Implementation/InternalApiImpl.d.ts

@@ -35,6 +35,8 @@ import { AdaptableFrameworkComponent } from '../../AdaptableOptions/AdaptableFra
 import { IMetamodelService } from '../../Utilities/Services/Interface/IMetamodelService';
 import { IModuleCollection } from '../../Strategy/Interface/IModule';
 import { AdaptableObjectTag } from '../../PredefinedConfig/Common/AdaptableObject';
+import { EditLookUpPermittedValues } from '../../../types';
+import { IRowEditService } from '../../Utilities/Services/Interface/IRowEditService';
 export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getSystemState(): SystemState;
     getAdaptableFormFromAlertForm(alertForm: string | AlertButtonForm, context: any, defaultMessageType?: AdaptableMessageType): (Omit<AdaptableForm<AlertButtonContext>, 'buttons'> & {
@@ -97,6 +99,7 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getAlertService(): IAlertService;
     getTeamSharingService(): ITeamSharingService;
     getMetamodelService(): IMetamodelService;
+    getRowEditService(): IRowEditService;
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
     runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
@@ -133,4 +136,5 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     showSettingsPanel(module: AdaptableModule, moduleParams?: ModuleParams): void;
     getLabelForTag(adaptableObjectTag: AdaptableObjectTag): string;
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
+    getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
 }

package/src/Api/Implementation/InternalApiImpl.js

@@ -288,6 +288,9 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     getMetamodelService() {
         return this.adaptable.MetamodelService;
     }
+    getRowEditService() {
+        return this.adaptable.RowEditService;
+    }
     getModules() {
         return this.adaptable.adaptableModules;
     }
@@ -519,10 +522,11 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         }
         if (typeof this.adaptable.adaptableOptions.userInterfaceOptions.objectTags === 'function') {
             // sanitize the provided tags, just to be sure that the user does NOT break the UI
-            return (this.adaptable.adaptableOptions.userInterfaceOptions
-                .objectTags(this.adaptable.api)
-                // jw - not sure how to check here only for when its a object and then do check
-                .filter((tag) => typeof tag == 'string' ? tag : tag.value != undefined && (tag === null || tag === void 0 ? void 0 : tag.label) != undefined));
+            return this.adaptable.adaptableOptions.userInterfaceOptions
+                .objectTags({
+                adaptableApi: this.adaptable.api,
+            })
+                .filter((tag) => typeof tag === 'string');
         }
     }
     getLayoutTags() {
@@ -545,7 +549,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
             };
             const customGeneratedTags = this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions.autoGenerateTagsForLayouts(autoGenerateTagsForLayoutsContext);
             // sanitize the provided tags, just to be sure that the user does NOT break the UI
-            return customGeneratedTags.filter((tag) => typeof tag == 'string' ? tag : tag.value != undefined && (tag === null || tag === void 0 ? void 0 : tag.label) != undefined);
+            return customGeneratedTags.filter((tag) => typeof tag === 'string');
         }
     }
     // General way to get to store from inside Adaptable...
@@ -557,10 +561,36 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(module, moduleParams);
     }
     getLabelForTag(adaptableObjectTag) {
-        return typeof adaptableObjectTag == 'string' ? adaptableObjectTag : adaptableObjectTag.label;
+        // not very interesting right now, but useful later when tag is not only a plain string
+        return adaptableObjectTag;
     }
     getValueForTag(adaptableObjectTag) {
-        return typeof adaptableObjectTag == 'string' ? adaptableObjectTag : adaptableObjectTag.value;
+        // not very interesting right now, but useful later when tag is not only a plain string
+        return adaptableObjectTag;
+    }
+    getEditLookUpValuesForColumn(editLookUpItem, column, gridCell) {
+        if (!editLookUpItem || !column) {
+            return undefined;
+        }
+        let editLookUpValues = editLookUpItem.values;
+        // first do the function then get hardcoded items
+        if (editLookUpValues != null && typeof editLookUpValues === 'function') {
+            const editLookUpContext = {
+                adaptableApi: this.adaptable.api,
+                column: column,
+                gridCell,
+            };
+            return editLookUpValues(editLookUpContext);
+        }
+        else {
+            let arr = editLookUpValues;
+            if (arr && ArrayExtensions_1.default.IsNotNullOrEmpty(arr)) {
+                return arr;
+            }
+        }
+        // if no hard-coded values or function provided then just get the distinct values for the column
+        // this will use the columnApi method that first looks for permitted values and then distinct values
+        return this.adaptable.api.columnApi.getDistinctDisplayValuesForColumn(column.columnId);
     }
 }
 exports.InternalApiImpl = InternalApiImpl;

package/src/Api/Implementation/SmartEditApiImpl.d.ts

@@ -1,7 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { SmartEditApi } from '../SmartEditApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
-import { SmartEditOperation } from '../../AdaptableOptions/SmartEdit';
+import { SmartEditCustomOperation, SmartEditOperation } from '../../AdaptableOptions/EditOptions';
 export declare class SmartEditApiImpl extends ApiBase implements SmartEditApi {
     setSmartEditOperation(mathOperation: SmartEditOperation): void;
     getSmartEditOperation(): SmartEditOperation;
@@ -9,4 +9,5 @@ export declare class SmartEditApiImpl extends ApiBase implements SmartEditApi {
     getSmartEditValue(): number;
     showSmartEditPopup(): void;
     applySmartEdit(gridCells: GridCell[]): void;
+    getSmartEditCustomOperations(): SmartEditCustomOperation[] | undefined;
 }

package/src/Api/Implementation/SmartEditApiImpl.js

@@ -25,5 +25,8 @@ class SmartEditApiImpl extends ApiBase_1.ApiBase {
     applySmartEdit(gridCells) {
         this.dispatchAction(SmartEditRedux.SmartEditApply(gridCells));
     }
+    getSmartEditCustomOperations() {
+        return this.getEditOptions().smartEditCustomOperations;
+    }
 }
 exports.SmartEditApiImpl = SmartEditApiImpl;

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -134,25 +134,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         if (!editLookUpItem || !gridCell || !gridCell.column) {
             return undefined;
         }
-        let editLookUpValues = editLookUpItem.values;
-        // first do the function then get hardcoded items
-        if (editLookUpValues != null && typeof editLookUpValues === 'function') {
-            const editLookUpContext = {
-                adaptableApi: this.adaptable.api,
-                column: gridCell.column,
-                gridCell: gridCell,
-            };
-            return editLookUpValues(editLookUpContext);
-        }
-        else {
-            let arr = editLookUpValues;
-            if (arr && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(arr)) {
-                return arr;
-            }
-        }
-        // if no hard-coded values or function provided then just get the distinct values for the column
-        // this will use the columnapi method that first looks for permitted values and then distinct values
-        return this.adaptable.api.columnApi.getDistinctDisplayValuesForColumn(gridCell.column.columnId);
+        return this.adaptable.api.internalApi.getEditLookUpValuesForColumn(editLookUpItem, gridCell.column, gridCell);
     }
     addColumnMenuItem(userMenuItem) {
         var _a;
@@ -173,9 +155,9 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         return (_a = this.getUserInterfaceOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
     }
     getAdaptableObjectTags() {
-        let objectTags = this.getUserInterfaceOptions().objectTags;
+        const objectTags = this.getUserInterfaceOptions().objectTags;
         if (objectTags != null && typeof objectTags === 'function') {
-            return objectTags(this.getAdaptableApi());
+            return objectTags({ adaptableApi: this.adaptable.api });
         }
         else {
             let arr = objectTags;

package/src/Api/InternalApi.d.ts

@@ -17,7 +17,7 @@ import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { Layout } from '../PredefinedConfig/LayoutState';
 import { AdaptableAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
-import { AdaptableMessageType, AlertDefinition, BaseContext, CellDataChangedInfo, LayoutAssociatedObject, SystemStatusMessageInfo } from '../types';
+import { AdaptableMessageType, AlertDefinition, BaseContext, CellDataChangedInfo, EditLookUpPermittedValues, LayoutAssociatedObject, SystemStatusMessageInfo } from '../types';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
 import { AdaptableFlashingCell } from '../PredefinedConfig/Common/AdaptableFlashingCell';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
@@ -34,6 +34,7 @@ import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelSer
 import { RowNode } from '@ag-grid-community/all-modules';
 import { IModuleCollection } from '../Strategy/Interface/IModule';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
+import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 /**
  * This set of api methods is designed for **internal use of Adaptable** only.
  *
@@ -101,6 +102,7 @@ export interface InternalApi {
     getAlertService(): IAlertService;
     getTeamSharingService(): ITeamSharingService;
     getMetamodelService(): IMetamodelService;
+    getRowEditService(): IRowEditService;
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
     runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
@@ -133,4 +135,5 @@ export interface InternalApi {
     showSettingsPanel(module: AdaptableModule, moduleParams?: ModuleParams): void;
     getLabelForTag(adaptableObjectTag: AdaptableObjectTag): string;
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
+    getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
 }

package/src/Api/SmartEditApi.d.ts

@@ -1,5 +1,6 @@
-import { SmartEditOperation } from '../AdaptableOptions/SmartEdit';
+import { SmartEditOperation } from '../AdaptableOptions/EditOptions';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
+import { SmartEditCustomOperation } from '../types';
 /**
  * Provides run-time access to the Smart Edit Module
  **/
@@ -31,4 +32,8 @@ export interface SmartEditApi {
      * @param gridCells Cells to apply the Smart Edit
      */
     applySmartEdit(gridCells: GridCell[]): void;
+    /**
+     * Retrieves an Smart Edit Custom Operations (provided in Edit Options)
+     */
+    getSmartEditCustomOperations(): SmartEditCustomOperation[] | undefined;
 }

package/src/PredefinedConfig/CalculatedColumnState.d.ts

@@ -46,6 +46,11 @@ export interface CalculatedColumnSettings extends SpecialColumnSettings {
      * @defaultValue false
      */
     ShowToolTip?: boolean;
+    /**
+     * If true, the Calculated Column Expression will NOT be evaluated and the value is loaded from the row data property with the same name as the ColumnId
+     * @defaultValue false
+     */
+    ExternallyEvaluatedExpression?: boolean;
 }
 /**
  * Calculated Column Query which may be a Scalar or an AggregatedScalar Expression

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

@@ -36,13 +36,13 @@ export interface AdaptableFormField {
      */
     name: string;
     /**
-     * Label to display in in the Field
+     * Label to display in the Field
      */
     label: string;
     /**
      * Field Type: text, date, number, checkbox, select, textOutput
      */
-    fieldType: 'text' | 'select' | 'date' | 'number' | 'checkbox' | 'textOutput';
+    fieldType: AdaptableFormFieldType;
     /**
      * Field Default Value - can be of type string, boolean, number
      */
@@ -55,4 +55,5 @@ export interface AdaptableFormField {
         label: string;
     }[];
 }
+export declare type AdaptableFormFieldType = 'text' | 'select' | 'date' | 'number' | 'checkbox' | 'textOutput';
 export declare function getDefaultAdaptableFormData<T extends BaseContext = BaseContext>(formDef?: AdaptableForm<T>): Record<string, any>;

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

@@ -12,9 +12,7 @@ export declare type AdaptableFormat = {
     Options: StringFormatterOptions;
 };
 export interface BaseFormatterOptions {
-    CustomDisplayFormats?: {
-        Id: string;
-    }[];
+    CustomDisplayFormats?: string[];
 }
 /**
  * Formatter Options for Numeric Columns