@eeacms/volto-clms-theme 1.1.295 → 1.1.297

package/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [1.1.297](https://github.com/eea/volto-clms-theme/compare/1.1.296...1.1.297) - 17 June 2026
+
+#### :hammer_and_wrench: Others
+
+- Refs #297796 - Keep datasets as sorted in edit form - related datasets field. [GhitaB - [`88f5d90`](https://github.com/eea/volto-clms-theme/commit/88f5d90b6e24b010e96d0076dcbaaf29ae8547e4)]
+### [1.1.296](https://github.com/eea/volto-clms-theme/compare/1.1.295...1.1.296) - 16 June 2026
+
+#### :hammer_and_wrench: Others
+
+- Refs #297796 - Fix ArrayWidget error to make related datasets field sortable. [GhitaB - [`b291165`](https://github.com/eea/volto-clms-theme/commit/b291165bf29a433cf9ed30aa9247fe161dd83bf4)]
 ### [1.1.295](https://github.com/eea/volto-clms-theme/compare/1.1.294...1.1.295) - 8 June 2026
 
 #### :house: Internal changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.295",
+  "version": "1.1.297",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/Blocks/CclRelatedListingBlock/CclRelatedListingView.jsx

@@ -87,7 +87,11 @@ const CclRelatedListingView = (props) => {
   } else if (data.content_type === 'UseCase') {
     sort_on = 'sortable_title';
     sort_order = 'ascending';
+  } else if (data.content_type === 'DataSet') {
+    sort_on = undefined;
+    sort_order = undefined;
   }
+
   const ref = React.useRef();
 
   const handleScroll = (ref) => {
@@ -95,27 +99,24 @@ const CclRelatedListingView = (props) => {
   };
 
   React.useEffect(() => {
+    const searchParams = {
+      portal_type: data.content_type || 'News Item',
+      ...associated,
+      ...(data.content_type === 'TechnicalLibrary'
+        ? { fullobjects: 1 }
+        : { metadata_fields: '_all' }),
+      ...(sort_on ? { sort_on } : {}),
+      ...(sort_order ? { sort_order } : {}),
+      b_size: 99999,
+    };
+
     uid &&
       id &&
       !searchSubrequests?.loading &&
       !sLoaded &&
       !searchSubrequests?.error &&
-      dispatch(
-        searchContent(
-          '/',
-          {
-            portal_type: data.content_type || 'News Item',
-            ...associated,
-            ...(data.content_type === 'TechnicalLibrary'
-              ? { fullobjects: 1 }
-              : { metadata_fields: '_all' }),
-            sort_on: sort_on,
-            sort_order: sort_order,
-            b_size: 99999,
-          },
-          `${id}-${uid}`,
-        ),
-      );
+      dispatch(searchContent('/', searchParams, `${id}-${uid}`));
+
     return () => {};
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [data, id, uid, dispatch]);
@@ -152,6 +153,24 @@ const CclRelatedListingView = (props) => {
         p_functions.setOriginalDataList([...libraries]);
         p_functions.setDataList([...libraries]);
       }
+    } else if (
+      data.content_type === 'DataSet' &&
+      Array.isArray(directQuery?.UID)
+    ) {
+      const orderMap = new Map(
+        directQuery.UID.map((item, index) => [item, index]),
+      );
+      const sorted = [...libraries].sort((a, b) => {
+        const ai = orderMap.get(a.UID) ?? Infinity;
+        const bi = orderMap.get(b.UID) ?? Infinity;
+        if (ai === bi) return 0;
+        return ai - bi;
+      });
+
+      if (sLoaded) {
+        p_functions.setOriginalDataList([...sorted]);
+        p_functions.setDataList([...sorted]);
+      }
     } else {
       if (sLoaded) {
         p_functions.setOriginalDataList([...libraries]);

package/src/customizations/volto/components/manage/Widgets/ArrayWidget.jsx

@@ -299,14 +299,15 @@ class ArrayWidget extends Component {
       !this.props.creatable
         ? SortableContainer(Select)
         : SortableContainer(CreatableSelect);
-
     return (
       <FormFieldWrapper {...this.props}>
         <SortableSelect
           useDragHandle
           // react-sortable-hoc props:
           axis="xy"
-          onSortEnd={this.onSortEnd}
+          onSortEnd={(sortProp) => {
+            this.onSortEnd(selectedOption, sortProp);
+          }}
           menuShouldScrollIntoView={false}
           distance={4}
           // small fix for https://github.com/clauderic/react-sortable-hoc/pull/352:
@@ -325,7 +326,9 @@ class ArrayWidget extends Component {
               : this.props.choices
               ? [
                   ...choices,
-                  ...(this.props.noValueOption && !this.props.default
+                  ...(this.props.noValueOption &&
+                  (this.props.default === undefined ||
+                    this.props.default === null)
                     ? [
                         {
                           label: this.props.intl.formatMessage(