Skip to content

[DO NOT MERGE ] data widgets support for 9.24 #1240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions packages/modules/data-widgets/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,54 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [2.28.2] DataWidgets - 2024-12-12
## [2.27.3] DataWidgets - 2025-01-20

### [2.28.2] Datagrid
### [2.11.1] DatagridDateFilter

#### Fixed

- We fixed an issue with range date filter working incorrectly in some cases.

### [2.28.3] Datagrid

#### Added

- We introduced a setting to exclude filters from being stored in the Personalization configuration.

## [2.27.2] DataWidgets - 2024-12-12

### Fixed

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

## [2.28.1] DataWidgets - 2024-11-21
## [2.27.1] DataWidgets - 2024-11-21

### Fixed

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

### [2.28.1] Datagrid
### [2.27.1] Datagrid

#### Fixed

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

## [2.28.0] DataWidgets - 2024-11-13
## [2.27.0] DataWidgets - 2024-11-13

### [2.10.4] DatagridDateFilter

#### Changed

- We improved type mismatch filter error message.

## [2.25.1] DataWidgets - 2024-11-04

### [2.10.4] DatagridDateFilter

#### Fixed

- We fixed an issue with the widget failing to render in Design mode.

### [2.9.3] DatagridDropdownFilter

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

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

## [2.26.0] DataWidgets - 2024-10-31
## [2.25.0] DataWidgets - 2024-10-31

### [2.10.3] DatagridDateFilter

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

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

### [2.26.1] Datagrid
### [2.25.0] Datagrid

#### Changed

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

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

## [2.24.1] DataWidgets - 2024-10-14
## [2.23.2] DataWidgets - 2024-10-14

### Fixed

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

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

## [2.24.0] DataWidgets - 2024-09-23

### [2.10.2] DatagridDateFilter

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

- Widget maintenance.

### [2.24.0] Datagrid
### [2.23.1] Datagrid

#### Added

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

### [1.2.1] DropdownSort

Expand Down
6 changes: 3 additions & 3 deletions packages/modules/data-widgets/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@mendix/data-widgets",
"moduleName": "Data Widgets",
"version": "2.28.2",
"version": "2.27.3",
"license": "Apache-2.0",
"copyright": "© Mendix Technology BV 2023. All rights reserved.",
"private": true,
Expand All @@ -27,13 +27,13 @@
},
"moduleFolderNameInModeler": "datawidgets",
"marketplace": {
"minimumMXVersion": "10.12.6.46815",
"minimumMXVersion": "9.24.0.2965",
"appNumber": 116540,
"appName": "Data Widgets"
},
"testProject": {
"githubUrl": "https://github.com/mendix/DataWidgets-module",
"branchName": "main"
"branchName": "data-widgets-backport-9-24"
},
"scripts": {
"verify": "rui-verify-package-format",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [2.11.1] - 2025-01-20

### Fixed

- We fixed an issue with range date filter working incorrectly in some cases.
Expand All @@ -24,6 +26,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

- We improved screen reader integration.

### Fixed

- We fixed an issue with the widget failing to render in Design mode.

## [2.10.3] - 2024-10-31

### Fixed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [2.9.3] - 2024-11-13
## [2.9.4] - 2024-11-13

### Fixed

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

- We improved type mismatch filter error message.

## [2.9.3] - 2024-11-04

### Fixed

- We fixed an issue with the widget failing to render in Design mode.

## [2.9.2] - 2024-10-31

### Fixed
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@mendix/datagrid-dropdown-filter-web",
"widgetName": "DatagridDropdownFilter",
"version": "2.9.3",
"version": "2.9.4",
"description": "",
"copyright": "© Mendix Technology BV 2023. All rights reserved.",
"private": true,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<package xmlns="http://www.mendix.com/package/1.0/">
<clientModule name="DatagridDropdownFilter" version="2.9.3" xmlns="http://www.mendix.com/clientModule/1.0/">
<clientModule name="DatagridDropdownFilter" version="2.9.4" xmlns="http://www.mendix.com/clientModule/1.0/">
<widgetFiles>
<widgetFile path="DatagridDropdownFilter.xml" />
</widgetFiles>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [2.8.4] - 2024-11-13
## [2.8.5] - 2024-11-13

### Changed

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

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

- We fixed an issue with the widget failing to render in Design mode.

### Breaking changes

- We improved accessibility for the filter type select button - the select menu shows on enter, space, and arrow keys.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [2.8.4] - 2024-11-13
## [2.8.5] - 2024-11-13

### Changed

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

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

- We fixed an issue with the widget failing to render in Design mode.

### Breaking changes

- We improved accessibility for the filter type select button - the select menu shows on enter, space, and arrow keys.
Expand Down
20 changes: 14 additions & 6 deletions packages/pluggableWidgets/datagrid-web/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [2.28.3] - 2025-01-20

### Added

- We introduced a setting to exclude filters from being stored in the Personalization configuration.
Expand All @@ -16,13 +18,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

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

## [2.28.1] - 2024-11-21
## [2.27.1] - 2024-11-21

### Fixed

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

## [2.28.0] - 2024-11-13
## [2.27.0] - 2024-11-13

### Fixed

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

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

## [2.26.1] - 2024-10-31
## [2.25.1] - 2024-11-04

### Fixed

- We fixed an issue with the widget failing to render in Design mode.

## [2.25.0] - 2024-10-31

### Changed

Expand All @@ -50,11 +58,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

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

## [2.24.0] - 2024-09-23
## [2.23.1] - 2024-09-25

### Added
### Changed

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

## [2.23.0] - 2024-09-20

Expand Down
4 changes: 2 additions & 2 deletions packages/pluggableWidgets/datagrid-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"mpkName": "com.mendix.widget.web.Datagrid.mpk"
},
"marketplace": {
"minimumMXVersion": "10.12.0",
"minimumMXVersion": "9.24.0.2965",
"appName": "Data Grid 2"
},
"testProject": {
"githubUrl": "https://github.com/mendix/testProjects",
"branchName": "datagrid-web-referenceSet"
"branchName": "datagrid-web-next"
},
"packagePath": "com.mendix.widget.web",
"scripts": {
Expand Down
4 changes: 0 additions & 4 deletions packages/pluggableWidgets/datagrid-web/src/Datagrid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@
<attributeType name="Integer" />
<attributeType name="Long" />
</attributeTypes>
<associationTypes>
<associationType name="Reference" />
<associationType name="ReferenceSet" />
</associationTypes>
</property>
<property key="content" type="widgets" dataSource="../datasource" required="false">
<caption>Custom content</caption>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { StaticSelectFilterStore } from "@mendix/widget-plugin-filtering/stores/
import { InputFilterStore, attrgroupFilterStore } from "@mendix/widget-plugin-filtering/stores/store-utils";
import { ensure } from "@mendix/widget-plugin-platform/utils/ensure";
import { FilterCondition } from "mendix/filters";
import { ListAttributeValue, ListAttributeListValue } from "mendix";
import { action, computed, makeObservable } from "mobx";
import { ReactNode, createElement } from "react";
import { ColumnsType } from "../../../../typings/DatagridProps";
Expand Down Expand Up @@ -50,7 +49,7 @@ export class ColumnFilterStore implements IColumnFilterStore {

if (store.type === "refselect") {
store.updateProps(this.toRefselectProps(props));
} else if (isListAttributeValue(props.attribute)) {
} else if (props.attribute) {
store.updateProps([props.attribute]);
}
}
Expand All @@ -69,7 +68,7 @@ export class ColumnFilterStore implements IColumnFilterStore {
return new RefFilterStore(this.toRefselectProps(props), dsViewState);
}

if (isListAttributeValue(props.attribute)) {
if (props.attribute) {
return attrgroupFilterStore(props.attribute.type, [props.attribute], dsViewState);
}

Expand Down Expand Up @@ -108,11 +107,5 @@ export class ColumnFilterStore implements IColumnFilterStore {
}
}

const isListAttributeValue = (
attribute?: ListAttributeValue | ListAttributeListValue
): attribute is ListAttributeValue => {
return !!(attribute && attribute.isList === false);
};

const errorMessage = (propName: string): string =>
`Can't map ColumnsType to AssociationProperties: ${propName} is undefined`;
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {
DynamicValue,
ListAttributeValue,
ListAttributeListValue,
ListExpressionValue,
ListWidgetValue,
ObjectItem,
Expand Down Expand Up @@ -35,9 +34,7 @@ export class ColumnStore implements GridColumn {
private _header?: DynamicValue<string> = undefined; // can render when unavailable
private _columnClass?: ListExpressionValue<string> = undefined; // can render when unavailable
private _tooltip?: ListExpressionValue<string> = undefined; // part of attribute or dynamicText
private _attribute?:
| ListAttributeValue<string | Big | boolean | Date>
| ListAttributeListValue<string | Big | boolean | Date> = undefined; // as "attribute"
private _attribute?: ListAttributeValue<string | Big | boolean | Date> = undefined; // as "attribute"
private _dynamicText?: ListExpressionValue<string> = undefined; // as "dynamicText"
private _content?: ListWidgetValue = undefined; // as "customContent"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @author Mendix Widgets Framework Team
*/
import { ComponentType, CSSProperties, ReactNode } from "react";
import { ActionValue, DynamicValue, EditableValue, ListValue, ListActionValue, ListAttributeValue, ListAttributeListValue, ListExpressionValue, ListReferenceValue, ListReferenceSetValue, ListWidgetValue, SelectionSingleValue, SelectionMultiValue } from "mendix";
import { ActionValue, DynamicValue, EditableValue, ListValue, ListActionValue, ListAttributeValue, ListExpressionValue, ListReferenceValue, ListReferenceSetValue, ListWidgetValue, SelectionSingleValue, SelectionMultiValue } from "mendix";
import { Big } from "big.js";

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

export interface ColumnsType {
showContentAs: ShowContentAsEnum;
attribute?: ListAttributeValue<string | Big | boolean | Date> | ListAttributeListValue<string | Big | boolean | Date>;
attribute?: ListAttributeValue<string | Big | boolean | Date>;
content?: ListWidgetValue;
dynamicText?: ListExpressionValue<string>;
exportValue?: ListExpressionValue<string>;
Expand Down
6 changes: 6 additions & 0 deletions packages/pluggableWidgets/gallery-web/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

- Fixed issue with xpath when widget has many filters.

## [1.12.3] - 2024-11-04

### Fixed

- We fixed an issue with the widget failing to render in Design mode.

## [1.12.2] - 2024-10-31

### Fixed
Expand Down
Loading
Loading