@adaptabletools/adaptable 11.1.5 → 11.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "11.1.5",
+  "version": "11.1.6",
   "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: 1649336531486;
+declare const _default: 1650312974062;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableOptions/FinancePluginOptions.d.ts

@@ -1,19 +1,43 @@
+import { RowNode } from '@ag-grid-community/all-modules';
+import { GridCell } from '../../types';
 /**
  * Options required for when using the Finance plugin
  */
 export interface FinancePluginOptions {
     /**
-     * Columns to be defined as (FDC3) Instrument
+     * Columns to be defined as FDC3
      */
-    instrumentColumns?: InstrumentColumn[];
+    fdc3Columns?: {
+        /**
+         * FDC3 Instruments
+         */
+        instrumentColumns?: InstrumentColumn[];
+        /**
+         * FDC3 Positions
+         */
+        positionColumns?: PositionColumn[];
+        /**
+         * FDC3 Contacts
+         */
+        contactColumns?: ContactColumn[];
+        /**
+         * FDC3 Countries
+         */
+        countryColumns?: CountryColumn[];
+        /**
+         * FDC3 Organizations
+         */
+        organizationColumns?: OrganizationColumn[];
+    };
     /**
      * Columns to use a Weighted Average aggregation
      */
     weightedAverageColumns?: WeightedAverageColumn[];
 }
 /**
- * Defines an Column which have Weighted Average aggregation
- */ export interface WeightedAverageColumn {
+ * An Column which contains a Weighted Average aggregation
+ */
+export interface WeightedAverageColumn {
     /**
      * Column which will contain the aggregation
      */
@@ -23,14 +47,36 @@ export interface FinancePluginOptions {
      */
     weightedColumnId: string;
 }
-/**
- * Defines an Column which will be defind as an (FDC3) Instrument
- */
-export interface InstrumentColumn {
+export interface FDC3Column {
     /**
-     * Column defined as an Instrument - its value provides the `name` property in the FDC3 message
+     * Id of Column defined as FDC3
      */
     columnId: string;
+    /**
+     * If provided, will supply `name` property in FDC3 message
+     */
+    name?: string;
+    /**
+     * Should Column display a 'Broadcast' context menu item
+     */
+    showBroadcastContextMenu?: boolean;
+    /**
+     * Label to display in Broadcast Context Menu Item
+     */
+    broadcastContextMenuLabel?: string | ((gridCell: GridCell, node: RowNode) => string);
+    /**
+     * FDC3 intents which the Column can raise
+     */
+    intents?: any;
+    /**
+     * Label to display in Intent Context Menu Item
+     */
+    intentContextMenuLabel?: string | ((intent: FDC3Intent, gridCell: GridCell, node: RowNode) => string);
+}
+/**
+ * A Column which will be defined as an FDC3 Instrument
+ */
+export interface InstrumentColumn extends FDC3Column {
     /**
      * Column which holds a ticker value as instrument data
      */
@@ -63,4 +109,88 @@ export interface InstrumentColumn {
      * Column which holds a FIGI value as instrument data
      */
     figiColumnId?: string;
+    /**
+     * FDC3 Intents available to the Column
+     */
+    intents?: InstrumentIntents;
+}
+export declare type InstrumentIntents = InstrumentIntent[];
+export declare type InstrumentIntent = 'ViewChart' | 'ViewQuote' | 'ViewNews' | 'ViewAnalysis' | 'ViewInstrument';
+/**
+ *  A (Numeric) Column which will be defined as an FDC3 Position
+ */
+export interface PositionColumn extends FDC3Column {
+    /**
+     * Column which contains the Instrument information of the FDC3 Message
+     */
+    instrumentColumnId: string;
+    /**
+     * FDC3 Intents available to the Column
+     */
+    intents?: PositionIntents;
+}
+export declare type PositionIntents = PositionIntent[];
+export declare type PositionIntent = 'ViewChart' | 'ViewNews' | 'ViewAnalysis';
+/**
+ *  A (String) Column which will be defined as an FDC3 Contact
+ *  columnId and at least one other property is required
+ */
+export interface ContactColumn extends FDC3Column {
+    /**
+     * Column which holds the email address of a Contact
+     */
+    emailColumnId?: string;
+    /**
+     * Column which holds an FDS_ID value a Contact
+     */
+    fds_IdColumnId?: string;
+    /**
+     * FDC3 Intents available to the Column
+     */
+    intents?: ContactIntents;
+}
+export declare type ContactIntents = ContactIntent[];
+export declare type ContactIntent = 'StartCall' | 'StartChat' | 'ViewContact';
+/**
+ *  A (String) Column which will be defined as an FDC3 Organization
+ */
+export interface OrganizationColumn extends FDC3Column {
+    /**
+     * Column which contains the LEI
+     */
+    leiColumnId?: string;
+    /**
+     * Column which contains a PermId
+     */
+    permIdColumnId?: string;
+    /**
+     * Column which contains an FDS_ID
+     */
+    fds_IdColumnId?: string;
+    /**
+     * FDC3 Intents available to the Column
+     */
+    intents?: OrganizationIntents;
+}
+export declare type OrganizationIntents = OrganizationIntent[];
+export declare type OrganizationIntent = 'ViewNews' | 'ViewAnalysis';
+/**
+ *  A (String) Column which will be defined as an FDC3 Country
+ */
+export interface CountryColumn extends FDC3Column {
+    /**
+     * Column which contains the ISOALPHA2 Standard
+     */
+    isoAlpha2ColumnId?: string;
+    /**
+     * Column which contains the ISOALPHA3 Standard
+     */
+    isoAlpha3ColumnId?: string;
+    /**
+     * FDC3 Intents available to the Column
+     */
+    intents?: CountryIntents;
 }
+export declare type CountryIntents = CountryIntent[];
+export declare type CountryIntent = 'ViewChart';
+export declare type FDC3Intent = 'ViewChart' | 'ViewQuote' | 'ViewNews' | 'ViewAnalysis' | 'ViewInstrument' | 'StartCall' | 'StartChat' | 'ViewContact';

package/src/AdaptableOptions/OpenFinPluginOptions.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
-import { InstrumentContext } from '../PredefinedConfig/Common/FDC3Context';
+import { AdaptableFDC3EventInfo } from '../PredefinedConfig/Common/FDC3Context';
 /**
  * Options required for when using the OpenFin plugin
  */
@@ -45,8 +45,8 @@ export interface OpenFinPluginOptions {
      */
     onValidationFailureInExcel?: 'override' | 'show-notification' | 'show-undo-notification';
     /**
-     * Useful when you also use the finance plugin configured with instrumentColumns - values in cells in an instrument column can be broadcasted to fdc3, and this function
+     * Useful when you also use the finance plugin configured with fdc3 related columns - values in cells such columns can be broadcasted to fdc3, and this function
      * will be called for broadcasting. It's your job to broadcast to the desired fdc3 channel
      */
-    broadcastFDC3Instrument?: (message: InstrumentContext) => void;
+    onFDC3MessageSent?: (eventInfo: AdaptableFDC3EventInfo) => void;
 }

package/src/AdaptableOptions/SmartEdit.d.ts

@@ -26,9 +26,9 @@ export declare type SmartEditCustomOperation = {
          */
         adaptableApi: AdaptableApi;
         /**
-         * Selected grid cell
+         * Current selected grid cell
          */
-        selectedCell: GridCell;
+        currentCell: GridCell;
     }) => number;
 };
 export declare type SmartEditOperation = SmartEditCustomOperation | MathOperation;

package/src/Api/AdaptableApi.d.ts

@@ -47,7 +47,6 @@ export interface AdaptableApi {
      * Provides access to the Alert Module
      */
     alertApi: AlertApi;
-    flashingCellApi: FlashingCellApi;
     /**
      * Provides access to the Application Module
      */
@@ -104,6 +103,10 @@ export interface AdaptableApi {
      * Provides access to AdapTable's filtering functionality
      */
     filterApi: FilterApi;
+    /**
+     * Provides access to the Flashing Cell Module
+     */
+    flashingCellApi: FlashingCellApi;
     /**
      * Provides access to the Format Column Module
      */

package/src/Api/EventApi.d.ts

@@ -211,5 +211,5 @@ export interface EventApi {
     off(eventName: 'AdaptableReady', callback: (adaptableReadyInfo: AdaptableReadyInfo) => void): void;
     emitSync(eventName: 'DashboardChanged', data?: any): any[];
     emitSync(eventName: 'FlashingCellDisplayed', data?: any): any[];
-    emit(eventName: 'AdaptableReady' | 'AlertFired' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'AdaptableStateChanged' | 'DashboardChanged' | 'CellChanged' | 'GridDataChanged' | 'LayoutChanged' | 'LiveDataChanged' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'BroadcastInstrument', data?: any): Promise<any>;
+    emit(eventName: 'AdaptableReady' | 'AlertFired' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'AdaptableStateChanged' | 'DashboardChanged' | 'CellChanged' | 'GridDataChanged' | 'LayoutChanged' | 'LiveDataChanged' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'FDC3MessageSent', data?: any): Promise<any>;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -168,9 +168,12 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return !!this.getColumnFromId(columnId, false);
     }
     getColumnFromId(columnId, logWarning = true) {
+        if (columnId == undefined) {
+            return;
+        }
         // just return null if no columns rather than logging a warning - otherwise get lots at startup
         if (ArrayExtensions_1.default.IsNullOrEmpty(this.getColumns())) {
-            return null;
+            return;
         }
         const foundColumn = this.getColumns().find((c) => c.columnId == columnId);
         if (foundColumn) {

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

@@ -12,7 +12,7 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getAllSuspendedFormatColumn(): FormatColumn[];
     getAllFormatColumnWithStyle(): FormatColumn[];
     getColumnComparisonForFormatColumn(formatColumn: FormatColumn): ColumnComparison | undefined;
-    getColumnIdsFromColumnComparison(columnComparision: ColumnComparison): string[];
+    getColumnIdsFromColumnComparison(columnComparison: ColumnComparison): string[];
     getAllFormatColumnWithDisplayFormat(): FormatColumn[];
     getAllFormatColumnWithCellAlignment(): FormatColumn[];
     addFormatColumn(formatColumn: FormatColumn): FormatColumn;

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -40,15 +40,19 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         }
         return undefined;
     }
-    getColumnIdsFromColumnComparison(columnComparision) {
+    getColumnIdsFromColumnComparison(columnComparison) {
         let returnValues = [];
-        let minIds = this.adaptable.api.columnApi.getColumnIdsFromId(columnComparision.MinValue.toString(), false);
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(minIds)) {
-            returnValues.push(...minIds);
+        if (typeof columnComparison.MinValue === 'string') {
+            let minIds = this.adaptable.api.columnApi.getColumnIdsFromId(columnComparison.MinValue, false);
+            if (ArrayExtensions_1.default.IsNotNullOrEmpty(minIds)) {
+                returnValues.push(...minIds);
+            }
         }
-        let maxIds = this.adaptable.api.columnApi.getColumnIdsFromId(columnComparision.MaxValue.toString(), false);
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(maxIds)) {
-            returnValues.push(...maxIds);
+        if (typeof columnComparison.MaxValue === 'string') {
+            let maxIds = this.adaptable.api.columnApi.getColumnIdsFromId(columnComparison.MaxValue, false);
+            if (ArrayExtensions_1.default.IsNotNullOrEmpty(maxIds)) {
+                returnValues.push(...maxIds);
+            }
         }
         return returnValues;
     }

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

@@ -10,11 +10,13 @@ export declare class ScopeApiImpl extends ApiBase implements ScopeApi {
     scopeIsEmpty(scope: AdaptableScope): boolean;
     scopeIsAll(scope: AdaptableScope): boolean;
     scopeHasDataType(scope: AdaptableScope): boolean;
+    scopeHasOnlyBooleanDataType(scope: AdaptableScope): boolean;
     scopeHasColumns(scope: AdaptableScope): boolean;
     isSingleColumnScope(scope: AdaptableScope): boolean;
     getSingleColumnInScope(scope: AdaptableScope): string | undefined;
     isSingleNumericColumnScope(scope: AdaptableScope): boolean;
     isSingleBooleanColumnScope(scope: AdaptableScope): boolean;
+    areAllBooleanColumnsInScope(scope: AdaptableScope): boolean;
     isColumnInScopeColumns(column: AdaptableColumn, scope: AdaptableScope): boolean;
     isPrimaryKeyColumnInScopeColumns(scope: AdaptableScope): boolean;
     getScopeToString(scope: AdaptableScope): string;

package/src/Api/Implementation/ScopeApiImpl.js

@@ -71,6 +71,10 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
     scopeHasDataType(scope) {
         return scope !== undefined && 'DataTypes' in scope;
     }
+    scopeHasOnlyBooleanDataType(scope) {
+        var _a;
+        return 'DataTypes' in scope && ((_a = scope.DataTypes) === null || _a === void 0 ? void 0 : _a.length) == 1 && scope.DataTypes[0] == 'Boolean';
+    }
     scopeHasColumns(scope) {
         return scope !== undefined && 'ColumnIds' in scope;
     }
@@ -100,6 +104,14 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             scope.ColumnIds.length == 1 &&
             this.adaptable.api.columnApi.isBooleanColumn(this.adaptable.api.columnApi.getColumnFromId(scope.ColumnIds[0])));
     }
+    areAllBooleanColumnsInScope(scope) {
+        return (this.scopeHasColumns(scope) &&
+            !this.scopeHasDataType(scope) &&
+            !this.scopeIsAll(scope) &&
+            'ColumnIds' in scope &&
+            scope.ColumnIds.length &&
+            scope.ColumnIds.every((columnId) => this.adaptable.api.columnApi.isBooleanColumn(this.adaptable.api.columnApi.getColumnFromId(columnId))));
+    }
     isColumnInScopeColumns(column, scope) {
         return this.scopeHasColumns(scope) && this.isColumnInScope(column, scope);
     }

package/src/Api/ScopeApi.d.ts

@@ -31,6 +31,11 @@ export interface ScopeApi {
      * @param scope Scope to check
      */
     scopeHasDataType(scope: AdaptableScope): boolean;
+    /**
+     * True if the Scope is DataTypes and contains only Boolean
+     * @param scope Scope to check
+     */
+    scopeHasOnlyBooleanDataType(scope: AdaptableScope): boolean;
     /**
      * True if Scope contains just 1 ColumnId
      * @param scope Scope to check
@@ -51,6 +56,11 @@ export interface ScopeApi {
      * @param scope Scope to check
      */
     isSingleBooleanColumnScope(scope: AdaptableScope): boolean;
+    /**
+     * True if all selected columns are boolean
+     * @param scope Scope to check
+     */
+    areAllBooleanColumnsInScope(scope: AdaptableScope): boolean;
     /**
      * True if Scope contains ColumnIds
      * @param scope Scope to check

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

@@ -73,4 +73,12 @@ export interface StringFormatterOptions {
      * Trims text (both start and end)
      */
     Trim?: boolean;
+    /**
+     * Prefix to use before the cell text
+     */
+    Prefix?: string;
+    /**
+     * Suffix to use after the cell text
+     */
+    Suffix?: string;
 }

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

@@ -1,3 +1,5 @@
+import { BaseEventInfo } from '../../Api/Events/BaseEventInfo';
+import { FDC3Intent } from '../../types';
 /**
  * General-purpose context type, as defined by [FDC3](https://fdc3.finos.org/docs/1.0/context-intro).
  * A context object is a well-understood datum that is streamable between FDC3 participants. As a result
@@ -28,7 +30,7 @@ export interface FDC3Context {
     [key: string]: unknown;
 }
 /**
- * Built-in context to define a financial instrument.
+ * Built-in context to define a financial Instrument
  */
 export interface InstrumentContext extends FDC3Context {
     /**
@@ -38,11 +40,11 @@ export interface InstrumentContext extends FDC3Context {
     /**
      * Free text name of instrument
      */
-    name: string;
+    name?: string;
     /**
      * The instrument data
      */
-    id: {
+    id?: {
         [key: string]: string;
     } & {
         ticker?: string;
@@ -55,3 +57,142 @@ export interface InstrumentContext extends FDC3Context {
         FIGI?: string;
     };
 }
+export interface InstrumentListContext extends FDC3Context {
+    /**
+     * Context type is always 'instrumentList'
+     */
+    type: 'instrumentList';
+    /**
+     * Free text name of instrument list
+     */
+    name?: string;
+    /**
+     * Optional Id
+     */
+    id?: any;
+    /**
+     * The instrument data
+     */
+    instruments?: InstrumentContext[];
+}
+/**
+ * Built-in context to define a financial position
+ */
+export interface PositionContext extends FDC3Context {
+    /**
+     * Context type is always 'position'
+     */
+    type: 'position';
+    instrument: InstrumentContext;
+    /**
+     * Free text name of Position
+     */
+    name?: string;
+    /**
+     * Optional Id
+     */
+    id?: any;
+    /**
+     * Holding in the Position
+     */
+    holding: number;
+}
+export interface PortfolioContext extends FDC3Context {
+    /**
+     * Context type is always 'portfolio'
+     */
+    type: 'portfolio';
+    /**
+     * Free text name of portfolio
+     */
+    name?: string;
+    /**
+     * Optional Id
+     */
+    id?: any;
+    /**
+     * The position data
+     */
+    positions?: PositionContext[];
+}
+export interface ContactContext extends FDC3Context {
+    /**
+     * Context type is always 'contact'
+     */
+    type: 'contact';
+    /**
+     * Free text name of contact
+     */
+    name?: string;
+    /**
+     * The contact data
+     */
+    id?: {
+        [key: string]: string;
+    } & {
+        email?: string;
+        FDS_ID?: string;
+    };
+}
+export interface ContactListContext extends FDC3Context {
+    /**
+     * Context type is always 'contactList'
+     */
+    type: 'contactList';
+    /**
+     * Free text name of contact list
+     */
+    name?: string;
+    /**
+     * Optional Id
+     */
+    id?: any;
+    /**
+     * The contact data
+     */
+    contacts?: ContactContext[];
+}
+export interface OrganizationContext extends FDC3Context {
+    /**
+     * Context type is always 'organization'
+     */
+    type: 'organization';
+    /**
+     * Free text name of organization
+     */
+    name?: string;
+    /**
+     * The organization data
+     */
+    id?: {
+        [key: string]: string;
+    } & {
+        LEI?: string;
+        PERMID?: string;
+        FDS_ID?: string;
+    };
+}
+export interface CountryContext extends FDC3Context {
+    /**
+     * Context type is always 'country'
+     */
+    type: 'country';
+    /**
+     * Free text name of country
+     */
+    name?: string;
+    /**
+     * The country data
+     */
+    id?: {
+        [key: string]: string;
+    } & {
+        ISOALPHA2?: string;
+        ISOALPHA3?: string;
+    };
+}
+export interface AdaptableFDC3EventInfo extends BaseEventInfo {
+    type: 'RaiseIntent' | 'BroadcastMessage';
+    intent?: FDC3Intent;
+    context: FDC3Context;
+}

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

@@ -118,6 +118,10 @@ export interface ContextMenuContext extends BaseMenuContext {
      * Whether Column that was clicked is only column with selected cells
      */
     isSingleSelectedColumn: boolean;
+    /**
+     * Whether the clicked cell is the only selected cell
+     */
+    isSingleSelectedCell: boolean;
     /**
      * Current AG Grid row node
      */

package/src/Redux/Store/AdaptableStore.js

@@ -201,6 +201,14 @@ class AdaptableStore {
             ConfigConstants.POPUP,
             ConfigConstants.PLUGINS,
         ];
+        const didPersistentStateChange = (state, newState) => {
+            return Object.keys(newState).some((key) => {
+                if (nonPersistentReduxKeys.includes(key)) {
+                    return false;
+                }
+                return (state === null || state === void 0 ? void 0 : state[key]) !== (newState === null || newState === void 0 ? void 0 : newState[key]);
+            });
+        };
         // this is now VERY BADLY NAMED!
         let rootReducer = AdaptableReduxMerger_1.mergeReducer(rootReducerWithResetManagement, exports.LOAD_STATE);
         const composeEnhancers = (x) => x;
@@ -214,7 +222,9 @@ class AdaptableStore {
             const emitterArg = { action, state, newState };
             this.emitter.emit(action.type, emitterArg);
             const finalState = emitterArg.newState;
-            const shouldPersist = !((_b = (_a = state === null || state === void 0 ? void 0 : state.System) === null || _a === void 0 ? void 0 : _a.License) === null || _b === void 0 ? void 0 : _b.disablePersistence) &&
+            const shouldPersist = state !== finalState &&
+                didPersistentStateChange(state, finalState) &&
+                !((_b = (_a = state === null || state === void 0 ? void 0 : state.System) === null || _a === void 0 ? void 0 : _a.License) === null || _b === void 0 ? void 0 : _b.disablePersistence) &&
                 !NON_PERSIST_ACTIONS[action.type] &&
                 !init &&
                 !this.loadStorageInProgress;

package/src/Strategy/SmartEditModule.js

@@ -127,7 +127,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                                 smartEditValue,
                                 column,
                                 adaptableApi: this.api,
-                                selectedCell,
+                                currentCell: selectedCell,
                                 value: selectedCell.rawValue,
                             });
                         }

package/src/Utilities/Helpers/FormatHelper.js

@@ -87,6 +87,12 @@ function StringFormatter(input, options = {}) {
         return undefined;
     }
     let s = input;
+    if (options.Prefix !== undefined) {
+        s = options.Prefix + s;
+    }
+    if (options.Suffix !== undefined) {
+        s = s + options.Suffix;
+    }
     if (options.Case !== undefined) {
         if (options.Case == 'Lower') {
             s = s.toLowerCase();

package/src/View/Components/Selectors/ColumnSelector.js

@@ -37,7 +37,7 @@ class ColumnSelector extends React.Component {
         let currentColumnName = selectedColumnIds.length > 0
             ? (_a = this.props.ColumnList.find((c) => c.columnId == selectedColumnIds[0])) === null || _a === void 0 ? void 0 : _a.friendlyName : 'Select a column';
         return (React.createElement("div", { "data-name": 'column-selector' },
-            React.createElement(FormLayout_1.default, { columns: [1], style: this.props.style },
+            React.createElement(FormLayout_1.default, { columns: [{ name: 'columnSelector', style: { display: 'flex' } }], style: this.props.style },
                 React.createElement(FormLayout_1.FormRow, null,
                     React.createElement(DropdownButton_1.default, { marginRight: 2, columns: ['label'], showClearButton: currentColumnName != 'Select a column', onClear: () => this.onClearButton(), style: { width: '100%', fontSize: 'small' }, className: "ab-DashboardToolbar__Layout__select", items: sortedColumnOptions, disabled: sortedColumnOptions.length == 0 }, currentColumnName)))));
     }

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

@@ -307,7 +307,11 @@ const renderStringFormat = (data, _onChange, setFormatOption) => {
                             React.createElement(Radio_1.default, { marginLeft: 2, checked: data.DisplayFormat.Options.Case == 'Upper', onChange: (checked) => setFormatOption('Case', 'Upper') }, "Upper"),
                             React.createElement(Radio_1.default, { marginLeft: 2, checked: data.DisplayFormat.Options.Case == 'Sentence', onChange: (checked) => setFormatOption('Case', 'Sentence') }, "Sentence"),
                             React.createElement(Radio_1.default, { marginLeft: 2, checked: data.DisplayFormat.Options.Case == undefined, onChange: (checked) => setFormatOption('Case', undefined) }, "None"),
-                            React.createElement(CheckBox_1.CheckBox, { marginLeft: 5, checked: data.DisplayFormat.Options.Trim, onChange: (checked) => setFormatOption('Trim', checked) }, "Trim")))))),
+                            React.createElement(CheckBox_1.CheckBox, { marginLeft: 5, checked: data.DisplayFormat.Options.Trim, onChange: (checked) => setFormatOption('Trim', checked) }, "Trim")),
+                        React.createElement(FormLayout_1.FormRow, { label: "Prefix" },
+                            React.createElement(Input_1.default, { value: data.DisplayFormat.Options.Prefix, onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
+                        React.createElement(FormLayout_1.FormRow, { label: "Suffix" },
+                            React.createElement(Input_1.default, { value: data.DisplayFormat.Options.Suffix, onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })))))),
         React.createElement(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Example"),
             React.createElement(Tabs_1.Tabs.Content, null,

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
-export declare const isFormatColumnStyleValid: (data: FormatColumn, api: AdaptableApi) => true | "No format applied";
+export declare const isFormatColumnStyleValid: (data: FormatColumn, api: AdaptableApi) => true | "No format applied" | "Invalid Cell Range" | "Invalid Column Comparison Range";
 declare type FormatColumnStyleWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
 };