Skip to content

Commit 640b045

Browse files
gjulivangjulivan
committed
chore(data-widgets): multiple fix rebase
1 parent f3610a3 commit 640b045

File tree

16 files changed

+68
-54
lines changed

16 files changed

+68
-54
lines changed

Diff for: ‎packages/modules/data-widgets/CHANGELOG.md

+17-15
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,38 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9-
## [2.28.2] DataWidgets - 2024-12-12
10-
11-
### [2.28.2] Datagrid
12-
13-
#### Fixed
9+
### Fixed
1410

1511
- We've stopped showing the loading indicator when all data were already loaded. The loading indicator was incorrectly displayed during client refresh operations involving a microflow.
1612

17-
## [2.28.1] DataWidgets - 2024-11-21
13+
## [2.27.1] DataWidgets - 2024-11-21
1814

1915
### Fixed
2016

2117
- We fixed an issue where css selector "--brand-primary" gets overwrite by datagrid.
2218

23-
### [2.28.1] Datagrid
19+
### [2.27.1] Datagrid
2420

2521
#### Fixed
2622

2723
- We fixed an issue where Export to Excel was not working in certain cases.
2824

29-
## [2.28.0] DataWidgets - 2024-11-13
25+
## [2.27.0] DataWidgets - 2024-11-13
3026

3127
### [2.10.4] DatagridDateFilter
3228

3329
#### Changed
3430

3531
- We improved type mismatch filter error message.
3632

33+
## [2.25.1] DataWidgets - 2024-11-04
34+
35+
### [2.10.4] DatagridDateFilter
36+
37+
#### Fixed
38+
39+
- We fixed an issue with the widget failing to render in Design mode.
40+
3741
### [2.9.3] DatagridDropdownFilter
3842

3943
#### Fixed
@@ -90,7 +94,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
9094

9195
- We fixed an issue where Tree Nodes resetting it's collapse state while reloading data.
9296

93-
## [2.26.0] DataWidgets - 2024-10-31
97+
## [2.25.0] DataWidgets - 2024-10-31
9498

9599
### [2.10.3] DatagridDateFilter
96100

@@ -118,7 +122,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
118122

119123
- We fixed an issue with grid wide filters not resetting.
120124

121-
### [2.26.1] Datagrid
125+
### [2.25.0] Datagrid
122126

123127
#### Changed
124128

@@ -140,7 +144,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
140144

141145
- We fixed an issue with grid wide filters not resetting.
142146

143-
## [2.24.1] DataWidgets - 2024-10-14
147+
## [2.23.2] DataWidgets - 2024-10-14
144148

145149
### Fixed
146150

@@ -158,8 +162,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
158162

159163
- We fixed an issue where filters wouldn't reset.
160164

161-
## [2.24.0] DataWidgets - 2024-09-23
162-
163165
### [2.10.2] DatagridDateFilter
164166

165167
#### Changed
@@ -188,11 +190,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
188190

189191
- Widget maintenance.
190192

191-
### [2.24.0] Datagrid
193+
### [2.23.1] Datagrid
192194

193195
#### Added
194196

195-
- We have introduced support for reference set associations in the linked attribute property.
197+
- Widget maintenance.
196198

197199
### [1.2.1] DropdownSort
198200

Diff for: ‎packages/modules/data-widgets/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@mendix/data-widgets",
33
"moduleName": "Data Widgets",
4-
"version": "2.28.2",
4+
"version": "2.27.2",
55
"license": "Apache-2.0",
66
"copyright": "© Mendix Technology BV 2023. All rights reserved.",
77
"private": true,
@@ -27,13 +27,13 @@
2727
},
2828
"moduleFolderNameInModeler": "datawidgets",
2929
"marketplace": {
30-
"minimumMXVersion": "10.12.6.46815",
30+
"minimumMXVersion": "9.24.0.2965",
3131
"appNumber": 116540,
3232
"appName": "Data Widgets"
3333
},
3434
"testProject": {
3535
"githubUrl": "https://github.com/mendix/DataWidgets-module",
36-
"branchName": "main"
36+
"branchName": "data-widgets-backport-9-24"
3737
},
3838
"scripts": {
3939
"verify": "rui-verify-package-format",

Diff for: ‎packages/pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9-
## [2.10.4] - 2024-11-13
9+
## [2.10.5] - 2024-11-13
1010

1111
### Changed
1212

@@ -20,6 +20,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2020

2121
- We improved screen reader integration.
2222

23+
### Fixed
24+
25+
- We fixed an issue with the widget failing to render in Design mode.
26+
2327
## [2.10.3] - 2024-10-31
2428

2529
### Fixed

Diff for: ‎packages/pluggableWidgets/datagrid-dropdown-filter-web/CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9-
## [2.9.3] - 2024-11-13
9+
## [2.9.4] - 2024-11-13
1010

1111
### Fixed
1212

@@ -16,6 +16,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1616

1717
- We improved type mismatch filter error message.
1818

19+
## [2.9.3] - 2024-11-04
20+
21+
### Fixed
22+
23+
- We fixed an issue with the widget failing to render in Design mode.
24+
1925
## [2.9.2] - 2024-10-31
2026

2127
### Fixed

Diff for: ‎packages/pluggableWidgets/datagrid-dropdown-filter-web/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@mendix/datagrid-dropdown-filter-web",
33
"widgetName": "DatagridDropdownFilter",
4-
"version": "2.9.3",
4+
"version": "2.9.4",
55
"description": "",
66
"copyright": "© Mendix Technology BV 2023. All rights reserved.",
77
"private": true,

Diff for: ‎packages/pluggableWidgets/datagrid-dropdown-filter-web/src/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<package xmlns="http://www.mendix.com/package/1.0/">
3-
<clientModule name="DatagridDropdownFilter" version="2.9.3" xmlns="http://www.mendix.com/clientModule/1.0/">
3+
<clientModule name="DatagridDropdownFilter" version="2.9.4" xmlns="http://www.mendix.com/clientModule/1.0/">
44
<widgetFiles>
55
<widgetFile path="DatagridDropdownFilter.xml" />
66
</widgetFiles>

Diff for: ‎packages/pluggableWidgets/datagrid-number-filter-web/CHANGELOG.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9-
## [2.8.4] - 2024-11-13
9+
## [2.8.5] - 2024-11-13
1010

1111
### Changed
1212

@@ -16,6 +16,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1616

1717
- We fixed an issue where onChange wouldn't triggered on empty or not empty filter.
1818

19+
- We fixed an issue with the widget failing to render in Design mode.
20+
1921
### Breaking changes
2022

2123
- We improved accessibility for the filter type select button - the select menu shows on enter, space, and arrow keys.

Diff for: ‎packages/pluggableWidgets/datagrid-text-filter-web/CHANGELOG.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9-
## [2.8.4] - 2024-11-13
9+
## [2.8.5] - 2024-11-13
1010

1111
### Changed
1212

@@ -16,6 +16,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1616

1717
- We fixed an issue where onChange wouldn't triggered on empty or not empty filter.
1818

19+
- We fixed an issue with the widget failing to render in Design mode.
20+
1921
### Breaking changes
2022

2123
- We improved accessibility for the filter type select button - the select menu shows on enter, space, and arrow keys.

Diff for: ‎packages/pluggableWidgets/datagrid-web/CHANGELOG.md

+13-7
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9-
## [2.28.2] - 2024-12-12
9+
## [2.27.2] - 2024-12-12
1010

1111
### Fixed
1212

1313
- We've stopped showing the loading indicator when all data were already loaded. The loading indicator was incorrectly displayed during client refresh operations involving a microflow.
1414

15-
## [2.28.1] - 2024-11-21
15+
## [2.27.1] - 2024-11-21
1616

1717
### Fixed
1818

1919
- We fixed an issue where Export to Excel was not working in certain cases.
2020

21-
## [2.28.0] - 2024-11-13
21+
## [2.27.0] - 2024-11-13
2222

2323
### Fixed
2424

@@ -32,7 +32,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3232

3333
- We improved resizing behaviour of the widget. It is now saving personalization settings only at the end of the resizing.
3434

35-
## [2.26.1] - 2024-10-31
35+
## [2.25.1] - 2024-11-04
36+
37+
### Fixed
38+
39+
- We fixed an issue with the widget failing to render in Design mode.
40+
41+
## [2.25.0] - 2024-10-31
3642

3743
### Changed
3844

@@ -46,11 +52,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
4652

4753
- We fixed an issue with grid wide filters not resetting.
4854

49-
## [2.24.0] - 2024-09-23
55+
## [2.23.1] - 2024-09-25
5056

51-
### Added
57+
### Changed
5258

53-
- We have introduced support for reference set associations in the linked attribute property.
59+
- Widget maintenance.
5460

5561
## [2.23.0] - 2024-09-20
5662

Diff for: ‎packages/pluggableWidgets/datagrid-web/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@mendix/datagrid-web",
33
"widgetName": "Datagrid",
4-
"version": "2.28.2",
4+
"version": "2.27.2",
55
"description": "",
66
"copyright": "© Mendix Technology BV 2023. All rights reserved.",
77
"private": true,
@@ -17,12 +17,12 @@
1717
"mpkName": "com.mendix.widget.web.Datagrid.mpk"
1818
},
1919
"marketplace": {
20-
"minimumMXVersion": "10.12.0",
20+
"minimumMXVersion": "9.24.0.2965",
2121
"appName": "Data Grid 2"
2222
},
2323
"testProject": {
2424
"githubUrl": "https://github.com/mendix/testProjects",
25-
"branchName": "datagrid-web-referenceSet"
25+
"branchName": "datagrid-web-next"
2626
},
2727
"packagePath": "com.mendix.widget.web",
2828
"scripts": {

Diff for: ‎packages/pluggableWidgets/datagrid-web/src/Datagrid.xml

-4
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@
8686
<attributeType name="Integer" />
8787
<attributeType name="Long" />
8888
</attributeTypes>
89-
<associationTypes>
90-
<associationType name="Reference" />
91-
<associationType name="ReferenceSet" />
92-
</associationTypes>
9389
</property>
9490
<property key="content" type="widgets" dataSource="../datasource" required="false">
9591
<caption>Custom content</caption>

Diff for: ‎packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx

+2-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { StaticSelectFilterStore } from "@mendix/widget-plugin-filtering/stores/
44
import { InputFilterStore, attrgroupFilterStore } from "@mendix/widget-plugin-filtering/stores/store-utils";
55
import { ensure } from "@mendix/widget-plugin-platform/utils/ensure";
66
import { FilterCondition } from "mendix/filters";
7-
import { ListAttributeValue, ListAttributeListValue } from "mendix";
87
import { action, computed, makeObservable } from "mobx";
98
import { ReactNode, createElement } from "react";
109
import { ColumnsType } from "../../../../typings/DatagridProps";
@@ -50,7 +49,7 @@ export class ColumnFilterStore implements IColumnFilterStore {
5049

5150
if (store.type === "refselect") {
5251
store.updateProps(this.toRefselectProps(props));
53-
} else if (isListAttributeValue(props.attribute)) {
52+
} else if (props.attribute) {
5453
store.updateProps([props.attribute]);
5554
}
5655
}
@@ -69,7 +68,7 @@ export class ColumnFilterStore implements IColumnFilterStore {
6968
return new RefFilterStore(this.toRefselectProps(props), dsViewState);
7069
}
7170

72-
if (isListAttributeValue(props.attribute)) {
71+
if (props.attribute) {
7372
return attrgroupFilterStore(props.attribute.type, [props.attribute], dsViewState);
7473
}
7574

@@ -108,11 +107,5 @@ export class ColumnFilterStore implements IColumnFilterStore {
108107
}
109108
}
110109

111-
const isListAttributeValue = (
112-
attribute?: ListAttributeValue | ListAttributeListValue
113-
): attribute is ListAttributeValue => {
114-
return !!(attribute && attribute.isList === false);
115-
};
116-
117110
const errorMessage = (propName: string): string =>
118111
`Can't map ColumnsType to AssociationProperties: ${propName} is undefined`;

Diff for: ‎packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnStore.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {
22
DynamicValue,
33
ListAttributeValue,
4-
ListAttributeListValue,
54
ListExpressionValue,
65
ListWidgetValue,
76
ObjectItem,
@@ -35,9 +34,7 @@ export class ColumnStore implements GridColumn {
3534
private _header?: DynamicValue<string> = undefined; // can render when unavailable
3635
private _columnClass?: ListExpressionValue<string> = undefined; // can render when unavailable
3736
private _tooltip?: ListExpressionValue<string> = undefined; // part of attribute or dynamicText
38-
private _attribute?:
39-
| ListAttributeValue<string | Big | boolean | Date>
40-
| ListAttributeListValue<string | Big | boolean | Date> = undefined; // as "attribute"
37+
private _attribute?: ListAttributeValue<string | Big | boolean | Date> = undefined; // as "attribute"
4138
private _dynamicText?: ListExpressionValue<string> = undefined; // as "dynamicText"
4239
private _content?: ListWidgetValue = undefined; // as "customContent"
4340

Diff for: ‎packages/pluggableWidgets/datagrid-web/src/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<package xmlns="http://www.mendix.com/package/1.0/">
3-
<clientModule name="Datagrid" version="2.28.2" xmlns="http://www.mendix.com/clientModule/1.0/">
3+
<clientModule name="Datagrid" version="2.27.2" xmlns="http://www.mendix.com/clientModule/1.0/">
44
<widgetFiles>
55
<widgetFile path="Datagrid.xml" />
66
</widgetFiles>

Diff for: ‎packages/pluggableWidgets/datagrid-web/typings/DatagridProps.d.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @author Mendix Widgets Framework Team
55
*/
66
import { ComponentType, CSSProperties, ReactNode } from "react";
7-
import { ActionValue, DynamicValue, EditableValue, ListValue, ListActionValue, ListAttributeValue, ListAttributeListValue, ListExpressionValue, ListReferenceValue, ListReferenceSetValue, ListWidgetValue, SelectionSingleValue, SelectionMultiValue } from "mendix";
7+
import { ActionValue, DynamicValue, EditableValue, ListValue, ListActionValue, ListAttributeValue, ListExpressionValue, ListReferenceValue, ListReferenceSetValue, ListWidgetValue, SelectionSingleValue, SelectionMultiValue } from "mendix";
88
import { Big } from "big.js";
99

1010
export type ItemSelectionMethodEnum = "checkbox" | "rowClick";
@@ -25,7 +25,7 @@ export type AlignmentEnum = "left" | "center" | "right";
2525

2626
export interface ColumnsType {
2727
showContentAs: ShowContentAsEnum;
28-
attribute?: ListAttributeValue<string | Big | boolean | Date> | ListAttributeListValue<string | Big | boolean | Date>;
28+
attribute?: ListAttributeValue<string | Big | boolean | Date>;
2929
content?: ListWidgetValue;
3030
dynamicText?: ListExpressionValue<string>;
3131
exportValue?: ListExpressionValue<string>;

0 commit comments

Comments
 (0)