plone · sneridagh · Jun 13, 2024 · Jan 16, 2024 · May 15, 2024 · May 15, 2024
diff --git a/packages/volto/cypress/tests/core/controlpanels/dexterity-controlpanel-layout.js b/packages/volto/cypress/tests/core/controlpanels/dexterity-controlpanel-layout.js
@@ -27,6 +27,8 @@ describe('ControlPanel: Dexterity Content-Types Layout', () => {
     );
     cy.get('#page-controlpanel-layout button').click();
 
+    cy.get('#sidebar .formtabs').contains('Settings').click();
+
     // Wait a bit for draftjs to load, without this the title block
     // custom placeholder is missing and cypress gives a timeout error
     cy.wait(1000);

diff --git a/packages/volto/locales/ca/LC_MESSAGES/volto.po b/packages/volto/locales/ca/LC_MESSAGES/volto.po
@@ -2481,6 +2481,11 @@ msgstr "Obre el menú"
 msgid "Open object browser"
 msgstr "Obre el navegador d'objectes"
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/de/LC_MESSAGES/volto.po b/packages/volto/locales/de/LC_MESSAGES/volto.po
@@ -2480,6 +2480,11 @@ msgstr "Menü öffnen"
 msgid "Open object browser"
 msgstr "Objekt-Browser öffnen"
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/en/LC_MESSAGES/volto.po b/packages/volto/locales/en/LC_MESSAGES/volto.po
@@ -2475,6 +2475,11 @@ msgstr ""
 msgid "Open object browser"
 msgstr ""
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/es/LC_MESSAGES/volto.po b/packages/volto/locales/es/LC_MESSAGES/volto.po
@@ -2482,6 +2482,11 @@ msgstr "Abrir menú"
 msgid "Open object browser"
 msgstr "Abrir buscador de objetos"
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/eu/LC_MESSAGES/volto.po b/packages/volto/locales/eu/LC_MESSAGES/volto.po
@@ -2482,6 +2482,11 @@ msgstr "Menua ireki"
 msgid "Open object browser"
 msgstr "Ireki elementu bilatzailea"
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/fi/LC_MESSAGES/volto.po b/packages/volto/locales/fi/LC_MESSAGES/volto.po
@@ -2480,6 +2480,11 @@ msgstr "Avaa valikko"
 msgid "Open object browser"
 msgstr ""
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/fr/LC_MESSAGES/volto.po b/packages/volto/locales/fr/LC_MESSAGES/volto.po
@@ -2482,6 +2482,11 @@ msgstr "Ouvrir le menu"
 msgid "Open object browser"
 msgstr "Ouvrir le navigateur d'objets"
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/hi/LC_MESSAGES/volto.po b/packages/volto/locales/hi/LC_MESSAGES/volto.po
@@ -2475,6 +2475,11 @@ msgstr "मेन्यू खोलें"
 msgid "Open object browser"
 msgstr "ऑब्जेक्ट ब्राउज़र खोलें"
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/it/LC_MESSAGES/volto.po b/packages/volto/locales/it/LC_MESSAGES/volto.po
@@ -2475,6 +2475,11 @@ msgstr "Apri menu"
 msgid "Open object browser"
 msgstr "Apri object browser"
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr "Ordine"
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/ja/LC_MESSAGES/volto.po b/packages/volto/locales/ja/LC_MESSAGES/volto.po
@@ -2480,6 +2480,11 @@ msgstr "メニューを開く"
 msgid "Open object browser"
 msgstr "オブジェクトブラウザを開く"
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/nl/LC_MESSAGES/volto.po b/packages/volto/locales/nl/LC_MESSAGES/volto.po
@@ -2479,6 +2479,11 @@ msgstr ""
 msgid "Open object browser"
 msgstr ""
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/pt/LC_MESSAGES/volto.po b/packages/volto/locales/pt/LC_MESSAGES/volto.po
@@ -2480,6 +2480,11 @@ msgstr "Abrir menu"
 msgid "Open object browser"
 msgstr ""
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/pt_BR/LC_MESSAGES/volto.po b/packages/volto/locales/pt_BR/LC_MESSAGES/volto.po
@@ -2481,6 +2481,11 @@ msgstr "Abrir menu"
 msgid "Open object browser"
 msgstr "Abrir navegador de objetos"
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/ro/LC_MESSAGES/volto.po b/packages/volto/locales/ro/LC_MESSAGES/volto.po
@@ -2475,6 +2475,11 @@ msgstr "Deschideți meniul"
 msgid "Open object browser"
 msgstr "Deschideți browserul de obiecte"
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/volto.pot b/packages/volto/locales/volto.pot
@@ -2477,6 +2477,11 @@ msgstr ""
 msgid "Open object browser"
 msgstr ""
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/locales/zh_CN/LC_MESSAGES/volto.po b/packages/volto/locales/zh_CN/LC_MESSAGES/volto.po
@@ -2481,6 +2481,11 @@ msgstr "打开菜单"
 msgid "Open object browser"
 msgstr "打开目标浏览器"
 
+#. Default: "Order"
+#: components/manage/Sidebar/Sidebar
+msgid "Order"
+msgstr ""
+
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"

diff --git a/packages/volto/news/5642.feature b/packages/volto/news/5642.feature
@@ -0,0 +1 @@
+Added blocks layout navigator @robgietema @sneridagh
diff --git a/packages/volto/package.json b/packages/volto/package.json
@@ -283,6 +283,9 @@
     "@babel/types": "7.20.5",
     "@fiverr/afterbuild-webpack-plugin": "^1.0.0",
     "@jest/globals": "^29.7.0",
+    "@dnd-kit/core": "6.0.8",
+    "@dnd-kit/sortable": "7.0.2",
+    "@dnd-kit/utilities": "3.2.2",
     "@loadable/babel-plugin": "5.13.2",
     "@loadable/webpack-plugin": "5.15.2",
     "@plone/types": "workspace:*",

diff --git a/packages/volto/src/actions/form/form.js b/packages/volto/src/actions/form/form.js
@@ -3,17 +3,33 @@
  * @module actions/form/form
  */
 
-import { SET_FORM_DATA } from '@plone/volto/constants/ActionTypes';
+import {
+  SET_FORM_DATA,
+  SET_UI_STATE,
+} from '@plone/volto/constants/ActionTypes';
 
 /**
  * Set form data function.
  * @function setFormData
  * @param {Object} data New form data.
- * @returns {Object} Set sidebar action.
+ * @returns {Object} Set form data action.
  */
 export function setFormData(data) {
   return {
     type: SET_FORM_DATA,
     data,
   };
 }
+
+/**
+ * Set ui state function.
+ * @function setUIState
+ * @param {Object} ui New ui state.
+ * @returns {Object} Set ui state action.
+ */
+export function setUIState(ui) {
+  return {
+    type: SET_UI_STATE,
+    ui,
+  };
+}
diff --git a/packages/volto/src/actions/index.js b/packages/volto/src/actions/index.js
@@ -157,7 +157,7 @@ export {
   resetMetadataFocus,
   setSidebarTab,
 } from '@plone/volto/actions/sidebar/sidebar';
-export { setFormData } from '@plone/volto/actions/form/form';
+export { setFormData, setUIState } from '@plone/volto/actions/form/form';
 export {
   deleteLinkTranslation,
   getTranslationLocator,