Do not break toolbar if layout id is not registerd in layoutViewsName…

…sMapping (#6485) Co-authored-by: David Glick <[email protected]>
plone · Nov 19, 2024 · d320bfe · d320bfe
1 parent de98f08
commit d320bfe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/volto/news/6485.bugfix b/packages/volto/news/6485.bugfix
@@ -0,0 +1 @@
+Do not break toolbar if layout id is not registered in layoutViewsNamesMapping. @cekk
diff --git a/packages/volto/src/components/manage/Display/Display.jsx b/packages/volto/src/components/manage/Display/Display.jsx
@@ -123,13 +123,15 @@ const DisplaySelect = (props) => {
       ? state.content.data[getLayoutFieldname(state.content.data)]
       : '',
   );
+  const layoutMappingId = config.views.layoutViewsNamesMapping?.[layout];
   const [selectedOption, setselectedOption] = useState({
     value: layout,
-    label:
-      intl.formatMessage({
-        id: config.views.layoutViewsNamesMapping?.[layout],
-        defaultMessage: config.views.layoutViewsNamesMapping?.[layout],
-      }) || layout,
+    label: layoutMappingId
+      ? intl.formatMessage({
+          id: layoutMappingId,
+          defaultMessage: layoutMappingId,
+        })
+      : layout,
   });
 
   const type = useSelector((state) =>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Do not break toolbar if layout id is not registered in layoutViewsNamesMapping. @cekk