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

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/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/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.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/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/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/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/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

@@ -2,7 +2,6 @@ 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) => {
@@ -33,7 +32,7 @@ const ActionButtons = (props) => {
     })));
 };
 export const ReactActionColumnRenderer = (props) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const rerender = useRerender();
     const adaptable = props.context.__adaptable;
     const { actionButtons, actionColumn } = adaptable.api.internalApi.getActionButtonsAndActionColumn(props.colDef);
@@ -41,20 +40,20 @@ export const ReactActionColumnRenderer = (props) => {
         return null;
     }
     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];
+    const isSummaryRow = adaptable.api.gridApi.isSummaryNode(props.node);
     let shouldRender = true;
     if (isGroupedRow) {
-        if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) {
+        if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupedRows) {
             shouldRender = false;
         }
     }
     else if (isSummaryRow) {
-        if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) {
+        if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows) {
             shouldRender = false;
         }
     }
     else {
-        if ((_d = actionColumn.rowScope) === null || _d === void 0 ? void 0 : _d.ExcludeDataRows) {
+        if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeDataRows) {
             shouldRender = false;
         }
     }
@@ -77,7 +76,7 @@ export const ReactActionColumnRenderer = (props) => {
 export class ActionColumnRenderer {
     // gets called once before the renderer is used
     init(params) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const adaptable = params.context.__adaptable;
         const { actionButtons, actionColumn } = adaptable.api.internalApi.getActionButtonsAndActionColumn(params.colDef);
         if (!actionColumn || !actionButtons.length) {
@@ -87,20 +86,20 @@ export class ActionColumnRenderer {
         this.eGui = document.createElement('div');
         this.eGui.className = 'ab-ActionColumn';
         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];
+        const isSummaryRow = adaptable.api.gridApi.isSummaryNode(params.node);
         let shouldRender = true;
         if (isGroupedRow) {
-            if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) {
+            if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupedRows) {
                 shouldRender = false;
             }
         }
         else if (isSummaryRow) {
-            if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) {
+            if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows) {
                 shouldRender = false;
             }
         }
         else {
-            if ((_d = actionColumn.rowScope) === null || _d === void 0 ? void 0 : _d.ExcludeDataRows) {
+            if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeDataRows) {
                 shouldRender = false;
             }
         }

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;
@@ -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, _c;
+        var _a;
         let style = {};
         const gradientStyle = styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.GradientStyle;
         if (params.value === undefined) {
@@ -689,7 +689,7 @@ export class AgGridColumnAdapter {
         }
         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])) {
+            this.adaptableApi.gridApi.isSummaryNode(params === null || params === void 0 ? void 0 : params.node)) {
             return style;
         }
         if (gradientStyle) {

package/src/agGrid/BadgeRenderer.js

@@ -1,7 +1,6 @@
 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 = (badgeStyle, abColumn, api) => {
     return class BadgetRenderer {
         getAdaptableInstance(params) {
@@ -9,31 +8,31 @@ export const getBadgeRendererForColumn = (badgeStyle, abColumn, api) => {
             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 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];
+            const isSummaryRow = adapatableApi.gridApi.isSummaryNode(params.node);
             let shouldRender = true;
             if (isGroupedRow) {
-                if ((_b = badgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) {
+                if ((_a = badgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupedRows) {
                     shouldRender = false;
                 }
             }
             else if (isSummaryRow) {
-                if ((_c = badgeStyle.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) {
+                if ((_b = badgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows) {
                     shouldRender = false;
                 }
             }
             else {
-                if ((_d = badgeStyle.RowScope) === null || _d === void 0 ? void 0 : _d.ExcludeDataRows) {
+                if ((_c = badgeStyle.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeDataRows) {
                     shouldRender = false;
                 }
             }
             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 : '';
+                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;
             }

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: 1712779308766 || Date.now(),
-    VERSION: "18.0.0-canary.31" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1712828124306 || Date.now(),
+    VERSION: "18.0.0-canary.32" || '--current-version--',
 };