chore(datagrid-web): revert reference set support for 9.24

gjulivan · gjulivan · commit e6d156496f22 · 2024-10-02T09:55:50.000+02:00
diff --git a/packages/modules/data-widgets/CHANGELOG.md b/packages/modules/data-widgets/CHANGELOG.md
@@ -6,49 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
-## [2.24.0] DataWidgets - 2024-09-23
+## [2.23.1] DataWidgets - 2024-09-25
 
-### [2.10.2] DatagridDateFilter
-
-#### Changed
-
--   Widget maintenance.
-
-#### Fixed
-
--   Fixed issue with "empty" and "not empty" filters showing incorrect results.
-
-### [2.9.1] DatagridDropdownFilter
-
-#### Changed
-
--   Widget maintenance.
-
-### [2.8.1] DatagridNumberFilter
-
-#### Changed
-
--   Widget maintenance.
-
-### [2.8.1] DatagridTextFilter
-
-#### Changed
-
--   Widget maintenance.
-
-### [2.24.0] Datagrid
-
-#### Added
-
--   We have introduced support for reference set associations in the linked attribute property.
-
-### [1.2.1] DropdownSort
-
-#### Changed
-
--   Widget maintenance.
-
-### [1.12.0] Gallery
+### [2.23.1] Datagrid
 
 #### Changed
 
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.24.0",
+  "version": "2.23.1",
   "license": "Apache-2.0",
   "copyright": "© Mendix Technology BV 2023. All rights reserved.",
   "private": true,
@@ -27,7 +27,7 @@
   },
   "moduleFolderNameInModeler": "datawidgets",
   "marketplace": {
-    "minimumMXVersion": "10.12.0",
+    "minimumMXVersion": "9.24.0.2965",
     "appNumber": 116540,
     "appName": "Data Widgets"
   },
diff --git a/packages/pluggableWidgets/datagrid-web/CHANGELOG.md b/packages/pluggableWidgets/datagrid-web/CHANGELOG.md
@@ -6,11 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
-## [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
 
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.24.0",
+  "version": "2.23.1",
   "description": "",
   "copyright": "© Mendix Technology BV 2023. All rights reserved.",
   "private": true,
@@ -17,7 +17,7 @@
     "mpkName": "com.mendix.widget.web.Datagrid.mpk"
   },
   "marketplace": {
-    "minimumMXVersion": "10.12.0",
+    "minimumMXVersion": "9.24.0.2965",
     "appName": "Data Grid 2"
   },
   "testProject": {
@@ -51,7 +51,7 @@
   "devDependencies": {
     "@mendix/automation-utils": "workspace:*",
     "@mendix/eslint-config-web-widgets": "workspace:*",
-    "@mendix/pluggable-widgets-tools": "^10.12.1",
+    "@mendix/pluggable-widgets-tools": "^10.7.2",
     "@mendix/prettier-config-web-widgets": "workspace:*",
     "@mendix/run-e2e": "workspace:*",
     "@mendix/widget-plugin-external-events": "workspace:*",
diff --git a/packages/pluggableWidgets/datagrid-web/src/Datagrid.xml b/packages/pluggableWidgets/datagrid-web/src/Datagrid.xml
@@ -78,10 +78,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/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";
@@ -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]);
         }
     }
@@ -68,7 +67,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);
         }
 
@@ -107,11 +106,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,
@@ -33,9 +32,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,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="Datagrid" version="2.24.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="Datagrid" version="2.23.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="Datagrid.xml" />
         </widgetFiles>
         <files>
             <file path="com/mendix/widget/web/datagrid/" />
         </files>
     </clientModule>
-</package>
+</package>
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";
@@ -23,7 +23,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>;
@@ -143,7 +143,6 @@ export interface DatagridPreviewProps {
     style: string;
     styleObject?: CSSProperties;
     readOnly: boolean;
-    renderMode?: "design" | "xray" | "structure";
     advanced: boolean;
     datasource: {} | { caption: string } | { type: string } | null;
     refreshInterval: number | null;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

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/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";`
`@@ -50,7 +49,7 @@ export class ColumnFilterStore implements IColumnFilterStore {`
`50`	`49`
`51`	`50`	`if (store.type === "refselect") {`
`52`	`51`	`store.updateProps(this.toRefselectProps(props));`
`53`		`- } else if (isListAttributeValue(props.attribute)) {`
	`52`	`+ } else if (props.attribute) {`
`54`	`53`	`store.updateProps([props.attribute]);`
`55`	`54`	`}`
`56`	`55`	`}`
`@@ -68,7 +67,7 @@ export class ColumnFilterStore implements IColumnFilterStore {`
`68`	`67`	`return new RefFilterStore(this.toRefselectProps(props), dsViewState);`
`69`	`68`	`}`
`70`	`69`
`71`		`- if (isListAttributeValue(props.attribute)) {`
	`70`	`+ if (props.attribute) {`
`72`	`71`	`return attrgroupFilterStore(props.attribute.type, [props.attribute], dsViewState);`
`73`	`72`	`}`
`74`	`73`
`@@ -107,11 +106,5 @@ export class ColumnFilterStore implements IColumnFilterStore {`
`107`	`106`	`}`
`108`	`107`	`}`
`109`	`108`
`110`		`-const isListAttributeValue = (`
`111`		`- attribute?: ListAttributeValue \| ListAttributeListValue`
`112`		`-): attribute is ListAttributeValue => {`
`113`		`- return !!(attribute && attribute.isList === false);`
`114`		`-};`
`115`		`-`
`116`	`109`	`const errorMessage = (propName: string): string =>`
`117`	`110`	`Can't map ColumnsType to AssociationProperties: ${propName} is undefined`;