chore(data-widgets): multiple fix rebase

gjulivan · gjulivan · commit cd0c434bcdeb · 2025-06-05T14:16:05.000+02:00
diff --git a/packages/modules/data-widgets/package.json b/packages/modules/data-widgets/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/data-widgets",
     "moduleName": "Data Widgets",
-    "version": "2.32.1",
+    "version": "2.27.5",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
     "private": true,
@@ -27,13 +27,13 @@
     },
     "moduleFolderNameInModeler": "datawidgets",
     "marketplace": {
-        "minimumMXVersion": "10.21.0.64362",
+        "minimumMXVersion": "9.24.0.2965",
         "appNumber": 116540,
         "appName": "Data Widgets"
     },
     "testProject": {
         "githubUrl": "https://github.com/mendix/DataWidgets-module",
-        "branchName": "mts/10.21"
+        "branchName": "data-widgets-backport-9-24"
     },
     "scripts": {
         "build:deps": "turbo run build --filter=data-widgets^...",
diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/package.json b/packages/pluggableWidgets/datagrid-date-filter-web/package.json
@@ -18,7 +18,7 @@
     },
     "packagePath": "com.mendix.widget.web",
     "marketplace": {
-        "minimumMXVersion": "9.17.0",
+        "minimumMXVersion": "9.24.0.2965",
         "appName": "Date Filter"
     },
     "testProject": {
diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/package.json b/packages/pluggableWidgets/datagrid-dropdown-filter-web/package.json
@@ -18,7 +18,7 @@
     },
     "packagePath": "com.mendix.widget.web",
     "marketplace": {
-        "minimumMXVersion": "9.17.0",
+        "minimumMXVersion": "9.24.0.2965",
         "appName": "Drop-down Filter"
     },
     "testProject": {
diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/DatagridDropdownFilter.editorPreview.tsx b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/DatagridDropdownFilter.editorPreview.tsx
@@ -4,11 +4,11 @@ enableStaticRendering(true);
 import { createElement, ReactElement } from "react";
 import { DatagridDropdownFilterPreviewProps } from "../typings/DatagridDropdownFilterProps";
 import { parseStyle } from "@mendix/widget-plugin-platform/preview/parse-style";
-import { Select } from "@mendix/widget-plugin-filtering/controls/select/Select";
+import { Select_inner } from "@mendix/widget-plugin-filtering/controls/select/Select";
 
 function Preview(props: DatagridDropdownFilterPreviewProps): ReactElement {
     return (
-        <Select
+        <Select_inner
             className={props.class}
             style={parseStyle(props.style)}
             options={[]}
diff --git a/packages/pluggableWidgets/datagrid-number-filter-web/package.json b/packages/pluggableWidgets/datagrid-number-filter-web/package.json
@@ -18,7 +18,7 @@
     },
     "packagePath": "com.mendix.widget.web",
     "marketplace": {
-        "minimumMXVersion": "9.17.0",
+        "minimumMXVersion": "9.24.0.2965",
         "appName": "Number Filter"
     },
     "testProject": {
diff --git a/packages/pluggableWidgets/datagrid-web/CHANGELOG.md b/packages/pluggableWidgets/datagrid-web/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- We have removed support for reference set associations to allow data grid to work on SP 9.24 and include all the changes from 2.27.4 up to 2.30.6.
+
 ## [2.30.6] - 2025-05-28
 
 ### Fixed
diff --git a/packages/pluggableWidgets/datagrid-web/package.json b/packages/pluggableWidgets/datagrid-web/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/datagrid-web",
     "widgetName": "Datagrid",
-    "version": "2.30.6",
+    "version": "2.27.5",
     "description": "",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
@@ -18,7 +18,7 @@
     },
     "packagePath": "com.mendix.widget.web",
     "marketplace": {
-        "minimumMXVersion": "10.12.0",
+        "minimumMXVersion": "9.24.0.2965",
         "appName": "Data Grid 2"
     },
     "testProject": {
diff --git a/packages/pluggableWidgets/datagrid-web/src/Datagrid.xml b/packages/pluggableWidgets/datagrid-web/src/Datagrid.xml
@@ -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>
diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx b/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx
@@ -4,7 +4,6 @@ import { StaticSelectFilterStore } from "@mendix/widget-plugin-filtering/stores/
 import { InputFilterStore, attrgroupFilterStore } from "@mendix/widget-plugin-filtering/stores/input/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";
@@ -59,7 +58,7 @@ export class ColumnFilterStore implements IColumnFilterStore {
 
         if (store.storeType === "refselect") {
             store.updateProps(this.toRefselectProps(props));
-        } else if (isListAttributeValue(props.attribute)) {
+        } else if (props.attribute) {
             store.updateProps([props.attribute]);
         }
     }
@@ -85,7 +84,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);
         }
 
@@ -124,11 +123,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`;
diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnStore.tsx b/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnStore.tsx
@@ -1,7 +1,6 @@
 import {
     DynamicValue,
     ListAttributeValue,
-    ListAttributeListValue,
     ListExpressionValue,
     ListWidgetValue,
     ObjectItem,
@@ -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"
 
diff --git a/packages/pluggableWidgets/datagrid-web/src/package.xml b/packages/pluggableWidgets/datagrid-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="Datagrid" version="2.30.6" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="Datagrid" version="2.27.5" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="Datagrid.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/datagrid-web/typings/DatagridProps.d.ts b/packages/pluggableWidgets/datagrid-web/typings/DatagridProps.d.ts
@@ -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";
@@ -27,7 +27,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>;
diff --git a/packages/shared/widget-plugin-filtering/src/controls/select/Select.tsx b/packages/shared/widget-plugin-filtering/src/controls/select/Select.tsx
@@ -24,7 +24,7 @@ interface SelectProps {
 
 const cls = classes();
 
-export const Select = observer(function Select(props: SelectProps): React.ReactElement {
+export function Select_inner(props: SelectProps): React.ReactElement {
     const { empty: isEmpty, showCheckboxes, clearable } = props;
     const toggleRef = useRef<HTMLButtonElement>(null);
     const { getToggleButtonProps, getMenuProps, getItemProps, isOpen, highlightedIndex } = useSelect(
@@ -79,4 +79,6 @@ export const Select = observer(function Select(props: SelectProps): React.ReactE
             />
         </div>
     );
-});
+}
+
+export const Select = observer(Select_inner);

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import { StaticSelectFilterStore } from "@mendix/widget-plugin-filtering/stores/`
`4`	`4`	`import { InputFilterStore, attrgroupFilterStore } from "@mendix/widget-plugin-filtering/stores/input/store-utils";`
`5`	`5`	`import { ensure } from "@mendix/widget-plugin-platform/utils/ensure";`
`6`	`6`	`import { FilterCondition } from "mendix/filters";`
`7`		`-import { ListAttributeValue, ListAttributeListValue } from "mendix";`
`8`	`7`	`import { action, computed, makeObservable } from "mobx";`
`9`	`8`	`import { ReactNode, createElement } from "react";`
`10`	`9`	`import { ColumnsType } from "../../../../typings/DatagridProps";`
`@@ -59,7 +58,7 @@ export class ColumnFilterStore implements IColumnFilterStore {`
`59`	`58`
`60`	`59`	`if (store.storeType === "refselect") {`
`61`	`60`	`store.updateProps(this.toRefselectProps(props));`
`62`		`- } else if (isListAttributeValue(props.attribute)) {`
	`61`	`+ } else if (props.attribute) {`
`63`	`62`	`store.updateProps([props.attribute]);`
`64`	`63`	`}`
`65`	`64`	`}`
`@@ -85,7 +84,7 @@ export class ColumnFilterStore implements IColumnFilterStore {`
`85`	`84`	`return new RefFilterStore(this.toRefselectProps(props), dsViewState);`
`86`	`85`	`}`
`87`	`86`
`88`		`- if (isListAttributeValue(props.attribute)) {`
	`87`	`+ if (props.attribute) {`
`89`	`88`	`return attrgroupFilterStore(props.attribute.type, [props.attribute], dsViewState);`
`90`	`89`	`}`
`91`	`90`
`@@ -124,11 +123,5 @@ export class ColumnFilterStore implements IColumnFilterStore {`
`124`	`123`	`}`
`125`	`124`	`}`
`126`	`125`
`127`		`-const isListAttributeValue = (`
`128`		`- attribute?: ListAttributeValue \| ListAttributeListValue`
`129`		`-): attribute is ListAttributeValue => {`
`130`		`- return !!(attribute && attribute.isList === false);`
`131`		`-};`
`132`		`-`
`133`	`126`	`const errorMessage = (propName: string): string =>`
`134`	`127`	`Can't map ColumnsType to AssociationProperties: ${propName} is undefined`;