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

package/src/agGrid/BadgeRenderer.js

@@ -2,10 +2,7 @@ import { Badge } from '../View/Components/Badge';
 import { renderWithAdaptableContext } from '../View/renderWithAdaptableContext';
 import * as React from 'react';
 import { ROW_SUMMARY_ROW_ID } from '../PredefinedConfig/Common/RowSummary';
-export const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
-    if (!styledColumn.BadgeStyle) {
-        return;
-    }
+export const getBadgeRendererForColumn = (badgeStyle, abColumn, api) => {
     return class BadgetRenderer {
         getAdaptableInstance(params) {
             const adaptable = params.context.__adaptable;
@@ -17,14 +14,25 @@ export const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
             const adapatableApi = adaptable.api;
             this.eGui = document.createElement('div');
             this.eGui.className = 'ab-Badge__wrapper';
-            const includeGrouped = Boolean(styledColumn.IncludeGroupedRows);
-            const isGrouped = params.node.group;
-            if (includeGrouped === false && isGrouped) {
-                const formattedValue = (_c = (_b = (_a = params.formatValue) === null || _a === void 0 ? void 0 : _a.call(params, params.value)) !== null && _b !== void 0 ? _b : params.value) !== null && _c !== void 0 ? _c : '';
-                this.eGui.innerHTML = formattedValue;
-                return;
+            const isGroupedRow = params.node.group;
+            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 = badgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) {
+                    shouldRender = false;
+                }
+            }
+            else if (isSummaryRow) {
+                if ((_c = badgeStyle.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) {
+                    shouldRender = false;
+                }
+            }
+            else {
+                if ((_d = badgeStyle.RowScope) === null || _d === void 0 ? void 0 : _d.ExcludeDataRows) {
+                    shouldRender = false;
+                }
             }
-            if (((_d = params === null || params === void 0 ? void 0 : params.data) === null || _d === void 0 ? void 0 : _d[ROW_SUMMARY_ROW_ID]) && !styledColumn.IncludeRowSummaries) {
+            if (!shouldRender) {
                 const formattedValue = (_g = (_f = (_e = params.formatValue) === null || _e === void 0 ? void 0 : _e.call(params, params.value)) !== null && _f !== void 0 ? _f : params.value) !== null && _g !== void 0 ? _g : '';
                 this.eGui.innerHTML = formattedValue;
                 return;
@@ -56,7 +64,7 @@ export const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
                     userName: adapatableApi.optionsApi.getUserName(),
                     adaptableId: adapatableApi.optionsApi.getAdaptableId(),
                 };
-                const badge = api.styledColumnApi.internalApi.getApplicableBadge(styledColumn, predicateDefHandlerContext);
+                const badge = api.styledColumnApi.internalApi.getApplicableBadge(badgeStyle, predicateDefHandlerContext);
                 const isNullValue = formattedValue === '' || formattedValue === null || formattedValue === undefined;
                 if (!isNullValue && badge) {
                     badgesConfig.push({
@@ -80,7 +88,7 @@ export const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
                 userName: adapatableApi.optionsApi.getUserName(),
                 adaptableId: adapatableApi.optionsApi.getAdaptableId(),
             };
-            const badge = api.styledColumnApi.internalApi.getApplicableBadge(styledColumn, predicateDefHandlerContext);
+            const badge = api.styledColumnApi.internalApi.getApplicableBadge(badgeStyle, predicateDefHandlerContext);
             const isNullValue = formattedValue === '' || formattedValue === null || formattedValue === undefined;
             if (
             // empty values

package/src/agGrid/PercentBarRenderer.js

@@ -15,7 +15,6 @@ export const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
             }
             // No longer support showing Percent Bar in Grouped Rows
             if (api.gridApi.isGroupRowNode(params.node)) {
-                // if (!styledColumn.IncludeGroupedRows && api.gridApi.isGroupRowNode(params.node)) {
                 if (params.value) {
                     this.eGui = document.createElement('div');
                     this.eGui.append(params.value);

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1712760567298 || Date.now(),
-    VERSION: "18.0.0-canary.30" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1712779308766 || Date.now(),
+    VERSION: "18.0.0-canary.31" || '--current-version--',
 };

package/src/metamodel/adaptable.metamodel.d.ts

@@ -897,11 +897,6 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
         }[];
     };
-    AdaptableScope: {
-        name: string;
-        kind: string;
-        desc: string;
-    };
     AdaptableSettingsPanel: {
         name: string;
         kind: string;
@@ -1328,12 +1323,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: {
+        props: ({
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
-        }[];
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        })[];
     };
     BadgeStyleDefinition: {
         name: string;
@@ -1919,6 +1921,11 @@ export declare const ADAPTABLE_METAMODEL: {
             noCode?: undefined;
         })[];
     };
+    ColumnScope: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     ColumnSort: {
         name: string;
         kind: string;
@@ -3379,28 +3386,18 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             isOpt: boolean;
             ref?: undefined;
-            defVal?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
             ref: string;
-            defVal?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            defVal: string;
-            ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             ref: string;
             isOpt?: undefined;
-            defVal?: undefined;
         })[];
     };
     FormatColumnOptions: {
@@ -4748,6 +4745,11 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt: boolean;
         }[];
     };
+    RowScope: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     RowsHighlightInfo: {
         name: string;
         kind: string;
@@ -5092,21 +5094,12 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             isOpt: boolean;
             ref: string;
-            defVal?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt?: undefined;
             ref?: undefined;
-            defVal?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            defVal: string;
-            ref?: undefined;
         })[];
     };
     StyledColumnState: {