@adaptabletools/adaptable-cjs 20.0.9 → 20.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/package.json +1 -1
  2. package/src/env.js +2 -2
  3. package/src/layout-manager/src/index.js +5 -4
  4. package/src/layout-manager/src/normalizeLayoutModel.js +0 -8
  5. package/src/layout-manager/src/simplifyLayoutModel.js +2 -5
  6. package/tsconfig.cjs.tsbuildinfo +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adaptabletools/adaptable-cjs",
3
- "version": "20.0.9",
3
+ "version": "20.0.10",
4
4
  "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
5
5
  "keywords": [
6
6
  "web-components",
package/src/env.js CHANGED
@@ -2,6 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = {
4
4
  NEXT_PUBLIC_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" || '',
5
- PUBLISH_TIMESTAMP: 1746012364827 || Date.now(),
6
- VERSION: "20.0.9" || '--current-version--',
5
+ PUBLISH_TIMESTAMP: 1746018992508 || Date.now(),
6
+ VERSION: "20.0.10" || '--current-version--',
7
7
  };
package/src/layout-manager/src/index.js CHANGED
@@ -264,6 +264,9 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
264
264
  GrandTotalRow: layout.GrandTotalRow,
265
265
  PivotExpandLevel: prevLayout?.PivotExpandLevel ?? -1,
266
266
  };
267
+ if (layout.SuppressAggFuncInHeader) {
268
+ pivotLayout.SuppressAggFuncInHeader = layout.SuppressAggFuncInHeader;
269
+ }
267
270
  const grandTotalColumn = this.gridApi.getGridOption('pivotRowTotals');
268
271
  if (grandTotalColumn) {
269
272
  pivotLayout.GrandTotalColumn = grandTotalColumn;
@@ -689,10 +692,8 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
689
692
  };
690
693
  this.suppressGlobalAgGridEventListener = true;
691
694
  const pivotMode = this.gridApi.isPivotMode();
692
- if (layout.SuppressAggFuncInHeader !== undefined &&
693
- layout.SuppressAggFuncInHeader !== this.gridApi.getGridOption('suppressAggFuncInHeader')) {
694
- // @ts-ignore
695
- this.gridApi.setGridOption('suppressAggFuncInHeader', layout.SuppressAggFuncInHeader);
695
+ if (!!layout.SuppressAggFuncInHeader !== !!this.gridApi.getGridOption('suppressAggFuncInHeader')) {
696
+ this.gridApi.setGridOption('suppressAggFuncInHeader', !!layout.SuppressAggFuncInHeader);
696
697
  }
697
698
  if (layout.GrandTotalRow) {
698
699
  const grandTotalRow = layout.GrandTotalRow === true || layout.GrandTotalRow === 'top'
package/src/layout-manager/src/normalizeLayoutModel.js CHANGED
@@ -29,10 +29,6 @@ function normalizeTableLayoutModel(layout, options) {
29
29
  if (!layout.RowGroupedColumns) {
30
30
  layout.RowGroupedColumns = [];
31
31
  }
32
- if (!Object.prototype.hasOwnProperty.call(layout, 'SuppressAggFuncInHeader')) {
33
- // make it an own property
34
- layout.SuppressAggFuncInHeader = undefined;
35
- }
36
32
  const ColumnOrderSet = new Set(layout.TableColumns);
37
33
  if (layout.RowGroupedColumns && layout.RowGroupedColumns.length && layout.TableColumns) {
38
34
  // the layout.TableColumns might not include the group columns
@@ -140,10 +136,6 @@ function normalizePivotLayoutModel(layout) {
140
136
  RowGroupDisplay: 'always-collapsed',
141
137
  };
142
138
  }
143
- if (!Object.prototype.hasOwnProperty.call(layout, 'SuppressAggFuncInHeader')) {
144
- // make it an own property
145
- layout.SuppressAggFuncInHeader = undefined;
146
- }
147
139
  return layout;
148
140
  }
149
141
  exports.normalizePivotLayoutModel = normalizePivotLayoutModel;
package/src/layout-manager/src/simplifyLayoutModel.js CHANGED
@@ -20,7 +20,7 @@ function simplifyTableLayoutModel(layout) {
20
20
  if (!layout.RowGroupedColumns && layout.RowGroupValues) {
21
21
  // delete layout.RowGroupValues;
22
22
  }
23
- if (layout.SuppressAggFuncInHeader === undefined) {
23
+ if (!layout.SuppressAggFuncInHeader) {
24
24
  delete layout.SuppressAggFuncInHeader;
25
25
  }
26
26
  // this is the default value
@@ -59,9 +59,6 @@ function simplifyTableLayoutModel(layout) {
59
59
  if (!layout.GrandTotalRow) {
60
60
  delete layout.GrandTotalRow;
61
61
  }
62
- if (!layout.SuppressAggFuncInHeader) {
63
- delete layout.SuppressAggFuncInHeader;
64
- }
65
62
  return layout;
66
63
  }
67
64
  exports.simplifyTableLayoutModel = simplifyTableLayoutModel;
@@ -70,7 +67,7 @@ function simplifyPivotLayoutModel(layout) {
70
67
  if (layout.ColumnWidths && !Object.keys(layout.ColumnWidths).length) {
71
68
  delete layout.ColumnWidths;
72
69
  }
73
- if (layout.SuppressAggFuncInHeader === undefined) {
70
+ if (!layout.SuppressAggFuncInHeader) {
74
71
  delete layout.SuppressAggFuncInHeader;
75
72
  }
76
73
  if (layout.PivotAggregationColumns && !layout.PivotAggregationColumns.length) {