@adaptabletools/adaptable 18.0.0-canary.30 → 18.0.0-canary.32

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

@@ -1,9 +1,10 @@
 export const getFormatColumnSettingsViewItems = (formatColumn) => {
-    var _a;
+    var _a, _b, _c, _d;
     const values = [
         `Cell alignment: ${(_a = formatColumn.CellAlignment) !== null && _a !== void 0 ? _a : 'default'}`,
-        `Include grouped rows: ${formatColumn.IncludeGroupedRows ? 'Yes' : 'No'}`,
-        `Include row summaries: ${formatColumn.IncludeRowSummaries ? 'Yes' : 'No'}`,
+        `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'}`,
+        `Row Summaries: ${((_d = formatColumn.RowScope) === null || _d === void 0 ? void 0 : _d.ExcludeSummaryRows) ? 'Yes' : 'No'}`,
     ].filter(Boolean);
     return {
         name: 'Settings',

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

@@ -1,3 +1,3 @@
-import { AdaptableApi, AdaptableScope } from '../../../types';
+import { AdaptableApi, ColumnScope } from '../../../types';
 import { AdaptableObjectItemView } from '../Interface/IModule';
-export declare const getScopeViewItems: (scope: AdaptableScope, api: AdaptableApi) => AdaptableObjectItemView;
+export declare const getScopeViewItems: (scope: ColumnScope, api: AdaptableApi) => AdaptableObjectItemView;

package/src/Utilities/ObjectFactory.js

@@ -233,6 +233,7 @@ export function CreateEmptyFormatColumn() {
         Style: CreateEmptyStyle(),
         DisplayFormat: undefined,
         CellAlignment: undefined,
+        RowScope: undefined,
     };
 }
 export function CreateEmptyFreeTextColumn(defaultSpecialColumnSettings) {
@@ -300,7 +301,6 @@ export function CreateEmptyStyledColumn() {
     return {
         Uuid: createUuid(),
         ColumnId: EMPTY_STRING,
-        IncludeGroupedRows: false,
     };
 }
 export function CreateDefaultStyledColumnBadge() {

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/Utilities/getAvailablePredicates.d.ts

@@ -1,3 +1,3 @@
-import { AdaptableApi, AdaptablePredicateDef, AdaptableScope } from '../../../types';
+import { AdaptableApi, AdaptablePredicateDef, ColumnScope } from '../../../types';
 import { AlertType } from './getAlertType';
-export declare const getAvailablePredicateDefinitions: (api: AdaptableApi, scope: AdaptableScope, alertType: AlertType) => AdaptablePredicateDef<string>[];
+export declare const getAvailablePredicateDefinitions: (api: AdaptableApi, scope: ColumnScope, alertType: AlertType) => AdaptablePredicateDef<string>[];

package/src/View/Alert/Utilities/getDefaultAlertDefinition.d.ts

@@ -6,7 +6,7 @@ import { AlertType } from './getAlertType';
  */
 export declare const getDefaultAlertDefinition: (alertDefinition: AlertDefinition, type: AlertType) => {
     Uuid: string;
-    Scope: import("../../../types").AdaptableScope<import("../../../PredefinedConfig/Common/AdaptableScope").ScopeDataType>;
+    Scope: import("../../../types").ColumnScope<import("../../../PredefinedConfig/Common/ColumnScope").ScopeDataType>;
     Rule: ({
         Predicates?: never;
     } & (({

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/EntityRulesEditor/EntityRulePredicatesEditor/EntityRulePredicatesEditor.d.ts

@@ -1,15 +1,15 @@
 import * as React from 'react';
-import { AdaptablePredicateDef, AdaptableScope } from '../../../../types';
+import { AdaptablePredicateDef, ColumnScope } from '../../../../types';
 import { EntityRulesEditorProps, RuleType } from '../index';
 export interface EntityRulePredicatesEditorProps {
     descriptions: EntityRulesEditorProps<any>['descriptions'];
     data: {
         Rule: RuleType;
-        Scope: AdaptableScope;
+        Scope: ColumnScope;
     };
     onChange: (data: {
         Rule: RuleType;
-        Scope: AdaptableScope;
+        Scope: ColumnScope;
     }) => void;
     predicateDefs: AdaptablePredicateDef[];
     getPredicateDefsForColId?: (colId: string) => AdaptablePredicateDef[];

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { FlexProps } from 'rebass';
-import type { AdaptableColumnPredicate, AdaptableModule, AdaptablePredicateDef, AdaptableScope } from '../../../types';
+import type { AdaptableColumnPredicate, AdaptableModule, AdaptablePredicateDef, ColumnScope } from '../../../types';
 import type { XOR } from '../../../Utilities/Extensions/TypeExtensions';
 import { AdaptableQuery } from '../../../PredefinedConfig/Common/AdaptableQuery';
 export type RuleType = XOR<{
@@ -30,7 +30,7 @@ export type EntityRulesEditorProps<T> = {
 };
 export declare const EntityRulesSummary: <T extends {
     Rule?: RuleType;
-    Scope: AdaptableScope;
+    Scope: ColumnScope;
 }>(props: {
     data: T;
     renderPredicate: (content: string) => React.ReactNode;
@@ -38,5 +38,5 @@ export declare const EntityRulesSummary: <T extends {
 }) => JSX.Element;
 export declare const EntityRulesEditor: <T extends {
     Rule: RuleType;
-    Scope: AdaptableScope;
+    Scope: ColumnScope;
 }>(props: EntityRulesEditorProps<T>) => JSX.Element;

package/src/View/Components/NewScopeComponent.d.ts

@@ -1,18 +1,18 @@
 import * as React from 'react';
-import { ScopeDataType, AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
+import { ScopeDataType, ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
 import { AdaptableColumn } from '../../types';
 export declare const isScopeValid: ({ Scope }: {
-    Scope: AdaptableScope;
+    Scope: ColumnScope;
 }) => string | true;
-export declare const renderScopeSummary: (scope: AdaptableScope, labels: {
+export declare const renderScopeSummary: (scope: ColumnScope, labels: {
     scopeWholeRow: string;
     scopeColumns: string;
     scopeDataTypes: string;
 }) => JSX.Element;
 export interface NewScopeComponentProps extends React.ClassAttributes<any> {
-    scope: AdaptableScope;
+    scope: ColumnScope;
     scopeColumns?: AdaptableColumn[];
-    updateScope: (scope: AdaptableScope) => void;
+    updateScope: (scope: ColumnScope) => void;
     availableDataTypes?: ScopeDataType[];
     hideWholeRow?: boolean;
     style?: React.CSSProperties;

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/RangesComponent.d.ts

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { CellColorRange, ColumnComparison, NumericStyledColumn } from '../../PredefinedConfig/StyledColumnState';
-import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
 export interface RangesComponentProps extends React.ClassAttributes<RangesComponent> {
     ranges: CellColorRange[];
     columnComparison?: ColumnComparison;
     rangeValueType: NumericStyledColumn['RangeValueType'];
     onRangeValueTypeChange: (rangeValueType: NumericStyledColumn['RangeValueType']) => void;
-    scope: AdaptableScope;
+    scope: ColumnScope;
     api: AdaptableApi;
     showRangeDirection: boolean;
     updateRanges: (ranges: CellColorRange[]) => void;

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/Components/SharedProps/WizardScopeState.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableScope } from '../../../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope } from '../../../PredefinedConfig/Common/ColumnScope';
 export interface WizardScopeState {
-    scope: AdaptableScope;
+    scope: ColumnScope;
 }

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

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

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
 import { AdaptableFormat } from '../../../PredefinedConfig/Common/AdaptableFormat';
-import { AdaptableScope } from '../../../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope } from '../../../PredefinedConfig/Common/ColumnScope';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 export type FormatColumnFormatWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
@@ -12,5 +12,5 @@ export interface FormatColumnFormatWizardState {
 }
 export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn) => string;
 export declare const renderFormatColumnFormatSummary: (data: FormatColumn) => JSX.Element;
-export declare const getFormatDisplayTypeForScope: (scope: AdaptableScope, api: AdaptableApi) => 'Number' | 'Date' | 'String' | undefined;
+export declare const getFormatDisplayTypeForScope: (scope: ColumnScope, api: AdaptableApi) => 'Number' | 'Date' | 'String' | undefined;
 export declare const FormatColumnFormatWizardSection: (props: FormatColumnFormatWizardSectionProps) => JSX.Element;

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

@@ -8,19 +8,24 @@ import { Tag } from '../../../components/Tag';
 import { ToggleGroup } from '../../../components/Toggle/ToggleGroup';
 import { Toggle } from '../../../components/Toggle/Toggle';
 export const renderFormatColumnSettingsSummary = (data) => {
-    var _a;
+    var _a, _b, _c, _d;
     return (React.createElement(Box, { padding: 2 },
         React.createElement(Text, null,
             "Cell alignment ",
             React.createElement(Tag, null, (_a = data.CellAlignment) !== null && _a !== void 0 ? _a : 'default')),
         React.createElement(Text, { mt: 3 },
-            "Include grouped rows ",
-            React.createElement(Tag, null, data.IncludeGroupedRows ? 'yes' : 'no')),
+            "Data Rows ",
+            React.createElement(Tag, null, ((_b = data.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeDataRows) ? 'no' : 'yes')),
+        ' ',
         React.createElement(Text, { mt: 3 },
-            "Include row summaries ",
-            React.createElement(Tag, null, data.IncludeRowSummaries ? 'yes' : 'no'))));
+            "Grouped Rows ",
+            React.createElement(Tag, null, ((_c = data.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeGroupedRows) ? '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'))));
 };
 export const FormatColumnSettingsWizardSection = (props) => {
+    var _a, _b, _c;
     const { data } = useOnePageAdaptableWizardContext();
     const onCellAlignmentSelectChanged = (CellAlignment) => {
         const newData = Object.assign(Object.assign({}, data), { CellAlignment });
@@ -29,11 +34,14 @@ export const FormatColumnSettingsWizardSection = (props) => {
         }
         props.onChange(newData);
     };
-    const onIncludeGroupedRowsChanged = (IncludeGroupedRows) => {
-        props.onChange(Object.assign(Object.assign({}, data), { IncludeGroupedRows }));
+    const onExcludeDataRowsChanged = (ExcludeDataRows) => {
+        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 }) }));
     };
-    const onIncludeRowSummariesChanged = (IncludeRowSummaries) => {
-        props.onChange(Object.assign(Object.assign({}, data), { IncludeRowSummaries }));
+    const onExcludeSummaryRowsChanged = (ExcludeSummaryRows) => {
+        props.onChange(Object.assign(Object.assign({}, data), { RowScope: Object.assign(Object.assign({}, data.RowScope), { ExcludeSummaryRows }) }));
     };
     return (React.createElement(Tabs, null,
         React.createElement(Tabs.Tab, null, "Settings"),
@@ -51,10 +59,13 @@ export const FormatColumnSettingsWizardSection = (props) => {
                             React.createElement(Toggle, { icon: "align-right", pressed: data.CellAlignment === 'Right', onPressedChange: (pressed) => pressed
                                     ? onCellAlignmentSelectChanged('Right')
                                     : onCellAlignmentSelectChanged(null) }))),
-                    React.createElement(FormRow, { label: "Include Grouped Rows:" },
+                    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(Flex, { alignItems: "center", marginLeft: 2 },
-                            React.createElement(CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeGroupedRows, onChange: onIncludeGroupedRowsChanged, mr: 2 }))),
-                    React.createElement(FormRow, { label: "Include Row Summaries:" },
+                            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(FormRow, { label: "Exclude Row Summaries:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
-                            React.createElement(CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeRowSummaries, onChange: onIncludeRowSummariesChanged, mr: 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/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/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

@@ -6,31 +6,51 @@ import { Tabs } from '../../../components/Tabs';
 import { Tag } from '../../../components/Tag';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 export const renderStyledColumnWizardSettingsSummary = (data) => {
+    var _a, _b, _c;
+    const badgeStyle = data;
     return (React.createElement(Box, { padding: 2 },
         React.createElement(Text, { mt: 3 },
-            "Include grouped rows ",
-            React.createElement(Tag, null, data.IncludeGroupedRows ? 'yes' : 'no')),
+            "Data Rows ",
+            React.createElement(Tag, null, ((_a = badgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeDataRows) ? 'no' : 'yes')),
+        ' ',
         React.createElement(Text, { mt: 3 },
-            "Include row summaries ",
-            React.createElement(Tag, null, data.IncludeRowSummaries ? 'yes' : 'no'))));
+            "Grouped Rows ",
+            React.createElement(Tag, null, ((_b = badgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) ? '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'))));
 };
 export const StyledColumnWizardSettingsSection = (props) => {
+    var _a, _b, _c;
     const { data } = useOnePageAdaptableWizardContext();
-    const onIncludeGroupedRowsChanged = (IncludeGroupedRows) => {
-        props.onChange(Object.assign(Object.assign({}, data), { IncludeGroupedRows }));
+    const onExcludeDataRowsChanged = (ExcludeDataRows) => {
+        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 }) }) }));
     };
-    const onIncludeRowSummariesChanged = (IncludeRowSummaries) => {
-        props.onChange(Object.assign(Object.assign({}, data), { IncludeRowSummaries }));
+    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 }) }) }));
     };
     return (React.createElement(Tabs, null,
         React.createElement(Tabs.Tab, null, "Settings"),
         React.createElement(Tabs.Content, null,
             React.createElement(Flex, { flexDirection: "row" },
                 React.createElement(FormLayout, null,
-                    React.createElement(FormRow, { label: "Include Grouped Rows:" },
+                    React.createElement(FormRow, { label: "Exclude Data Rows:" },
+                        React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
+                            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(Flex, { alignItems: "center", marginLeft: 2 },
-                            React.createElement(CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeGroupedRows, onChange: onIncludeGroupedRowsChanged, mr: 2 }))),
-                    React.createElement(FormRow, { label: "Include Row Summaries:" },
+                            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 }))),
+                    React.createElement(FormRow, { label: "Exclude Row Summaries:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
-                            React.createElement(CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeRowSummaries, onChange: onIncludeRowSummariesChanged, mr: 2 }))))))));
+                            React.createElement(CheckBox, { "data-name": "exclude-summary-rows-checkbox", checked: 
+                                // @ts-ignore
+                                (_c = data.BadgeStyle.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged, mr: 2 }))),
+                    ' ')))));
 };

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,

package/src/agGrid/ActionColumnRenderer.js

@@ -32,14 +32,32 @@ const ActionButtons = (props) => {
     })));
 };
 export const ReactActionColumnRenderer = (props) => {
+    var _a, _b, _c;
     const rerender = useRerender();
     const adaptable = props.context.__adaptable;
     const { actionButtons, actionColumn } = adaptable.api.internalApi.getActionButtonsAndActionColumn(props.colDef);
     if (!actionColumn || !actionButtons.length) {
         return null;
     }
-    // TODO: see why types do not match
-    if (adaptable.api.gridApi.isGroupRowNode(props.node) && !actionColumn.includeGroupedRows) {
+    const isGroupedRow = adaptable.api.gridApi.isGroupRowNode(props.node);
+    const isSummaryRow = adaptable.api.gridApi.isSummaryNode(props.node);
+    let shouldRender = true;
+    if (isGroupedRow) {
+        if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupedRows) {
+            shouldRender = false;
+        }
+    }
+    else if (isSummaryRow) {
+        if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows) {
+            shouldRender = false;
+        }
+    }
+    else {
+        if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeDataRows) {
+            shouldRender = false;
+        }
+    }
+    if (!shouldRender) {
         return null;
     }
     const pkValue = adaptable.getPrimaryKeyValueFromRowNode(props.node, props.api);
@@ -58,6 +76,7 @@ export const ReactActionColumnRenderer = (props) => {
 export class ActionColumnRenderer {
     // gets called once before the renderer is used
     init(params) {
+        var _a, _b, _c;
         const adaptable = params.context.__adaptable;
         const { actionButtons, actionColumn } = adaptable.api.internalApi.getActionButtonsAndActionColumn(params.colDef);
         if (!actionColumn || !actionButtons.length) {
@@ -66,8 +85,25 @@ export class ActionColumnRenderer {
         // create the cell
         this.eGui = document.createElement('div');
         this.eGui.className = 'ab-ActionColumn';
-        // if its a group node then only show if set to do so
-        if (adaptable.api.gridApi.isGroupRowNode(params.node) && !actionColumn.includeGroupedRows) {
+        const isGroupedRow = adaptable.api.gridApi.isGroupRowNode(params.node);
+        const isSummaryRow = adaptable.api.gridApi.isSummaryNode(params.node);
+        let shouldRender = true;
+        if (isGroupedRow) {
+            if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupedRows) {
+                shouldRender = false;
+            }
+        }
+        else if (isSummaryRow) {
+            if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows) {
+                shouldRender = false;
+            }
+        }
+        else {
+            if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeDataRows) {
+                shouldRender = false;
+            }
+        }
+        if (!shouldRender) {
             this.eGui.innerHTML = '';
             return;
         }