fixed test cases

plone · Nov 22, 2024 · 10fb29c · 10fb29c
1 parent 747b5fd
commit 10fb29c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/packages/volto/news/6481.bugfix b/packages/volto/news/6481.bugfix
@@ -0,0 +1 @@
+Fixed Order blocks in sidebar doesn't respect layout restrictions by setting appropriate handlers in `Item.jsx`. @alihamza1221
diff --git a/packages/volto/src/components/manage/Blocks/Block/BlocksForm.jsx b/packages/volto/src/components/manage/Blocks/Block/BlocksForm.jsx
@@ -283,6 +283,7 @@ const BlocksForm = (props) => {
               onDeleteBlock={onDeleteBlock}
               onSelectBlock={onSelectBlock}
               removable
+              editable={editable}
               errors={blocksErrors}
             />
           </div>,

diff --git a/packages/volto/src/components/manage/Blocks/Block/EditBlockWrapper.jsx b/packages/volto/src/components/manage/Blocks/Block/EditBlockWrapper.jsx
@@ -52,7 +52,7 @@ const EditBlockWrapper = (props) => {
 
   const data = applyBlockDefaults({ data: originalData, ...blockProps, intl });
 
-  const visible = selected && !hideHandler(data);
+  const visible = selected && !hideHandler(data, editable);
 
   const required = isBoolean(data.required)
     ? data.required

diff --git a/packages/volto/src/components/manage/Blocks/Block/Order/Item.jsx b/packages/volto/src/components/manage/Blocks/Block/Order/Item.jsx
@@ -41,10 +41,11 @@ export const Item = forwardRef(
     const gridSelected = useSelector((state) => state.form.ui.gridSelected);
     const dispatch = useDispatch();
 
-    const visible = !hideHandler(data);
-    const required = isBoolean(data.required)
-      ? data.required
-      : includes(config.blocks.requiredBlocks, data.type);
+    const visible = !hideHandler(data, props?.editable);
+
+    const required = isBoolean(data?.required)
+      ? data?.required
+      : includes(config.blocks.requiredBlocks, data?.['@type']);
 
     return (
       <li

diff --git a/packages/volto/src/components/manage/Blocks/Block/Order/Order.jsx b/packages/volto/src/components/manage/Blocks/Block/Order/Order.jsx
@@ -17,6 +17,7 @@ export function Order({
   dndKitCore,
   dndKitSortable,
   dndKitUtilities,
+  editable,
   errors,
 }) {
   const [activeId, setActiveId] = useState(null);
@@ -147,6 +148,7 @@ export function Order({
             indentationWidth={indentationWidth}
             onRemove={removable ? () => handleRemove(id) : undefined}
             onSelectBlock={onSelectBlock}
+            editable={editable}
             errors={errors?.[id] || {}}
           />
         ))}

diff --git a/packages/volto/src/components/manage/Blocks/Block/__snapshots__/BlocksForm.test.jsx.snap b/packages/volto/src/components/manage/Blocks/Block/__snapshots__/BlocksForm.test.jsx.snap
@@ -153,6 +153,7 @@ exports[`Allow override of blocksConfig 1`] = `
             class="action drag"
             data-cypress="draggable-handle"
             role="button"
+            style="visibility: visible;"
             tabindex="0"
           >
             <svg
@@ -215,6 +216,7 @@ exports[`Allow override of blocksConfig 1`] = `
             class="action drag"
             data-cypress="draggable-handle"
             role="button"
+            style="visibility: visible;"
             tabindex="0"
           >
             <svg

diff --git a/packages/volto/src/helpers/Blocks/Blocks.js b/packages/volto/src/helpers/Blocks/Blocks.js
@@ -77,13 +77,14 @@ export function blockHasValue(data) {
  * Pluggable method to test if a block has a set value (any non-empty value)
  * @function hideHandler
  * @param {Object} data Block data
- * @return {boolean} True if block has fixed attribute, or if the addBlockButton is disabled or block having value is not editable
+ * @param {boolean} editable Indicates if is editable
+ * @return {boolean} True if block is fixed
  */
-export const hideHandler = (data) => {
+export const hideHandler = (data, editable) => {
   return (
-    !!data.fixed ||
+    !!data?.fixed ||
     (!config.experimental.addBlockButton.enabled &&
-      !(blockHasValue(data) && data.editable))
+      !(data && blockHasValue(data) && !!editable))
   );
 };