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

package/src/agGrid/AdaptableAgGrid.js

@@ -394,7 +394,6 @@ export class AdaptableAgGrid {
             adaptableApi: this.api,
             agGridApi: this.agGridAdapter.getAgGridApi(),
         });
-        this.api.userInterfaceApi.hideLoadingScreen();
         perfInitAdaptableAgGrid.end();
         return Promise.resolve(this.api);
     }
@@ -3570,12 +3569,12 @@ export class AdaptableAgGrid {
                     if (!dataChangedScope.wholeRow) {
                         const columnIds = this.api.expressionApi.getColumnsFromExpression(styleModule.Rule.BooleanExpression);
                         if (columnIds.includes(cellDataChangedInfo.column.columnId)) {
-                            if (this.api.scopeApi.scopeIsAll(styleModule.Scope)) {
+                            if (this.api.columnScopeApi.scopeIsAll(styleModule.Scope)) {
                                 dataChangedScope.wholeRow = true;
                                 return;
                             }
                             else {
-                                this.api.scopeApi
+                                this.api.columnScopeApi
                                     .getColumnsForScope(styleModule.Scope)
                                     .map((c) => c.columnId)
                                     .forEach((colId) => {

package/src/agGrid/AgGridColumnAdapter.js

@@ -10,7 +10,6 @@ import UIHelper from '../View/UIHelper';
 import { getPercentBarRendererForColumn } from './PercentBarRenderer';
 import { getBadgeRendererForColumn } from './BadgeRenderer';
 import Helper from '../Utilities/Helpers/Helper';
-import { ROW_SUMMARY_ROW_ID } from '../PredefinedConfig/Common/RowSummary';
 export class AgGridColumnAdapter {
     constructor(adaptableInstance) {
         this.adaptableInstance = adaptableInstance;
@@ -207,7 +206,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';
@@ -349,19 +348,19 @@ export class AgGridColumnAdapter {
                 const options = mostRelevantFormatColumn.DisplayFormat.Options;
                 if (mostRelevantFormatColumn.DisplayFormat.Formatter === 'NumberFormatter') {
                     // change the Number format - if the scope allows it
-                    if (this.adaptableApi.scopeApi.isColumnInNumericScope(abColumn, mostRelevantFormatColumn.Scope)) {
+                    if (this.adaptableApi.columnScopeApi.isColumnInNumericScope(abColumn, mostRelevantFormatColumn.Scope)) {
                         return this.adaptableApi.formatColumnApi.internalApi.getNumberFormattedValue(params.value, params.node, abColumn, options);
                     }
                 }
                 if (mostRelevantFormatColumn.DisplayFormat.Formatter === 'DateFormatter') {
                     // change the Date format - if the scope allows it
-                    if (this.adaptableApi.scopeApi.isColumnInDateScope(abColumn, mostRelevantFormatColumn.Scope)) {
+                    if (this.adaptableApi.columnScopeApi.isColumnInDateScope(abColumn, mostRelevantFormatColumn.Scope)) {
                         return this.adaptableApi.formatColumnApi.internalApi.getDateFormattedValue(params.value, params.node, abColumn, options);
                     }
                 }
                 if (mostRelevantFormatColumn.DisplayFormat.Formatter === 'StringFormatter') {
                     // change the String format - if the scope allows it
-                    if (this.adaptableApi.scopeApi.isColumnInStringsScope(abColumn, mostRelevantFormatColumn.Scope)) {
+                    if (this.adaptableApi.columnScopeApi.isColumnInStringsScope(abColumn, mostRelevantFormatColumn.Scope)) {
                         return this.adaptableApi.formatColumnApi.internalApi.getStringFormattedValue(params.value, params.node, abColumn, options);
                     }
                 }
@@ -379,7 +378,8 @@ export class AgGridColumnAdapter {
             const cellEditableFn = this.adaptableOptions.editOptions.isCellEditable;
             const editableCallback = (params) => {
                 // Adaptable Row Summarie rows are not editable
-                if (params.node.data[ROW_SUMMARY_ROW_ID]) {
+                //        if (params.node.data[ROW_SUMMARY_ROW_ID]) {
+                if (this.adaptableApi.gridApi.isSummaryNode(params.node)) {
                     return false;
                 }
                 if (!cellEditableFn) {
@@ -403,7 +403,7 @@ export class AgGridColumnAdapter {
             const preventEditAlertsForColumn = this.adaptableApi.alertApi.internalApi
                 .getAlertDefinitionsWithPreventEdit()
                 .filter((alertDefinition) => {
-                return this.adaptableApi.scopeApi.isColumnInScope(abColumn, alertDefinition.Scope);
+                return this.adaptableApi.columnScopeApi.isColumnInScope(abColumn, alertDefinition.Scope);
             });
             const noValidations = !preventEditAlertsForColumn.length && !((_a = this.adaptableOptions.editOptions) === null || _a === void 0 ? void 0 : _a.validateOnServer);
             if (noValidations) {
@@ -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;
         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) &&
+            this.adaptableApi.gridApi.isSummaryNode(params === null || params === void 0 ? void 0 : params.node)) {
             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;

package/src/agGrid/BadgeRenderer.js

@@ -1,31 +1,38 @@
 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;
             return adaptable;
         }
         init(params) {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f;
             const adaptable = this.getAdaptableInstance(params);
             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 = adapatableApi.gridApi.isSummaryNode(params.node);
+            let shouldRender = true;
+            if (isGroupedRow) {
+                if ((_a = badgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupedRows) {
+                    shouldRender = false;
+                }
+            }
+            else if (isSummaryRow) {
+                if ((_b = badgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows) {
+                    shouldRender = false;
+                }
+            }
+            else {
+                if ((_c = badgeStyle.RowScope) === null || _c === void 0 ? void 0 : _c.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) {
-                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 : '';
+            if (!shouldRender) {
+                const formattedValue = (_f = (_e = (_d = params.formatValue) === null || _d === void 0 ? void 0 : _d.call(params, params.value)) !== null && _e !== void 0 ? _e : params.value) !== null && _f !== void 0 ? _f : '';
                 this.eGui.innerHTML = formattedValue;
                 return;
             }
@@ -56,7 +63,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 +87,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: 1712828124306 || Date.now(),
+    VERSION: "18.0.0-canary.32" || '--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: {