@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.1

package/src/AdaptableOptions/DefaultAdaptableOptions.js

@@ -1,68 +1,43 @@
 import * as GeneralConstants from '../Utilities/Constants/GeneralConstants';
-import * as FilterConstants from '../Utilities/Constants/FilterConstants';
 import UIHelper, { getHexForName, GRAY, GREEN, RED } from '../View/UIHelper';
-import { DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME, EMPTY_ARRAY, } from '../Utilities/Constants/GeneralConstants';
-import { ExportDestination } from '../PredefinedConfig/Common/Enums';
+import { EMPTY_STRING, EMPTY_ARRAY, DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME, SYSTEM_REPORT_NAMES, SYSTEM_REPORT_FORMATS, SYSTEM_EXPORT_DESTINATIONS, } from '../Utilities/Constants/GeneralConstants';
 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,
-    primaryKey: '',
+    primaryKey: EMPTY_STRING,
     autogeneratePrimaryKey: false,
-    userName: GeneralConstants.USER_NAME,
+    userName: 'anonymous',
     predefinedConfig: undefined,
+    adaptableContext: {},
     actionColumnOptions: {
         actionColumns: undefined,
     },
-    actionRowOptions: {
-        actionRowButtons: undefined,
-        autoHandle: true,
-        disableInlineEditing: false,
-        setPrimaryKeyValue: undefined,
-        actionRowButtonOptions: {
-            customConfiguration: undefined,
-            position: 'pinnedLeft',
-        },
-        actionRowFormOptions: {
-            formTitle: undefined,
-            formDescription: undefined,
-            formFieldLabel: undefined,
-            formButtons: undefined,
-            onFormSubmit: undefined,
-        },
-    },
     alertOptions: {
         alertForms: undefined,
         maxAlertsInStore: 20,
         cellHighlightDuration: 2000,
         rowHighlightDuration: 4000,
         statusbarHighlightDuration: 2000,
-        dataChangeDetectionPolicy: GeneralConstants.RAW_VALUE_DATA_CHANGE_DETECTION_POLICY,
-        actionHandlers: undefined,
+        dataChangeDetectionPolicy: 'rawValue',
+        commandHandlers: undefined,
         alertMessageText: undefined,
         showMissingPrimaryKeyAlert: false,
     },
     calendarOptions: { holidays: undefined },
-    cellSummaryOptions: { cellSummaryOperations: undefined },
+    cellSummaryOptions: {
+        customCellSummaryOperations: undefined,
+        numericDisplayFormat: {
+            FractionDigits: 2,
+        },
+    },
     chartingOptions: {
-        saveChartBehaviour: GeneralConstants.SAVE_CHART_BEHAVIOUR_NONE,
+        saveChartBehaviour: 'none',
         agGridContainerName: GeneralConstants.AG_GRID_CHART_WINDOW,
         externalChartingOptions: {},
     },
-    containerOptions: {
-        adaptableContainer: GeneralConstants.ADAPTABLE_CONTAINER_ID,
-        agGridContainer: GeneralConstants.AG_GRID_CONTAINER_ID,
-        agGridContainerWaitTimeout: 60000,
-        modalContainer: undefined,
-        systemStatusContainer: undefined,
-        alertContainer: undefined,
-    },
     columnOptions: {
         columnFriendlyName: undefined,
         columnTypes: EMPTY_ARRAY,
@@ -72,154 +47,139 @@ const DefaultAdaptableOptions = {
     columnMenuOptions: {
         customColumnMenu: undefined,
     },
-    contextMenuOptions: {
-        customContextMenu: undefined,
-    },
-    columnFilterOptions: {
-        quickFilterOptions: {
-            hideQuickFilterDropdown: undefined,
-            hideQuickFilterInput: undefined,
-            quickFilterTrigger: FilterConstants.FILTER_TRIGGER_MOUSE_ENTER,
-            quickFilterDebounce: 250,
-            quickFilterHeight: null,
-            showQuickFilter: true,
-            quickFilterWildcards: {},
-            quickFilterValuesWidth: 180,
-        },
-        filterFormOptions: {
-            useAgGridFilterFormStyle: true,
-            defaultFilterFormTab: 'Values',
-        },
-        valuesFilterOptions: {
-            valuesFilterTrigger: FilterConstants.FILTER_TRIGGER_MOUSE_ENTER,
-            sortValuesFilter: false,
-            filterValuesUsingTime: false,
-            showCurrentlyFilteredValuesOnly: false,
-            showCurrentlyFilteredValuesCount: false,
-            maxFilterValuesToDisplay: undefined,
-            showValuesCount: undefined,
-            valuesFilterPredicateOptions: undefined,
-        },
-        indicateFilteredColumns: true,
-        useAdaptableColumnFiltering: true,
-        clearColumnFiltersOnStartUp: false,
-        filterActionOnUserDataChange: {
-            applyFilter: FilterConstants.FILTER_ACTION_ALWAYS,
-            throttleDelay: 0,
-        },
-        filterActionOnExternalDataChange: {
-            applyFilter: FilterConstants.FILTER_ACTION_NEVER,
-            throttleDelay: 0,
-        },
-        autoApplyFilter: true,
-        defaultNumericColumnFilter: FilterConstants.PREDICATE_EQUALS,
-        defaultStringColumnFilter: FilterConstants.PREDICATE_CONTAINS,
-        defaultDateColumnFilter: FilterConstants.PREDICATE_ON,
-        enableFilterOnSpecialColumns: true,
-        showClearFilterButton: false,
-        showSuspendFilterButton: false,
-        showDatePicker: true,
-    },
     commentOptions: {
         showPopupCloseButton: true,
         dateFormat: DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME,
     },
-    customSortOptions: { customSortComparers: undefined },
-    notificationsOptions: {
-        maxNotifications: 3,
-        position: GeneralConstants.TOAST_POSITIONS_BOTTOM_RIGHT,
-        duration: GeneralConstants.NOTIFICATION_DURATION,
-        showProgressBar: false,
-        closeWhenClicked: false,
-        pauseWhenHovering: false,
-        isDraggable: false,
-        transition: GeneralConstants.TOAST_TRANSITIONS_SLIDE,
-        showApplicationIcon: false,
-        showSystemStatusMessageNotifications: false,
-        maxSystemMessagesInStore: GeneralConstants.NOTIFICATION_MAX_SYSTEM_MESSAGES,
-    },
-    dataImportOptions: {
-        fileHandlers: undefined,
-    },
-    flashingCellOptions: {
-        defaultFlashDuration: 500,
-        defaultFlashTarget: GeneralConstants.FLASHING_TARGET_CELL,
-        defaultDownChangeStyle: {
-            BackColor: getHexForName(RED),
-        },
-        defaultUpChangeStyle: {
-            BackColor: getHexForName(GREEN),
-        },
-        defaultNeutralChangeStyle: {
-            BackColor: getHexForName(GRAY),
-        },
+    containerOptions: {
+        adaptableContainer: 'adaptable',
+        agGridContainer: 'grid',
+        agGridContainerWaitTimeout: 60000,
+        modalContainer: undefined,
+        systemStatusContainer: undefined,
+        alertContainer: undefined,
     },
-    expressionOptions: {
-        evaluateAdaptableQLExternally: undefined,
-        displayColumnFriendlyNamesForExpressions: true,
-        systemBooleanFunctions: undefined,
-        systemScalarFunctions: undefined,
-        systemObservableFunctions: undefined,
-        systemAggregatedBooleanFunctions: undefined,
-        systemAggregatedScalarFunctions: undefined,
-        moduleExpressionFunctions: undefined,
-        performExpressionValidation: true,
-        maxTimeframeSize: 28800000,
-        caseSensitiveExpressions: false,
+    contextMenuOptions: {
+        customContextMenu: undefined,
     },
+    customSortOptions: { customSortComparers: undefined },
     dashboardOptions: {
         canFloat: true,
         showQuickSearchInHeader: true,
         customDashboardButtons: undefined,
         customToolbars: undefined,
-        buttonsLocation: GeneralConstants.DASHBOARD_BUTTONS_LOCATION_RIGHT,
+        buttonsLocation: 'right',
     },
+    dataChangeHistoryOptions: {
+        activeByDefault: false,
+        showDataChange: undefined,
+        changeHistoryButton: undefined,
+        showLastDataChangeOnly: true,
+    },
+    dataImportOptions: {
+        fileHandlers: undefined,
+    },
+    dataSetOptions: { dataSets: EMPTY_ARRAY },
     editOptions: {
         validateOnServer: undefined,
         displayServerValidationMessages: true,
         isCellEditable: undefined,
         smartEditCustomOperations: undefined,
+        customEditColumnValues: undefined,
     },
     entitlementOptions: {
-        defaultAccessLevel: GeneralConstants.ACCESS_LEVEL_FULL,
+        defaultAccessLevel: 'Full',
         moduleEntitlements: undefined,
     },
     exportOptions: {
-        exportFormatType: 'rawValue',
+        exportDataFormat: 'rawValue',
         exportDateFormat: undefined,
         customDestinations: undefined,
         externalReports: undefined,
         appendFileTimestamp: false,
-        systemExportDestinations: [
-            ExportDestination.Excel,
-            ExportDestination.CSV,
-            ExportDestination.Clipboard,
-            ExportDestination.JSON,
-            ExportDestination.Table,
-        ],
-        systemReportNames: [
-            GeneralConstants.ALL_DATA_REPORT,
-            GeneralConstants.CURRENT_DATA_REPORT,
-            GeneralConstants.VISUAL_DATA_REPORT,
-            GeneralConstants.SELECTED_CELLS_REPORT,
-            GeneralConstants.SELECTED_ROWS_REPORT,
-        ],
+        systemReportNames: SYSTEM_REPORT_NAMES,
+        systemReportFormats: SYSTEM_REPORT_FORMATS,
+        systemExportDestinations: SYSTEM_EXPORT_DESTINATIONS,
         reportFilename: undefined,
+        csvSeparator: ',',
+        skipColumnHeaders: false,
     },
-    dataSetOptions: { dataSets: EMPTY_ARRAY },
-    groupingOptions: {
-        restoreUngroupedColumns: false,
-        autoOrderGroupedColumns: true,
+    expressionOptions: {
+        evaluateAdaptableQLExternally: undefined,
+        displayColumnFriendlyNamesForExpressions: true,
+        systemBooleanFunctions: undefined,
+        systemScalarFunctions: undefined,
+        systemObservableFunctions: undefined,
+        systemAggregatedBooleanFunctions: undefined,
+        systemAggregatedScalarFunctions: undefined,
+        moduleExpressionFunctions: undefined,
+        performExpressionValidation: true,
+        maxTimeframeSize: 28800000, // 8 hours
+        caseSensitiveExpressions: false,
+    },
+    fdc3Options: {
+        enableLogging: false,
+        actionColumnDefaultConfiguration: {
+            columnId: 'fdc3ActionColumn',
+            headerName: 'FDC3 Actions',
+            width: 200,
+            resizable: true,
+            movable: false,
+            rowScope: {
+                ExcludeDataRows: false,
+                ExcludeGroupRows: true,
+                ExcludeSummaryRows: true,
+            },
+        },
+        uiControlsDefaultConfiguration: {
+            // default config is set in FDC3 Service, to make it easier to overview
+            contexts: {},
+            intents: {},
+        },
+    },
+    filterOptions: {
+        filterActionOnDataChange: {
+            applyFilter: 'Always',
+            throttleDelay: 0,
+        },
+        clearFiltersOnStartUp: false,
+        enableFilterOnSpecialColumns: true,
+        useAdaptableFiltering: true,
+        showDatePicker: true,
+        columnFilterOptions: {
+            indicateFilteredColumns: true,
+            autoApplyColumnFilter: true,
+            defaultNumericColumnFilter: 'Equals',
+            defaultStringColumnFilter: 'Contains',
+            defaultDateColumnFilter: 'On',
+            hideQuickFilterDropdown: undefined,
+            hideQuickFilterInput: undefined,
+            quickFilterDebounce: 250,
+            quickFilterHeight: null,
+            showQuickFilter: true,
+            quickFilterWildcards: {},
+        },
+        gridFilterOptions: {
+            availableFilterEditors: ['ExpressionEditor', 'QueryBuilder'],
+        },
+    },
+    flashingCellOptions: {
+        defaultFlashDuration: 500,
+        defaultFlashTarget: 'cell',
+        defaultDownChangeStyle: {
+            BackColor: getHexForName(RED),
+        },
+        defaultUpChangeStyle: {
+            BackColor: getHexForName(GREEN),
+        },
+        defaultNeutralChangeStyle: {
+            BackColor: getHexForName(GRAY),
+        },
     },
     formatColumnOptions: {
         customDisplayFormatters: undefined,
     },
     layoutOptions: {
-        displayRowGroups: GeneralConstants.DISPLAY_ROW_GROUPS_DYNAMIC,
-        autoSaveLayouts: true,
-        autoSizeColumnsInLayout: false,
-        autoSizeColumnsInPivotLayout: false,
-        createDefaultLayout: false,
         layoutViewOptions: {
             maxColumnsToDisplay: 10,
         },
@@ -229,9 +189,22 @@ const DefaultAdaptableOptions = {
             autoCheckTagsForLayouts: false,
         },
     },
-    gridFilterOptions: {
-        availableFilterEditors: ['ExpressionEditor', 'QueryBuilder'],
-        clearGridFilterOnStartUp: false,
+    noteOptions: {
+        showPopupCloseButton: true,
+        dateFormat: DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME,
+    },
+    notificationsOptions: {
+        maxNotifications: 3,
+        position: 'BottomRight',
+        duration: 3000,
+        showProgressBar: false,
+        closeWhenClicked: false,
+        pauseWhenHovering: false,
+        isDraggable: false,
+        transition: 'Slide',
+        showApplicationIcon: false,
+        showSystemStatusMessageNotifications: false,
+        maxSystemMessagesInStore: 100,
     },
     predicateOptions: {
         customPredicateDefs: [],
@@ -241,16 +214,34 @@ const DefaultAdaptableOptions = {
         systemFlashingCellPredicates: SystemFlashingCellPredicateIds,
         systemBadgeStylePredicates: SystemBadgeStylePredicateIds,
         caseSensitivePredicates: false,
+        evaluateValuesPredicateUsingTime: true,
     },
     quickSearchOptions: {
-        excludeColumnFromQuickSearch: undefined,
-        runQuickSearchOnRowGroups: true,
-        runQuickSearchOnPivotColumns: true,
         clearQuickSearchOnStartUp: false,
-        quickSearchPlaceholder: GeneralConstants.QUICK_SEARCH_PLACEHOLDER,
+        quickSearchPlaceholder: 'Search',
         filterResultsAfterQuickSearch: false,
-        runQuickSearchWithCaseSensitivity: false,
-        runBespokeQuickSearch: undefined,
+        isQuickSearchCaseSensitive: false,
+        runCustomQuickSearch: undefined,
+    },
+    rowFormOptions: {
+        autoHandle: true,
+        disableInlineEditing: false,
+        setPrimaryKeyValue: undefined,
+        rowFormTitle: undefined,
+        rowFormDescription: undefined,
+        rowFormFieldLabel: undefined,
+        rowFormButtons: undefined,
+        onRowFormSubmit: undefined,
+        includeColumnInRowForm: undefined,
+    },
+    settingsPanelOptions: {
+        popupType: 'modal',
+        title: ModuleConstants.SettingsPanelFriendlyName,
+        icon: 'ConfigurationIcon',
+        navigation: {},
+        alwaysShowInDashboard: false,
+        alwaysShowInToolPanel: false,
+        showModuleIcons: true,
     },
     stateOptions: {
         debounceStateDelay: 400,
@@ -272,19 +263,26 @@ const DefaultAdaptableOptions = {
         suppressOverrideConfigWarning: false,
         showUpdateNotificationOncePerUpdate: false,
     },
+    toolPanelOptions: {
+        showToolPanelsDropdown: true,
+        customButtons: undefined,
+        customToolPanels: undefined,
+    },
     userInterfaceOptions: {
         alternativeModuleNames: undefined,
         applicationIcon: undefined,
         useCustomMacLikeScrollbars: false,
-        englishVariant: GeneralConstants.ENGLISH_VARIANT,
-        showLoadingScreen: true,
-        loadingScreenDelay: GeneralConstants.LOADING_SCREEN_DELAY,
-        loadingScreenTitle: GeneralConstants.LOADING_SCREEN_TITLE,
-        loadingScreenText: GeneralConstants.LOADING_SCREEN_TEXT,
+        loadingScreenOptions: {
+            showLoadingScreen: true,
+            loadingScreenDelay: 200,
+            loadingScreenTitle: 'Initialising Grid',
+            loadingScreenText: 'Retrieving your settings and setting up the grid...',
+        },
+        englishVariant: 'GB',
         disableDeleteConfirmation: false,
         dateInputOptions: {
             useNativeInput: false,
-            dateFormat: GeneralConstants.DATE_INPUT_DATE_FORMAT,
+            dateFormat: 'yyyy-MM-dd',
             // locale is not explicitly defaulted to 'en-US' as this is already done by the react-day-picker
             showWeekNumber: false,
             showOutsideDays: true,
@@ -295,108 +293,93 @@ const DefaultAdaptableOptions = {
         readOnlyCellStyle: undefined,
         editedCellStyle: undefined,
         styleClassNames: EMPTY_ARRAY,
-        permittedValues: undefined,
-        editLookUpItems: undefined,
         showDocumentationLinks: true,
         showAdapTableVersion: true,
     },
-    toolPanelOptions: {
-        showToolPanelsDropdown: true,
-        customButtons: undefined,
-        customToolPanels: undefined,
-    },
-    dataChangeHistoryOptions: {
-        activeByDefault: false,
-        showDataChange: undefined,
-        changeHistoryButton: undefined,
-        showLastDataChangeOnly: true,
-    },
-    settingsPanelOptions: {
-        popupType: GeneralConstants.POPUP_TYPE_WINDOW,
-        title: ModuleConstants.SettingsPanelFriendlyName,
-        icon: GeneralConstants.ICON_CONFIGURATION,
-        navigation: {},
-        alwaysShowInDashboard: false,
-        alwaysShowInToolPanel: false,
-        showModuleIcons: true
-    },
-    fdc3Options: {
-        enableLogging: false,
-        actionColumnDefaultConfiguration: {
-            columnId: GeneralConstants.FDC3_ACTION_COLUMN_DEFAULT_COLUMN_ID,
-            headerName: GeneralConstants.FDC3_ACTION_COLUMN_DEFAULT_HEADER_NAME,
-            width: 200,
-            resizable: true,
-            movable: false,
-        },
-        uiControlsDefaultConfiguration: {
-            // default config is set in FDC3 Service, to make it easier to overview
-            contexts: {},
-            intents: {},
-        },
-    },
-    noteOptions: {
-        showPopupCloseButton: true,
-        dateFormat: DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME,
-    },
 };
 export function applyDefaultAdaptableOptions(adaptableOptions) {
-    var _a;
     const adaptableOptsWithDefaults = Object.assign({}, DefaultAdaptableOptions, adaptableOptions);
     adaptableOptsWithDefaults.adaptableStateKey =
-        (_a = adaptableOptsWithDefaults.adaptableStateKey) !== null && _a !== void 0 ? _a : adaptableOptsWithDefaults.adaptableId;
-    adaptableOptsWithDefaults.dataImportOptions = Object.assign({}, DefaultAdaptableOptions.dataImportOptions, adaptableOptions.dataImportOptions);
-    adaptableOptsWithDefaults.expressionOptions = Object.assign({}, DefaultAdaptableOptions.expressionOptions, adaptableOptions.expressionOptions);
+        adaptableOptsWithDefaults.adaptableStateKey ?? adaptableOptsWithDefaults.adaptableId;
+    // action column options
+    adaptableOptsWithDefaults.actionColumnOptions = Object.assign({}, DefaultAdaptableOptions.actionColumnOptions, adaptableOptions.actionColumnOptions);
+    // action column options
+    adaptableOptsWithDefaults.rowFormOptions = Object.assign({}, DefaultAdaptableOptions.rowFormOptions, adaptableOptions.rowFormOptions);
+    // alert options
+    adaptableOptsWithDefaults.alertOptions = Object.assign({}, DefaultAdaptableOptions.alertOptions, adaptableOptions.alertOptions);
+    // calendar options
     adaptableOptsWithDefaults.calendarOptions = Object.assign({}, DefaultAdaptableOptions.calendarOptions, adaptableOptions.calendarOptions);
+    // cell summary options
+    adaptableOptsWithDefaults.cellSummaryOptions = Object.assign({}, DefaultAdaptableOptions.cellSummaryOptions, adaptableOptions.cellSummaryOptions);
+    // charting options
+    adaptableOptsWithDefaults.chartingOptions = Object.assign({}, DefaultAdaptableOptions.chartingOptions, adaptableOptions.chartingOptions);
+    adaptableOptsWithDefaults.chartingOptions.externalChartingOptions = Object.assign({}, DefaultAdaptableOptions.chartingOptions.externalChartingOptions, adaptableOptsWithDefaults.chartingOptions.externalChartingOptions);
+    // column options
     adaptableOptsWithDefaults.columnOptions = Object.assign({}, DefaultAdaptableOptions.columnOptions, adaptableOptions.columnOptions);
+    // TEMP filter options
+    adaptableOptsWithDefaults.filterOptions = Object.assign({}, DefaultAdaptableOptions.filterOptions, adaptableOptions.filterOptions);
+    adaptableOptsWithDefaults.filterOptions.columnFilterOptions = Object.assign({}, DefaultAdaptableOptions.filterOptions.columnFilterOptions, adaptableOptsWithDefaults.filterOptions.columnFilterOptions);
+    adaptableOptsWithDefaults.filterOptions.gridFilterOptions = Object.assign({}, DefaultAdaptableOptions.filterOptions.gridFilterOptions, adaptableOptsWithDefaults.filterOptions.gridFilterOptions);
+    // column menu options
+    adaptableOptsWithDefaults.columnMenuOptions = Object.assign({}, DefaultAdaptableOptions.columnMenuOptions, adaptableOptions.columnMenuOptions);
+    // comment options
     adaptableOptsWithDefaults.commentOptions = Object.assign({}, DefaultAdaptableOptions.commentOptions, adaptableOptions.commentOptions);
+    // container options
+    adaptableOptsWithDefaults.containerOptions = Object.assign({}, DefaultAdaptableOptions.containerOptions, adaptableOptions.containerOptions);
+    // context menu options
+    adaptableOptsWithDefaults.contextMenuOptions = Object.assign({}, DefaultAdaptableOptions.contextMenuOptions, adaptableOptions.contextMenuOptions);
+    // custom sort options
     adaptableOptsWithDefaults.customSortOptions = Object.assign({}, DefaultAdaptableOptions.customSortOptions, adaptableOptions.customSortOptions);
+    // dashboard options
+    adaptableOptsWithDefaults.dashboardOptions = Object.assign({}, DefaultAdaptableOptions.dashboardOptions, adaptableOptions.dashboardOptions);
+    // data import options
+    adaptableOptsWithDefaults.dataImportOptions = Object.assign({}, DefaultAdaptableOptions.dataImportOptions, adaptableOptions.dataImportOptions);
+    // data change history options
+    adaptableOptsWithDefaults.dataChangeHistoryOptions = Object.assign({}, DefaultAdaptableOptions.dataChangeHistoryOptions, adaptableOptions.dataChangeHistoryOptions);
+    // data set options
     adaptableOptsWithDefaults.dataSetOptions = Object.assign({}, DefaultAdaptableOptions.dataSetOptions, adaptableOptions.dataSetOptions);
-    adaptableOptsWithDefaults.cellSummaryOptions = Object.assign({}, DefaultAdaptableOptions.cellSummaryOptions, adaptableOptions.cellSummaryOptions);
-    adaptableOptsWithDefaults.predicateOptions = Object.assign({}, DefaultAdaptableOptions.predicateOptions, adaptableOptsWithDefaults.predicateOptions);
+    // edit options
+    adaptableOptsWithDefaults.editOptions = Object.assign({}, DefaultAdaptableOptions.editOptions, adaptableOptions.editOptions);
+    // entitlement options
+    adaptableOptsWithDefaults.entitlementOptions = Object.assign({}, DefaultAdaptableOptions.entitlementOptions, adaptableOptions.entitlementOptions);
+    // export options
+    adaptableOptsWithDefaults.exportOptions = Object.assign({}, DefaultAdaptableOptions.exportOptions, adaptableOptions.exportOptions);
+    // expression options
+    adaptableOptsWithDefaults.expressionOptions = Object.assign({}, DefaultAdaptableOptions.expressionOptions, adaptableOptions.expressionOptions);
+    // fdc3 options
+    adaptableOptsWithDefaults.fdc3Options = Object.assign({}, DefaultAdaptableOptions.fdc3Options, adaptableOptions.fdc3Options);
+    adaptableOptsWithDefaults.fdc3Options.actionColumnDefaultConfiguration = Object.assign({}, DefaultAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration, adaptableOptsWithDefaults.fdc3Options.actionColumnDefaultConfiguration);
+    adaptableOptsWithDefaults.fdc3Options.uiControlsDefaultConfiguration = Object.assign({}, DefaultAdaptableOptions.fdc3Options.uiControlsDefaultConfiguration, adaptableOptsWithDefaults.fdc3Options.uiControlsDefaultConfiguration);
+    // flashing cell options
+    adaptableOptsWithDefaults.flashingCellOptions = Object.assign({}, DefaultAdaptableOptions.flashingCellOptions, adaptableOptions.flashingCellOptions);
+    // format column options
+    adaptableOptsWithDefaults.formatColumnOptions = Object.assign({}, DefaultAdaptableOptions.formatColumnOptions, adaptableOptions.formatColumnOptions);
+    // layout options
     adaptableOptsWithDefaults.layoutOptions = Object.assign({}, DefaultAdaptableOptions.layoutOptions, adaptableOptions.layoutOptions);
-    adaptableOptsWithDefaults.notificationsOptions = Object.assign({}, DefaultAdaptableOptions.notificationsOptions, adaptableOptions.notificationsOptions);
+    adaptableOptsWithDefaults.layoutOptions.layoutTagOptions = Object.assign({}, DefaultAdaptableOptions.layoutOptions.layoutTagOptions, adaptableOptsWithDefaults.layoutOptions.layoutTagOptions);
+    adaptableOptsWithDefaults.layoutOptions.layoutViewOptions = Object.assign({}, DefaultAdaptableOptions.layoutOptions.layoutViewOptions, adaptableOptsWithDefaults.layoutOptions.layoutViewOptions);
+    // note options
     adaptableOptsWithDefaults.noteOptions = Object.assign({}, DefaultAdaptableOptions.noteOptions, adaptableOptions.noteOptions);
-    adaptableOptsWithDefaults.alertOptions = Object.assign({}, DefaultAdaptableOptions.alertOptions, adaptableOptions.alertOptions);
-    adaptableOptsWithDefaults.flashingCellOptions = Object.assign({}, DefaultAdaptableOptions.flashingCellOptions, adaptableOptions.flashingCellOptions);
-    adaptableOptsWithDefaults.entitlementOptions = Object.assign({}, DefaultAdaptableOptions.entitlementOptions, adaptableOptions.entitlementOptions);
-    adaptableOptsWithDefaults.dashboardOptions = Object.assign({}, DefaultAdaptableOptions.dashboardOptions, adaptableOptions.dashboardOptions);
-    adaptableOptsWithDefaults.editOptions = Object.assign({}, DefaultAdaptableOptions.editOptions, adaptableOptions.editOptions);
-    adaptableOptsWithDefaults.actionColumnOptions = Object.assign({}, DefaultAdaptableOptions.actionColumnOptions, adaptableOptions.actionColumnOptions);
-    // to do
-    adaptableOptsWithDefaults.actionRowOptions = Object.assign({}, DefaultAdaptableOptions.actionRowOptions, adaptableOptions.actionRowOptions);
-    adaptableOptsWithDefaults.actionRowOptions.actionRowButtonOptions = Object.assign({}, DefaultAdaptableOptions.actionRowOptions.actionRowButtonOptions, adaptableOptsWithDefaults.actionRowOptions.actionRowButtonOptions);
-    adaptableOptsWithDefaults.actionRowOptions.actionRowFormOptions = Object.assign({}, DefaultAdaptableOptions.actionRowOptions.actionRowFormOptions, adaptableOptsWithDefaults.actionRowOptions.actionRowFormOptions);
-    adaptableOptsWithDefaults.containerOptions = Object.assign({}, DefaultAdaptableOptions.containerOptions, adaptableOptions.containerOptions);
-    adaptableOptsWithDefaults.groupingOptions = Object.assign({}, DefaultAdaptableOptions.groupingOptions, adaptableOptions.groupingOptions);
+    // notification options
+    adaptableOptsWithDefaults.notificationsOptions = Object.assign({}, DefaultAdaptableOptions.notificationsOptions, adaptableOptions.notificationsOptions);
+    // predicate options
+    adaptableOptsWithDefaults.predicateOptions = Object.assign({}, DefaultAdaptableOptions.predicateOptions, adaptableOptsWithDefaults.predicateOptions);
+    // quick search options
     adaptableOptsWithDefaults.quickSearchOptions = Object.assign({}, DefaultAdaptableOptions.quickSearchOptions, adaptableOptions.quickSearchOptions);
-    adaptableOptsWithDefaults.columnFilterOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions, adaptableOptions.columnFilterOptions);
-    adaptableOptsWithDefaults.columnFilterOptions.quickFilterOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions.quickFilterOptions, adaptableOptsWithDefaults.columnFilterOptions.quickFilterOptions);
-    adaptableOptsWithDefaults.columnFilterOptions.filterFormOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions.filterFormOptions, adaptableOptsWithDefaults.columnFilterOptions.filterFormOptions);
-    adaptableOptsWithDefaults.columnFilterOptions.valuesFilterOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions.valuesFilterOptions, adaptableOptsWithDefaults.columnFilterOptions.valuesFilterOptions);
-    adaptableOptsWithDefaults.gridFilterOptions = Object.assign({}, DefaultAdaptableOptions.gridFilterOptions, adaptableOptions.gridFilterOptions);
-    adaptableOptsWithDefaults.userInterfaceOptions = Object.assign({}, DefaultAdaptableOptions.userInterfaceOptions, adaptableOptions.userInterfaceOptions);
-    adaptableOptsWithDefaults.userInterfaceOptions.dateInputOptions = Object.assign({}, DefaultAdaptableOptions.userInterfaceOptions.dateInputOptions, adaptableOptsWithDefaults.userInterfaceOptions.dateInputOptions);
-    adaptableOptsWithDefaults.columnMenuOptions = Object.assign({}, DefaultAdaptableOptions.columnMenuOptions, adaptableOptions.columnMenuOptions);
-    adaptableOptsWithDefaults.contextMenuOptions = Object.assign({}, DefaultAdaptableOptions.contextMenuOptions, adaptableOptions.contextMenuOptions);
+    // settings panel options
+    adaptableOptsWithDefaults.settingsPanelOptions = Object.assign({}, DefaultAdaptableOptions.settingsPanelOptions, adaptableOptions.settingsPanelOptions);
+    // state optoins
     adaptableOptsWithDefaults.stateOptions = Object.assign({}, DefaultAdaptableOptions.stateOptions, adaptableOptions.stateOptions);
-    adaptableOptsWithDefaults.exportOptions = Object.assign({}, DefaultAdaptableOptions.exportOptions, adaptableOptions.exportOptions);
+    // team sharing options
     adaptableOptsWithDefaults.teamSharingOptions = Object.assign({}, DefaultAdaptableOptions.teamSharingOptions, adaptableOptions.teamSharingOptions);
+    // tool panel
     adaptableOptsWithDefaults.toolPanelOptions = Object.assign({}, DefaultAdaptableOptions.toolPanelOptions, adaptableOptions.toolPanelOptions);
-    adaptableOptsWithDefaults.dataChangeHistoryOptions = Object.assign({}, DefaultAdaptableOptions.dataChangeHistoryOptions, adaptableOptions.dataChangeHistoryOptions);
-    adaptableOptsWithDefaults.chartingOptions = Object.assign({}, DefaultAdaptableOptions.chartingOptions, adaptableOptions.chartingOptions);
-    adaptableOptsWithDefaults.chartingOptions.externalChartingOptions = Object.assign({}, DefaultAdaptableOptions.chartingOptions.externalChartingOptions, adaptableOptsWithDefaults.chartingOptions.externalChartingOptions);
-    adaptableOptsWithDefaults.settingsPanelOptions = Object.assign({}, DefaultAdaptableOptions.settingsPanelOptions, adaptableOptions.settingsPanelOptions);
-    adaptableOptsWithDefaults.fdc3Options = Object.assign({}, DefaultAdaptableOptions.fdc3Options, adaptableOptions.fdc3Options);
-    adaptableOptsWithDefaults.fdc3Options.actionColumnDefaultConfiguration = Object.assign({}, DefaultAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration, adaptableOptsWithDefaults.fdc3Options.actionColumnDefaultConfiguration);
-    adaptableOptsWithDefaults.fdc3Options.uiControlsDefaultConfiguration = Object.assign({}, DefaultAdaptableOptions.fdc3Options.uiControlsDefaultConfiguration, adaptableOptsWithDefaults.fdc3Options.uiControlsDefaultConfiguration);
+    // user interface options
+    adaptableOptsWithDefaults.userInterfaceOptions = Object.assign({}, DefaultAdaptableOptions.userInterfaceOptions, adaptableOptions.userInterfaceOptions);
+    adaptableOptsWithDefaults.userInterfaceOptions.loadingScreenOptions = Object.assign({}, DefaultAdaptableOptions.userInterfaceOptions.loadingScreenOptions, adaptableOptsWithDefaults.userInterfaceOptions.loadingScreenOptions);
+    adaptableOptsWithDefaults.userInterfaceOptions.dateInputOptions = Object.assign({}, DefaultAdaptableOptions.userInterfaceOptions.dateInputOptions, adaptableOptsWithDefaults.userInterfaceOptions.dateInputOptions);
     const { predefinedConfig } = adaptableOptsWithDefaults;
-    if (predefinedConfig) {
-        adaptableOptsWithDefaults.predefinedConfig =
-            typeof predefinedConfig === 'string'
-                ? predefinedConfig
-                : initPredefinedConfigWithUuids(predefinedConfig);
-    }
+    adaptableOptsWithDefaults.predefinedConfig = initPredefinedConfigWithUuids(predefinedConfig);
     return adaptableOptsWithDefaults;
 }
 export const getDefaultAdaptableOptions = () => DefaultAdaptableOptions;

package/src/AdaptableOptions/EditOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableMessageType, BaseContext } from '../../types';
+import { AdaptableMessageType, BaseContext, AdaptableColumnContext } from '../../types';
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { MathOperation } from '../PredefinedConfig/Common/Enums';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
@@ -25,6 +25,32 @@ export interface EditOptions<TData = any> {
      * Custom Operations to use in Smart Edit
      */
     smartEditCustomOperations?: SmartEditCustomOperation<TData>[];
+    /**
+     * Dropdown values displayed when column is being edited
+     */
+    showSelectCellEditor?: (currentColumContext: AdaptableColumnContext<TData>) => boolean;
+    /**
+     * List of Column values to display when Editing (i.e. in Edit Lookups, Bulk Update)
+     */
+    customEditColumnValues?: (context: CustomEditColumnValuesContext<TData>) => CustomEditColumnValueInfo[] | Promise<CustomEditColumnValueInfo[]>;
+}
+/**
+ * Context used when getting Distinct Column Values for Editing
+ */
+export interface CustomEditColumnValuesContext<TData = any> extends AdaptableColumnContext<TData> {
+    /**
+     * Current distinct values in Cell
+     */
+    defaultValues: Required<CustomEditColumnValueInfo>[];
+    currentSearchValue: string;
+    /**
+     * Currently edited Grid Cell
+     */
+    gridCell: GridCell;
+}
+export interface CustomEditColumnValueInfo {
+    label?: string;
+    value: any;
 }
 /**
  * Used for Server Validation ie. after an edit in AG Grid which must be checked on Server