@adaptabletools/adaptable 18.0.0-canary.31 → 18.0.0-canary.33

package/src/Strategy/ExportModule.js

@@ -27,8 +27,8 @@ export class ExportModule extends AdaptableModuleBase {
     }
     getExplicitlyReferencedColumnIds(report) {
         if (report.ReportColumnScope === 'ScopeColumns' &&
-            this.api.scopeApi.scopeHasColumns(report.Scope)) {
-            return this.api.scopeApi
+            this.api.columnScopeApi.scopeHasColumns(report.Scope)) {
+            return this.api.columnScopeApi
                 .getColumnsForScope(report.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
@@ -48,7 +48,7 @@ export class ExportModule extends AdaptableModuleBase {
         let returnMenuItems = [];
         const availableSystemReports = this.api.exportApi.getAvailableSystemReports();
         if (availableSystemReports.includes(VISUAL_DATA_REPORT)) {
-            returnMenuItems.push(this.createMenuItemClickFunction('export-visual-data-excel', 'Excel', this.moduleInfo.Glyph, () => this.export(this.api.exportApi.getReportByName(VISUAL_DATA_REPORT), ExportDestination.Excel)));
+            returnMenuItems.push(this.createMenuItemClickFunction('export-visual-data-excel', 'Excel', 'excel', () => this.export(this.api.exportApi.getReportByName(VISUAL_DATA_REPORT), ExportDestination.Excel)));
         }
         if (availableSystemReports.includes(ALL_DATA_REPORT)) {
             const allDataReport = this.api.exportApi.getReportByName(ALL_DATA_REPORT);
@@ -88,9 +88,26 @@ export class ExportModule extends AdaptableModuleBase {
         const getMenuItemName = (reportName, destination) => {
             return `export-${adjustName(reportName)}-${adjustName(destination)}`;
         };
+        const getMenuItemIcon = (exportDestination) => {
+            // once we have icons for csv, clipboard etc then i would like to add them here one by one and use moduleinfo for custom
+            switch (exportDestination) {
+                case ExportDestination.Excel:
+                    return 'excel';
+                case ExportDestination.Clipboard:
+                    return 'clipboard';
+                case ExportDestination.CSV:
+                    return 'csv';
+                case ExportDestination.JSON:
+                    return 'json';
+                case ExportDestination.Table:
+                    return 'grid';
+            }
+            return this.moduleInfo.Glyph;
+        };
         const menuItems = [];
         for (const destination of this.api.exportApi.getAvailableExportDestinations()) {
-            menuItems.push(this.createMenuItemClickFunction(getMenuItemName(report.Name, destination), destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
+            menuItems.push(this.createMenuItemClickFunction(getMenuItemName(report.Name, destination), destination, getMenuItemIcon(destination), //  'filter', //  this.moduleInfo.Glyph,
+            () => this.export(report, destination)));
         }
         for (const customDestination of this.api.exportApi.getCustomDestinations()) {
             menuItems.push(this.createMenuItemClickFunction(getMenuItemName(report.Name, customDestination.name), customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));

package/src/Strategy/FlashingCellModule.js

@@ -46,8 +46,8 @@ export class FlashingCellModule extends AdaptableModuleBase {
         if (queryExpression) {
             return this.api.expressionApi.getColumnsFromExpression(queryExpression);
         }
-        else if (this.api.scopeApi.scopeHasColumns(alertDefinition.Scope)) {
-            return this.api.scopeApi
+        else if (this.api.columnScopeApi.scopeHasColumns(alertDefinition.Scope)) {
+            return this.api.columnScopeApi
                 .getColumnsForScope(alertDefinition.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
@@ -65,7 +65,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
             if (!this.api.columnApi.isCalculatedColumn(column.columnId)) {
                 const flashingCellDefinitions = this.api.flashingCellApi.getFlashingCellDefinitions();
                 const flashingCellForCurrentColumn = flashingCellDefinitions.find((flashingCellDefinition) => {
-                    return this.api.scopeApi.isColumnInScope(column, flashingCellDefinition.Scope);
+                    return this.api.columnScopeApi.isColumnInScope(column, flashingCellDefinition.Scope);
                 });
                 if (flashingCellForCurrentColumn) {
                     return [
@@ -165,7 +165,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
         const definitions = this.api.flashingCellApi.getActiveFlashingCellDefinitions();
         const defaultNoPredicateReturn = false;
         let relatedFlashingCellsDefinitions = definitions
-            .filter((v) => this.api.scopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
+            .filter((v) => this.api.columnScopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
             .filter((flashingCellDefinition) => !isReactiveQuery(flashingCellDefinition.Rule));
         let triggeredFlashingCells = [];
         if (ArrayExtensions.IsNotNullOrEmpty(relatedFlashingCellsDefinitions)) {

package/src/Strategy/FormatColumnModule.js

@@ -22,8 +22,8 @@ export class FormatColumnModule extends AdaptableModuleBase {
         if (queryExpression) {
             return this.api.expressionApi.getColumnsFromExpression(queryExpression);
         }
-        else if (this.api.scopeApi.scopeHasColumns(formatColumn.Scope)) {
-            return this.api.scopeApi
+        else if (this.api.columnScopeApi.scopeHasColumns(formatColumn.Scope)) {
+            return this.api.columnScopeApi
                 .getColumnsForScope(formatColumn.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }

package/src/Strategy/NoteModule.js

@@ -11,7 +11,7 @@ export class NoteModule extends AdaptableModuleBase {
         return super.isModuleAvailable() && !this.api.optionsApi.getAutogeneratePrimaryKey();
     }
     createContextMenuItems(menuContext) {
-        var _a, _b, _c;
+        var _a, _b;
         if (!this.isModuleAvailable()) {
             return;
         }
@@ -28,10 +28,10 @@ export class NoteModule extends AdaptableModuleBase {
         if (!isCellNotable) {
             return;
         }
-        const [note] = (_c = this.adaptable.api.noteApi.getNotesForCell({
+        const note = this.adaptable.api.noteApi.getNoteForCell({
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
-        })) !== null && _c !== void 0 ? _c : [];
+        });
         if (note) {
             return [
                 this.createMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {

package/src/Strategy/PlusMinusModule.js

@@ -19,8 +19,8 @@ export class PlusMinusModule extends AdaptableModuleBase {
         return this.api.plusMinusApi.getAllPlusMinus(config);
     }
     getExplicitlyReferencedColumnIds(plusMinusNudge) {
-        if (this.api.scopeApi.scopeHasColumns(plusMinusNudge.Scope)) {
-            return this.api.scopeApi
+        if (this.api.columnScopeApi.scopeHasColumns(plusMinusNudge.Scope)) {
+            return this.api.columnScopeApi
                 .getColumnsForScope(plusMinusNudge.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
@@ -92,7 +92,7 @@ export class PlusMinusModule extends AdaptableModuleBase {
                 let replacementGridCell;
                 plusMinusNudges.forEach((pmr) => {
                     if (!foundRule) {
-                        if (this.api.scopeApi.isColumnInScope(gridCell.column, pmr.Scope)) {
+                        if (this.api.columnScopeApi.isColumnInScope(gridCell.column, pmr.Scope)) {
                             if (this.api.gridApi.isCellEditable(gridCell)) {
                                 //for aggrid as we are getting strings sometimes
                                 if (typeof gridCell.rawValue != 'number') {

package/src/Strategy/ShortcutModule.js

@@ -46,7 +46,7 @@ export class ShortcutModule extends AdaptableModuleBase {
         const matchingShortcut = this.api.shortcutApi
             .getActiveShortcuts()
             .find((x) => keyDownEvent.key.toLowerCase() === x.ShortcutKey.toLowerCase() &&
-            this.api.scopeApi.isColumnInScope(this.api.columnApi.getColumnWithColumnId(columnId), x.Scope));
+            this.api.columnScopeApi.isColumnInScope(this.api.columnApi.getColumnWithColumnId(columnId), x.Scope));
         if (!matchingShortcut || !matchingShortcut.ShortcutValue) {
             return;
         }

package/src/Strategy/StyledColumnModule.js

@@ -15,8 +15,8 @@ export class StyledColumnModule extends AdaptableModuleBase {
         return this.api.styledColumnApi.getStyledColumns(config);
     }
     getExplicitlyReferencedColumnIds(formatColumn) {
-        if (this.api.scopeApi.scopeHasColumns(formatColumn.Scope)) {
-            return this.api.scopeApi
+        if (this.api.columnScopeApi.scopeHasColumns(formatColumn.Scope)) {
+            return this.api.columnScopeApi
                 .getColumnsForScope(formatColumn.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
@@ -104,7 +104,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                         // Number
                         // Create Styled Column - Gradient | Percent Bar | Badge
                         case 'Number':
-                            const emptyRanges = this.api.scopeApi.createCellColorRangesForScope({
+                            const emptyRanges = this.api.columnScopeApi.createCellColorRangesForScope({
                                 ColumnIds: [column.columnId],
                             });
                             const newGrandientButton = this.createMenuItemShowPopup('styled-column-gradient-add', 'Create Gradient Column', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
@@ -177,7 +177,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                 name: 'Settings',
                 values: [
                     `Data Rows: ${((_b = (_a = styledColumn.BadgeStyle) === null || _a === void 0 ? void 0 : _a.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeDataRows) ? 'No' : 'Yes'}`,
-                    `Grouped Rows: ${((_d = (_c = styledColumn.BadgeStyle) === null || _c === void 0 ? void 0 : _c.RowScope) === null || _d === void 0 ? void 0 : _d.ExcludeGroupedRows) ? 'No' : 'Yes'}`,
+                    `Group Rows: ${((_d = (_c = styledColumn.BadgeStyle) === null || _c === void 0 ? void 0 : _c.RowScope) === null || _d === void 0 ? void 0 : _d.ExcludeGroupRows) ? 'No' : 'Yes'}`,
                     `Summary Rows: ${((_f = (_e = styledColumn.BadgeStyle) === null || _e === void 0 ? void 0 : _e.RowScope) === null || _f === void 0 ? void 0 : _f.ExcludeSummaryRows) ? 'No' : 'Yes'}`,
                 ],
             });

package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsViewItems.js

@@ -3,7 +3,7 @@ export const getFormatColumnSettingsViewItems = (formatColumn) => {
     const values = [
         `Cell alignment: ${(_a = formatColumn.CellAlignment) !== null && _a !== void 0 ? _a : 'default'}`,
         `Data Rows: ${((_b = formatColumn.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeDataRows) ? 'Yes' : 'No'}`,
-        `Grouped Rows: ${((_c = formatColumn.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeGroupedRows) ? 'Yes' : 'No'}`,
+        `Group Rows: ${((_c = formatColumn.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeGroupRows) ? 'Yes' : 'No'}`,
         `Row Summaries: ${((_d = formatColumn.RowScope) === null || _d === void 0 ? void 0 : _d.ExcludeSummaryRows) ? 'Yes' : 'No'}`,
     ].filter(Boolean);
     return {

package/src/Utilities/Services/CellPopupService.js

@@ -74,9 +74,9 @@ export class CellPopupService {
             this.hidePopup();
             return;
         }
-        const cellNotes = this.adaptable.api.noteApi.getNotesForCell(cellPosition);
+        const cellNote = this.adaptable.api.noteApi.getNoteForCell(cellPosition);
         const cellComments = this.adaptable.api.commentApi.getCommentThread(cellPosition);
-        const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
+        const hasNotesOrComments = cellNote || cellComments;
         // call only if it is different
         if (CellPopupService.isSameAddress(openCellAddress, cellPosition)) {
             return;
@@ -92,9 +92,9 @@ export class CellPopupService {
             return;
         }
         // if open but this has no note, close
-        const cellNotes = this.adaptable.api.noteApi.getNotesForCell(cellAddress);
+        const cellNote = this.adaptable.api.noteApi.getNoteForCell(cellAddress);
         const cellComments = this.adaptable.api.commentApi.getCommentThread(cellAddress);
-        const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
+        const hasNotesOrComments = cellNote || cellComments;
         if (openCellAddress && !hasNotesOrComments) {
             // hide only if in edit mode
             // because if you select a cell and move the mouse fast over another cell

package/src/Utilities/Services/ReportService.js

@@ -134,7 +134,7 @@ export class ReportService {
             case 'SelectedColumns':
                 return '[Selected Columns]';
             case 'ScopeColumns':
-                return this.adaptableApi.scopeApi.getScopeDescription(report.Scope);
+                return this.adaptableApi.columnScopeApi.getScopeDescription(report.Scope);
         }
     }
     GetReportExpressionDescription(report, cols) {
@@ -197,7 +197,7 @@ export class ReportService {
                     reportColumns = report.Scope.ColumnIds.map((columnId) => this.adaptableApi.columnApi.getColumnWithColumnId(columnId)).filter((c) => c);
                 }
                 else {
-                    reportColumns = this.adaptableApi.scopeApi.getColumnsForScope(report.Scope);
+                    reportColumns = this.adaptableApi.columnScopeApi.getColumnsForScope(report.Scope);
                 }
                 break;
         }

package/src/Utilities/Services/ValidationService.js

@@ -15,7 +15,7 @@ export class ValidationService {
         }
         let editingRules = this.adaptableApi.alertApi.internalApi
             .getAlertDefinitionsWithPreventEdit()
-            .filter((v) => this.adaptableApi.scopeApi.isColumnInScope(cellDataChangedInfo.column, v.Scope));
+            .filter((v) => this.adaptableApi.columnScopeApi.isColumnInScope(cellDataChangedInfo.column, v.Scope));
         let failedValidations = [];
         if (ArrayExtensions.IsNotEmpty(editingRules)) {
             editingRules.forEach((alertDefinition) => {
@@ -127,7 +127,7 @@ export class ValidationService {
     }
     createValidationDescription(alertDefinition) {
         var _a, _b;
-        return (this.adaptableApi.scopeApi.getScopeDescription(alertDefinition.Scope) +
+        return (this.adaptableApi.columnScopeApi.getScopeDescription(alertDefinition.Scope) +
             ' ' +
             ((_b = (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.map((predicate) => this.adaptableApi.predicateApi.predicateToString(predicate)).join(' AND ')));
     }

package/src/View/Alert/AlertEntityRow.js

@@ -9,7 +9,7 @@ export class AlertEntityRow extends React.Component {
         let alertDefinition = this.props.adaptableObject;
         let messageTypes = ['Info', 'Success', 'Warning', 'Error'];
         let colItems = cloneObject(this.props.colItems);
-        colItems[0].Content = (React.createElement(EntityRowItem, { Content: this.props.api.scopeApi.getScopeToString(alertDefinition.Scope) }));
+        colItems[0].Content = (React.createElement(EntityRowItem, { Content: this.props.api.columnScopeApi.getScopeToString(alertDefinition.Scope) }));
         colItems[1].Content = (React.createElement(EntityRowItem, { Content: this.props.api.alertApi.internalApi.getAlertRuleDescription(alertDefinition) }));
         colItems[2].Content = (React.createElement("div", null,
             React.createElement(DropdownButton, { showClearButton: false, items: messageTypes.map((item) => ({

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

@@ -24,7 +24,7 @@ export const AlertScopeWizardSection = (props) => {
                         Predicates: [{ PredicateId: 'AnyChange' }],
                     };
                 }
-                if (newData.Rule.ObservableExpression !== undefined && !api.scopeApi.scopeIsAll(Scope)) {
+                if (newData.Rule.ObservableExpression !== undefined && !api.columnScopeApi.scopeIsAll(Scope)) {
                     // if it had observable expression and the scope is changed to partial
                     // we need to reset to not be an observable expression, as observable is not supported
                     // for partial scope
@@ -32,7 +32,7 @@ export const AlertScopeWizardSection = (props) => {
                     newData.Rule.BooleanExpression = '';
                 }
                 if (newData.Rule.AggregatedBooleanExpression !== undefined &&
-                    !api.scopeApi.scopeIsAll(Scope)) {
+                    !api.columnScopeApi.scopeIsAll(Scope)) {
                     // if it had aggregation expression and the scope is changed to partial
                     // we need to reset to not be an aggregation expression, as aggregation is not supported
                     // for partial scope

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

@@ -3,7 +3,7 @@ import { Box, Text } from 'rebass';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { ValueOptionsTags } from '../../Components/ValueSelector';
 export const renderScopeSummary = (data) => {
-    const { api: { scopeApi }, } = useOnePageAdaptableWizardContext();
+    const { api: { columnScopeApi: scopeApi }, } = useOnePageAdaptableWizardContext();
     const columnsInScope = scopeApi.getColumnsForScope(data.Scope);
     return (React.createElement(React.Fragment, null,
         React.createElement(Box, null,

package/src/View/ColumnInfo/ColumnInfo.js

@@ -132,7 +132,7 @@ const ModuleView = (props) => {
         var _a;
         if ('Scope' in item.abObject) {
             const abColumn = adaptable.api.columnApi.getColumnWithColumnId(props.selectedColumnId);
-            return adaptable.api.scopeApi.isColumnInScope(abColumn, item.abObject.Scope);
+            return adaptable.api.columnScopeApi.isColumnInScope(abColumn, item.abObject.Scope);
         }
         if ('ColumnId' in item.abObject) {
             return ((_a = item.abObject) === null || _a === void 0 ? void 0 : _a.ColumnId) === props.selectedColumnId;

package/src/View/Components/NewScopeComponent.js

@@ -42,7 +42,7 @@ const DATA_TYPES_MAP = {
 };
 export const renderScopeSummary = (scope, labels) => {
     const adaptable = useAdaptable();
-    const scopeApi = adaptable.api.scopeApi;
+    const scopeApi = adaptable.api.columnScopeApi;
     const columnsInScope = scopeApi.getColumnsForScope(scope);
     return (React.createElement(React.Fragment, null,
         React.createElement(Box, null,
@@ -58,7 +58,7 @@ const DATA_TYPES_OPTIONS = Object.values(DATA_TYPES_MAP);
 export const NewScopeComponent = (props) => {
     var _a, _b;
     const { api } = useAdaptable();
-    const { scopeApi, columnApi } = api;
+    const { columnScopeApi: scopeApi, columnApi } = api;
     const [columnsSearchText, setColumnsSearchText] = useState('');
     const scopeColumns = React.useMemo(() => {
         const allColumns = props.scopeColumns || columnApi.getColumns();

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { Flex } from 'rebass';
-import { GetNotesSelector } from '../../../../Redux/ActionsReducers/NoteRedux';
+import { GetNoteSelector } from '../../../../Redux/ActionsReducers/NoteRedux';
 import { SystemCommentsAndNotesEditModeSelector, SystemCommentsAndNotesFocusedEntitySelector, SystemCommentsAndNotesSelector, } from '../../../../Redux/ActionsReducers/SystemRedux';
 import { useAdaptable } from '../../../AdaptableContext';
 import { CommentsEditor } from '../../../Comments/CommentsEditor';
@@ -13,11 +13,8 @@ const ConnectedNoteEditor = ({ enableEditMode }) => {
     const editMode = useSelector((state) => SystemCommentsAndNotesEditModeSelector(state.System));
     const cellPopupService = api.internalApi.getCellPopupService();
     const cellAddress = useSelector((state) => SystemCommentsAndNotesSelector(state.System));
-    const [
-    // Only handle first note for now
-    // Later we can handle multiple notes
-    note,] = useSelector((state) => {
-        return cellAddress ? GetNotesSelector(state.Note, cellAddress) : [];
+    const note = useSelector((state) => {
+        return cellAddress ? GetNoteSelector(state.Note, cellAddress) : null;
     });
     const handleNoteChange = React.useCallback((value) => {
         api.noteApi.updateNoteText(value, note);

package/src/View/Components/RangesComponent.js

@@ -114,7 +114,7 @@ export class RangesComponent extends React.Component {
             this.props.updateColumnComparison(columnComparison);
         }
         else {
-            const ranges = this.props.api.scopeApi.createCellColorRangesForScope(this.props.scope);
+            const ranges = this.props.api.columnScopeApi.createCellColorRangesForScope(this.props.scope);
             this.setState({
                 rangesType: 'Standard',
             });

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

@@ -24,7 +24,7 @@ export const CustomSortColumnWizardSection = (props) => {
         const columnSortComparers = api.optionsApi.getCustomSortOptions().customSortComparers || [];
         const usedColumnIds = [
             ...customSorts.map((customSort) => customSort.ColumnId),
-            ...columnSortComparers.map((comparer) => api.scopeApi.getColumnIdsInScope(comparer.scope)),
+            ...columnSortComparers.map((comparer) => api.columnScopeApi.getColumnIdsInScope(comparer.scope)),
         ];
         // filter out used colum ids, but include the current one
         return sortableColumns.filter((column) => {

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -95,7 +95,7 @@ const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableCont
                     columnId: 'undoActionColumn',
                     friendlyName: ' ',
                     rowScope: {
-                        ExcludeGroupedRows: true,
+                        ExcludeGroupRows: true,
                         ExcludeSummaryRows: true,
                     },
                     actionColumnSettings: { suppressMenu: true, suppressMovable: true },

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

@@ -410,7 +410,7 @@ export const FormatColumnFormatWizardSection = (props) => {
         update({ DisplayFormat });
     };
     const Type = data.DisplayFormat && data.DisplayFormat.Formatter;
-    const customScopedFormatters = customDisplayFormatters.filter((displayFormatter) => adaptable.api.scopeApi.isScopeInScope(data.Scope, displayFormatter.scope));
+    const customScopedFormatters = customDisplayFormatters.filter((displayFormatter) => adaptable.api.columnScopeApi.isScopeInScope(data.Scope, displayFormatter.scope));
     if (Type === 'NumberFormatter') {
         return renderNumberFormat(data, update, setFormatOption, customScopedFormatters, formatColumnApi);
     }

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

@@ -5,7 +5,7 @@ export function FormatColumnRuleWizardSection(props) {
     const { data, api, moduleInfo } = useOnePageAdaptableWizardContext();
     return (React.createElement(EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: props.defaultPredicateId, 
         // TODO see what is this
-        predicateDefs: api.formatColumnApi.internalApi.getFormatColumnDefsForScope(data.Scope), getPredicateDefsForColId: (colId) => api.formatColumnApi.internalApi.getFormatColumnDefsForScope({ ColumnIds: [colId] }), showNoRule: true, showBoolean: true, showAggregation: false, showObservable: false, showPredicate: !api.scopeApi.scopeIsAll(data.Scope), data: data, onChange: (formatColumn) => props.onChange(formatColumn), descriptions: {
+        predicateDefs: api.formatColumnApi.internalApi.getFormatColumnDefsForScope(data.Scope), getPredicateDefsForColId: (colId) => api.formatColumnApi.internalApi.getFormatColumnDefsForScope({ ColumnIds: [colId] }), showNoRule: true, showBoolean: true, showAggregation: false, showObservable: false, showPredicate: !api.columnScopeApi.scopeIsAll(data.Scope), data: data, onChange: (formatColumn) => props.onChange(formatColumn), descriptions: {
             selectPredicate: 'Create a Format Column Rule - to be applied when data changes',
             useBooleanQuery: (React.createElement(React.Fragment, null,
                 "Use an BooleanQuery if ",

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

@@ -17,7 +17,7 @@ export const FormatColumnScopeWizardSection = (props) => {
         }, scope: data.Scope, updateScope: (Scope) => {
             var _a, _b;
             const newData = Object.assign(Object.assign({}, data), { Scope });
-            const wholeRow = api.scopeApi.scopeIsAll(Scope);
+            const wholeRow = api.columnScopeApi.scopeIsAll(Scope);
             if ((_b = (_a = newData.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length) {
                 if (wholeRow) {
                     // if scope is whole row, a predicate cannot be present, so we set the rule

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

@@ -18,8 +18,8 @@ export const renderFormatColumnSettingsSummary = (data) => {
             React.createElement(Tag, null, ((_b = data.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeDataRows) ? 'no' : 'yes')),
         ' ',
         React.createElement(Text, { mt: 3 },
-            "Grouped Rows ",
-            React.createElement(Tag, null, ((_c = data.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeGroupedRows) ? 'no' : 'yes')),
+            "Group Rows ",
+            React.createElement(Tag, null, ((_c = data.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeGroupRows) ? 'no' : 'yes')),
         React.createElement(Text, { mt: 3 },
             "Summary Rows ",
             React.createElement(Tag, null, ((_d = data.RowScope) === null || _d === void 0 ? void 0 : _d.ExcludeSummaryRows) ? 'no' : 'yes'))));
@@ -38,7 +38,7 @@ export const FormatColumnSettingsWizardSection = (props) => {
         props.onChange(Object.assign(Object.assign({}, data), { RowScope: Object.assign(Object.assign({}, data.RowScope), { ExcludeDataRows }) }));
     };
     const onExcludeGroupedRowsChanged = (ExcludeGroupedRows) => {
-        props.onChange(Object.assign(Object.assign({}, data), { RowScope: Object.assign(Object.assign({}, data.RowScope), { ExcludeGroupedRows }) }));
+        props.onChange(Object.assign(Object.assign({}, data), { RowScope: Object.assign(Object.assign({}, data.RowScope), { ExcludeGroupRows: ExcludeGroupedRows }) }));
     };
     const onExcludeSummaryRowsChanged = (ExcludeSummaryRows) => {
         props.onChange(Object.assign(Object.assign({}, data), { RowScope: Object.assign(Object.assign({}, data.RowScope), { ExcludeSummaryRows }) }));
@@ -62,9 +62,9 @@ export const FormatColumnSettingsWizardSection = (props) => {
                     React.createElement(FormRow, { label: "Exclude Data Rows:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
                             React.createElement(CheckBox, { "data-name": "exclude-data-rows-checkbox", checked: (_a = data.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeDataRows, onChange: onExcludeDataRowsChanged, mr: 2 }))),
-                    React.createElement(FormRow, { label: "Exclude Grouped Rows:" },
+                    React.createElement(FormRow, { label: "Exclude Group Rows:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
-                            React.createElement(CheckBox, { "data-name": "exclude-grouped-rows-checkbox", checked: (_b = data.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows, onChange: onExcludeGroupedRowsChanged, mr: 2 }))),
+                            React.createElement(CheckBox, { "data-name": "exclude-grouped-rows-checkbox", checked: (_b = data.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged, mr: 2 }))),
                     React.createElement(FormRow, { label: "Exclude Row Summaries:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
                             React.createElement(CheckBox, { "data-name": "exclude-summary-rows-checkbox", checked: (_c = data.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged, mr: 2 }))))))));

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

@@ -9,7 +9,7 @@ export const isFormatColumnStyleValid = (data, api) => {
         UIHelper.IsEmptyStyle(data.Style) &&
         data.DisplayFormat === undefined &&
         data.CellAlignment === undefined &&
-        !api.scopeApi.isSingleBooleanColumnScope(data.Scope)) {
+        !api.columnScopeApi.isSingleBooleanColumnScope(data.Scope)) {
         return 'No format applied';
     }
     return true;

package/src/View/Layout/Wizard/sections/RowGroupingSection.js

@@ -43,7 +43,7 @@ export const RowGroupingSection = (props) => {
         props.onChange(Object.assign(Object.assign({}, layout), { RowGroupedColumns: columnIds }));
     };
     return (React.createElement(Tabs, { style: { height: '100%' } },
-        React.createElement(Tabs.Tab, null, "Grouped Rows"),
+        React.createElement(Tabs.Tab, null, "Group Rows"),
         ((_a = layout.ExpandedRowGroupValues) === null || _a === void 0 ? void 0 : _a.length) && React.createElement(Tabs.Tab, null, "Expanded Rows"),
         React.createElement(Tabs.Content, null,
             React.createElement(ValueSelector, { showFilterInput: true, showSelectedOnlyPosition: "top", filter: columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => { var _a; return (_a = option.friendlyName) !== null && _a !== void 0 ? _a : option.columnId; }, options: sortedGroupableColumns, value: (_b = layout.RowGroupedColumns) !== null && _b !== void 0 ? _b : [], allowReorder: true, xSelectedLabel: () => {

package/src/View/PlusMinus/PlusMinusSummary.js

@@ -19,12 +19,12 @@ export class PlusMinusSummaryComponent extends React.Component {
     render() {
         let moduleSummaries = [];
         // title row
-        let titleRow = (React.createElement(ModuleHeader, { key: this.props.moduleInfo.FriendlyName, moduleInfo: this.props.moduleInfo, moduleSummary: Helper.returnItemCount(this.props.PlusMinusNudges.filter((item) => this.props.api.scopeApi.isColumnInScopeColumns(this.props.summarisedColumn, item.Scope)), this.props.moduleInfo.FriendlyName), onNew: () => this.onNew(), newButtonTooltip: 'Plus / Minus Rule', accessLevel: this.props.accessLevel }));
+        let titleRow = (React.createElement(ModuleHeader, { key: this.props.moduleInfo.FriendlyName, moduleInfo: this.props.moduleInfo, moduleSummary: Helper.returnItemCount(this.props.PlusMinusNudges.filter((item) => this.props.api.columnScopeApi.isColumnInScopeColumns(this.props.summarisedColumn, item.Scope)), this.props.moduleInfo.FriendlyName), onNew: () => this.onNew(), newButtonTooltip: 'Plus / Minus Rule', accessLevel: this.props.accessLevel }));
         moduleSummaries.push(titleRow);
         // existing items
         this.props.PlusMinusNudges.map((item, index) => {
             var _a;
-            if (this.props.api.scopeApi.isColumnInScopeColumns(this.props.summarisedColumn, item.Scope)) {
+            if (this.props.api.columnScopeApi.isColumnInScopeColumns(this.props.summarisedColumn, item.Scope)) {
                 let detailRow = (React.createElement(ModuleDetail, { key: 'PM' + index, item1: 'Nudge Value: ' + item.NudgeValue, item2: ((_a = item.Rule) === null || _a === void 0 ? void 0 : _a.BooleanExpression) ? item.Rule.BooleanExpression : 'Always', configEnity: item, showShare: this.props.teamSharingActivated, moduleInfo: this.props.moduleInfo, onEdit: () => this.onEdit(item), onShare: (config) => this.props.onShare(item, config), onDelete: PlusMinusRedux.PlusMinusNudgeDelete(item), accessLevel: this.props.accessLevel }));
                 moduleSummaries.push(detailRow);
             }

package/src/View/StyledColumn/Wizard/StyledColumnBadgeSection.js

@@ -7,7 +7,6 @@ import HelpBlock from '../../../components/HelpBlock';
 import SimpleButton from '../../../components/SimpleButton';
 import { Tabs } from '../../../components/Tabs';
 import ObjectFactory from '../../../Utilities/ObjectFactory';
-import { AdaptablePopover } from '../../AdaptablePopover';
 import { AdaptableIconSelector } from '../../Components/AdaptableIconSelector';
 import { PredicateEditor } from '../../Components/PredicateEditor/PredicateEditor';
 import { StyleComponent } from '../../Components/StyleComponent';
@@ -16,6 +15,7 @@ import { StyledColumnBadgePreview } from './StyledColumnWizardStyleSection/Compo
 import { Badge } from '../../Components/Badge';
 import { AdaptableIconComponent } from '../../Components/AdaptableIconComponent';
 import { DEFAULT_INTEGER_DISPLAY_VALUE, DEFAULT_STRING_DISPLAY_VALUE, } from '../../../Utilities/Constants/GeneralConstants';
+import { Accordion } from '../../../components/Accordion';
 const BadgeEditor = (props) => {
     var _a, _b;
     const { api } = useOnePageAdaptableWizardContext();
@@ -36,12 +36,10 @@ const BadgeEditor = (props) => {
                 React.createElement(FormRow, { label: "Style" },
                     React.createElement(HelpBlock, { fontSize: 2, mb: 1, mt: 2 }, "Select the Style for the Badge"),
                     ' ',
-                    React.createElement(AdaptablePopover, { showEvent: "mouseenter", hideEvent: "mouseleave", showIcon: false, useButton: false, popoverMaxWidth: 700, bodyText: [
-                            React.createElement(StyleComponent, { showFontSizeAs: "radio", headless: true, hidePreview: true, api: api, Style: (_a = badge.Style) !== null && _a !== void 0 ? _a : {}, UpdateStyle: (Style) => {
-                                    onChange(Object.assign(Object.assign({}, badge), { Style }));
-                                } }),
-                        ] },
-                        React.createElement(SimpleButton, { variant: "raised" }, "Edit Badge Style"))),
+                    React.createElement(Accordion, { title: "Edit Badge Style" },
+                        React.createElement(StyleComponent, { showFontSizeAs: "radio", headless: true, hidePreview: true, api: api, Style: (_a = badge.Style) !== null && _a !== void 0 ? _a : {}, UpdateStyle: (Style) => {
+                                onChange(Object.assign(Object.assign({}, badge), { Style }));
+                            } }))),
                 !api.columnApi.hasArrayDataType(columnId) && ( // dont show predicates for arrays
                 (React.createElement(
                     FormRow,

package/src/View/StyledColumn/Wizard/StyledColumnWizardColumnSection.js

@@ -55,7 +55,7 @@ export const StyledColumnWizardColumnSection = (props) => {
     }, [data]);
     const handleColumnsChange = (columnIds) => {
         const columnId = columnIds[0];
-        const emptyRanges = api.scopeApi.createCellColorRangesForScope({
+        const emptyRanges = api.columnScopeApi.createCellColorRangesForScope({
             ColumnIds: [columnId],
         });
         const newStyledColumn = Object.assign(Object.assign({}, data), { ColumnId: columnId });

package/src/View/StyledColumn/Wizard/StyledColumnWizardSettingsSection.js

@@ -14,8 +14,8 @@ export const renderStyledColumnWizardSettingsSummary = (data) => {
             React.createElement(Tag, null, ((_a = badgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeDataRows) ? 'no' : 'yes')),
         ' ',
         React.createElement(Text, { mt: 3 },
-            "Grouped Rows ",
-            React.createElement(Tag, null, ((_b = badgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) ? 'no' : 'yes')),
+            "Group Rows ",
+            React.createElement(Tag, null, ((_b = badgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupRows) ? 'no' : 'yes')),
         React.createElement(Text, { mt: 3 },
             "Summary Rows ",
             React.createElement(Tag, null, ((_c = badgeStyle.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) ? 'no' : 'yes'))));
@@ -27,7 +27,7 @@ export const StyledColumnWizardSettingsSection = (props) => {
         props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeDataRows }) }) }));
     };
     const onExcludeGroupedRowsChanged = (ExcludeGroupedRows) => {
-        props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeGroupedRows }) }) }));
+        props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeGroupRows: ExcludeGroupedRows }) }) }));
     };
     const onExcludeSummaryRowsChanged = (ExcludeSummaryRows) => {
         props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeSummaryRows }) }) }));
@@ -42,11 +42,11 @@ export const StyledColumnWizardSettingsSection = (props) => {
                             React.createElement(CheckBox, { "data-name": "exclude-data-rows-checkbox", checked: 
                                 // @ts-ignore
                                 (_a = data.BadgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeDataRows, onChange: onExcludeDataRowsChanged, mr: 2 }))),
-                    React.createElement(FormRow, { label: "Exclude Grouped Rows:" },
+                    React.createElement(FormRow, { label: "Exclude Group Rows:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
                             React.createElement(CheckBox, { "data-name": "exclude-grouped-rows-checkbox", checked: 
                                 // @ts-ignore
-                                (_b = data.BadgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows, onChange: onExcludeGroupedRowsChanged, mr: 2 }))),
+                                (_b = data.BadgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged, mr: 2 }))),
                     React.createElement(FormRow, { label: "Exclude Row Summaries:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
                             React.createElement(CheckBox, { "data-name": "exclude-summary-rows-checkbox", checked: 

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection.js

@@ -204,7 +204,7 @@ export const StyledColumnWizardStyleSection = (props) => {
     };
     const handleRangeValueTypeChange = React.useCallback((rangeValueType) => {
         const ranges = rangeValueType === 'Number'
-            ? api.scopeApi.createCellColorRangesForScope(scope)
+            ? api.columnScopeApi.createCellColorRangesForScope(scope)
             : [
                 {
                     Min: 0,