@adaptabletools/adaptable 18.1.14 → 18.1.15-canary.0

package/src/agGrid/AgGridAdapter.d.ts

@@ -21,7 +21,6 @@ export declare class AgGridAdapter {
      * to handle this edge case, we try to extract the AG GridApi from the invocation arguments
      */
     grabAgGridApiOnTheFly(args: unknown): void;
-    getLiveGridOptions(): GridOptions | undefined;
     updateGridOptions(options: ManagedGridOptions): void;
     getGridOption<Key extends keyof GridOptions>(key: Key): GridOptions[Key];
     setGridOption<Key extends ManagedGridOptionKey>(key: Key, value: GridOptions[Key]): void;

package/src/agGrid/AgGridAdapter.js

@@ -1,4 +1,4 @@
-import { GridApi, ModuleRegistry, } from '@ag-grid-community/core';
+import { ModuleRegistry, } from '@ag-grid-community/core';
 import { ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME, ADAPTABLE_ROW_ACTION_BUTTONS, ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME, } from '../Utilities/Constants/GeneralConstants';
 import { createUuid } from '../PredefinedConfig/Uuid';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
@@ -39,23 +39,18 @@ export class AgGridAdapter {
      * to handle this edge case, we try to extract the AG GridApi from the invocation arguments
      */
     grabAgGridApiOnTheFly(args) {
-        if (this.DANGER_USE_GETTER_gridApi) {
+        var _a;
+        if (this.DANGER_USE_GETTER_gridApi || this.DANGER_gridApi_from_args) {
             return;
         }
         if (Array.isArray(args) &&
             args[0] &&
             typeof args[0].api === 'object' &&
-            args[0].api instanceof GridApi) {
+            // can't ise instanceof operator because gridApi is exported as interface
+            typeof ((_a = args[0].api) === null || _a === void 0 ? void 0 : _a.getGridId) === 'function') {
             this.DANGER_gridApi_from_args = args[0].api;
         }
     }
-    // TODO AFL check if this is still needed if GridAPI offers the `getOption` method
-    // do NOT ever mutate the returned object!!
-    getLiveGridOptions() {
-        var _a, _b;
-        // @ts-ignore
-        return (_b = (_a = this.getAgGridApi()) === null || _a === void 0 ? void 0 : _a.gos) === null || _b === void 0 ? void 0 : _b.gridOptions;
-    }
     updateGridOptions(options) {
         var _a;
         (_a = this.getAgGridApi()) === null || _a === void 0 ? void 0 : _a.updateGridOptions(options);
@@ -80,6 +75,7 @@ export class AgGridAdapter {
         if (isFilterActive) {
             // used in particular at init time to show the filter icon correctly
             for (const colFilter of activeFilters) {
+                // AG Grid exposes the Column interface, but we need the AG Column class
                 const agGridCol = this.getAgGridApi().getColumn(colFilter.ColumnId);
                 if (agGridCol) {
                     columnsWithActiveFilters[agGridCol.getColId()] = true;
@@ -91,6 +87,7 @@ export class AgGridAdapter {
             }
         }
         const agFilterModel = this.getAgGridApi().getFilterModel();
+        // AG Grid exposes the Column interface, but we need the AG Column class
         (this.getAgGridApi().getColumns() || []).forEach((col) => {
             /**
              * When AG Grid filters are used active state should not be removed for all columns.
@@ -493,7 +490,7 @@ export class AgGridAdapter {
     }
     isColumnFilterable(colDef) {
         // follow agGrid logic which is that ONLY filterable if explicitly set
-        if (this.adaptableInstance.EntitlementService.getEntitlementAccessLevelForModule(ModuleConstants.ColumnFilterModuleId) == 'Hidden') {
+        if (this.adaptableApi.entitlementApi.getEntitlementAccessLevelForModule(ModuleConstants.ColumnFilterModuleId) == 'Hidden') {
             return false;
         }
         return colDef != null && colDef.filter != null && colDef.filter != false;

package/src/agGrid/AgGridColumnAdapter.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
 import { ColumnSetupInfo } from './ColumnSetupInfo';
-import { ColDef, Column } from '@ag-grid-community/core';
+import { ColDef, ColGroupDef, Column, GridOptions } from '@ag-grid-community/core';
 import { AdaptableVariant } from '../AdaptableInterfaces/IAdaptable';
 export declare function getEditorsForColumnTypes(variant: AdaptableVariant): Record<string, ColDef['cellEditor']>;
 export declare class AgGridColumnAdapter {
@@ -26,6 +26,7 @@ export declare class AgGridColumnAdapter {
     private setupColumnCellDataType;
     setupColumnHeader({ col, abColumn }: ColumnSetupInfo): boolean;
     private setupColumnFilter;
+    setupColumnFloatingFilterTemporarily(initialGridOptions: GridOptions): void;
     private setupColumnFloatingFilter;
     private setupColumnValueFormatter;
     private setupColumnEditable;
@@ -54,4 +55,5 @@ export declare class AgGridColumnAdapter {
     private getAlertCellStyle;
     private getFlashingCellStyle;
     private getCellHighlightStyle;
+    isColGroupDef(columnDefinition: ColDef | ColGroupDef): columnDefinition is ColGroupDef;
 }

package/src/agGrid/AgGridColumnAdapter.js

@@ -10,7 +10,7 @@ import UIHelper from '../View/UIHelper';
 import { getPercentBarRendererForColumn } from './PercentBarRenderer';
 import { getBadgeRendererForColumn } from './BadgeRenderer';
 import Helper from '../Utilities/Helpers/Helper';
-import { AdaptableReactNumberEditor, AdaptableNumberEditor } from './editors/AdaptableNumberEditor';
+import { AdaptableNumberEditor, AdaptableReactNumberEditor } from './editors/AdaptableNumberEditor';
 import { AdaptableDateEditor, AdaptableReactDateEditor } from './editors/AdaptableDateEditor';
 export function getEditorsForColumnTypes(variant) {
     return {
@@ -128,14 +128,12 @@ export class AgGridColumnAdapter {
             const quickSearchStyleClassName = this.adaptableApi.quickSearchApi.getQuickSearchStyle().ClassName;
             const hasQuickSearchStyleClassName = StringExtensions.IsNotNullOrEmpty(quickSearchStyleClassName);
             const cellClass = (params) => {
-                const gridCell = this.adaptableInstance.getGridCellFromRowNode(params.node, abColumn.columnId);
+                const gridCell = this.adaptableApi.gridApi.getGridCellFromRowNode(params.node, abColumn.columnId);
                 // if a Visual Data export is in progress, we are interested only in the Excel Style Class
                 if (this.adaptableApi.exportApi.internalApi.isVisualDataExportInProgress()) {
                     const userDefinedCellClass = typeof userCellClass === 'function' ? userCellClass(params) : userCellClass;
                     const cellClassKey = this.getExcelClassNameForCell(colId, gridCell.primaryKeyValue, userDefinedCellClass);
-                    return this.adaptableApi.internalApi
-                        .getReportService()
-                        .getExcelStyleIdForCellClassKey(cellClassKey);
+                    return this.adaptableApi.exportApi.internalApi.getExcelStyleIdForCellClassKey(cellClassKey);
                 }
                 const isQuickSearchActive = hasQuickSearchStyleClassName && this.isQuickSearchActive(gridCell, params);
                 const editableClassName = this.getEditableCellClass(gridCell, params);
@@ -334,6 +332,16 @@ export class AgGridColumnAdapter {
             return FilterWrapperFactory(this.adaptableInstance);
         });
     }
+    setupColumnFloatingFilterTemporarily(initialGridOptions) {
+        var _a;
+        (_a = initialGridOptions.columnDefs) === null || _a === void 0 ? void 0 : _a.filter((colDef) => !this.isColGroupDef(colDef)).map((colDef) => {
+            var _a;
+            const isFloatingFilterEnabled = ((_a = initialGridOptions.defaultColDef) === null || _a === void 0 ? void 0 : _a.floatingFilter) || colDef.floatingFilter;
+            if (isFloatingFilterEnabled) {
+                colDef.floatingFilterComponent = FloatingFilterWrapperFactory(this.adaptableInstance);
+            }
+        });
+    }
     setupColumnFloatingFilter({ col, colDef }) {
         const isFloatingFilterDisabled = !colDef.floatingFilter ||
             !this.adaptableOptions.columnFilterOptions.useAdaptableColumnFiltering;
@@ -361,6 +369,7 @@ export class AgGridColumnAdapter {
                 return;
             }
             return (params) => {
+                var _a, _b, _c, _d, _e, _f;
                 const { node, value } = params;
                 const mostRelevantFormatColumn = this.adaptableApi.formatColumnApi.internalApi.getMostRelevantFormatColumnForColumn(activeFormatColumnsWithDisplayFormat, abColumn, { node, value });
                 if (!mostRelevantFormatColumn) {
@@ -371,19 +380,37 @@ export class AgGridColumnAdapter {
                 if (mostRelevantFormatColumn.DisplayFormat.Formatter === 'NumberFormatter') {
                     // change the Number format - if the scope allows it
                     if (this.adaptableApi.columnScopeApi.isColumnInNumericScope(abColumn, mostRelevantFormatColumn.Scope)) {
-                        return this.adaptableApi.formatColumnApi.internalApi.getNumberFormattedValue(params.value, params.node, abColumn, options);
+                        let cellValue = params.value;
+                        if (typeof ((_a = params.value) === null || _a === void 0 ? void 0 : _a.toNumber) === 'function' &&
+                            typeof ((_b = params.value) === null || _b === void 0 ? void 0 : _b.toString) === 'function') {
+                            // aggregation values are wrapped in an AG Grid specific object
+                            cellValue = params.value.toNumber();
+                        }
+                        return this.adaptableApi.formatColumnApi.internalApi.getNumberFormattedValue(cellValue, params.node, abColumn, options);
                     }
                 }
                 if (mostRelevantFormatColumn.DisplayFormat.Formatter === 'DateFormatter') {
                     // change the Date format - if the scope allows it
                     if (this.adaptableApi.columnScopeApi.isColumnInDateScope(abColumn, mostRelevantFormatColumn.Scope)) {
-                        return this.adaptableApi.formatColumnApi.internalApi.getDateFormattedValue(params.value, params.node, abColumn, options);
+                        let cellValue = params.value;
+                        if (typeof ((_c = params.value) === null || _c === void 0 ? void 0 : _c.toNumber) === 'function' &&
+                            typeof ((_d = params.value) === null || _d === void 0 ? void 0 : _d.toString) === 'function') {
+                            // aggregation values are wrapped in an AG Grid specific object
+                            cellValue = params.value.toString();
+                        }
+                        return this.adaptableApi.formatColumnApi.internalApi.getDateFormattedValue(cellValue, params.node, abColumn, options);
                     }
                 }
                 if (mostRelevantFormatColumn.DisplayFormat.Formatter === 'StringFormatter') {
                     // change the String format - if the scope allows it
                     if (this.adaptableApi.columnScopeApi.isColumnInStringsScope(abColumn, mostRelevantFormatColumn.Scope)) {
-                        return this.adaptableApi.formatColumnApi.internalApi.getStringFormattedValue(params.value, params.node, abColumn, options);
+                        let cellValue = params.value;
+                        if (typeof ((_e = params.value) === null || _e === void 0 ? void 0 : _e.toNumber) === 'function' &&
+                            typeof ((_f = params.value) === null || _f === void 0 ? void 0 : _f.toString) === 'function') {
+                            // aggregation values are wrapped in an AG Grid specific object
+                            cellValue = params.value.toString();
+                        }
+                        return this.adaptableApi.formatColumnApi.internalApi.getStringFormattedValue(cellValue, params.node, abColumn, options);
                     }
                 }
                 // should NEVER arrive at this line, but just to be sure
@@ -408,12 +435,7 @@ export class AgGridColumnAdapter {
                     return typeof userValue === 'function' ? userValue(params) : userValue;
                 }
                 const gridCell = this.adaptableInstance.getGridCellFromRowNode(params.node, params.column.getColId());
-                const cellEditableContext = {
-                    gridCell,
-                    adaptableApi: this.adaptableApi,
-                    userName: this.adaptableOptions.userName,
-                    adaptableId: this.adaptableOptions.adaptableId,
-                };
+                const cellEditableContext = Object.assign({ gridCell }, this.adaptableApi.internalApi.buildBaseContext());
                 return cellEditableFn(cellEditableContext);
             };
             return editableCallback;
@@ -814,4 +836,8 @@ export class AgGridColumnAdapter {
             return convertAdaptableStyleToCSS(cellHightlight.highlightStyle);
         }
     }
+    isColGroupDef(columnDefinition) {
+        // @ts-ignore
+        return columnDefinition['children'] != null;
+    }
 }

package/src/agGrid/BadgeRenderer.js

@@ -43,7 +43,7 @@ export const getBadgeRendererForColumn = (badgeStyle, abColumn, api) => {
                 this.renderSingularValues(params, adaptableApi);
             }
         }
-        renderArrayValues(params, adapatableApi) {
+        renderArrayValues(params, adaptableApi) {
             var _a, _b, _c, _d, _e, _f;
             let badgesConfig = [];
             if (!Array.isArray(params.value) || params.value.length === 0) {
@@ -53,16 +53,7 @@ export const getBadgeRendererForColumn = (badgeStyle, abColumn, api) => {
             }
             for (const value of params.value) {
                 const formattedValue = (_f = (_e = (_d = params.formatValue) === null || _d === void 0 ? void 0 : _d.call(params, value)) !== null && _e !== void 0 ? _e : value) !== null && _f !== void 0 ? _f : '';
-                const predicateDefHandlerContext = {
-                    value: value,
-                    oldValue: null,
-                    displayValue: params.formatValue,
-                    node: params.node,
-                    column: abColumn,
-                    adaptableApi: adapatableApi,
-                    userName: adapatableApi.optionsApi.getUserName(),
-                    adaptableId: adapatableApi.optionsApi.getAdaptableId(),
-                };
+                const predicateDefHandlerContext = Object.assign({ value: value, oldValue: null, displayValue: params.formatValue, node: params.node, column: abColumn }, adaptableApi.internalApi.buildBaseContext());
                 const badge = api.styledColumnApi.internalApi.getApplicableBadge(badgeStyle, predicateDefHandlerContext);
                 const isNullValue = formattedValue === '' || formattedValue === null || formattedValue === undefined;
                 if (!isNullValue && badge) {
@@ -74,19 +65,10 @@ export const getBadgeRendererForColumn = (badgeStyle, abColumn, api) => {
             }
             this.renderBadges(badgesConfig, api, params);
         }
-        renderSingularValues(params, adapatableApi) {
+        renderSingularValues(params, adaptableApi) {
             var _a, _b, _c;
             const formattedValue = (_c = (_b = (_a = params.formatValue) === null || _a === void 0 ? void 0 : _a.call(params, params.value)) !== null && _b !== void 0 ? _b : params.value) !== null && _c !== void 0 ? _c : '';
-            const predicateDefHandlerContext = {
-                value: params.value,
-                oldValue: null,
-                displayValue: params.formatValue,
-                node: params.node,
-                column: abColumn,
-                adaptableApi: adapatableApi,
-                userName: adapatableApi.optionsApi.getUserName(),
-                adaptableId: adapatableApi.optionsApi.getAdaptableId(),
-            };
+            const predicateDefHandlerContext = Object.assign({ value: params.value, oldValue: null, displayValue: params.formatValue, node: params.node, column: abColumn }, adaptableApi.internalApi.buildBaseContext());
             const badge = api.styledColumnApi.internalApi.getApplicableBadge(badgeStyle, predicateDefHandlerContext);
             const isNullValue = formattedValue === '' || formattedValue === null || formattedValue === undefined;
             if (

package/src/agGrid/FloatingFilterWrapper.js

@@ -29,6 +29,27 @@ export const FloatingFilterWrapperFactory = (adaptable) => {
             filterContainer.parentElement.parentElement.style.padding = 'var(--ab-space-1)';
         }
     }
+    if (adaptable.isAgGridInitialising) {
+        if (adaptable.variant === 'react') {
+            return () => React.createElement(React.Fragment, null);
+        }
+        return class FloatingFilterStub {
+            init(params) {
+                this.filterContainer = document.createElement('div');
+            }
+            getGui() {
+                return this.filterContainer;
+            }
+            destroy() {
+                var _a;
+                (_a = this.unmountReactRoot) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.filterContainer = null;
+            }
+            onParentModelChanged() {
+                // nothing yet
+            }
+        };
+    }
     if (adaptable.variant === 'react') {
         return forwardRef(function ReactFloatingFilterWrapper(props, ref) {
             const colId = props.column.getId();

package/src/agGrid/buildSortedColumnStateForLayout.d.ts

@@ -3,5 +3,5 @@ import { Layout } from '../types';
 export declare function buildSortedColumnStateForLayout(params: {
     columnState: ColumnState[];
     layout: Layout;
-    gridOptions: GridOptions;
+    groupDisplayType: GridOptions['groupDisplayType'];
 }): ColumnState[];

package/src/agGrid/buildSortedColumnStateForLayout.js

@@ -3,9 +3,9 @@ import { getAutoRowGroupColumnIdFor } from '../Api/Internal/ColumnInternalApi';
 import { isAutoRowGroupColumn } from '../Api/Implementation/ColumnApiImpl';
 import { sortColumnStateForVisibleColumns } from './sortColumnStateForVisibleColumns';
 export function buildSortedColumnStateForLayout(params) {
-    const { columnState, layout, gridOptions } = params;
+    const { columnState, layout, groupDisplayType } = params;
     let visibleColumnList = [...layout.Columns];
-    const multipleGroupColumns = gridOptions.groupDisplayType === 'multipleColumns';
+    const multipleGroupColumns = groupDisplayType === 'multipleColumns';
     const singleGroupColumn = !multipleGroupColumns;
     const rowGroupedColumnsIndexes = {};
     let generatedRowGroupColumnsIds = [];

package/src/agGrid/defaultAdaptableOptions.js

@@ -1,10 +1,15 @@
 import * as GeneralConstants from '../Utilities/Constants/GeneralConstants';
+import * as FilterConstants from '../Utilities/Constants/FilterConstants';
 import UIHelper, { getHexForName, GRAY, GREEN, RED } from '../View/UIHelper';
 import { EMPTY_ARRAY } from '../Utilities/Constants/GeneralConstants';
 import { ExportDestination } from '../PredefinedConfig/Common/Enums';
 import { SystemAlertPredicateIds, SystemBadgeStylePredicateIds, SystemFilterPredicateIds, SystemFlashingCellPredicateIds, SystemFormatColumnPredicateIds, } from '../PredefinedConfig/Common/AdaptablePredicate';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { initPredefinedConfigWithUuids } from '../Utilities/Helpers/AdaptableHelper';
+/**
+ * Default Adaptable Options values used if not set by the user
+ * Try to avoid any hard coded strings or numbers - use General (or other) Constants files
+ */
 const DefaultAdaptableOptions = {
     adaptableId: GeneralConstants.ADAPTABLE_ID,
     adaptableStateKey: undefined,
@@ -18,30 +23,30 @@ const DefaultAdaptableOptions = {
         cellHighlightDuration: 2000,
         rowHighlightDuration: 4000,
         statusbarHighlightDuration: 2000,
-        dataChangeDetectionPolicy: 'rawValue',
+        dataChangeDetectionPolicy: GeneralConstants.RAW_VALUE_DATA_CHANGE_DETECTION_POLICY,
         actionHandlers: undefined,
         alertMessageText: undefined,
         showMissingPrimaryKeyAlert: false,
     },
     notificationsOptions: {
         maxNotifications: 3,
-        position: 'BottomRight',
-        duration: 3000,
+        position: GeneralConstants.TOAST_POSITIONS_BOTTOM_RIGHT,
+        duration: GeneralConstants.NOTIFICATION_DURATION,
         showProgressBar: false,
         closeWhenClicked: false,
         pauseWhenHovering: false,
         isDraggable: false,
-        transition: 'Slide',
+        transition: GeneralConstants.TOAST_TRANSITIONS_SLIDE,
         showApplicationIcon: false,
         showSystemStatusMessageNotifications: false,
-        maxSystemMessagesInStore: 100,
+        maxSystemMessagesInStore: GeneralConstants.NOTIFICATION_MAX_SYSTEM_MESSAGES,
     },
     dataImportOptions: {
         fileHandlers: undefined,
     },
     flashingCellOptions: {
         defaultFlashDuration: 500,
-        defaultFlashTarget: 'cell',
+        defaultFlashTarget: GeneralConstants.FLASHING_TARGET_CELL,
         defaultDownChangeStyle: {
             BackColor: getHexForName(RED),
         },
@@ -68,8 +73,8 @@ const DefaultAdaptableOptions = {
     calendarOptions: { holidays: undefined },
     cellSummaryOptions: { cellSummaryOperations: undefined },
     containerOptions: {
-        adaptableContainer: 'adaptable',
-        agGridContainer: 'grid',
+        adaptableContainer: GeneralConstants.ADAPTABLE_CONTAINER_ID,
+        agGridContainer: GeneralConstants.AG_GRID_CONTAINER_ID,
         agGridContainerWaitTimeout: 60000,
         modalContainer: undefined,
         systemStatusContainer: undefined,
@@ -86,7 +91,7 @@ const DefaultAdaptableOptions = {
         showQuickSearchInHeader: true,
         customDashboardButtons: undefined,
         customToolbars: undefined,
-        buttonsLocation: 'right',
+        buttonsLocation: GeneralConstants.DASHBOARD_BUTTONS_LOCATION_RIGHT,
     },
     actionColumnOptions: {
         actionColumns: undefined,
@@ -115,7 +120,7 @@ const DefaultAdaptableOptions = {
         smartEditCustomOperations: undefined,
     },
     entitlementOptions: {
-        defaultAccessLevel: 'Full',
+        defaultAccessLevel: GeneralConstants.ACCESS_LEVEL_FULL,
         moduleEntitlements: undefined,
     },
     exportOptions: {
@@ -150,7 +155,7 @@ const DefaultAdaptableOptions = {
         customDisplayFormatters: undefined,
     },
     layoutOptions: {
-        displayRowGroups: 'closed',
+        displayRowGroups: GeneralConstants.DISPLAY_ROW_GROUPS_DYNAMIC,
         autoSaveLayouts: true,
         autoSizeColumnsInLayout: false,
         autoSizeColumnsInPivotLayout: false,
@@ -174,7 +179,7 @@ const DefaultAdaptableOptions = {
         quickFilterOptions: {
             hideQuickFilterDropdown: undefined,
             hideQuickFilterInput: undefined,
-            quickFilterTrigger: 'mouseenter',
+            quickFilterTrigger: FilterConstants.FILTER_TRIGGER_MOUSE_ENTER,
             quickFilterDebounce: 250,
             quickFilterHeight: null,
             showQuickFilter: true,
@@ -186,7 +191,7 @@ const DefaultAdaptableOptions = {
             defaultFilterFormTab: 'Values',
         },
         valuesFilterOptions: {
-            valuesFilterTrigger: 'mouseenter',
+            valuesFilterTrigger: FilterConstants.FILTER_TRIGGER_MOUSE_ENTER,
             sortValuesFilter: false,
             filterValuesUsingTime: false,
             showCurrentlyFilteredValuesOnly: false,
@@ -199,17 +204,17 @@ const DefaultAdaptableOptions = {
         useAdaptableColumnFiltering: true,
         clearColumnFiltersOnStartUp: false,
         filterActionOnUserDataChange: {
-            applyFilter: GeneralConstants.FILTER_ALWAYS,
+            applyFilter: FilterConstants.FILTER_ACTION_ALWAYS,
             throttleDelay: 0,
         },
         filterActionOnExternalDataChange: {
-            applyFilter: GeneralConstants.FILTER_NEVER,
+            applyFilter: FilterConstants.FILTER_ACTION_NEVER,
             throttleDelay: 0,
         },
         autoApplyFilter: true,
-        defaultNumericColumnFilter: 'Equals',
-        defaultStringColumnFilter: 'Contains',
-        defaultDateColumnFilter: 'On',
+        defaultNumericColumnFilter: FilterConstants.PREDICATE_EQUALS,
+        defaultStringColumnFilter: FilterConstants.PREDICATE_CONTAINS,
+        defaultDateColumnFilter: FilterConstants.PREDICATE_ON,
         enableFilterOnSpecialColumns: true,
         showClearFilterButton: false,
         showSuspendFilterButton: false,
@@ -233,7 +238,7 @@ const DefaultAdaptableOptions = {
         runQuickSearchOnRowGroups: true,
         runQuickSearchOnPivotColumns: true,
         clearQuickSearchOnStartUp: false,
-        quickSearchPlaceholder: 'Search',
+        quickSearchPlaceholder: GeneralConstants.QUICK_SEARCH_PLACEHOLDER,
         filterResultsAfterQuickSearch: false,
         runQuickSearchWithCaseSensitivity: false,
         runBespokeQuickSearch: undefined,
@@ -262,15 +267,15 @@ const DefaultAdaptableOptions = {
         alternativeModuleNames: undefined,
         applicationIcon: undefined,
         useCustomMacLikeScrollbars: false,
-        englishVariant: 'GB',
+        englishVariant: GeneralConstants.ENGLISH_VARIANT,
         showLoadingScreen: true,
-        loadingScreenDelay: 200,
-        loadingScreenTitle: 'Initialising Grid',
-        loadingScreenText: 'Retrieving your settings and setting up the grid...',
+        loadingScreenDelay: GeneralConstants.LOADING_SCREEN_DELAY,
+        loadingScreenTitle: GeneralConstants.LOADING_SCREEN_TITLE,
+        loadingScreenText: GeneralConstants.LOADING_SCREEN_TEXT,
         disableDeleteConfirmation: false,
         dateInputOptions: {
             useNativeInput: false,
-            dateFormat: 'yyyy-MM-dd',
+            dateFormat: GeneralConstants.DATE_INPUT_DATE_FORMAT,
             // locale is not explicitly defaulted to 'en-US' as this is already done by the react-day-picker
             showWeekNumber: false,
             showOutsideDays: true,
@@ -294,26 +299,26 @@ const DefaultAdaptableOptions = {
         activeByDefault: false,
         showDataChange: undefined,
         changeHistoryButton: undefined,
-        showLastDataChangeOnly: true
+        showLastDataChangeOnly: true,
     },
     settingsPanelOptions: {
-        popupType: 'window',
+        popupType: GeneralConstants.POPUP_TYPE_WINDOW,
         title: ModuleConstants.SettingsPanelFriendlyName,
-        icon: 'ConfigurationIcon',
+        icon: GeneralConstants.ICON_CONFIGURATION,
         navigation: {},
         alwaysShowInDashboard: false,
         alwaysShowInToolPanel: false,
     },
     chartingOptions: {
-        saveStrategy: 'none',
+        saveChartBehaviour: GeneralConstants.SAVE_CHART_BEHAVIOUR_NONE,
         agGridContainerName: GeneralConstants.AG_GRID_CHART_WINDOW,
         externalChartingOptions: {},
     },
     fdc3Options: {
         enableLogging: false,
         actionColumnDefaultConfiguration: {
-            columnId: 'fdc3ActionColumn',
-            headerName: 'FDC3 Actions',
+            columnId: GeneralConstants.FDC3_ACTION_COLUMN_DEFAULT_COLUMN_ID,
+            headerName: GeneralConstants.FDC3_ACTION_COLUMN_DEFAULT_HEADER_NAME,
             width: 200,
             resizable: true,
             movable: false,

package/src/components/AdaptableFormComponent/AdaptableFormComponent.js

@@ -16,25 +16,13 @@ export function AdaptableFormComponentButtons({ formDef, onClick, defaultTone, d
         });
         let buttonStyle = api.internalApi.getStyleForButton(button, context
             ? context
-            : {
-                adaptableApi: api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            });
+            : Object.assign({}, api.internalApi.buildBaseContext()));
         let buttonLabel = api.internalApi.getLabelForButton(button, context
             ? context
-            : {
-                adaptableApi: api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            });
+            : Object.assign({}, api.internalApi.buildBaseContext()));
         let buttonTooltip = api.internalApi.getTooltipForButton(button, context
             ? context
-            : {
-                adaptableApi: api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            });
+            : Object.assign({}, api.internalApi.buildBaseContext()));
         return (React.createElement(SimpleButton, { autoFocus: focusFirstButton && index === 0, disabled: disabledButtons[index], key: index, tooltip: buttonTooltip, icon: buttonIcon, tone: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _a !== void 0 ? _a : defaultTone, variant: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant, "data-text": buttonLabel, className: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className, marginLeft: index ? 2 : 0, onClick: () => {
                 onClick(button);
             } }, buttonLabel));

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1722345319339 || Date.now(),
-    VERSION: "18.1.14" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1724081698262 || Date.now(),
+    VERSION: "18.1.15-canary.0" || '--current-version--',
 };