@adaptabletools/adaptable 13.1.1 → 14.0.0-canary.1

package/src/Strategy/FormatColumnModule.js

@@ -14,12 +14,14 @@ const getFormatColumnStyleViewItems_1 = require("./Utilities/FormatColumn/getFor
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
 const MoveFormatColumn_1 = require("../View/FormatColumn/MoveFormatColumn");
+const Helper_1 = require("../Utilities/Helpers/Helper");
+const updateSingleToMultiplePredicates_1 = require("./Utilities/updateSingleToMultiplePredicates");
 class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'format-column', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
     }
     getModuleAdaptableObjects(config) {
-        return this.api.formatColumnApi.getAllFormatColumn(config);
+        return this.api.formatColumnApi.getFormatColumns(config);
     }
     getExplicitlyReferencedColumnIds(formatColumn) {
         if (this.api.scopeApi.scopeHasColumns(formatColumn.Scope)) {
@@ -34,6 +36,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     updateOldConfig() {
         this.updateConditionalStylesColumnsOldConfig();
+        this.updateFormatColumnSingleToMultiplePredicates();
         // update ConditionalStyle StatusBarPanel
         const oldStatusBars = this.api.internalApi.getState().StatusBar.StatusBars;
         let replaceConditionalStyleStatusBar = false;
@@ -62,6 +65,16 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             this.api.toolPanelApi.setModuleButtons([...new Set(dashboardModuleButtons)]);
         }
     }
+    updateFormatColumnSingleToMultiplePredicates() {
+        const formatColumns = this.api.formatColumnApi.getFormatColumns();
+        formatColumns.forEach((formatColumn) => {
+            if (formatColumn.Rule && 'Predicate' in formatColumn.Rule) {
+                const preparedFormatColumn = (0, Helper_1.cloneObject)(formatColumn);
+                (0, updateSingleToMultiplePredicates_1.updateSingleToMultiplePredicates)(preparedFormatColumn.Rule);
+                this.api.formatColumnApi.editFormatColumn(preparedFormatColumn);
+            }
+        });
+    }
     updateConditionalStylesColumnsOldConfig() {
         var _a;
         const oldConditionalStyles = (_a = this.api.internalApi.getState().ConditionalStyle) === null || _a === void 0 ? void 0 : _a.ConditionalStyles;
@@ -71,8 +84,21 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: Conditional Styles have been merged into 'Format Columns'`);
         // remove conditional styles
         this.api.internalApi.deleteConditionalStyles(oldConditionalStyles);
+        const transformedFormatColumns = oldConditionalStyles.map((conditionalStyle) => {
+            const formatColumn = {
+                Scope: conditionalStyle.Scope,
+                Style: conditionalStyle.Style,
+                IncludeGroupedRows: conditionalStyle.IncludeGroupedRows,
+            };
+            if ('Rule' in conditionalStyle && conditionalStyle.Rule.Predicate) {
+                formatColumn.Rule = {
+                    Predicates: [conditionalStyle.Rule.Predicate],
+                };
+            }
+            return formatColumn;
+        });
         // add as format column
-        this.api.formatColumnApi.addFormatColumns(oldConditionalStyles);
+        this.api.formatColumnApi.addFormatColumns(transformedFormatColumns);
     }
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
@@ -88,7 +114,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.formatColumnApi.getAllFormatColumn(),
+            ModuleEntities: this.api.formatColumnApi.getFormatColumns(),
             AddAction: FormatColumnRedux.FormatColumnAdd,
             EditAction: FormatColumnRedux.FormatColumnEdit,
         };

package/src/Strategy/FreeTextColumnModule.js

@@ -17,7 +17,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             !this.api.internalApi.getAdaptableOptions().autogeneratePrimaryKey);
     }
     getModuleAdaptableObjects() {
-        return this.api.freeTextColumnApi.getAllFreeTextColumn();
+        return this.api.freeTextColumnApi.getFreeTextColumns();
     }
     hasNamedQueryReferences() {
         return false;
@@ -36,7 +36,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
             if (this.api.freeTextColumnApi
-                .getAllFreeTextColumn()
+                .getFreeTextColumns()
                 .find((ftc) => ftc.ColumnId == column.columnId)) {
                 let popupParam = {
                     column: column,
@@ -51,7 +51,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.freeTextColumnApi.getAllFreeTextColumn(),
+            ModuleEntities: this.api.freeTextColumnApi.getFreeTextColumns(),
             AddAction: FreeTextColumnRedux.FreeTextColumnAdd,
             EditAction: FreeTextColumnRedux.FreeTextColumnEdit,
         };

package/src/Strategy/LayoutModule.js

@@ -21,7 +21,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
         this.clearUnsuportedFeaturesFromLayout = (layout) => {
-            const layoutSupportedFeatures = this.api.layoutApi.getLayoutSupportedFeatures();
+            const layoutSupportedFeatures = this.api.layoutApi.internalApi.getLayoutSupportedFeatures();
             let needsUpdate = false;
             const layoutToSave = Object.assign({}, layout);
             if (!layoutSupportedFeatures.RowGroupedColumns && layout.RowGroupedColumns) {
@@ -66,11 +66,11 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
          * less error prone to just remove it.
          */
         if (this.api.internalApi.getAdaptableInstance().getRowModel() === 'viewport') {
-            this.api.layoutApi.getAllLayout().forEach(this.clearUnsuportedFeaturesFromLayout);
+            this.api.layoutApi.getLayouts().forEach(this.clearUnsuportedFeaturesFromLayout);
         }
     }
     getModuleAdaptableObjects() {
-        return this.api.layoutApi.getAllLayout();
+        return this.api.layoutApi.getLayouts();
     }
     getExplicitlyReferencedColumnIds(layout) {
         const columnIds = [];
@@ -89,7 +89,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getTeamSharingReferences(adaptableObject) {
         const teamSharingReferences = super.getTeamSharingReferences(adaptableObject);
         const layoutName = adaptableObject.Name;
-        if (this.api.internalApi.hasLayoutSpecificObjects() && !!layoutName) {
+        if (this.api.layoutApi.internalApi.hasLayoutSpecificObjects() && !!layoutName) {
             const layoutAssociatedObjectReferences = [];
             const loadConfig = {
                 associatedWithLayout: layoutName,
@@ -99,7 +99,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 Reference: alertDefinition,
                 Module: 'Alert',
             }));
-            this.api.customSortApi.getAllCustomSort(loadConfig).forEach((customSort) => layoutAssociatedObjectReferences.push({
+            this.api.customSortApi.getCustomSorts(loadConfig).forEach((customSort) => layoutAssociatedObjectReferences.push({
                 Reference: customSort,
                 Module: 'CustomSort',
             }));
@@ -107,7 +107,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 Reference: flashingCell,
                 Module: 'FlashingCell',
             }));
-            this.api.formatColumnApi.getAllFormatColumn(loadConfig).forEach((formatColumn) => layoutAssociatedObjectReferences.push({
+            this.api.formatColumnApi.getFormatColumns(loadConfig).forEach((formatColumn) => layoutAssociatedObjectReferences.push({
                 Reference: formatColumn,
                 Module: 'FormatColumn',
             }));
@@ -115,16 +115,16 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 Reference: plusMinusNudge,
                 Module: 'PlusMinus',
             }));
-            this.api.shortcutApi.getAllShortcut(loadConfig).forEach((shortcut) => layoutAssociatedObjectReferences.push({
+            this.api.shortcutApi.getShortcuts(loadConfig).forEach((shortcut) => layoutAssociatedObjectReferences.push({
                 Reference: shortcut,
                 Module: 'Shortcut',
             }));
             [
-                ...this.api.scheduleApi.getAllReportSchedule(loadConfig),
-                ...this.api.scheduleApi.getAllReminderSchedule(loadConfig),
-                ...this.api.scheduleApi.getAllGlue42Schedule(loadConfig),
-                ...this.api.scheduleApi.getAllIPushPullSchedule(loadConfig),
-                ...this.api.scheduleApi.getAllOpenFinSchedule(loadConfig),
+                ...this.api.scheduleApi.getReportSchedules(loadConfig),
+                ...this.api.scheduleApi.getReminderSchedules(loadConfig),
+                ...this.api.scheduleApi.getGlue42Schedules(loadConfig),
+                ...this.api.scheduleApi.getIPushPullSchedules(loadConfig),
+                ...this.api.scheduleApi.getOpenFinSchedules(loadConfig),
             ].forEach((schedule) => layoutAssociatedObjectReferences.push({
                 Reference: schedule,
                 Module: 'Schedule',
@@ -138,7 +138,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     handleAdaptableReady() {
         requestAnimationFrame(() => {
-            this.api.layoutApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
+            this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
         });
     }
     addColumnMenuItems(column) {
@@ -248,7 +248,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const { agGridColumn } = menuContext;
         const columnId = agGridColumn.getColId();
         const isPivotColumn = this.api.columnApi.isAutoPivotColumn(columnId);
-        if (!isPivotColumn && this.api.columnApi.getColumnDataTypeFromColumnId(columnId) !== 'Number') {
+        if (!isPivotColumn && this.api.columnApi.getColumnDataTypeForColumnId(columnId) !== 'Number') {
             return;
         }
         /**
@@ -302,7 +302,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.layoutApi.getAllLayout(),
+            ModuleEntities: this.api.layoutApi.getLayouts(),
             AddAction: LayoutRedux.LayoutAdd,
             EditAction: LayoutRedux.LayoutSave,
         };
@@ -314,7 +314,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const maxColumnsToDisplay = (_d = (_c = (_b = (_a = this.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.layoutOptions) === null || _b === void 0 ? void 0 : _b.layoutViewOptions) === null || _c === void 0 ? void 0 : _c.maxColumnsToDisplay) !== null && _d !== void 0 ? _d : 10;
         const columnIdToFriendlyName = (columnId) => {
-            return this.api.columnApi.getFriendlyNameFromColumnId(columnId);
+            return this.api.columnApi.getFriendlyNameForColumnId(columnId);
         };
         let columns = layout.Columns.filter((c) => !this.api.columnApi.isAutoRowGroupColumn(c)).filter((c) => !this.api.columnApi.isAutoPivotColumn(c));
         if (columns.length >
@@ -394,7 +394,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             getEditWizard: () => LayoutWizard_1.LayoutWizard,
             getStatusBarPanelProps: () => {
                 const text = this.api.layoutApi.getCurrentLayoutName();
-                const layouts = this.api.layoutApi.getAllLayout();
+                const layouts = this.api.layoutApi.getLayouts();
                 const popover = layouts.length > 1 ? LayoutStatusBarSubPanelPopover_1.LayoutStatusBarSubPanelPopover : null;
                 return {
                     content: text,
@@ -406,7 +406,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
     }
     handleLayoutChange() {
-        if (!this.api.internalApi.hasLayoutSpecificObjects()) {
+        if (!this.api.layoutApi.internalApi.hasLayoutSpecificObjects()) {
             // no need if no callback implementation is provided or no auto checking
             return;
         }

package/src/Strategy/PlusMinusModule.js

@@ -34,7 +34,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!((_a = plusMinusNudge.Rule) === null || _a === void 0 ? void 0 : _a.BooleanExpression)) {
             return [];
         }
-        return this.api.queryApi.getReferencedNamedQueryNames((_b = plusMinusNudge.Rule) === null || _b === void 0 ? void 0 : _b.BooleanExpression);
+        return this.api.queryApi.internalApi.getReferencedNamedQueryNames((_b = plusMinusNudge.Rule) === null || _b === void 0 ? void 0 : _b.BooleanExpression);
     }
     handleAdaptableReady() {
         let plusMinusNudges = this.api.plusMinusApi.getAllPlusMinus();
@@ -96,7 +96,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 plusMinusNudges.forEach((pmr) => {
                     if (!foundRule) {
                         if (this.api.scopeApi.isColumnInScope(gridCell.column, pmr.Scope)) {
-                            if (this.api.gridApi.areCellsEditable([gridCell])) {
+                            if (this.api.gridApi.isCellEditable(gridCell)) {
                                 //for aggrid as we are getting strings sometimes
                                 if (typeof gridCell.rawValue != 'number') {
                                     gridCell.rawValue = parseFloat(gridCell.rawValue);

package/src/Strategy/QueryModule.js

@@ -13,11 +13,11 @@ class QueryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.QueryModuleId, ModuleConstants.QueryFriendlyName, 'query', 'QueryPopup', 'Run real-time text-based queries using a wealth of powerful functions and operators', api);
     }
     getModuleAdaptableObjects() {
-        return this.api.queryApi.getAllNamedQuery();
+        return this.api.queryApi.getNamedQueries();
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.queryApi.getAllNamedQuery(),
+            ModuleEntities: this.api.queryApi.getNamedQueries(),
             AddAction: QueryRedux.NamedQueryAdd,
             EditAction: QueryRedux.NamedQueryEdit,
         };
@@ -26,7 +26,7 @@ class QueryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.queryLanguageApi.getColumnsFromExpression(namedQuery.BooleanExpression);
     }
     getReferencedNamedQueryNames(namedQuery) {
-        return this.api.queryApi.getReferencedNamedQueryNames(namedQuery.BooleanExpression);
+        return this.api.queryApi.internalApi.getReferencedNamedQueryNames(namedQuery.BooleanExpression);
     }
     toView(query) {
         return {

package/src/Strategy/ScheduleModule.js

@@ -46,25 +46,23 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.clearAllJobs();
         //add schedules
         this.api.scheduleApi
-            .getAllActiveReminderSchedule()
+            .getActiveReminderSchedules()
             .forEach((reminderSchedule) => {
             this.addSchedule(reminderSchedule, Enums_1.ScheduleType.Reminder);
         });
         // add Reports
-        this.api.scheduleApi.getAllActiveReportSchedule().forEach((reportSchedule) => {
+        this.api.scheduleApi.getActiveReportSchedules().forEach((reportSchedule) => {
             this.addSchedule(reportSchedule, Enums_1.ScheduleType.Report);
         });
         this.api.scheduleApi
-            .getAllActiveIPushPullSchedule()
+            .getActiveIPushPullSchedules()
             .forEach((iPushPullSchedule) => {
             this.addSchedule(iPushPullSchedule, Enums_1.ScheduleType.ipushpull);
         });
-        this.api.scheduleApi.getAllActiveGlue42Schedule().forEach((glue42Schedule) => {
+        this.api.scheduleApi.getActiveGlue42Schedules().forEach((glue42Schedule) => {
             this.addSchedule(glue42Schedule, Enums_1.ScheduleType.Glue42);
         });
-        this.api.scheduleApi
-            .getAllActiveOpenFinSchedule()
-            .forEach((OpenFinSchedule) => {
+        this.api.scheduleApi.getActiveOpenFinSchedules().forEach((OpenFinSchedule) => {
             this.addSchedule(OpenFinSchedule, Enums_1.ScheduleType.OpenFin);
         });
         // }
@@ -127,14 +125,14 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const exportAcessLevel = entitlementService.getEntitlementAccessLevelForModule(ModuleConstants.ExportModuleId);
         let allSchedules = [];
         if (accessLevel !== 'Hidden') {
-            allSchedules.push(...this.api.scheduleApi.getAllReminderSchedule(config));
+            allSchedules.push(...this.api.scheduleApi.getReminderSchedules(config));
         }
         if (exportAcessLevel !== 'Hidden') {
-            allSchedules.push(...this.api.scheduleApi.getAllReportSchedule(config));
+            allSchedules.push(...this.api.scheduleApi.getReportSchedules(config));
         }
-        allSchedules.push(...this.api.scheduleApi.getAllIPushPullSchedule(config));
-        allSchedules.push(...this.api.scheduleApi.getAllGlue42Schedule(config));
-        allSchedules.push(...this.api.scheduleApi.getAllOpenFinSchedule(config));
+        allSchedules.push(...this.api.scheduleApi.getIPushPullSchedules(config));
+        allSchedules.push(...this.api.scheduleApi.getGlue42Schedules(config));
+        allSchedules.push(...this.api.scheduleApi.getOpenFinSchedules(config));
         return allSchedules;
     }
     toView(schedule) {

package/src/Strategy/ShortcutModule.js

@@ -19,14 +19,14 @@ class ShortcutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.adaptable = api.internalApi.getAdaptableInstance();
     }
     getModuleAdaptableObjects(config) {
-        return this.api.shortcutApi.getAllShortcut(config);
+        return this.api.shortcutApi.getShortcuts(config);
     }
     hasNamedQueryReferences() {
         return false;
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.shortcutApi.getAllShortcut(),
+            ModuleEntities: this.api.shortcutApi.getShortcuts(),
             AddAction: ShortcutRedux.ShortcutAdd,
             EditAction: ShortcutRedux.ShortcutEdit,
         };
@@ -38,7 +38,7 @@ class ShortcutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         });
     }
     checkListenToKeyDown() {
-        const shortcuts = this.api.shortcutApi.getAllShortcut();
+        const shortcuts = this.api.shortcutApi.getShortcuts();
         this.shouldHandleKeyDown = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(shortcuts);
     }
     handleKeyDown(cellEditorKeyDownEvent) {
@@ -48,9 +48,9 @@ class ShortcutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         const { keyDownEvent, cellValue, columnId, updateValueCallback } = cellEditorKeyDownEvent;
         const matchingShortcut = this.api.shortcutApi
-            .getAllActiveShortcut()
+            .getActiveShortcuts()
             .find((x) => keyDownEvent.key.toLowerCase() === x.ShortcutKey.toLowerCase() &&
-            this.api.scopeApi.isColumnInScope(this.api.columnApi.getColumnFromId(columnId), x.Scope));
+            this.api.scopeApi.isColumnInScope(this.api.columnApi.getColumnWithColumnId(columnId), x.Scope));
         if (!matchingShortcut || !matchingShortcut.ShortcutValue) {
             return;
         }

package/src/Strategy/SmartEditModule.js

@@ -27,7 +27,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 !menuContext.adaptableColumn.readOnly &&
                 menuContext.isSelectedCell &&
                 menuContext.isSingleSelectedColumn &&
-                this.api.gridApi.areCellsEditable(menuContext.selectedCellInfo.gridCells)) {
+                this.api.gridApi.isEveryCellEditable(menuContext.selectedCellInfo.gridCells)) {
                 let popUpParams = {
                     source: 'ContextMenu',
                 };
@@ -100,7 +100,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         }
         if (ArrayExtensions_1.default.IsNotNullOrEmpty(selectedCellInfo.gridCells) &&
-            !this.api.gridApi.areCellsEditable(selectedCellInfo.gridCells)) {
+            !this.api.gridApi.isEveryCellEditable(selectedCellInfo.gridCells)) {
             return {
                 Alert: {
                     alertType: 'generic',
@@ -118,7 +118,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let column;
         if (!this.api.internalApi.isGridInPivotMode()) {
             if (ArrayExtensions_1.default.IsNotNullOrEmpty(selectedCellInfo.columns)) {
-                column = this.api.columnApi.getColumnFromId(selectedCellInfo.columns[0].columnId);
+                column = this.api.columnApi.getColumnWithColumnId(selectedCellInfo.columns[0].columnId);
                 if (column) {
                     selectedCellInfo.gridCells.forEach((selectedCell) => {
                         let newValue;

package/src/Strategy/StyledColumnModule.js

@@ -6,9 +6,10 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const StyledColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/StyledColumnRedux"));
 const StyledColumnWizard_1 = require("../View/StyledColumn/Wizard/StyledColumnWizard");
-const StyledColumnWizardStyleSection_1 = require("../View/StyledColumn/Wizard/StyledColumnWizardStyleSection");
+const StyledColumnWizardStyleSection_1 = require("../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
 const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
+const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.StyledColumnModuleId, ModuleConstants.StyledColumnFriendlyName, 'brush', 'StyledColumnPopup', // to change
@@ -37,7 +38,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     updateOldConfig() {
         const formatColumnsWithColumnStyles = this.api.formatColumnApi
-            .getAllFormatColumn()
+            .getFormatColumns()
             .filter((formatColumn) => formatColumn.ColumnStyle);
         if (!formatColumnsWithColumnStyles.length) {
             return;
@@ -57,7 +58,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         styledColumns.forEach((styledColumn) => this.api.styledColumnApi.addStyledColumn(styledColumn));
     }
     getModuleAdaptableObjects(config) {
-        return this.api.styledColumnApi.getAllStyledColumn(config);
+        return this.api.styledColumnApi.getStyledColumns(config);
     }
     getExplicitlyReferencedColumnIds(formatColumn) {
         if (this.api.scopeApi.scopeHasColumns(formatColumn.Scope)) {
@@ -74,7 +75,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let returnColumnMenuItems = [];
         if (column && this.isModuleEditable() && !column.isSparkline) {
             if (column.dataType === 'Number') {
-                let styledColumn = this.api.styledColumnApi.getStyledColumnByColumnId(column.columnId);
+                let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
                 let styledColumnExists = Boolean(styledColumn);
                 if (!styledColumn) {
                     styledColumn = Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: column.columnId, 
@@ -93,7 +94,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Styled Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
             }
             if (column.dataType == 'Boolean' && !this.api.columnApi.isFreeTextColumn(column.columnId)) {
-                let styledColumn = this.api.styledColumnApi.getStyledColumnByColumnId(column.columnId);
+                let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
                 const hasCheckBox = styledColumn && (styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.CheckBoxStyle);
                 if (hasCheckBox) {
                     returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Remove Checkbox', 'unchecked', () => {
@@ -112,7 +113,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.styledColumnApi.getAllStyledColumn(),
+            ModuleEntities: this.api.styledColumnApi.getStyledColumns(),
             AddAction: StyledColumnRedux.StyledColumnAdd,
             EditAction: StyledColumnRedux.StyledColumnEdit,
         };
@@ -140,7 +141,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Column',
-                    values: [this.api.columnApi.getFriendlyNameFromColumnId(styledColumn.ColumnId)],
+                    values: [this.api.columnApi.getFriendlyNameForColumnId(styledColumn.ColumnId)],
                 },
                 !styledColumn.SparkLineStyle && {
                     name: 'Style',
@@ -152,6 +153,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     name: 'Settings',
                     values: [`Include grouped rows: ${styledColumn.IncludeGroupedRows ? 'Yes' : 'No'}`],
                 },
+                (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(styledColumn, this.api),
             ].filter(Boolean),
         };
     }

package/src/Strategy/TeamSharingModule.js

@@ -33,7 +33,7 @@ class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             this.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingCommitImport());
         });
         if (this.api.teamSharingApi.isTeamSharingAvailable()) {
-            this.api.teamSharingApi.triggerLoadingTeamSharingEntries();
+            this.api.teamSharingApi.internalApi.triggerLoadingTeamSharingEntries();
         }
     }
     isModuleAvailable() {
@@ -47,7 +47,7 @@ class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     handleStateChanged(adaptableStateChangedInfo) {
         // check if TeamSharing is activated
-        if (!this.api.teamSharingApi.isTeamSharingActivated()) {
+        if (!this.api.teamSharingApi.isTeamSharingAvailable()) {
             return;
         }
         // skip all teamsharing actions, otherwise we could get in an infinite loop
@@ -167,7 +167,7 @@ class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return {
             actions: [TeamSharingApplyButton_1.TeamSharingApplyButton],
             onMount: () => {
-                this.api.teamSharingApi.triggerLoadingTeamSharingEntries();
+                this.api.teamSharingApi.internalApi.triggerLoadingTeamSharingEntries();
             },
             getDeleteAction: (sharedEntity) => {
                 return TeamSharingRedux.TeamSharingRemoveItem(sharedEntity.Uuid);

package/src/Strategy/ThemeModule.js

@@ -10,7 +10,7 @@ class ThemeModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.ThemeModuleId, ModuleConstants.ThemeFriendlyName, 'theme', 'ThemePopup', 'Theme AdapTable with a colour configuration set of your choosing', api);
     }
     getModuleAdaptableObjects() {
-        return this.api.themeApi.getAllTheme();
+        return this.api.themeApi.getThemes();
     }
     hasNamedQueryReferences() {
         return false;

package/src/Strategy/Utilities/CustomSort/getCustomSortColumnViewItems.js

@@ -4,7 +4,7 @@ exports.getCustomSortColumnViewItems = void 0;
 const getCustomSortColumnViewItems = (customSort, api) => {
     return {
         name: 'Column',
-        values: [api.columnApi.getFriendlyNameFromColumnId(customSort.ColumnId)],
+        values: [api.columnApi.getFriendlyNameForColumnId(customSort.ColumnId)],
     };
 };
 exports.getCustomSortColumnViewItems = getCustomSortColumnViewItems;

package/src/Strategy/Utilities/Layout/getLayoutFilterViewItems.js

@@ -4,7 +4,7 @@ exports.getLayoutFilterViewItems = void 0;
 const getLayoutFilterViewItems = (layout, api) => {
     var _a;
     const columnIdToFriendlyName = (columnId) => {
-        return api.columnApi.getFriendlyNameFromColumnId(columnId);
+        return api.columnApi.getFriendlyNameForColumnId(columnId);
     };
     return {
         name: 'Filter',

package/src/Strategy/Utilities/Layout/getLayoutSortViewItems.js

@@ -4,7 +4,7 @@ exports.getLayoutSortViewItems = void 0;
 const getLayoutSortViewItems = (layout, api) => {
     var _a;
     const columnIdToFriendlyName = (columnId) => {
-        return api.columnApi.getFriendlyNameFromColumnId(columnId);
+        return api.columnApi.getFriendlyNameForColumnId(columnId);
     };
     return {
         name: 'Sort',

package/src/Strategy/Utilities/getRuleViewItems.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableApi } from '../../../types';
 export declare const getRuleViewItems: (rule: any, api: AdaptableApi) => {
     name: string;
-    values: string[];
+    values: any[];
 };

package/src/Strategy/Utilities/getRuleViewItems.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRuleViewItems = void 0;
 const getRuleViewItems = (rule, api) => {
+    var _a, _b, _c;
     return {
         name: 'Condition',
         values: [
-            rule.Predicate
-                ? api.predicateApi.predicateToString(rule.Predicate)
-                : api.internalApi.getAdaptableQueryExpressionText(rule),
+            ((_a = rule === null || rule === void 0 ? void 0 : rule.Predicates) === null || _a === void 0 ? void 0 : _a.length)
+                ? (_b = rule === null || rule === void 0 ? void 0 : rule.Predicates) === null || _b === void 0 ? void 0 : _b.map((predicate) => api.predicateApi.predicateToString(predicate)).join(' AND ')
+                : (_c = api.internalApi.getAdaptableQueryExpressionText(rule)) !== null && _c !== void 0 ? _c : 'No condition',
         ],
     };
 };

package/src/Strategy/Utilities/getScopeViewItems.js

@@ -5,7 +5,7 @@ const getScopeViewItems = (scope, api) => {
     let values = [];
     if ('ColumnIds' in scope && Array.isArray(scope.ColumnIds)) {
         values = scope.ColumnIds;
-        values = scope.ColumnIds.map((columnId) => api.columnApi.getFriendlyNameFromColumnId(columnId)).filter(Boolean);
+        values = scope.ColumnIds.map((columnId) => api.columnApi.getFriendlyNameForColumnId(columnId)).filter(Boolean);
     }
     if ('DataTypes' in scope) {
         values = scope.DataTypes;

package/src/Strategy/Utilities/updateSingleToMultiplePredicates.d.ts

@@ -0,0 +1,5 @@
+import { AdaptablePredicate } from '../../types';
+export declare function updateSingleToMultiplePredicates<T extends {
+    Predicates?: AdaptablePredicate[];
+    Predicate?: AdaptablePredicate | void;
+}>(rule: T): T;

package/src/Strategy/Utilities/updateSingleToMultiplePredicates.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateSingleToMultiplePredicates = void 0;
+function updateSingleToMultiplePredicates(rule) {
+    var _a;
+    if ('Predicate' in rule && rule.Predicate) {
+        rule.Predicates = [rule.Predicate, ...((_a = rule.Predicates) !== null && _a !== void 0 ? _a : [])];
+        delete rule.Predicate;
+    }
+    return rule;
+}
+exports.updateSingleToMultiplePredicates = updateSingleToMultiplePredicates;

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -55,7 +55,7 @@ exports.DefaultAdaptableOptions = {
     },
     adaptableQLOptions: {
         caseSensitiveTextComparisons: false,
-        externallyEvaluatedModules: [],
+        evaluateAdaptableQLExternally: undefined,
         customPredicateDefs: [],
         displayColumnFriendlyNamesForExpressions: true,
         expressionOptions: {
@@ -154,7 +154,8 @@ exports.DefaultAdaptableOptions = {
         customSortComparers: undefined,
         englishVariant: 'GB',
         unbalancedGroupsKey: undefined,
-        keepGroupedColumnIndex: false,
+        restoreUngroupedColumns: false,
+        disableDeleteConfirmation: false,
     },
     layoutOptions: {
         includeExpandedRowGroups: false,
@@ -254,7 +255,7 @@ exports.DefaultAdaptableOptions = {
         editLookUpItems: undefined,
         customDisplayFormatters: undefined,
         showDocumentationLinks: true,
-        gridInfoSections: ['GridSummary', 'AdaptableOptions', 'ColumnInfo'],
+        gridInfoSections: ['GridSummary', 'AdaptableOptions', 'ColumnInfo', 'AdaptableObjectsSummary'],
         showAdapTableVersion: true,
     },
     toolPanelOptions: {