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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "18.0.0-canary.30",
+  "version": "18.0.0-canary.31",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/ActionColumnOptions.d.ts

@@ -1,4 +1,5 @@
 import { IRowNode } from '@ag-grid-community/core';
+import { RowScope } from "../PredefinedConfig/Common/RowScope";
 import { AdaptableButton, AdaptableObject, BaseContext } from '../types';
 /**
  * Options related to Action Columns in AdapTable
@@ -27,9 +28,9 @@ export interface ActionColumn<TData = any> extends AdaptableObject {
      */
     actionColumnButton: AdaptableButton<ActionColumnContext<TData>> | AdaptableButton<ActionColumnContext<TData>>[];
     /**
-     * Shows Action Column also in grouped rows
+     * Which types of Rows should contain buttons (data, grouped, summary)
      */
-    includeGroupedRows?: boolean;
+    rowScope?: RowScope;
     /**
      * Additional optional properties for Column (e.g. filterable, resizable)
      */

package/src/AdaptableOptions/CustomSortOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableScope } from '../../types';
+import { ColumnScope } from '../../types';
 import { AdaptableComparerFunction } from '../PredefinedConfig/Common/AdaptableComparerFunction';
 /**
  * Options for providing Custom Sorts comparers
@@ -16,7 +16,7 @@ export interface ColumnValuesComparer<TData = any> {
     /**
      * Column for which to compare values
      */
-    scope: AdaptableScope;
+    scope: ColumnScope;
     /**
      * Comparer function to use
      */

package/src/AdaptableOptions/FormatColumnOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableScope } from '../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope } from '../PredefinedConfig/Common/ColumnScope';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { BaseContext } from '../../types';
 import { IRowNode } from '@ag-grid-community/core';
@@ -30,7 +30,7 @@ export interface CustomDisplayFormatter {
     /**
      * Where Custom Display Format can be applied
      */
-    scope: AdaptableScope;
+    scope: ColumnScope;
 }
 /**
  * Context used in handler of CustomDisplayFormatter

package/src/AdaptableOptions/PredicateOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptablePredicateDef, AdaptableScope, BaseContext, PredicateModuleScope, SystemAlertPredicateId, SystemAlertPredicateIds, SystemBadgeStylePredicateId, SystemBadgeStylePredicateIds, SystemFilterPredicateId, SystemFilterPredicateIds, SystemFlashingCellPredicateId, SystemFlashingCellPredicateIds, SystemFormatColumnPredicateId, SystemFormatColumnPredicateIds } from '../types';
+import { AdaptablePredicateDef, ColumnScope, BaseContext, PredicateModuleScope, SystemAlertPredicateId, SystemAlertPredicateIds, SystemBadgeStylePredicateId, SystemBadgeStylePredicateIds, SystemFilterPredicateId, SystemFilterPredicateIds, SystemFlashingCellPredicateId, SystemFlashingCellPredicateIds, SystemFormatColumnPredicateId, SystemFormatColumnPredicateIds } from '../types';
 /**
  * Options for managing Adaptable Predicates using AdaptableQL
  */
@@ -51,5 +51,5 @@ export interface SystemPredicatesContext<PREDICATE_TYPE = string> extends BaseCo
     /**
      * Current Scope where Predicates are being used
      */
-    columnScope: AdaptableScope;
+    columnScope: ColumnScope;
 }

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableIcon } from '../PredefinedConfig/Common/AdaptableIcon';
 import { DateInputOptions } from './DateInputOptions';
-import { AdaptableScope } from '../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope } from '../PredefinedConfig/Common/ColumnScope';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
@@ -136,7 +136,7 @@ export interface BasePermittedValues {
     /**
      * Scope where Values will appear (Mandatory property)
      */
-    scope: AdaptableScope;
+    scope: ColumnScope;
 }
 /**
  * Permitted/possible values, when column values can be selected (e.g. sort, bulk-update)

package/src/Api/FlashingCellApi.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableFlashingCell } from '../PredefinedConfig/Common/AdaptableFlashingCell';
 import { AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptableScope } from '../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope } from '../PredefinedConfig/Common/ColumnScope';
 import { FlashingCellDefinition, FlashingCellState } from '../PredefinedConfig/FlashingCellState';
 import { AdaptableObjectLookupCriteria } from '../PredefinedConfig/Common/AdaptableObject';
 /**
@@ -83,7 +83,7 @@ export interface FlashingCellApi {
      * Retrieves all Predicate Defs that match given Scope
      * @param scope the Scope to check
      */
-    getFlashingCellPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFlashingCellPredicateDefsForScope(scope: ColumnScope): AdaptablePredicateDef[];
     /**
      * Clears all Cells and Rows which have been flashed (primarily used if duration is 'Always')
      */

package/src/Api/Implementation/FlashingCellApiImpl.d.ts

@@ -3,7 +3,7 @@ import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFl
 import { FlashingCellApi } from '../FlashingCellApi';
 import { FlashingCellDefinition, FlashingCellState } from '../../PredefinedConfig/FlashingCellState';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
 import { FlashingCellInternalApi } from '../Internal/FlashingCellInternalApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableObjectLookupCriteria } from '../../types';
@@ -23,7 +23,7 @@ export declare class FlashingCellApiImpl extends ApiBase implements FlashingCell
     unSuspendFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     addFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
     editFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
-    getFlashingCellPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFlashingCellPredicateDefsForScope(scope: ColumnScope): AdaptablePredicateDef[];
     clearAllFlashingCells(): void;
     isAnyFlashingCellActive(): boolean;
     findFlashingCellDefinitions(criteria: AdaptableObjectLookupCriteria): FlashingCellDefinition[];

package/src/Api/Implementation/ScopeApiImpl.d.ts

@@ -1,33 +1,33 @@
 import { ApiBase } from './ApiBase';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableScope, ScopeDataType } from '../../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope, ScopeDataType } from '../../PredefinedConfig/Common/ColumnScope';
 import { ScopeApi } from '../ScopeApi';
 import { CellColorRange } from '../../PredefinedConfig/StyledColumnState';
 export declare class ScopeApiImpl extends ApiBase implements ScopeApi {
-    isColumnInScope(column: AdaptableColumn | undefined, scope: AdaptableScope | undefined): boolean;
-    getColumnsForScope(scope: AdaptableScope): AdaptableColumn[];
-    getScopeDescription(scope: AdaptableScope): string;
-    scopeIsEmpty(scope: AdaptableScope): boolean;
-    scopeIsAll(scope: AdaptableScope): boolean;
-    scopeHasDataType(scope: AdaptableScope): boolean;
-    scopeHasColumnType(scope: AdaptableScope): boolean;
-    scopeHasOnlyBooleanDataType(scope: AdaptableScope): boolean;
-    scopeHasColumns(scope: AdaptableScope): boolean;
-    isSingleColumnScope(scope: AdaptableScope): boolean;
-    getSingleColumnInScope(scope: AdaptableScope): string | undefined;
-    isSingleNumericColumnScope(scope: AdaptableScope): boolean;
-    isSingleBooleanColumnScope(scope: AdaptableScope): boolean;
-    areAllBooleanColumnsInScope(scope: AdaptableScope): boolean;
-    isColumnInScopeColumns(column: AdaptableColumn, scope: AdaptableScope): boolean;
-    isPrimaryKeyColumnInScopeColumns(scope: AdaptableScope): boolean;
-    getScopeToString(scope: AdaptableScope): string;
-    getColumnIdsInScope(scope: AdaptableScope): string[] | undefined;
-    getColumnTypesInScope(scope: AdaptableScope): string[] | undefined;
-    getDataTypesInScope(scope: AdaptableScope): ScopeDataType[] | undefined;
-    isColumnInNumericScope(column: AdaptableColumn, scope: AdaptableScope): boolean;
-    isColumnInStringsScope(column: AdaptableColumn, scope: AdaptableScope): boolean;
-    isColumnInDateScope(column: AdaptableColumn, scope: AdaptableScope): boolean;
-    isScopeInScope(a: AdaptableScope, b: AdaptableScope): boolean;
-    createCellColorRangesForScope(scope: AdaptableScope): CellColorRange[];
+    isColumnInScope(column: AdaptableColumn | undefined, scope: ColumnScope | undefined): boolean;
+    getColumnsForScope(scope: ColumnScope): AdaptableColumn[];
+    getScopeDescription(scope: ColumnScope): string;
+    scopeIsEmpty(scope: ColumnScope): boolean;
+    scopeIsAll(scope: ColumnScope): boolean;
+    scopeHasDataType(scope: ColumnScope): boolean;
+    scopeHasColumnType(scope: ColumnScope): boolean;
+    scopeHasOnlyBooleanDataType(scope: ColumnScope): boolean;
+    scopeHasColumns(scope: ColumnScope): boolean;
+    isSingleColumnScope(scope: ColumnScope): boolean;
+    getSingleColumnInScope(scope: ColumnScope): string | undefined;
+    isSingleNumericColumnScope(scope: ColumnScope): boolean;
+    isSingleBooleanColumnScope(scope: ColumnScope): boolean;
+    areAllBooleanColumnsInScope(scope: ColumnScope): boolean;
+    isColumnInScopeColumns(column: AdaptableColumn, scope: ColumnScope): boolean;
+    isPrimaryKeyColumnInScopeColumns(scope: ColumnScope): boolean;
+    getScopeToString(scope: ColumnScope): string;
+    getColumnIdsInScope(scope: ColumnScope): string[] | undefined;
+    getColumnTypesInScope(scope: ColumnScope): string[] | undefined;
+    getDataTypesInScope(scope: ColumnScope): ScopeDataType[] | undefined;
+    isColumnInNumericScope(column: AdaptableColumn, scope: ColumnScope): boolean;
+    isColumnInStringsScope(column: AdaptableColumn, scope: ColumnScope): boolean;
+    isColumnInDateScope(column: AdaptableColumn, scope: ColumnScope): boolean;
+    isScopeInScope(a: ColumnScope, b: ColumnScope): boolean;
+    createCellColorRangesForScope(scope: ColumnScope): CellColorRange[];
     private distinctColumnValuesAreEmpty;
 }

package/src/Api/Internal/AlertInternalApi.d.ts

@@ -5,7 +5,7 @@ import { AlertFormContext } from '../../AdaptableOptions/AlertOptions';
 import { AdaptableAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { GridDataChangedInfo } from '../Events/GridDataChanged';
-import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
 import { IRowNode } from '@ag-grid-community/core';
@@ -72,7 +72,7 @@ export declare class AlertInternalApi extends ApiBase {
      * Retrieves all Predicate Defs that match given Scope
      * @param scope the Scope to check
      */
-    getAlertPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    getAlertPredicateDefsForScope(scope: ColumnScope): AdaptablePredicateDef[];
     /**
      * Returns a description of an Alert Definition
      * @param alertDefinition Alert Definition to use

package/src/Api/Internal/FormatColumnInternalApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, AdaptableScope, FormatColumn, StringFormatterOptions } from '../../types';
+import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, ColumnScope, FormatColumn, StringFormatterOptions } from '../../types';
 import { ApiBase } from '../Implementation/ApiBase';
 import { IRowNode } from '@ag-grid-community/core';
 export declare class FormatColumnInternalApi extends ApiBase {
@@ -76,7 +76,7 @@ export declare class FormatColumnInternalApi extends ApiBase {
      * Returns all Predicates appropriate for the given Scope
      * @param scope Scope to check
      */
-    getFormatColumnDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFormatColumnDefsForScope(scope: ColumnScope): AdaptablePredicateDef[];
     /**
      * Checks if format column is relevant for a given cell (intersection of given AdaptableColumn and RowNode)
      *

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -155,23 +155,34 @@ export class FormatColumnInternalApi extends ApiBase {
      * @param params
      */
     formatColumnShouldRender(formatColumn, column, rowNode, cellValue) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         // suspended is important to be first
         if (formatColumn.IsSuspended) {
             return false;
         }
-        if (!formatColumn.IncludeGroupedRows &&
-            this.getAdaptableApi().gridApi.isGroupRowNode(rowNode)) {
-            return false;
+        const isSummaryNode = (_a = rowNode === null || rowNode === void 0 ? void 0 : rowNode.data) === null || _a === void 0 ? void 0 : _a[ROW_SUMMARY_ROW_ID];
+        const isGroupedRowNode = this.getAdaptableApi().gridApi.isGroupRowNode(rowNode);
+        // For Summary Rows cannot be excluded
+        if (isSummaryNode) {
+            if ((_b = formatColumn.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows) {
+                return false;
+            }
         }
-        if (!formatColumn.IncludeRowSummaries && ((_a = rowNode === null || rowNode === void 0 ? void 0 : rowNode.data) === null || _a === void 0 ? void 0 : _a[ROW_SUMMARY_ROW_ID])) {
-            return false;
+        else if (isGroupedRowNode) {
+            if ((_c = formatColumn.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeGroupedRows) {
+                return false;
+            }
+        }
+        else {
+            if ((_d = formatColumn.RowScope) === null || _d === void 0 ? void 0 : _d.ExcludeDataRows) {
+                return false;
+            }
         }
         if (!formatColumn.Rule) {
             return true;
         }
         // first run the predicate
-        if (formatColumn.Rule.Predicates && ((_c = (_b = formatColumn.Rule) === null || _b === void 0 ? void 0 : _b.Predicates) === null || _c === void 0 ? void 0 : _c.length)) {
+        if (formatColumn.Rule.Predicates && ((_f = (_e = formatColumn.Rule) === null || _e === void 0 ? void 0 : _e.Predicates) === null || _f === void 0 ? void 0 : _f.length)) {
             const predicateDefHandlerContext = Object.assign({ value: cellValue, oldValue: null, displayValue: cellValue, node: rowNode, column: column }, this.getAdaptableApi().internalApi.buildBaseContext());
             return this.evaluatePredicate(formatColumn, predicateDefHandlerContext);
         } // then run the Expression

package/src/Api/Internal/PredicateInternalApi.d.ts

@@ -2,7 +2,7 @@ import { ApiBase } from '../Implementation/ApiBase';
 import { AdaptablePredicate, AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { SystemFilterPredicateId } from '../../PredefinedConfig/Common/ColumnFilter';
 import { AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableScope } from '../../types';
+import { ColumnScope } from '../../types';
 export declare class PredicateInternalApi extends ApiBase {
     /**
      * Returns true if the predicate has a dropdown.
@@ -13,23 +13,23 @@ export declare class PredicateInternalApi extends ApiBase {
     /**
      * Get all Filter Predicate Definitions - System and Custom
      */
-    getFilterPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFilterPredicateDefs(scope: ColumnScope): AdaptablePredicateDef[];
     private getSystemFilterPredicateIds;
     /**
      * Get all Alert Predicate Definitions - System and Custom
      */
-    getAlertPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
+    getAlertPredicateDefs(scope: ColumnScope): AdaptablePredicateDef[];
     private getSystemAlertPredicateIds;
     private getSystemBadgeStylePredicateIds;
     /**
      * Get all Format Column Predicate Definitions - System and Custom
      */
-    getFormatColumnPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFormatColumnPredicateDefs(scope: ColumnScope): AdaptablePredicateDef[];
     private getSystemFormatColumnPredicateIds;
     /**
      * Get all Flashing Cell Predicate Definitions - System and Custom
      */
-    getFlashingCellPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFlashingCellPredicateDefs(scope: ColumnScope): AdaptablePredicateDef[];
     private getSystemFlashingCellPredicateIds;
     /**
      * Gets the correct Equality-type System Predicate for a particular DataType
@@ -39,7 +39,7 @@ export declare class PredicateInternalApi extends ApiBase {
     /**
      * Get all Badge Style Predicate Definitions - System and Custom
      */
-    getBadgeStylePredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
+    getBadgeStylePredicateDefs(scope: ColumnScope): AdaptablePredicateDef[];
     /**
      * Merges System and Custom Predicate Definitions but ensures that Custom ones take precedence
      * (i.e. if there is a Custom Predicate with the same Id as a System one, the Custom one is used)

package/src/Api/Internal/StyledColumnInternalApi.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { BadgeStyleDefinition, CellColorRange, ColumnComparison, NumericStyledColumn, StyledColumn } from '../../PredefinedConfig/StyledColumnState';
+import { BadgeStyle, BadgeStyleDefinition, CellColorRange, ColumnComparison, NumericStyledColumn, StyledColumn } from '../../PredefinedConfig/StyledColumnState';
 import { IRowNode } from '@ag-grid-community/core';
 import { PredicateDefHandlerContext } from '../../types';
 export declare class StyledColumnInternalApi extends ApiBase {
@@ -57,6 +57,6 @@ export declare class StyledColumnInternalApi extends ApiBase {
      * @param styledColumn Styled Column to Add
      */
     hasStyledColumnRelativeCellRange(styledColumn: StyledColumn): boolean;
-    getApplicableBadge(styledColumn: StyledColumn, context: PredicateDefHandlerContext): BadgeStyleDefinition | null;
+    getApplicableBadge(badgeStyle: BadgeStyle, context: PredicateDefHandlerContext): BadgeStyleDefinition | null;
     getBadgePredicateDefsForColumn(columnId: string): import("../../types").AdaptablePredicateDef<string>[];
 }

package/src/Api/Internal/StyledColumnInternalApi.js

@@ -241,15 +241,14 @@ export class StyledColumnInternalApi extends ApiBase {
                 return cellColorRange.Min == 'Col-Min' || cellColorRange.Max == 'Col-Max';
             })))) !== null && _e !== void 0 ? _e : false);
     }
-    getApplicableBadge(styledColumn, context) {
-        var _a, _b;
-        if (!((_a = styledColumn.BadgeStyle) === null || _a === void 0 ? void 0 : _a.Badges.length)) {
+    getApplicableBadge(badgeStyle, context) {
+        if (!badgeStyle.Badges.length) {
             return null;
         }
         // first that matches, sort last ones without predicate
         const badgesWithoutAll = [];
         const badgesWithAll = [];
-        for (let badge of (_b = styledColumn.BadgeStyle) === null || _b === void 0 ? void 0 : _b.Badges) {
+        for (let badge of badgeStyle.Badges) {
             if (!badge.Predicate) {
                 badgesWithAll.push(badge);
             }

package/src/Api/ScopeApi.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableScope, ScopeDataType } from '../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope, ScopeDataType } from '../PredefinedConfig/Common/ColumnScope';
 import { CellColorRange } from '../PredefinedConfig/StyledColumnState';
 /**
  * Provides access to a suite of functions related to the `Scope` object
@@ -10,116 +10,116 @@ export interface ScopeApi {
      * @param column Column to check
      * @param scope   The Scope to check
      */
-    isColumnInScope(column: AdaptableColumn | undefined, scope: AdaptableScope): boolean;
+    isColumnInScope(column: AdaptableColumn | undefined, scope: ColumnScope): boolean;
     /**
      * Returns list of all Columns in the given Scope
      * @param scope the Scope to check
      */
-    getColumnsForScope(scope: AdaptableScope): AdaptableColumn[];
+    getColumnsForScope(scope: ColumnScope): AdaptableColumn[];
     /**
      * True if Scope is empty
      * @param scope Scope to check
      */
-    scopeIsEmpty(scope: AdaptableScope): boolean;
+    scopeIsEmpty(scope: ColumnScope): boolean;
     /**
      * True if Scope is 'All'
      * @param scope Scope to check
      */
-    scopeIsAll(scope: AdaptableScope): boolean;
+    scopeIsAll(scope: ColumnScope): boolean;
     /**
      * True if Scope contains DataTypes
      * @param scope Scope to check
      */
-    scopeHasDataType(scope: AdaptableScope): boolean;
+    scopeHasDataType(scope: ColumnScope): boolean;
     /**
      * True if Scope contains ColumnTypes
      * @param scope Scope to check
      */
-    scopeHasColumnType(scope: AdaptableScope): boolean;
+    scopeHasColumnType(scope: ColumnScope): boolean;
     /**
      * True if the Scope is DataTypes and contains only Boolean
      * @param scope Scope to check
      */
-    scopeHasOnlyBooleanDataType(scope: AdaptableScope): boolean;
+    scopeHasOnlyBooleanDataType(scope: ColumnScope): boolean;
     /**
      * True if Scope contains just 1 ColumnId
      * @param scope Scope to check
      */
-    isSingleColumnScope(scope: AdaptableScope): boolean;
+    isSingleColumnScope(scope: ColumnScope): boolean;
     /**
      * Gets the only Column in given Scope
      * @param scope Scope to check
      */
-    getSingleColumnInScope(scope: AdaptableScope): string | undefined;
+    getSingleColumnInScope(scope: ColumnScope): string | undefined;
     /**
      * True if Scope contains just 1 numeric Column
      * @param scope Scope to check
      */
-    isSingleNumericColumnScope(scope: AdaptableScope): boolean;
+    isSingleNumericColumnScope(scope: ColumnScope): boolean;
     /**
      * True if Scope contains just 1 boolean Column
      * @param scope Scope to check
      */
-    isSingleBooleanColumnScope(scope: AdaptableScope): boolean;
+    isSingleBooleanColumnScope(scope: ColumnScope): boolean;
     /**
      * True if all selected columns are boolean
      * @param scope Scope to check
      */
-    areAllBooleanColumnsInScope(scope: AdaptableScope): boolean;
+    areAllBooleanColumnsInScope(scope: ColumnScope): boolean;
     /**
      * True if Scope contains ColumnIds
      * @param scope Scope to check
      */
-    scopeHasColumns(scope: AdaptableScope): boolean;
+    scopeHasColumns(scope: ColumnScope): boolean;
     /**
      * Gets string representation of the Scope
      * @param scope Scope to check
      */
-    getScopeToString(scope: AdaptableScope): string;
+    getScopeToString(scope: ColumnScope): string;
     /**
      * Whether PK column is included in Scope's column section
      * @param scope Scope to check
      */
-    isPrimaryKeyColumnInScopeColumns(scope: AdaptableScope): boolean;
+    isPrimaryKeyColumnInScopeColumns(scope: ColumnScope): boolean;
     /**
      * True if Column is in Scope's 'ColumnIds' section
      * @param column Column to check
      * @param scope Scope to check
      */
-    isColumnInScopeColumns(column: AdaptableColumn, scope: AdaptableScope): boolean;
+    isColumnInScopeColumns(column: AdaptableColumn, scope: ColumnScope): boolean;
     /**
      * Returns all the ColumnIds in the Scope
      * @param scope Scope to check
      */
-    getColumnIdsInScope(scope: AdaptableScope): string[] | undefined;
+    getColumnIdsInScope(scope: ColumnScope): string[] | undefined;
     /**
      * Returns all the ColumnTypes in the Scope
      * @param scope Scope to check
      */
-    getColumnTypesInScope(scope: AdaptableScope): string[] | undefined;
+    getColumnTypesInScope(scope: ColumnScope): string[] | undefined;
     /**
      * Returns all the DataTypes in the Scope
      * @param scope Scope to check
      */
-    getDataTypesInScope(scope: AdaptableScope): ScopeDataType[] | undefined;
+    getDataTypesInScope(scope: ColumnScope): ScopeDataType[] | undefined;
     /**
      * True if Scope has Numeric DataType containing Column
      * @param column Column to check
      * @param scope Scope to check
      */
-    isColumnInNumericScope(column: AdaptableColumn, scope: AdaptableScope): boolean;
+    isColumnInNumericScope(column: AdaptableColumn, scope: ColumnScope): boolean;
     /**
      * True if Scope has String DataType containing Column
      * @param column Column to check
      * @param scope Scope to check
      */
-    isColumnInStringsScope(column: AdaptableColumn, scope: AdaptableScope): boolean;
+    isColumnInStringsScope(column: AdaptableColumn, scope: ColumnScope): boolean;
     /**
      * True if Scope has Data DataType which contains Column
      * @param column Column to check
      * @param scope Scope to check
      */
-    isColumnInDateScope(column: AdaptableColumn, scope: AdaptableScope): boolean;
+    isColumnInDateScope(column: AdaptableColumn, scope: ColumnScope): boolean;
     /**
      * True if first scope is in second Scope
      *
@@ -135,15 +135,15 @@ export interface ScopeApi {
      * @param scopeA first Scope
      * @param scopeB second Scope
      */
-    isScopeInScope(scopeA: AdaptableScope, scopeB: AdaptableScope): boolean;
+    isScopeInScope(scopeA: ColumnScope, scopeB: ColumnScope): boolean;
     /**
      * Provides a description for the Scope
      * @param scope The Scope to check
      */
-    getScopeDescription(scope: AdaptableScope): string;
+    getScopeDescription(scope: ColumnScope): string;
     /**
      * Creates Cell Color Ranges (used in Format Column) for given Scope
      * @param scope Scope to use
      */
-    createCellColorRangesForScope(scope: AdaptableScope): CellColorRange[];
+    createCellColorRangesForScope(scope: ColumnScope): CellColorRange[];
 }

package/src/PredefinedConfig/AlertState.d.ts

@@ -1,5 +1,5 @@
 import { ConfigState } from './ConfigState';
-import { AdaptableScope } from './Common/AdaptableScope';
+import { ColumnScope } from './Common/ColumnScope';
 import { AdaptableColumnPredicate } from './Common/AdaptablePredicate';
 import { TypeHint } from './Common/Types';
 import { AdaptableMessageType } from './Common/AdaptableMessageType';
@@ -27,7 +27,7 @@ export interface AlertDefinition extends SuspendableObject {
     /**
      * Where Alert can be triggered: one, some or all columns or DataTypes
      */
-    Scope: AdaptableScope;
+    Scope: ColumnScope;
     /**
      * When Alert should be triggered
      */

package/src/PredefinedConfig/Common/AdaptableObject.d.ts

@@ -1,5 +1,5 @@
 import { TypeUuid } from '../Uuid';
-import { AdaptableScope } from './AdaptableScope';
+import { ColumnScope } from './ColumnScope';
 /**
  * Base interface which all other Adaptable State-related objects extend
  */
@@ -30,9 +30,9 @@ export type AdaptableObjectTag = string;
  */
 export interface AdaptableObjectLookupCriteria {
     /**
-     * AdaptableScope
+     * ColumnScope
      */
-    scope?: AdaptableScope;
+    scope?: ColumnScope;
     /**
      * AdaptableObjectTag
      */
@@ -43,5 +43,5 @@ export interface AdaptableObjectLookupCriteria {
     ids?: AdaptableObject['Uuid'][];
 }
 export interface AdaptableObjectWithScope extends AdaptableObject {
-    Scope: AdaptableScope;
+    Scope: ColumnScope;
 }

package/src/PredefinedConfig/Common/AdaptablePredicate.d.ts

@@ -1,7 +1,7 @@
 import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableIcon, ColumnFilter } from '../../types';
 import { AdaptableColumn, AdaptableColumnDataType } from './AdaptableColumn';
-import { AdaptableScope } from './AdaptableScope';
+import { ColumnScope } from './ColumnScope';
 import { BaseContext } from './BaseContext';
 /**
  * Predicate object used by AdapTableQL - essentially a boolean function
@@ -40,7 +40,7 @@ export interface AdaptablePredicateDef<PREDICATE_TYPE = string> {
     /**
      * Columns (or DataTypes) where Predicate is active
      */
-    columnScope: AdaptableScope;
+    columnScope: ColumnScope;
     /**
      * Modules where Predicate can run
      */

package/src/PredefinedConfig/Common/{AdaptableScope.d.ts → ColumnScope.d.ts}

@@ -14,4 +14,4 @@ export type ScopeColumnTypes = {
 /**
  * Defines where a given Object / Module is active
  */
-export type AdaptableScope<Type = ScopeDataType> = ScopeAll | ScopeDataTypes<Type> | ScopeColumnIds | ScopeColumnTypes;
+export type ColumnScope<Type = ScopeDataType> = ScopeAll | ScopeDataTypes<Type> | ScopeColumnIds | ScopeColumnTypes;

package/src/PredefinedConfig/Common/RowScope.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Defines which types of Rows to exclude when rendering Format Columns, Action Columns, Badges
+ */
+export type RowScope = {
+    /**
+     * Exclude regular data rows
+     */
+    ExcludeDataRows?: boolean;
+    /**
+     * Exclude Grouped Rows
+     */
+    ExcludeGroupedRows?: boolean;
+    /**
+     * Exclude Summary Rows (used in Row Summaries)
+     */
+    ExcludeSummaryRows?: boolean;
+};

package/src/PredefinedConfig/Common/RowScope.js

@@ -0,0 +1 @@
+export {};

package/src/PredefinedConfig/ExportState.d.ts

@@ -1,6 +1,6 @@
 import { ConfigState } from './ConfigState';
 import { BaseSchedule } from './Common/Schedule';
-import { AdaptableScope } from './Common/AdaptableScope';
+import { ColumnScope } from './Common/ColumnScope';
 import { AdaptableColumnBase } from './Common/AdaptableColumn';
 import { AdaptableObject } from './Common/AdaptableObject';
 import { AdaptableFormData } from './Common/AdaptableForm';
@@ -42,7 +42,7 @@ export interface Report extends AdaptableObject {
     /**
      * Columns Scope; only required if `ReportColumnScope` is 'ScopeColumns'
      */
-    Scope?: AdaptableScope;
+    Scope?: ColumnScope;
     /**
      * Query to use; only required if `ReportRowScope` is 'ExpressionRows'
      */