@eeacms/volto-clms-theme 1.1.294 → 1.1.296

package/CHANGELOG.md

@@ -4,6 +4,20 @@ 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.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
+
+- style: Automated code fix [eea-jenkins - [`cb21bf3`](https://github.com/eea/volto-clms-theme/commit/cb21bf3e1891a59fce5e8cbd2bd2185ba67cae03)]
+
+#### :hammer_and_wrench: Others
+
+- fix routing [Dobricean Ioan Dorian - [`a640f1f`](https://github.com/eea/volto-clms-theme/commit/a640f1f55e682d2f6b5a007df8e12aa4283d27b1)]
 ### [1.1.294](https://github.com/eea/volto-clms-theme/compare/1.1.293...1.1.294) - 5 June 2026
 
 #### :hammer_and_wrench: Others

package/package.json

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

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(

package/src/index.js

@@ -53,6 +53,7 @@ import reducers from './reducers';
 import CookieBanner from 'volto-cookie-banner/CookieBannerContainer';
 import CLMSLoginView from './components/CLMSLoginView/CLMSLogin';
 import AuthomaticLoginPlone from './components/CLMSLoginView/AuthomaticLoginPlone';
+import { withCLMSLoginRoutes } from './loginRoutes';
 //SLATE CONFIGURATION
 import installLinkEditor from '@plone/volto-slate/editor/plugins/AdvancedLink';
 
@@ -271,23 +272,11 @@ const applyConfig = (config) => {
   );
 
   config.addonRoutes = [
-    ...config.addonRoutes,
-    {
-      path: '/login-plone',
-      component: AuthomaticLoginPlone,
-    },
-    {
-      path: '/**/login-plone',
-      component: AuthomaticLoginPlone,
-    },
-    {
-      path: '/login',
-      component: CLMSLoginView,
-    },
-    {
-      path: '/**/login',
-      component: CLMSLoginView,
-    },
+    ...withCLMSLoginRoutes(
+      config.addonRoutes,
+      CLMSLoginView,
+      AuthomaticLoginPlone,
+    ),
     {
       path: '/profile',
       component: ProfileView,

package/src/loginRoutes.js

@@ -0,0 +1,35 @@
+const clmsLoginPaths = [
+  '/login',
+  '/**/login',
+  '/login-plone',
+  '/**/login-plone',
+];
+
+const routeHasCLMSLoginPath = (route) => {
+  const paths = Array.isArray(route.path) ? route.path : [route.path];
+  return paths.some((path) => clmsLoginPaths.includes(path));
+};
+
+export const buildLoginRoutes = (Login, LoginPlone) => [
+  {
+    path: '/login',
+    component: Login,
+  },
+  {
+    path: '/**/login',
+    component: Login,
+  },
+  {
+    path: '/login-plone',
+    component: LoginPlone,
+  },
+  {
+    path: '/**/login-plone',
+    component: LoginPlone,
+  },
+];
+
+export const withCLMSLoginRoutes = (addonRoutes, Login, LoginPlone) => [
+  ...buildLoginRoutes(Login, LoginPlone),
+  ...(addonRoutes || []).filter((route) => !routeHasCLMSLoginPath(route)),
+];