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

package/src/PredefinedConfig/FlashingCellState.d.ts

@@ -1,6 +1,6 @@
 import { ConfigState } from './ConfigState';
 import { AdaptableStyle } from './Common/AdaptableStyle';
-import { AdaptableColumnPredicate, AdaptableScope } from '../types';
+import { AdaptableColumnPredicate, ColumnScope } from '../types';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { TypeHint } from './Common/Types';
@@ -34,7 +34,7 @@ export interface FlashingCellDefinition extends SuspendableObject {
     /**
      * Where Flashing Cell can display: Column[s] or DataType[s]
      */
-    Scope: AdaptableScope;
+    Scope: ColumnScope;
     /**
      * When Flashing Cell should be triggered
      */

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -1,7 +1,8 @@
 import { ConfigState } from './ConfigState';
 import { AdaptableStyle } from './Common/AdaptableStyle';
 import { AdaptableFormat } from './Common/AdaptableFormat';
-import { AdaptableScope } from './Common/AdaptableScope';
+import { ColumnScope } from './Common/ColumnScope';
+import { RowScope } from './Common/RowScope';
 import { SuspendableObject } from './Common/SuspendableObject';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { TypeHint } from './Common/Types';
@@ -23,7 +24,7 @@ export interface FormatColumn extends SuspendableObject {
     /**
      * Where Format will be applied - whole Row, some Columns or all Columns of given DataType
      */
-    Scope: AdaptableScope;
+    Scope: ColumnScope;
     /**
      * Rule used to decide whether to apply the Format; if undefined Format is always applied
      */
@@ -41,15 +42,13 @@ export interface FormatColumn extends SuspendableObject {
      */
     CellAlignment?: 'Left' | 'Right' | 'Center';
     /**
-     * Interop.io to Format the Column in Grouped Rows
-     * @defaultValue false
+     * Which types of Rows should be formatted (data, grouped, summary)
      */
-    IncludeGroupedRows?: boolean;
+    RowScope?: RowScope;
     /**
-     * Interop.io to include Row Summary Rows
-     * @defaultValue false
+     * @deprecated FormatColumns now apply to grouped rows by default; use RowScope for more control
      */
-    IncludeRowSummaries?: boolean;
+    IncludeGroupedRows?: never;
 }
 /**
  * The Format Column Rule - can be either a Predicate or a BooleanExpression

package/src/PredefinedConfig/PlusMinusState.d.ts

@@ -1,5 +1,5 @@
 import { ConfigState } from './ConfigState';
-import { AdaptableScope } from './Common/AdaptableScope';
+import { ColumnScope } from './Common/ColumnScope';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { SuspendableObject } from './Common/SuspendableObject';
 /**
@@ -18,7 +18,7 @@ export interface PlusMinusNudge extends SuspendableObject {
     /**
      * Where Rule is applied
      */
-    Scope: AdaptableScope;
+    Scope: ColumnScope;
     /**
      * Amount by which to update cell when Rule is applied
      */

package/src/PredefinedConfig/ShortcutState.d.ts

@@ -1,5 +1,5 @@
 import { ConfigState } from './ConfigState';
-import { AdaptableScope } from './Common/AdaptableScope';
+import { ColumnScope } from './Common/ColumnScope';
 import { SuspendableObject } from './Common/SuspendableObject';
 /**
  * Predefined Configuration for Shortcut Module
@@ -21,7 +21,7 @@ export interface Shortcut extends SuspendableObject {
     /**
      * Numeric Columns where Shortcut is applied
      */
-    Scope: AdaptableScope<ShortcutScopeDataType>;
+    Scope: ColumnScope<ShortcutScopeDataType>;
     /**
      * Key which triggers the Shortcut when pressed
      */

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -3,6 +3,7 @@ import { SuspendableObject } from './Common/SuspendableObject';
 import { SparklineOptions } from '@ag-grid-community/core';
 import { AdaptableCustomIcon, AdaptableSystemIcon, AdaptablePredicate, AdaptableStyle } from '../types';
 import { TypeHint } from './Common/Types';
+import { RowScope } from "./Common/RowScope";
 /**
  * Predefined Configuration for Styled Column Module
  */
@@ -36,16 +37,6 @@ export interface StyledColumn extends SuspendableObject {
      * Displays cell values in Column as a Badge
      */
     BadgeStyle?: BadgeStyle;
-    /**
-     * Includes Styled Column in Grouped Rows
-     * @defaultValue false
-     */
-    IncludeGroupedRows?: boolean;
-    /**
-     * Includes Row Summaries in Styled Column
-     * @defaultValue false
-     */
-    IncludeRowSummaries?: boolean;
 }
 /**
  * Style used to display Percent Bars in Special Column Style
@@ -195,4 +186,8 @@ export interface BadgeStyle {
      * Collection of Badge Style Definitions
      */
     Badges?: BadgeStyleDefinition[];
+    /**
+     * Which types of Rows should contain a Badge (data, grouped, summary)
+     */
+    RowScope?: RowScope;
 }

package/src/Strategy/StyledColumnModule.js

@@ -162,6 +162,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
         };
     }
     toView(styledColumn) {
+        var _a, _b, _c, _d, _e, _f;
         const specificTypeItems = [];
         if (styledColumn.GradientStyle || styledColumn.PercentBarStyle) {
             specificTypeItems.push({
@@ -175,8 +176,9 @@ export class StyledColumnModule extends AdaptableModuleBase {
             specificTypeItems.push({
                 name: 'Settings',
                 values: [
-                    `Include grouped rows: ${styledColumn.IncludeGroupedRows ? 'Yes' : 'No'}`,
-                    `Include row summaries: ${styledColumn.IncludeRowSummaries ? 'Yes' : 'No'}`,
+                    `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'}`,
+                    `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

@@ -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/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/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/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/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/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/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/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/agGrid/ActionColumnRenderer.js

@@ -2,6 +2,7 @@ import SimpleButton from '../components/SimpleButton';
 import * as React from 'react';
 import { useRerender } from '../components/utils/useRerender';
 import { renderWithAdaptableContext } from '../View/renderWithAdaptableContext';
+import { ROW_SUMMARY_ROW_ID } from '../PredefinedConfig/Common/RowSummary';
 const ActionButtons = (props) => {
     const { buttons, adaptableApi, context, rerender } = props;
     return (React.createElement(React.Fragment, null, buttons.map((button, index) => {
@@ -32,14 +33,32 @@ const ActionButtons = (props) => {
     })));
 };
 export const ReactActionColumnRenderer = (props) => {
+    var _a, _b, _c, _d;
     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 = (_a = props === null || props === void 0 ? void 0 : props.data) === null || _a === void 0 ? void 0 : _a[ROW_SUMMARY_ROW_ID];
+    let shouldRender = true;
+    if (isGroupedRow) {
+        if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) {
+            shouldRender = false;
+        }
+    }
+    else if (isSummaryRow) {
+        if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) {
+            shouldRender = false;
+        }
+    }
+    else {
+        if ((_d = actionColumn.rowScope) === null || _d === void 0 ? void 0 : _d.ExcludeDataRows) {
+            shouldRender = false;
+        }
+    }
+    if (!shouldRender) {
         return null;
     }
     const pkValue = adaptable.getPrimaryKeyValueFromRowNode(props.node, props.api);
@@ -58,6 +77,7 @@ export const ReactActionColumnRenderer = (props) => {
 export class ActionColumnRenderer {
     // gets called once before the renderer is used
     init(params) {
+        var _a, _b, _c, _d;
         const adaptable = params.context.__adaptable;
         const { actionButtons, actionColumn } = adaptable.api.internalApi.getActionButtonsAndActionColumn(params.colDef);
         if (!actionColumn || !actionButtons.length) {
@@ -66,8 +86,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 = (_a = params === null || params === void 0 ? void 0 : params.data) === null || _a === void 0 ? void 0 : _a[ROW_SUMMARY_ROW_ID];
+        let shouldRender = true;
+        if (isGroupedRow) {
+            if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) {
+                shouldRender = false;
+            }
+        }
+        else if (isSummaryRow) {
+            if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) {
+                shouldRender = false;
+            }
+        }
+        else {
+            if ((_d = actionColumn.rowScope) === null || _d === void 0 ? void 0 : _d.ExcludeDataRows) {
+                shouldRender = false;
+            }
+        }
+        if (!shouldRender) {
             this.eGui.innerHTML = '';
             return;
         }

package/src/agGrid/AgGridColumnAdapter.js

@@ -207,7 +207,7 @@ export class AgGridColumnAdapter {
                     return getPercentBarRendererForColumn(styledColumn, abColumn, this.adaptableApi);
                 }
                 if (styledColumn.BadgeStyle) {
-                    return getBadgeRendererForColumn(styledColumn, abColumn, this.adaptableApi);
+                    return getBadgeRendererForColumn(styledColumn.BadgeStyle, abColumn, this.adaptableApi);
                 }
                 if (styledColumn.SparkLineStyle) {
                     return 'agSparklineCellRenderer';
@@ -664,7 +664,7 @@ export class AgGridColumnAdapter {
         return Object.assign(Object.assign({}, this.getFormatColumnCellStyle(gridCell.column, activeFormatColumnsWithStyle, params)), styledColumnStyle);
     }
     getStyledColumnStyle(styledColumn, abColumn, params) {
-        var _a, _b;
+        var _a, _b, _c;
         let style = {};
         const gradientStyle = styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.GradientStyle;
         if (params.value === undefined) {
@@ -672,7 +672,6 @@ export class AgGridColumnAdapter {
         }
         let colValue = params.value;
         if (this.adaptableApi.gridApi.isGroupRowNode(params.node)) {
-            // We no longer support Grouped Rows
             return style;
             // if (styledColumn.IncludeGroupedRows) {
             //   const minColumnValue =
@@ -688,7 +687,9 @@ export class AgGridColumnAdapter {
             //   return style;
             // }
         }
-        if (((_b = (_a = params === null || params === void 0 ? void 0 : params.node) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[ROW_SUMMARY_ROW_ID]) && !styledColumn.IncludeRowSummaries) {
+        if (styledColumn.BadgeStyle &&
+            !((_a = styledColumn.BadgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeSummaryRows) &&
+            ((_c = (_b = params === null || params === void 0 ? void 0 : params.node) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c[ROW_SUMMARY_ROW_ID])) {
             return style;
         }
         if (gradientStyle) {

package/src/agGrid/BadgeRenderer.d.ts

@@ -1,4 +1,4 @@
-import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
+import { BadgeStyle } from '../PredefinedConfig/StyledColumnState';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-export declare const getBadgeRendererForColumn: (styledColumn: StyledColumn, abColumn: AdaptableColumn, api: AdaptableApi) => any;
+export declare const getBadgeRendererForColumn: (badgeStyle: BadgeStyle, abColumn: AdaptableColumn, api: AdaptableApi) => any;