@adaptabletools/adaptable 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.esm.tsbuildinfo +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adaptabletools/adaptable",
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
@@ -1,5 +1,5 @@
1
1
  export default {
2
2
  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" || '',
3
- PUBLISH_TIMESTAMP: 1746012335086 || Date.now(),
4
- VERSION: "20.0.9" || '--current-version--',
3
+ PUBLISH_TIMESTAMP: 1746018963775 || Date.now(),
4
+ VERSION: "20.0.10" || '--current-version--',
5
5
  };
package/src/layout-manager/src/index.js CHANGED
@@ -261,6 +261,9 @@ export class LayoutManager extends LMEmitter {
261
261
  GrandTotalRow: layout.GrandTotalRow,
262
262
  PivotExpandLevel: prevLayout?.PivotExpandLevel ?? -1,
263
263
  };
264
+ if (layout.SuppressAggFuncInHeader) {
265
+ pivotLayout.SuppressAggFuncInHeader = layout.SuppressAggFuncInHeader;
266
+ }
264
267
  const grandTotalColumn = this.gridApi.getGridOption('pivotRowTotals');
265
268
  if (grandTotalColumn) {
266
269
  pivotLayout.GrandTotalColumn = grandTotalColumn;
@@ -686,10 +689,8 @@ export class LayoutManager extends LMEmitter {
686
689
  };
687
690
  this.suppressGlobalAgGridEventListener = true;
688
691
  const pivotMode = this.gridApi.isPivotMode();
689
- if (layout.SuppressAggFuncInHeader !== undefined &&
690
- layout.SuppressAggFuncInHeader !== this.gridApi.getGridOption('suppressAggFuncInHeader')) {
691
- // @ts-ignore
692
- this.gridApi.setGridOption('suppressAggFuncInHeader', layout.SuppressAggFuncInHeader);
692
+ if (!!layout.SuppressAggFuncInHeader !== !!this.gridApi.getGridOption('suppressAggFuncInHeader')) {
693
+ this.gridApi.setGridOption('suppressAggFuncInHeader', !!layout.SuppressAggFuncInHeader);
693
694
  }
694
695
  if (layout.GrandTotalRow) {
695
696
  const grandTotalRow = layout.GrandTotalRow === true || layout.GrandTotalRow === 'top'
package/src/layout-manager/src/normalizeLayoutModel.js CHANGED
@@ -25,10 +25,6 @@ export function normalizeTableLayoutModel(layout, options) {
25
25
  if (!layout.RowGroupedColumns) {
26
26
  layout.RowGroupedColumns = [];
27
27
  }
28
- if (!Object.prototype.hasOwnProperty.call(layout, 'SuppressAggFuncInHeader')) {
29
- // make it an own property
30
- layout.SuppressAggFuncInHeader = undefined;
31
- }
32
28
  const ColumnOrderSet = new Set(layout.TableColumns);
33
29
  if (layout.RowGroupedColumns && layout.RowGroupedColumns.length && layout.TableColumns) {
34
30
  // the layout.TableColumns might not include the group columns
@@ -135,10 +131,6 @@ export function normalizePivotLayoutModel(layout) {
135
131
  RowGroupDisplay: 'always-collapsed',
136
132
  };
137
133
  }
138
- if (!Object.prototype.hasOwnProperty.call(layout, 'SuppressAggFuncInHeader')) {
139
- // make it an own property
140
- layout.SuppressAggFuncInHeader = undefined;
141
- }
142
134
  return layout;
143
135
  }
144
136
  export function normalizeLayoutModel(layout, options) {
package/src/layout-manager/src/simplifyLayoutModel.js CHANGED
@@ -17,7 +17,7 @@ export function simplifyTableLayoutModel(layout) {
17
17
  if (!layout.RowGroupedColumns && layout.RowGroupValues) {
18
18
  // delete layout.RowGroupValues;
19
19
  }
20
- if (layout.SuppressAggFuncInHeader === undefined) {
20
+ if (!layout.SuppressAggFuncInHeader) {
21
21
  delete layout.SuppressAggFuncInHeader;
22
22
  }
23
23
  // this is the default value
@@ -56,9 +56,6 @@ export function simplifyTableLayoutModel(layout) {
56
56
  if (!layout.GrandTotalRow) {
57
57
  delete layout.GrandTotalRow;
58
58
  }
59
- if (!layout.SuppressAggFuncInHeader) {
60
- delete layout.SuppressAggFuncInHeader;
61
- }
62
59
  return layout;
63
60
  }
64
61
  export function simplifyPivotLayoutModel(layout) {
@@ -66,7 +63,7 @@ export function simplifyPivotLayoutModel(layout) {
66
63
  if (layout.ColumnWidths && !Object.keys(layout.ColumnWidths).length) {
67
64
  delete layout.ColumnWidths;
68
65
  }
69
- if (layout.SuppressAggFuncInHeader === undefined) {
66
+ if (!layout.SuppressAggFuncInHeader) {
70
67
  delete layout.SuppressAggFuncInHeader;
71
68
  }
72
69
  if (layout.PivotAggregationColumns && !layout.PivotAggregationColumns.length) {