@adaptabletools/adaptable 20.0.0-canary.10 → 20.0.0-canary.12

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 (7) hide show
  1. package/package.json +1 -1
  2. package/src/AdaptableOptions/DashboardOptions.d.ts +1 -1
  3. package/src/Api/Internal/ColumnInternalApi.js +1 -2
  4. package/src/View/Dashboard/CustomToolbar.js +2 -2
  5. package/src/env.js +2 -2
  6. package/src/migration/VersionUpgrade20.js +8 -3
  7. 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.0-canary.10",
3
+ "version": "20.0.0-canary.12",
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/AdaptableOptions/DashboardOptions.d.ts CHANGED
@@ -96,4 +96,4 @@ export type ToolbarActions = ToolbarAction[];
96
96
  /**
97
97
  * Action available in Custom Toolbar - Close or Configure
98
98
  */
99
- export type ToolbarAction = 'Close' | 'Configure';
99
+ export type ToolbarAction = 'close' | 'configure';
package/src/Api/Internal/ColumnInternalApi.js CHANGED
@@ -1,7 +1,6 @@
1
1
  import { ApiBase } from '../Implementation/ApiBase';
2
2
  import { AG_GRID_GROUPED_COLUMN } from '../../Utilities/Constants/GeneralConstants';
3
3
  import uniq from 'lodash/uniq';
4
- import { isArray } from 'lodash';
5
4
  import StringExtensions from '../../Utilities/Extensions/StringExtensions';
6
5
  export function getAutoRowGroupColumnIdFor(columnId) {
7
6
  return `${AG_GRID_GROUPED_COLUMN}-${columnId}`;
@@ -23,7 +22,7 @@ export class ColumnInternalApi extends ApiBase {
23
22
  .getColumns()
24
23
  .forEach((c) => {
25
24
  const agGridColType = this.getAgGridColumnType(c.columnId);
26
- if (isArray(agGridColType)) {
25
+ if (Array.isArray(agGridColType)) {
27
26
  colTypes.push(...agGridColType);
28
27
  }
29
28
  else {
package/src/View/Dashboard/CustomToolbar.js CHANGED
@@ -87,8 +87,8 @@ export const CustomToolbarCmp = (props) => {
87
87
  };
88
88
  export const CustomToolbarWrapper = (props) => {
89
89
  const { api } = useAdaptable();
90
- return (React.createElement(PanelDashboard, { headerText: props.customToolbar.title ? props.customToolbar.title : '', showConfigureActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'Configure') !=
91
- undefined, showCloseActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'Close') != undefined, onConfigure: () => {
90
+ return (React.createElement(PanelDashboard, { headerText: props.customToolbar.title ? props.customToolbar.title : '', showConfigureActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'configure') !=
91
+ undefined, showCloseActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'close') != undefined, onConfigure: () => {
92
92
  const customToolbarConfiguredInfo = {
93
93
  ...api.internalApi.buildBaseContext(),
94
94
  customToolbar: props.customToolbar,
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: 1741781297912 || Date.now(),
4
- VERSION: "20.0.0-canary.10" || '--current-version--',
3
+ PUBLISH_TIMESTAMP: 1741787102842 || Date.now(),
4
+ VERSION: "20.0.0-canary.12" || '--current-version--',
5
5
  };
package/src/migration/VersionUpgrade20.js CHANGED
@@ -13,6 +13,7 @@ function transition_pre_20(layout) {
13
13
  if (l.Columns) {
14
14
  layout.TableColumns = l.Columns;
15
15
  delete l.Columns;
16
+ delete layout.PivotColumns;
16
17
  }
17
18
  if (l.PinnedColumnsMap) {
18
19
  layout.ColumnPinning = l.PinnedColumnsMap;
@@ -28,11 +29,12 @@ function transition_pre_20(layout) {
28
29
  }
29
30
  if (l.EnablePivot) {
30
31
  layout.PivotColumns = l.PivotColumns || [];
32
+ delete layout.TableColumns;
31
33
  if (l.AggregationColumns) {
32
34
  layout.PivotAggregationColumns = layout.TableAggregationColumns;
33
35
  }
34
36
  }
35
- if (l.ColumnFilters) {
37
+ if (Array.isArray(l.ColumnFilters)) {
36
38
  layout.ColumnFilters = l.ColumnFilters.map((columnFilter) => {
37
39
  const filter = {
38
40
  ...columnFilter,
@@ -41,10 +43,13 @@ function transition_pre_20(layout) {
41
43
  // while version 20 has an array of predicates
42
44
  // @ts-ignore
43
45
  if (filter.Predicate) {
44
- // @ts-ignore
45
- delete filter.Predicate;
46
46
  // @ts-ignore
47
47
  filter.Predicates = [filter.Predicate];
48
+ // @ts-ignore
49
+ delete filter.Predicate;
50
+ }
51
+ if (!Array.isArray(filter.Predicates)) {
52
+ filter.Predicates = [];
48
53
  }
49
54
  filter.Predicates = filter.Predicates.map((p) => {
50
55
  // the following predicate ids were renamed: