@adaptabletools/adaptable 14.0.0-canary.1 → 14.0.0-canary.3

package/src/Utilities/Services/ReportService.js

@@ -4,22 +4,51 @@ exports.ReportService = void 0;
 const tslib_1 = require("tslib");
 const groupBy_1 = tslib_1.__importDefault(require("lodash/groupBy"));
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
-const Uuid_1 = require("../../PredefinedConfig/Uuid");
 const GeneralConstants_1 = require("../Constants/GeneralConstants");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Extensions/ArrayExtensions"));
 const FormatHelper_1 = tslib_1.__importStar(require("../Helpers/FormatHelper"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
+const uuid_1 = require("../../components/utils/uuid");
 class ReportService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
+        this.excelStylesCache = {};
+        this.cellClassKey2excelStyleIdMap = {};
+        this.excelStylesWithFormattedDate = {};
         this.adaptableApi = adaptableApi;
     }
+    resetExcelStyleMemoization() {
+        this.excelStylesCache = {};
+        this.cellClassKey2excelStyleIdMap = {};
+        this.excelStylesWithFormattedDate = {};
+    }
+    registerExcelStyle(excelStyle, cellClassKey) {
+        const excelStyleKey = JSON.stringify(excelStyle);
+        if (!this.excelStylesCache[excelStyleKey]) {
+            const excelStyleId = (0, uuid_1.createUuid)();
+            const excelStyleWithId = Object.assign(Object.assign({}, excelStyle), { id: excelStyleId });
+            this.excelStylesCache[excelStyleKey] = excelStyleWithId;
+        }
+        this.cellClassKey2excelStyleIdMap[cellClassKey] = this.excelStylesCache[excelStyleKey].id;
+    }
+    getRegisteredExcelStyles() {
+        return Object.values(this.excelStylesCache);
+    }
+    getExcelStyleIdForCellClassKey(cellClassKey) {
+        return this.cellClassKey2excelStyleIdMap[cellClassKey];
+    }
+    registerExcelStyleWithFormattedDate(cellClassId, isoFormattedValue) {
+        this.excelStylesWithFormattedDate[cellClassId] = isoFormattedValue;
+    }
+    getExcelStyleWithFormattedDate(cellClassId) {
+        return this.excelStylesWithFormattedDate[cellClassId];
+    }
     CreateSystemReport(systemReportName) {
         switch (systemReportName) {
             case GeneralConstants_1.VISUAL_DATA_REPORT:
                 return {
-                    Uuid: (0, Uuid_1.createUuid)(),
+                    Uuid: (0, uuid_1.createUuid)(),
                     Name: GeneralConstants_1.VISUAL_DATA_REPORT,
                     ReportColumnScope: 'VisibleColumns',
                     ReportRowScope: 'VisibleRows',
@@ -28,7 +57,7 @@ class ReportService {
                 };
             case GeneralConstants_1.ALL_DATA_REPORT:
                 return {
-                    Uuid: (0, Uuid_1.createUuid)(),
+                    Uuid: (0, uuid_1.createUuid)(),
                     Name: GeneralConstants_1.ALL_DATA_REPORT,
                     ReportColumnScope: 'AllColumns',
                     ReportRowScope: 'AllRows',
@@ -37,7 +66,7 @@ class ReportService {
                 };
             case GeneralConstants_1.CURRENT_DATA_REPORT:
                 return {
-                    Uuid: (0, Uuid_1.createUuid)(),
+                    Uuid: (0, uuid_1.createUuid)(),
                     Name: GeneralConstants_1.CURRENT_DATA_REPORT,
                     ReportColumnScope: 'VisibleColumns',
                     ReportRowScope: 'VisibleRows',
@@ -46,7 +75,7 @@ class ReportService {
                 };
             case GeneralConstants_1.SELECTED_CELLS_REPORT:
                 return {
-                    Uuid: (0, Uuid_1.createUuid)(),
+                    Uuid: (0, uuid_1.createUuid)(),
                     Name: GeneralConstants_1.SELECTED_CELLS_REPORT,
                     ReportColumnScope: 'SelectedColumns',
                     ReportRowScope: 'SelectedCellRows',
@@ -55,7 +84,7 @@ class ReportService {
                 };
             case GeneralConstants_1.SELECTED_ROWS_REPORT:
                 return {
-                    Uuid: (0, Uuid_1.createUuid)(),
+                    Uuid: (0, uuid_1.createUuid)(),
                     Name: GeneralConstants_1.SELECTED_ROWS_REPORT,
                     ReportColumnScope: 'VisibleColumns',
                     ReportRowScope: 'SelectedRows',
@@ -188,7 +217,7 @@ class ReportService {
                 break;
         }
         if (includePrimaryKey) {
-            const pkColumn = reportColumns.find((column) => column.columnId === this.adaptableApi.internalApi.getAdaptableOptions().primaryKey);
+            const pkColumn = reportColumns.find((column) => column.columnId === this.adaptableApi.optionsApi.getPrimaryKey());
             // TODO simplify after we fix the IsPrimaryKey bug
             // const pkColumn = reportColumns.find(column => column.IsPrimaryKey);
             if (!pkColumn && !!this.adaptableApi.columnApi.getPrimaryKeyColumn()) {
@@ -252,8 +281,7 @@ class ReportService {
                         const selectedColumnIds = columnIds.filter((columnId) => selectedRowColumnIds.includes(columnId));
                         const row = this.getRowObjectForColumnIds(rowNode, selectedColumnIds);
                         if (includePrimaryKey) {
-                            row[this.adaptableApi.internalApi.getAdaptableOptions().primaryKey] =
-                                rowPrimaryKeyValue;
+                            row[this.adaptableApi.optionsApi.getPrimaryKey()] = rowPrimaryKeyValue;
                         }
                         data.rows.push(row);
                     }
@@ -315,12 +343,12 @@ class ReportService {
             });
         }
         // otherwise check the general export format types
-        let cellExportFormat = this.computeCellExportValueFormat(columnType);
+        let cellExportFormat = this.adaptableApi.exportApi.internalApi.getCellExportFormatType(columnType);
         return this.getCellExportValueFromRawValueByType(rowNode, cellRawValue, columnId, cellExportFormat);
     }
     getReportFileName(reportName) {
         let fileName = StringExtensions_1.default.ReplaceEmptySpacesWithUnderscore(reportName);
-        if (this.adaptableApi.internalApi.getAdaptableOptions().exportOptions.appendFileTimestamp) {
+        if (this.adaptableApi.optionsApi.getExportOptions().appendFileTimestamp) {
             fileName = `${fileName}_${(0, FormatHelper_1.DateFormatter)(new Date(), {
                 Pattern: 'yyyyMMdd_HHmmss',
             })}`;
@@ -331,7 +359,7 @@ class ReportService {
         // TO DO
     }
     getCustomExportDateFormat() {
-        return this.adaptableApi.internalApi.getAdaptableOptions().exportOptions.exportDateFormat;
+        return this.adaptableApi.optionsApi.getExportOptions().exportDateFormat;
     }
     getCellExportValueFromRawValueByType(rowNode, cellRawValue, columnId, 
     // default to rawValue if, for some reason, the configs provide invalid values
@@ -341,24 +369,5 @@ class ReportService {
             : // type === formattedValue
                 this.adaptableApi.gridApi.getDisplayValueFromRawValue(rowNode, columnId, cellRawValue);
     }
-    computeCellExportValueFormat(columnDataType) {
-        const exportOptions = this.adaptableApi.internalApi.getAdaptableOptions().exportOptions;
-        if (exportOptions.exportFormatType === 'rawValue' ||
-            exportOptions.exportFormatType === 'formattedValue') {
-            return exportOptions.exportFormatType;
-        }
-        // format is customized based on column data type
-        switch (columnDataType) {
-            case 'String':
-                return exportOptions.exportFormatType.string;
-            case 'Number':
-                return exportOptions.exportFormatType.number;
-            case 'Date':
-                return exportOptions.exportFormatType.date;
-            default:
-                // default to rawValue for all other column types
-                return 'rawValue';
-        }
-    }
 }
 exports.ReportService = ReportService;

package/src/Utilities/Services/TeamSharingService.js

@@ -5,7 +5,7 @@ const Uuid_1 = require("../../PredefinedConfig/Uuid");
 class TeamSharingService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
-        const teamSharingOptions = adaptableApi.internalApi.getAdaptableOptions().teamSharingOptions;
+        const teamSharingOptions = adaptableApi.optionsApi.getTeamSharingOptions();
         if (teamSharingOptions.updateInterval > 0) {
             // convert minutes to millis
             const updateInterval = teamSharingOptions.updateInterval * 60000;
@@ -15,7 +15,7 @@ class TeamSharingService {
         }
     }
     buildSharedEntityWithDependencies(adaptableObject, module, configuration) {
-        const sharingUserName = this.adaptableApi.internalApi.getAdaptableOptions().userName;
+        const sharingUserName = this.adaptableApi.optionsApi.getUserName();
         const sharingTimestamp = new Date().getTime();
         const createdSharedEntities = [];
         this.createSharedEntity(adaptableObject, module, configuration, sharingUserName, sharingTimestamp, createdSharedEntities);
@@ -108,7 +108,7 @@ class TeamSharingService {
         return result;
     }
     showUpdateNotifications() {
-        const { updateNotification } = this.adaptableApi.internalApi.getAdaptableOptions().teamSharingOptions;
+        const { updateNotification } = this.adaptableApi.optionsApi.getTeamSharingOptions();
         if (!updateNotification) {
             return;
         }

package/src/Utilities/Services/ValidationService.js

@@ -62,19 +62,20 @@ class ValidationService {
     }
     IsAlertDefinitionTriggered(alertDefinition, dataChangedEvent) {
         var _a;
+        const displayValue = this.adaptableApi.gridApi.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId);
         return this.adaptableApi.predicateApi.handlePredicates((_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, {
             value: dataChangedEvent.newValue,
             oldValue: dataChangedEvent.oldValue,
-            displayValue: this.adaptableApi.gridApi.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId),
+            displayValue,
             node: dataChangedEvent.rowNode,
             column: dataChangedEvent.column,
         }, false);
     }
     performServerValidation(cellDataChangedInfo, config) {
         return () => {
-            this.adaptableApi.internalApi
-                .getAdaptableOptions()
-                .editOptions.validateOnServer(cellDataChangedInfo)
+            this.adaptableApi.optionsApi
+                .getEditOptions()
+                .validateOnServer(cellDataChangedInfo)
                 .then((validationResult) => {
                 var _a, _b;
                 if (validationResult.NewValue === undefined) {
@@ -92,8 +93,7 @@ class ValidationService {
                     row[(_b = this.adaptableApi.columnApi.internalApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : cellDataChangedInfo.column.columnId] = validationResult.NewValue;
                     this.adaptableApi.gridApi.updateGridData([row]);
                     if (StringExtensions_1.default.IsNotNullOrEmpty(validationResult.ValidationMessage) &&
-                        this.adaptableApi.internalApi.getAdaptableOptions().editOptions
-                            .displayServerValidationMessages) {
+                        this.adaptableApi.optionsApi.getEditOptions().displayServerValidationMessages) {
                         this.adaptableApi.alertApi.showAlertInfo('Server Validation Message', validationResult.ValidationMessage);
                     }
                 }

package/src/View/AdaptableView.js

@@ -20,7 +20,7 @@ class AdaptableView extends React.Component {
     render() {
         var _a, _b, _c, _d;
         const watermark = (_d = (_c = (_b = (_a = this.props.AdaptableApi) === null || _a === void 0 ? void 0 : _a.internalApi) === null || _b === void 0 ? void 0 : _b.getSystemState()) === null || _c === void 0 ? void 0 : _c.License) === null || _d === void 0 ? void 0 : _d.watermark;
-        const adaptableOptions = this.props.AdaptableApi.internalApi.getAdaptableOptions();
+        const adaptableOptions = this.props.AdaptableApi.optionsApi.getAdaptableOptions();
         return (React.createElement("div", null,
             this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard_1.Dashboard, { api: this.props.AdaptableApi })),
             React.createElement(AdaptableLoadingScreen_1.AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup }),

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ColumnsList.js

@@ -173,6 +173,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
             header: () => React.createElement(HeaderCellWrapper, null, "Primary Key"),
             maxWidth: 80,
             sortable: false,
+            renderMenuIcon: false,
             render: (params) => {
                 const { data } = params;
                 const column = data;
@@ -187,6 +188,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
         included: {
             maxWidth: 80,
             resizable: true,
+            renderMenuIcon: false,
             header: () => (React.createElement(HeaderWithCheckbox, { label: "Included", checked: allIncluded ? true : allExcluded ? false : null, onChange: (allIncluded) => {
                     if (allIncluded) {
                         includeAllColumns();
@@ -212,6 +214,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
             header: React.createElement(HeaderCellWrapper, null, "Field"),
             field: 'field',
             minWidth: 150,
+            renderMenuIcon: false,
             render: (params) => {
                 const column = params.data;
                 const humanized = StringExtensions_1.default.Humanize(column.field);
@@ -224,6 +227,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
         type: {
             header: React.createElement(HeaderCellWrapper, null, "Type"),
             maxWidth: 140,
+            renderMenuIcon: false,
             render: (params) => {
                 var _a;
                 const column = params.data;
@@ -232,6 +236,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
             },
         },
         sortable: {
+            renderMenuIcon: false,
             header: (React.createElement(HeaderWithCheckbox, { label: "Sortable", checked: isAllSortableColumns() ? true : isNoneSortableColumns() ? false : null, onChange: (allSortable) => {
                     if (allSortable) {
                         setAllSortable();
@@ -248,6 +253,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
             },
         },
         editable: {
+            renderMenuIcon: false,
             header: (React.createElement(HeaderWithCheckbox, { label: "Editable", checked: isAllEditableColumns() ? true : isNoneEditableColumns() ? false : null, onChange: (allEditable) => {
                     if (allEditable) {
                         setAllEditable();
@@ -265,6 +271,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
             },
         },
         resizable: {
+            renderMenuIcon: false,
             header: (React.createElement(HeaderWithCheckbox, { label: "Resizable", checked: isAllResizableColumns() ? true : isNoneResizableColumns() ? false : null, onChange: (allResizable) => {
                     if (allResizable) {
                         setAllResizable();
@@ -282,6 +289,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
             },
         },
         groupable: {
+            renderMenuIcon: false,
             header: (React.createElement(HeaderWithCheckbox, { label: "Groupable", checked: isAllGroupableColumns() ? true : isNoneGroupableColumns() ? false : null, onChange: (allGroupable) => {
                     if (allGroupable) {
                         setAllGroupable();
@@ -298,8 +306,9 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
                         } })));
             },
         },
-        filtrable: {
-            header: (React.createElement(HeaderWithCheckbox, { label: "Filtrable", checked: isAllFilterableColumns() ? true : isNoneFilterableColumns() ? false : null, onChange: (allFilterable) => {
+        filterable: {
+            renderMenuIcon: false,
+            header: (React.createElement(HeaderWithCheckbox, { label: "Filterable", checked: isAllFilterableColumns() ? true : isNoneFilterableColumns() ? false : null, onChange: (allFilterable) => {
                     if (allFilterable) {
                         setAllFilterable();
                     }

package/src/View/Alert/Wizard/isValidAlertRules.js

@@ -1,27 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidAlertRules = void 0;
-const ModuleConstants_1 = require("../../../Utilities/Constants/ModuleConstants");
+const Utilities_1 = require("../../Components/EntityRulesEditor/Utilities");
 const isValidAlertRules = (alert, api, context) => {
     var _a;
-    let valid = true;
-    if (!alert.Rule.Predicates &&
+    if (!((_a = alert.Rule.Predicates) === null || _a === void 0 ? void 0 : _a.length) &&
         !alert.Rule.BooleanExpression &&
         !alert.Rule.ObservableExpression &&
         !alert.Rule.AggregatedBooleanExpression) {
-        return 'No condition defined for alert';
+        return 'No Rule defined for Alert';
     }
-    if (valid && alert.Rule.Predicates) {
-        valid = api.predicateApi.isEveryPredicateValid((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates);
-        if (!valid) {
-            return 'Predicate is not valid';
-        }
-    }
-    if (valid && alert.Rule.BooleanExpression) {
-        valid = api.queryLanguageApi.isValidBooleanExpression(alert.Rule.BooleanExpression, ModuleConstants_1.AlertModuleId);
-        if (!valid) {
-            return 'The Expression is not a valid Boolean Expression';
-        }
+    const isRuleValid = (0, Utilities_1.isAdaptableRuleValid)(alert, api, context);
+    if (typeof isRuleValid === 'string') {
+        return isRuleValid;
     }
     // boolean expressions may also be saved as named queries
     if (context.namedQuery != false) {
@@ -30,18 +21,6 @@ const isValidAlertRules = (alert, api, context) => {
             return isValidName.message;
         }
     }
-    if (valid && alert.Rule.ObservableExpression) {
-        valid = api.queryLanguageApi.isValidObservableExpression(alert.Rule.ObservableExpression, ModuleConstants_1.AlertModuleId);
-        if (!valid) {
-            return 'The Expression is not a valid Observable Expression';
-        }
-    }
-    if (valid && alert.Rule.AggregatedBooleanExpression) {
-        valid = api.queryLanguageApi.isValidAggregatedBooleanExpression(alert.Rule.AggregatedBooleanExpression, ModuleConstants_1.AlertModuleId);
-        if (!valid) {
-            return 'The Expression is not a valid AggregatedBoolean Expression';
-        }
-    }
     return true;
 };
 exports.isValidAlertRules = isValidAlertRules;

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -117,7 +117,7 @@ const AdaptableObjectListItem = (props) => {
     const isEditDisabled = !Boolean(EditWizard || viewOptions.onOpenEditPopup);
     const showActions = !props.hideControls;
     const showEditButton = Boolean(EditWizard);
-    const adaptableOpttions = adaptable.api.internalApi.getAdaptableOptions();
+    const adaptableOpttions = adaptable.api.optionsApi.getAdaptableOptions();
     const disableDeleteConfirmationState = (0, react_redux_1.useSelector)((adaptableState) => SystemRedux.SystemDisableDeleteConfirmationSelector(adaptableState.System));
     const disableDeleteConfirmation = disableDeleteConfirmationState || ((_h = adaptableOpttions === null || adaptableOpttions === void 0 ? void 0 : adaptableOpttions.generalOptions) === null || _h === void 0 ? void 0 : _h.disableDeleteConfirmation);
     return (React.createElement(React.Fragment, null,

package/src/View/Components/EntityRulesEditor/Utilities.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableApi } from '../../../types';
 import { OnePageAdaptableWizardContextType } from '../../Wizard/OnePageAdaptableWizard';
 import { RuleType } from './index';
-export declare const isRuleValid: (abObject: {
+export declare const isAdaptableRuleValid: (abObject: {
     Rule?: RuleType;
-}, api: AdaptableApi, context: OnePageAdaptableWizardContextType<unknown>) => true | "The Expression is not a valid Boolean Expression" | "No valid Condition is specified" | "The Predicates are not valid";
+}, api: AdaptableApi, context: OnePageAdaptableWizardContextType<unknown>) => string | true;

package/src/View/Components/EntityRulesEditor/Utilities.js

@@ -1,21 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRuleValid = void 0;
-const isRuleValid = (abObject, api, context) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    if (!((_b = (_a = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length) && !((_c = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _c === void 0 ? void 0 : _c.BooleanExpression)) {
-        return 'No valid Condition is specified';
-    }
-    if ((_e = (_d = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _d === void 0 ? void 0 : _d.Predicates) === null || _e === void 0 ? void 0 : _e.length) {
-        if (!api.predicateApi.isEveryPredicateValid((_f = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _f === void 0 ? void 0 : _f.Predicates)) {
-            return 'The Predicates are not valid';
+exports.isAdaptableRuleValid = void 0;
+const isAdaptableRuleValid = (abObject, api, context) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    if ((_b = (_a = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length) {
+        if (!api.predicateApi.isEveryPredicateValid((_c = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _c === void 0 ? void 0 : _c.Predicates)) {
+            return `The Predicate${((_e = (_d = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _d === void 0 ? void 0 : _d.Predicates) === null || _e === void 0 ? void 0 : _e.length) === 1 ? ' is' : 's are'} not valid`;
         }
     }
-    if ((_g = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _g === void 0 ? void 0 : _g.BooleanExpression) {
-        if (!api.queryLanguageApi.isValidBooleanExpression((_h = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _h === void 0 ? void 0 : _h.BooleanExpression, context.moduleInfo.ModuleName)) {
+    if ((_f = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _f === void 0 ? void 0 : _f.BooleanExpression) {
+        if (!api.queryLanguageApi.isValidBooleanExpression((_g = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _g === void 0 ? void 0 : _g.BooleanExpression, context.moduleInfo.ModuleName)) {
             return 'The Expression is not a valid Boolean Expression';
         }
     }
+    if ((_h = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _h === void 0 ? void 0 : _h.ObservableExpression) {
+        if (!api.queryLanguageApi.isValidObservableExpression((_j = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _j === void 0 ? void 0 : _j.ObservableExpression, context.moduleInfo.ModuleName)) {
+            return 'The Expression is not a valid Observable Expression';
+        }
+    }
+    if ((_k = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _k === void 0 ? void 0 : _k.AggregatedBooleanExpression) {
+        if (!api.queryLanguageApi.isValidAggregatedBooleanExpression((_l = abObject === null || abObject === void 0 ? void 0 : abObject.Rule) === null || _l === void 0 ? void 0 : _l.AggregatedBooleanExpression, context.moduleInfo.ModuleName)) {
+            return 'The Expression is not a valid Aggregated Boolean Expression';
+        }
+    }
     return true;
 };
-exports.isRuleValid = isRuleValid;
+exports.isAdaptableRuleValid = isAdaptableRuleValid;

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)),