@adaptabletools/adaptable 14.0.0-canary.2 → 14.0.0

package/src/View/Components/FilterForm/FilterForm.js

@@ -53,7 +53,7 @@ class FilterFormComponent extends React.Component {
     static createColumnFilterFromProps(props) {
         let existingColumnFilter = props.columnFilters.find((cf) => cf.ColumnId == props.currentColumn.columnId);
         if (!existingColumnFilter) {
-            const filterOptions = props.api.internalApi.getAdaptableOptions().filterOptions;
+            const filterOptions = props.api.optionsApi.getFilterOptions();
             if (filterOptions.defaultFilterFormTab == 'Values') {
                 return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.columnId, 'Values', []);
             }
@@ -83,7 +83,7 @@ class FilterFormComponent extends React.Component {
             : 'values';
     }
     static getDerivedStateFromProps(props, state) {
-        const filterOptions = props.api.internalApi.getAdaptableOptions().filterOptions;
+        const filterOptions = props.api.optionsApi.getFilterOptions();
         const editedColumnFilter = filterOptions.autoApplyFilter
             ? FilterFormComponent.createColumnFilterFromProps(props)
             : state.editedColumnFilter;
@@ -110,8 +110,7 @@ class FilterFormComponent extends React.Component {
         }
     }
     async loadPermittedValues(filter = '') {
-        const { values: distinctColumnValues, suppressClientSideFilter } = await (0, runIfNotResolvedIn_1.runIfNotResolvedIn)(this.props.api.gridApi.internalApi.getDistinctFilterDisplayValuesForColumn(this.props.currentColumn.columnId, filter, this.props.api.internalApi.getAdaptableOptions().filterOptions
-            .showDistinctFilteredValuesOnly), () => this._isMounted && this.setState({ isDistinctColumnValuesLoading: true }));
+        const { values: distinctColumnValues, suppressClientSideFilter } = await (0, runIfNotResolvedIn_1.runIfNotResolvedIn)(this.props.api.gridApi.internalApi.getDistinctFilterDisplayValuesForColumn(this.props.currentColumn.columnId, filter, this.props.api.optionsApi.getFilterOptions().showDistinctFilteredValuesOnly), () => this._isMounted && this.setState({ isDistinctColumnValuesLoading: true }));
         if (!this._isMounted) {
             return;
         }
@@ -124,7 +123,7 @@ class FilterFormComponent extends React.Component {
     render() {
         var _a, _b;
         let isFilterable = this.isFilterable();
-        const filterOptions = this.props.api.internalApi.getAdaptableOptions().filterOptions;
+        const filterOptions = this.props.api.optionsApi.getFilterOptions();
         const predicateDefs = this.props.api.filterApi
             .getFilterPredicateDefsForColumn(this.props.currentColumn)
             .filter((predicate) => !predicate.onlyQuickFilter);
@@ -214,7 +213,7 @@ class FilterFormComponent extends React.Component {
             this.onCloseForm();
         }
         else {
-            if (this.props.api.internalApi.getAdaptableOptions().filterOptions.autoApplyFilter) {
+            if (this.props.api.optionsApi.getFilterOptions().autoApplyFilter) {
                 this.props.onSetColumnFilter(editedColumnFilter);
             }
         }
@@ -257,7 +256,7 @@ class FilterFormComponent extends React.Component {
         const { editedColumnFilter } = this.state;
         editedColumnFilter.Predicate.Inputs[index] = value;
         this.setState({ editedColumnFilter });
-        if (this.props.api.internalApi.getAdaptableOptions().filterOptions.autoApplyFilter) {
+        if (this.props.api.optionsApi.getFilterOptions().autoApplyFilter) {
             this.props.onSetColumnFilter(editedColumnFilter);
         }
         // this.props.onSetColumnFilter(editedColumnFilter);

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -32,8 +32,7 @@ class QuickFilterFormComponent extends React.Component {
             }
         };
         this.loadPermittedValues = async (filter = '') => {
-            const { values, suppressClientSideFilter } = await (0, runIfNotResolvedIn_1.runIfNotResolvedIn)(this.props.api.gridApi.internalApi.getDistinctFilterDisplayValuesForColumn(this.props.currentColumn.columnId, filter, this.props.api.internalApi.getAdaptableOptions().filterOptions
-                .showDistinctFilteredValuesOnly), () => this._isMounted && this.setState({ isDistinctColumnValuesLoading: true }));
+            const { values, suppressClientSideFilter } = await (0, runIfNotResolvedIn_1.runIfNotResolvedIn)(this.props.api.gridApi.internalApi.getDistinctFilterDisplayValuesForColumn(this.props.currentColumn.columnId, filter, this.props.api.optionsApi.getFilterOptions().showDistinctFilteredValuesOnly), () => this._isMounted && this.setState({ isDistinctColumnValuesLoading: true }));
             if (!this._isMounted) {
                 return;
             }
@@ -67,7 +66,7 @@ class QuickFilterFormComponent extends React.Component {
             // there is no way to find out if the changed rows are relevant for this filter, so we have to update it every time :/
             this.handleGridValueChange();
         });
-        if ((_c = this.props.api.internalApi.getAdaptableOptions().filterOptions) === null || _c === void 0 ? void 0 : _c.showDistinctFilteredValuesOnly) {
+        if ((_c = this.props.api.optionsApi.getFilterOptions()) === null || _c === void 0 ? void 0 : _c.showDistinctFilteredValuesOnly) {
             this.props.api.internalApi.getAdaptableInstance()._on('GridFiltered', () => {
                 const filter = this.getFilterFromProps();
                 if (this.hasValuesPredicate(filter === null || filter === void 0 ? void 0 : filter.Predicate)) {
@@ -98,7 +97,7 @@ class QuickFilterFormComponent extends React.Component {
     }
     getFilterFromProps(props = this.props) {
         const filter = props.columnFilters.find((cf) => cf.ColumnId == props.currentColumn.columnId);
-        const filterOptions = props.api.internalApi.getAdaptableOptions().filterOptions;
+        const filterOptions = props.api.optionsApi.getFilterOptions();
         if (filter) {
             return filter;
         }
@@ -132,12 +131,12 @@ class QuickFilterFormComponent extends React.Component {
             hideEvent = 'blur';
         }
         let showQuickFilterDropdown = true;
-        let hideQuickFilterDropdownFunction = this.props.api.internalApi.getAdaptableOptions().filterOptions.hideQuickFilterDropdown;
+        let hideQuickFilterDropdownFunction = this.props.api.optionsApi.getFilterOptions().hideQuickFilterDropdown;
         if (hideQuickFilterDropdownFunction) {
             showQuickFilterDropdown = !hideQuickFilterDropdownFunction(this.props.currentColumn);
         }
         let showQuickFilterInput = true;
-        let hideQuickFilterInputFunction = this.props.api.internalApi.getAdaptableOptions().filterOptions.hideQuickFilterInput;
+        let hideQuickFilterInputFunction = this.props.api.optionsApi.getFilterOptions().hideQuickFilterInput;
         if (hideQuickFilterInputFunction) {
             showQuickFilterInput = !hideQuickFilterInputFunction(this.props.currentColumn);
         }
@@ -269,8 +268,7 @@ class QuickFilterFormComponent extends React.Component {
                     } },
                     React.createElement(rebass_1.Flex, { m: 2 },
                         React.createElement(SimpleButton_1.default, { onClick: () => this.clearFilter() }, "Clear Filter"),
-                        ((_a = this.props.api.internalApi.getAdaptableOptions().filterOptions) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) ==
-                            false && (React.createElement(SimpleButton_1.default, { ml: 2, onClick: () => this.updateFilter(this.state.filter) }, "Apply Filter"))),
+                        ((_a = this.props.api.optionsApi.getFilterOptions()) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) == false && (React.createElement(SimpleButton_1.default, { ml: 2, onClick: () => this.updateFilter(this.state.filter) }, "Apply Filter"))),
                     React.createElement(ListBoxFilterForm_1.ListBoxFilterForm, { disabled: this.isFilterDisabled(), suppressClientSideFilter: this.state.suppressClientSideFilter, isLoading: this.state.isDistinctColumnValuesLoading, onFilterChange: this.handleFilterChange, currentColumn: this.props.currentColumn, columns: [], columnDistinctValues: this.state.distinctColumnValues, dataType: this.props.currentColumn.dataType, uiSelectedColumnValues: this.state.filter.Predicate.Inputs.filter((input) => input !== ''), useAgGridStyle: true, onColumnValueSelectedChange: (list) => this.onColumnValuesChange(list) })));
             } },
             React.createElement(SimpleButton_1.default, { "data-name": 'Select Values', style: {
@@ -288,7 +286,7 @@ class QuickFilterFormComponent extends React.Component {
         var _a;
         const { filter } = this.state;
         filter.Predicate = { PredicateId: filter.Predicate.PredicateId, Inputs: columnValues };
-        if ((_a = this.props.api.internalApi.getAdaptableOptions().filterOptions) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) {
+        if ((_a = this.props.api.optionsApi.getFilterOptions()) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) {
             this.updateFilter(filter);
         }
         else {

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

@@ -8,7 +8,7 @@ const AdaptableViewFactory_1 = require("../../../AdaptableViewFactory");
 const AdaptablePopupModuleView_1 = require("./AdaptablePopupModuleView");
 const AdaptablePopupBody = (props) => {
     var _a;
-    const modalContainer = UIHelper_1.UIHelper.getModalContainer(props.api.internalApi.getAdaptableOptions(), document);
+    const modalContainer = UIHelper_1.UIHelper.getModalContainer(props.api.optionsApi.getAdaptableOptions(), document);
     const moduleName = props.module.moduleInfo.ModuleName;
     const accessLevel = props.api.internalApi
         .getEntitlementService()

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

@@ -11,7 +11,7 @@ const TopBar = (props) => {
     var _a;
     const baseClassName = 'ab-Adaptable-Popup__TopBar';
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const applicationIcon = (_a = adaptable.api.internalApi.getAdaptableOptions().userInterfaceOptions) === null || _a === void 0 ? void 0 : _a.applicationIcon;
+    const applicationIcon = (_a = adaptable.api.optionsApi.getUserInterfaceOptions()) === null || _a === void 0 ? void 0 : _a.applicationIcon;
     let icon = React.createElement(React.Fragment, null);
     const iconClassName = `${baseClassName}__Icon`;
     if (props.icon === 'ConfigurationIcon') {

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

@@ -14,7 +14,7 @@ const showToast = (props) => {
         Toastify_1.toast.dismiss();
         api = null;
     });
-    const adaptableOptions = props.api.internalApi.getAdaptableOptions();
+    const adaptableOptions = props.api.optionsApi.getAdaptableOptions();
     const toastProps = ObjectFactory_1.default.CreateToastOptions(adaptableOptions.notificationsOptions, {
         containerId: adaptableOptions.adaptableId,
         onClose: () => {

package/src/View/Components/ToolPanel/AdaptableToolPanel.js

@@ -27,7 +27,7 @@ const AdaptableToolPanelComponent = (props) => {
     const toolPanelsGlyph = React.createElement(icons_1.Icon, { name: 'align-justify' });
     const entitlementService = props.api.internalApi.getEntitlementService();
     const moduleService = props.api.internalApi.getModuleService();
-    const adaptableOptions = props.api.internalApi.getAdaptableOptions();
+    const adaptableOptions = props.api.optionsApi.getAdaptableOptions();
     const toolPanelOptions = adaptableOptions.toolPanelOptions;
     const settingsPanelOptions = adaptableOptions.settingsPanelOptions;
     if (entitlementService.isModuleHiddenEntitlement('ToolPanel')) {

package/src/View/Components/ToolPanel/ToolPanelPopup.js

@@ -66,8 +66,7 @@ class ToolPanelPopupComponent extends React.Component {
         const isToolPanelReadOnly = entitlementService.isModuleReadOnlyEntitlement('ToolPanel');
         const isModuleCheckboxDisabled = (module) => {
             if (module === 'SettingsPanel') {
-                return this.props.api.internalApi.getAdaptableOptions().settingsPanelOptions
-                    .alwaysShowInDashboard;
+                return this.props.api.optionsApi.getSettingsPanelOptions().alwaysShowInDashboard;
             }
             return false;
         };

package/src/View/CustomSort/Wizard/CustomSortColumnWizardSection.js

@@ -25,10 +25,9 @@ exports.isValidCustomSortColumn = isValidCustomSortColumn;
 const CustomSortColumnWizardSection = (props) => {
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const sortableCols = React.useMemo(() => {
-        var _a, _b;
         const sortableColumns = api.columnApi.getSortableColumns();
         const customSorts = api.customSortApi.getCustomSorts();
-        const columnSortComparers = ((_b = (_a = api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.customSortComparers) || [];
+        const columnSortComparers = api.optionsApi.getGeneralOptions().customSortComparers || [];
         const usedColumnIds = [
             ...customSorts.map((customSort) => customSort.ColumnId),
             ...columnSortComparers.map((comparer) => api.scopeApi.getColumnIdsInScope(comparer.scope)),

package/src/View/Dashboard/CustomToolbarWrapper.js

@@ -43,9 +43,15 @@ const CustomToolbarWrapper = (props) => {
         if (props.customToolbar.frameworkComponent) {
             adaptableApi.internalApi.createFrameworkComponent(element, props.customToolbar.frameworkComponent, 'toolbar');
         }
+        const destroyUnsubscribe = adaptableApi.eventApi.on('AdaptableDestroy', () => {
+            var _a;
+            (_a = adaptableApi === null || adaptableApi === void 0 ? void 0 : adaptableApi.internalApi) === null || _a === void 0 ? void 0 : _a.destroyFrameworkComponent(element, props.customToolbar.frameworkComponent, 'toolbar');
+        });
         return () => {
+            var _a;
+            destroyUnsubscribe();
             if (props.customToolbar.frameworkComponent) {
-                adaptableApi.internalApi.destroyFrameworkComponent(element, props.customToolbar.frameworkComponent, 'toolbar');
+                (_a = adaptableApi === null || adaptableApi === void 0 ? void 0 : adaptableApi.internalApi) === null || _a === void 0 ? void 0 : _a.destroyFrameworkComponent(element, props.customToolbar.frameworkComponent, 'toolbar');
             }
         };
     }, []);

package/src/View/Dashboard/Dashboard.js

@@ -70,7 +70,7 @@ const DashboardComponent = (props) => {
     const renderModuleButtons = () => {
         let shortcutsArray = props.DashboardState.ModuleButtons;
         let shortcuts = null;
-        const alwaysShowInDashboard = props.api.internalApi.getAdaptableOptions().settingsPanelOptions.alwaysShowInDashboard;
+        const alwaysShowInDashboard = props.api.optionsApi.getSettingsPanelOptions().alwaysShowInDashboard;
         const shouldAddSettingsPanel = alwaysShowInDashboard &&
             !props.api.internalApi.getEntitlementService().isModuleHiddenEntitlement('SettingsPanel');
         if (shouldAddSettingsPanel && !shortcutsArray.includes('SettingsPanel')) {
@@ -100,14 +100,14 @@ const DashboardComponent = (props) => {
     };
     const renderQuickSearch = () => {
         return (React.createElement(rebass_1.Box, { ml: 2 },
-            React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { type: "text", placeholder: props.api.internalApi.getAdaptableOptions().searchOptions.quickSearchPlaceholder, className: "ab-DashboardToolbar__QuickSearch__text", value: searchText, OnTextChange: search, style: { width: 'auto' }, inputStyle: { width: '7rem' } })));
+            React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { type: "text", placeholder: props.api.optionsApi.getSearchOptions().quickSearchPlaceholder, className: "ab-DashboardToolbar__QuickSearch__text", value: searchText, OnTextChange: search, style: { width: 'auto' }, inputStyle: { width: '7rem' } })));
     };
     let instanceName = props.api.internalApi.getToolbarTitle();
-    let dashboardOptions = props.api.internalApi.getAdaptableOptions().dashboardOptions;
+    let dashboardOptions = props.api.optionsApi.getDashboardOptions();
     const shouldRenderQuickSearchHeader = dashboardOptions.showQuickSearchInHeader &&
         props.api.internalApi.getModuleService().getModuleById(ModuleConstants_1.QuickSearchModuleId).isModuleAvailable();
-    const applicationIcon = props.api.internalApi.getAdaptableOptions().userInterfaceOptions.applicationIcon;
-    return props.DashboardState.IsHidden ? (React.createElement("div", null)) : (React.createElement(Dashboard_1.Dashboard, { title: instanceName, canFloat: props.api.internalApi.getAdaptableOptions().dashboardOptions.canFloat, activeTabIndex: props.DashboardState.ActiveTabIndex, onActiveTabIndexChange: (ActiveTabIndex) => {
+    const applicationIcon = props.api.optionsApi.getUserInterfaceOptions().applicationIcon;
+    return props.DashboardState.IsHidden ? (React.createElement("div", null)) : (React.createElement(Dashboard_1.Dashboard, { title: instanceName, canFloat: props.api.optionsApi.getDashboardOptions().canFloat, activeTabIndex: props.DashboardState.ActiveTabIndex, onActiveTabIndexChange: (ActiveTabIndex) => {
             props.onSetActiveTabIndex(ActiveTabIndex);
         }, collapsed: props.DashboardState.IsCollapsed, onCollapsedChange: (IsCollapsed) => {
             props.onSetIsCollapsed(IsCollapsed);

package/src/View/Dashboard/DashboardPopup.js

@@ -65,8 +65,7 @@ class DashboardPopupComponent extends React.Component {
         const isDashboardDisabled = dashboardAccessLevel === 'ReadOnly';
         const isModuleCheckboxDisabled = (module) => {
             if (module === 'SettingsPanel') {
-                return this.props.api.internalApi.getAdaptableOptions().settingsPanelOptions
-                    .alwaysShowInDashboard;
+                return this.props.api.optionsApi.getSettingsPanelOptions().alwaysShowInDashboard;
             }
             return false;
         };
@@ -75,7 +74,7 @@ class DashboardPopupComponent extends React.Component {
                 areDashboardSettingsVisible && (React.createElement(Panel_1.default, { header: 'Dashboard Modes', style: { height: 'auto', overflow: 'visible' }, variant: "default", borderRadius: "none" },
                     React.createElement(CheckBox_1.CheckBox, { mr: 3, "data-name": "collapse", className: `${baseClassName}__settings-option`, checked: this.props.IsCollapsed, onChange: (checked) => this.props.onSetDashboardCollapsed(checked) }, "Collapse"),
                     ' ',
-                    this.props.api.internalApi.getAdaptableOptions().dashboardOptions.canFloat && (React.createElement(CheckBox_1.CheckBox, { mr: 3, "data-name": "floating", className: `${baseClassName}__settings-option`, checked: this.props.IsFloating, onChange: (checked) => this.props.onSetDashboardFloating(checked) }, "Float")),
+                    this.props.api.optionsApi.getDashboardOptions().canFloat && (React.createElement(CheckBox_1.CheckBox, { mr: 3, "data-name": "floating", className: `${baseClassName}__settings-option`, checked: this.props.IsFloating, onChange: (checked) => this.props.onSetDashboardFloating(checked) }, "Float")),
                     ' ',
                     React.createElement(CheckBox_1.CheckBox, { "data-name": "hidden", className: `${baseClassName}__settings-option`, checked: this.props.IsHidden, onChange: (checked) => this.props.onSetDashboardHidden(checked) }, "Hidden"))),
                 React.createElement(Panel_1.default, { header: 'Dashboard Contents', style: { borderBottom: '1px solid var(--ab-color-primary)' }, variant: "default", borderRadius: "none", marginTop: 4 },

package/src/View/Dashboard/DashboardViewPanel.js

@@ -17,7 +17,7 @@ class DashboardViewPanelComponent extends React.Component {
             ' ',
             React.createElement(CheckBox_1.CheckBox, { className: `ab-${elementType}__Dashboard__collapsed-check`, marginTop: 0, fontSize: 2, padding: 1, checked: this.props.IsCollapsed, onChange: (checked) => this.props.onSetDashboardCollapsed(checked) }, "Collapse"),
             '',
-            this.props.api.internalApi.getAdaptableOptions().dashboardOptions.canFloat && (React.createElement(CheckBox_1.CheckBox, { className: `ab-${elementType}__Dashboard__collapsed-check`, marginTop: 0, fontSize: 2, padding: 1, checked: this.props.IsFloating, onChange: (checked) => this.props.onSetDashboardFloating(checked) }, "Float")),
+            this.props.api.optionsApi.getDashboardOptions().canFloat && (React.createElement(CheckBox_1.CheckBox, { className: `ab-${elementType}__Dashboard__collapsed-check`, marginTop: 0, fontSize: 2, padding: 1, checked: this.props.IsFloating, onChange: (checked) => this.props.onSetDashboardFloating(checked) }, "Float")),
             ' ',
             React.createElement(CheckBox_1.CheckBox, { className: `ab-${elementType}__Dashboard__hidden-check`, marginTop: 0, fontSize: 2, padding: 1, checked: this.props.IsHidden, onChange: (checked) => this.props.onSetDashboardHidden(checked) }, "Hidden")));
     }

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -64,7 +64,7 @@ const DataChangeHistoryGrid = (props) => {
         // 2. this UI will be reimplemented with Infinite Table anyway
         const addedRows = mapChangeHistoryRowData(addedChangeHistoryLogs, mainAdaptableInstance);
         const removedRows = mapChangeHistoryRowData(removedChangeHistoryLogs, mainAdaptableInstance);
-        adaptableApi.internalApi.getAdaptableOptions().gridOptions.api.applyTransactionAsync({
+        adaptableApi.optionsApi.getAgGridOptions().api.applyTransactionAsync({
             add: addedRows,
             remove: removedRows,
         });

package/src/View/DataChangeHistory/DataChangeHistoryPopup.js

@@ -31,8 +31,7 @@ class DataChangeHistoryPopupComponent extends React.Component {
             suspended && (React.createElement(ButtonPlay_1.ButtonPlay, { className: "ab-DataChangeHistoryPopup--button-resume", "data-name": 'data-change-history--button-resume', variant: 'outlined', tooltip: 'Resume tracking data changes', onClick: () => onChangeHistoryResume() }, "Resume")),
             enabled && (React.createElement(ButtonPause_1.ButtonPause, { className: "ab-DataChangeHistoryPopup--button-suspend", "data-name": 'data-change-history--button-suspend', variant: 'outlined', tooltip: 'Suspend tracking data changes', onClick: () => onChangeHistorySuspend() }, "Suspend")),
             (enabled || suspended) && (React.createElement(ButtonStop_1.ButtonStop, { className: "ab-DataChangeHistoryPopup--button-deactivate", "data-name": 'data-change-history--button-deactivate', variant: 'outlined', tooltip: 'Deactivate data change tracking', onClick: () => onChangeHistoryDisable() }, "Deactivate"))));
-        const dateFormat = `${this.props.api.internalApi.getAdaptableOptions().userInterfaceOptions.dateInputOptions
-            .dateFormat} HH:mm:ss`;
+        const dateFormat = `${this.props.api.optionsApi.getUserInterfaceOptions().dateInputOptions.dateFormat} HH:mm:ss`;
         const statusPanel = (React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPopup--status-panel", alignItems: 'center', style: { gap: 'var(--ab-space-1)' } },
             enabled && (React.createElement(React.Fragment, null,
                 React.createElement(rebass_1.Text, { className: "ab-DataChangeHistoryPanel--status-active", style: { color: 'var(--ab-color-success)', fontWeight: 'bold' } }, "Active"),

package/src/View/DataChangeHistory/DataChangeHistoryViewPanel.js

@@ -40,7 +40,7 @@ const DataChangeHistoryViewPanelControl = (props) => {
         suspended && (React.createElement(ButtonPlay_1.ButtonPlay, { className: "ab-DataChangeHistoryPanel--button-resume", "data-name": 'data-change-history--button-resume', tooltip: 'Resume tracking data changes', onClick: () => onChangeHistoryResume() })),
         enabled && (React.createElement(ButtonPause_1.ButtonPause, { className: "ab-DataChangeHistoryPanel--button-suspend", "data-name": 'data-change-history--button-suspend', tooltip: 'Suspend tracking data changes', onClick: () => onChangeHistorySuspend() })),
         (enabled || suspended) && (React.createElement(ButtonStop_1.ButtonStop, { className: "ab-DataChangeHistoryPanel--button-deactivate", "data-name": 'data-change-history--button-deactivate', tooltip: 'Deactivate data change tracking', onClick: () => onChangeHistoryDisable() }))));
-    const dateFormat = `${adaptable.api.internalApi.getAdaptableOptions().userInterfaceOptions.dateInputOptions.dateFormat} HH:mm:ss`;
+    const dateFormat = `${adaptable.api.optionsApi.getUserInterfaceOptions().dateInputOptions.dateFormat} HH:mm:ss`;
     const statusPanel = (React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPanel--status-panel", alignItems: 'center', style: { gap: gap } },
         enabled && (React.createElement(Tooltip_1.default, { label: !!activationTime && `since ${(0, FormatHelper_1.DateFormatter)(activationTime, { Pattern: dateFormat })}` },
             React.createElement(rebass_1.Text, { className: "ab-DataChangeHistoryPanel--status-active", fontSize: 2, style: { color: 'var(--ab-color-success)' } }, "Active"))),

package/src/View/Filter/FilterViewPanel.js

@@ -19,10 +19,10 @@ class FilterViewPanelComponent extends React.Component {
         super(props);
     }
     render() {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-        const showClearButton = (_b = (_a = this.props.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.filterOptions) === null || _b === void 0 ? void 0 : _b.showClearFilterButton;
-        const showSuspendFilterButton = (_d = (_c = this.props.api.internalApi.getAdaptableOptions()) === null || _c === void 0 ? void 0 : _c.filterOptions) === null || _d === void 0 ? void 0 : _d.showSuspendFilterButton;
+        const showClearButton = (_a = this.props.api.optionsApi.getFilterOptions()) === null || _a === void 0 ? void 0 : _a.showClearFilterButton;
+        const showSuspendFilterButton = (_b = this.props.api.optionsApi.getFilterOptions()) === null || _b === void 0 ? void 0 : _b.showSuspendFilterButton;
         const isAtLeastOneFilterActive = this.props.api.filterApi.getActiveColumnFilters().length > 0;
         const isAtLeastOneFilter = this.props.api.filterApi.getColumnFilters().length > 0;
         const handleSuspendUnsuspendAll = () => {

package/src/View/FlashingCell/Wizard/isValidFlashingCellRules.js

@@ -1,24 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidFlashingCellRules = void 0;
-const ModuleConstants_1 = require("../../../Utilities/Constants/ModuleConstants");
+const Utilities_1 = require("../../Components/EntityRulesEditor/Utilities");
 const isValidFlashingCellRules = (flashingCell, api, context) => {
-    var _a, _b, _c, _d, _e;
-    let valid = true;
+    var _a, _b;
     if (!((_b = (_a = flashingCell.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length) && !flashingCell.Rule.BooleanExpression) {
         return 'No Rule defined for Flashing Cell';
     }
-    if (valid && ((_d = (_c = flashingCell.Rule) === null || _c === void 0 ? void 0 : _c.Predicates) === null || _d === void 0 ? void 0 : _d.length)) {
-        valid = api.predicateApi.isEveryPredicateValid((_e = flashingCell.Rule) === null || _e === void 0 ? void 0 : _e.Predicates);
-        if (!valid) {
-            return 'Predicate is not valid';
-        }
-    }
-    if (valid && flashingCell.Rule.BooleanExpression) {
-        valid = api.queryLanguageApi.isValidBooleanExpression(flashingCell.Rule.BooleanExpression, ModuleConstants_1.FlashingCellModuleId);
-        if (!valid) {
-            return 'The Expression is not a valid Boolean Expression';
-        }
+    const isRuleValid = (0, Utilities_1.isAdaptableRuleValid)(flashingCell, api, context);
+    if (typeof isRuleValid === 'string') {
+        return isRuleValid;
     }
     // boolean expressions may also be saved as named queries
     if (context.namedQuery != false) {

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

@@ -151,6 +151,7 @@ const getFormatDisplayTypeForScope = (scope, api) => {
 };
 exports.getFormatDisplayTypeForScope = getFormatDisplayTypeForScope;
 const renderDateFormat = (data, _onChange, setFormatOption, scopedCustomFormatters) => {
+    var _a;
     if (data.DisplayFormat.Formatter !== 'DateFormatter') {
         return null;
     }
@@ -165,8 +166,9 @@ const renderDateFormat = (data, _onChange, setFormatOption, scopedCustomFormatte
                     ")."),
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "Pattern" },
-                        React.createElement(Input_1.default, { "data-name": "pattern", value: data.DisplayFormat.Options.Pattern, onChange: (e) => setFormatOption('Pattern', e.currentTarget.value), mr: 2 }),
-                        React.createElement("span", null, FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options, true)))))),
+                        React.createElement(Input_1.default, { "data-name": "pattern", value: (_a = data.DisplayFormat.Options.Pattern) !== null && _a !== void 0 ? _a : '', onChange: (e) => setFormatOption('Pattern', e.currentTarget.value), mr: 2 }),
+                        React.createElement("span", null, data.DisplayFormat.Options.Pattern &&
+                            FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options, true)))))),
         scopedCustomFormatters.length > 0 && (React.createElement(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Custom Formats"),
             React.createElement(Tabs_1.Tabs.Content, null,

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

@@ -97,7 +97,10 @@ function FormatColumnWizard(props) {
             },
             {
                 isValid: (abObject, api, context) => {
-                    return abObject.Rule ? (0, Utilities_1.isRuleValid)(abObject, api, context) : true;
+                    if (!abObject.Rule) {
+                        return true;
+                    }
+                    return (0, Utilities_1.isAdaptableRuleValid)(abObject, api, context);
                 },
                 title: 'Condition',
                 details: 'Build a Rule when the Format Column should be applied',

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.js

@@ -62,7 +62,7 @@ exports.isValidFreeTextColumn = isValidFreeTextColumn;
 const FreeTextColumnSettingsWizardSection = (props) => {
     var _a;
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const Pattern = api.internalApi.getAdaptableOptions().userInterfaceOptions.dateInputOptions.dateFormat;
+    const Pattern = api.optionsApi.getUserInterfaceOptions().dateInputOptions.dateFormat;
     const [ColumnNameFocused, setColumnNameFocused] = (0, react_1.useState)(false);
     const inEdit = props.isEdit;
     const validCheck = (0, exports.isValidFreeTextColumn)(data, api);

package/src/View/GridInfo/GridInfoPopup.js

@@ -65,7 +65,7 @@ const GridInfoPopup = (props) => {
             })
             : null;
         const selectedRowInfo = props.api.gridApi.getSelectedRowInfo();
-        if ((_a = props.api.internalApi.getAdaptableOptions().userInterfaceOptions) === null || _a === void 0 ? void 0 : _a.showAdapTableVersion) {
+        if ((_a = props.api.optionsApi.getUserInterfaceOptions()) === null || _a === void 0 ? void 0 : _a.showAdapTableVersion) {
             returnRows.push(createReadOnlyColItem(colItems, 'AdapTable Version', version_1.default));
         }
         returnRows.push(createReadOnlyColItem(colItems, 'Sorted Columns', ArrayExtensions_1.default.IsNotNullOrEmpty(sorts) ? sorts.join('; ') : 'None'));

package/src/View/Layout/PivotDetailsPopoup.js

@@ -15,13 +15,13 @@ const tableDOMProps = {
 const PivotDetailsPopoup = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const adaptableApi = adaptable.api;
-    const primaryKey = adaptableApi.internalApi.getAdaptableOptions().primaryKey;
+    const primaryKey = adaptableApi.optionsApi.getPrimaryKey();
     const { hasPivotValue, rows, rowGroups, columnId, layout, aggColumn, pivotValue, pivotColumnId, } = props.popupProps;
     let data = rows;
     const columns = React.useMemo(() => {
-        var _a, _b;
+        var _a;
         const getFriendlyName = (columnId) => adaptableApi.columnApi.getFriendlyNameForColumnId(columnId);
-        const pivotPreviewOptionColumn = (_b = (_a = adaptableApi.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.layoutOptions) === null || _b === void 0 ? void 0 : _b.pivotPreviewColumns;
+        const pivotPreviewOptionColumn = (_a = adaptableApi.optionsApi.getLayoutOptions()) === null || _a === void 0 ? void 0 : _a.pivotPreviewColumns;
         let pivotPreviewExtraColumns = [];
         if (typeof pivotPreviewOptionColumn === 'function') {
             const pivotPreviewColumnsContext = {

package/src/View/PlusMinus/Wizard/PlusMinusSettingsWizardSection.d.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
 import { OnePageAdaptableWizardContextType } from '../../Wizard/OnePageAdaptableWizard';
-import { PlusMinusNudge, AdaptableApi } from '../../../types';
+import { AdaptableApi, PlusMinusNudge } from '../../../types';
 export declare const PlusMinusSettingsSummary: React.FunctionComponent<{
     hasCondition: boolean;
 }>;
-export declare const isSettingsValid: (hasCondition: boolean) => (data: PlusMinusNudge, api: AdaptableApi, context: OnePageAdaptableWizardContextType<PlusMinusNudge>) => true | "The Expression is not a valid Boolean Expression" | "No valid Condition is specified" | "The Predicates are not valid" | "Nudge value is not specified" | "Nudge value must be different than 0";
+export declare const isSettingsValid: (hasCondition: boolean) => (data: PlusMinusNudge, api: AdaptableApi, context: OnePageAdaptableWizardContextType<PlusMinusNudge>) => string | true;
 interface PlusMinusSettingsWizardSectionProps {
     onChange: (plusMinusNudge: PlusMinusNudge) => void;
     hasCondition: boolean;

package/src/View/PlusMinus/Wizard/PlusMinusSettingsWizardSection.js

@@ -24,9 +24,15 @@ const PlusMinusSettingsSummary = (props) => {
 };
 exports.PlusMinusSettingsSummary = PlusMinusSettingsSummary;
 const isSettingsValid = (hasCondition) => (data, api, context) => {
-    const ruleValidation = hasCondition ? (0, Utilities_1.isRuleValid)(data, api, context) : true;
-    if (typeof ruleValidation === 'string') {
-        return ruleValidation;
+    var _a;
+    if (hasCondition) {
+        if (!((_a = data === null || data === void 0 ? void 0 : data.Rule) === null || _a === void 0 ? void 0 : _a.BooleanExpression)) {
+            return 'No valid Rule is specified';
+        }
+        const ruleValidation = (0, Utilities_1.isAdaptableRuleValid)(data, api, context);
+        if (typeof ruleValidation === 'string') {
+            return ruleValidation;
+        }
     }
     if (typeof data.NudgeValue !== 'number') {
         return 'Nudge value is not specified';

package/src/View/QuickSearch/QuickSearchPopup.js

@@ -18,7 +18,7 @@ const useQuickSearchDebounced_1 = require("./useQuickSearchDebounced");
 const QuickSearchPopupComponent = (props) => {
     const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)(props);
     const [state, setState] = (0, react_1.useState)({
-        RunQueryAfterQuickSearch: props.api.internalApi.getAdaptableOptions().searchOptions.filterResultsAfterQuickSearch,
+        RunQueryAfterQuickSearch: props.api.optionsApi.getSearchOptions().filterResultsAfterQuickSearch,
         EditedStyle: props.QuickSearchStyle,
     });
     const onUpdateStyle = (style) => {
@@ -27,14 +27,14 @@ const QuickSearchPopupComponent = (props) => {
     };
     const onQuickSearchBehaviourChange = (checked) => {
         setState(Object.assign(Object.assign({}, state), { RunQueryAfterQuickSearch: checked }));
-        props.api.internalApi.getAdaptableOptions().searchOptions.filterResultsAfterQuickSearch =
+        props.api.optionsApi.getAdaptableOptions().searchOptions.filterResultsAfterQuickSearch =
             checked;
     };
     return (React.createElement(PopupPanel_1.PopupPanel, { headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },
         React.createElement(Panel_1.default, { header: props.moduleInfo.FriendlyName + ' Text', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginLeft: 2, marginRight: 2 },
             ' ',
             React.createElement(FormLayout_1.default, null,
-                React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { "data-name": "quick-search-text", type: "text", marginLeft: 2, marginRight: 5, padding: 20, style: { height: '100%' }, placeholder: props.api.internalApi.getAdaptableOptions().searchOptions.quickSearchPlaceholder, value: searchText, OnTextChange: search }))),
+                React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { "data-name": "quick-search-text", type: "text", marginLeft: 2, marginRight: 5, padding: 20, style: { height: '100%' }, placeholder: props.api.optionsApi.getSearchOptions().quickSearchPlaceholder, value: searchText, OnTextChange: search }))),
         React.createElement(Panel_1.default, { header: props.api.internalApi.getCorrectEnglishVariant('Behaviour'), style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginLeft: 2, marginRight: 2 },
             ' ',
             React.createElement(rebass_1.Flex, { flexDirection: "column" },

package/src/View/QuickSearch/QuickSearchStatusBarContent.js

@@ -12,6 +12,6 @@ const QuickSearchStatusBarContent = () => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const handleTextChange = React.useCallback((text) => dispatch(QuickSearchRedux.QuickSearchRun(text)), []);
-    return (React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { onClick: (event) => event.stopPropagation(), type: "text", inputStyle: { padding: '2px 3px', width: 90 }, placeholder: adaptable.api.internalApi.getAdaptableOptions().searchOptions.quickSearchPlaceholder, value: text, OnTextChange: handleTextChange }));
+    return (React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { onClick: (event) => event.stopPropagation(), type: "text", inputStyle: { padding: '2px 3px', width: 90 }, placeholder: adaptable.api.optionsApi.getSearchOptions().quickSearchPlaceholder, value: text, OnTextChange: handleTextChange }));
 };
 exports.QuickSearchStatusBarContent = QuickSearchStatusBarContent;

package/src/View/QuickSearch/QuickSearchViewPanel.js

@@ -10,7 +10,7 @@ const React = tslib_1.__importStar(require("react"));
 const QuickSearchViewPanelComponent = (props) => {
     const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)(props);
     const elementType = props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-    return (React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { type: "text", placeholder: props.api.internalApi.getAdaptableOptions().searchOptions.quickSearchPlaceholder, className: `ab-${elementType}__QuickSearch__text`, value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: '7rem' } }));
+    return (React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { type: "text", placeholder: props.api.optionsApi.getSearchOptions().quickSearchPlaceholder, className: `ab-${elementType}__QuickSearch__text`, value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: '7rem' } }));
 };
 function mapStateToProps(state) {
     return {

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -12,7 +12,7 @@ const AdaptableContext_1 = require("./AdaptableContext");
 const SpecialColumnSettingsWizardStep = (props) => {
     var _a, _b;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const possibleColumnTypes = adaptable.api.internalApi.getAdaptableOptions().columnOptions.columnTypes;
+    const possibleColumnTypes = adaptable.api.optionsApi.getColumnOptions().columnTypes;
     const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = (_a = props.settings) !== null && _a !== void 0 ? _a : {};
     const handleColumnTypeChange = (columnType, checked) => {
         var _a, _b, _c;
@@ -38,8 +38,7 @@ const SpecialColumnSettingsWizardStep = (props) => {
                             { size: '30%', name: 'third' },
                         ] },
                         React.createElement(FormLayout_1.FormRow, null,
-                            React.createElement(CheckBox_1.CheckBox, { "data-name": "filterable", checked: Filterable, onChange: (Filterable) => onSettingsChange({ Filterable }), disabled: !adaptable.api.internalApi.getAdaptableOptions().filterOptions
-                                    .enableFilterOnSpecialColumns }, "Filterable"),
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "filterable", checked: Filterable, onChange: (Filterable) => onSettingsChange({ Filterable }), disabled: !adaptable.api.optionsApi.getFilterOptions().enableFilterOnSpecialColumns }, "Filterable"),
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "resizable", checked: Resizable, onChange: (Resizable) => onSettingsChange({ Resizable }) }, "Resizable"),
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "groupable", checked: Groupable, onChange: (Groupable) => onSettingsChange({ Groupable }) }, "Groupable")),
                         React.createElement(FormLayout_1.FormRow, null,

package/src/agGrid/Adaptable.d.ts

@@ -282,7 +282,7 @@ export declare class Adaptable implements IAdaptable {
     private getUserColDefProperty;
     setupColumnCellStyle({ col, colId, abColumn }: ColumnSetupInfo): void;
     setupColumnCellClass({ col, colId, abColumn }: ColumnSetupInfo): void;
-    getExcelClassNameForCell(colId: string, primaryKeyValue: any): string;
+    getExcelClassNameForCell(colId: string, primaryKeyValue: any, userDefinedCellClass?: string | string[]): string;
     setupColumnCellEditor({ colId, col }: ColumnSetupInfo): void;
     setupColumnCellRenderer({ col, colId, abColumn }: ColumnSetupInfo): void;
     setupColumnTooltipValueGetter({ col, colId, abColumn }: ColumnSetupInfo): void;