IO-3236 HasFeatureAccess Date

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/src/components/feature-wrapper/feature-wrapper.component.jsx

@@ -81,8 +81,9 @@ export function HasFeatureAccess({ featureName, bodyshop, bypass, debug = false
   }
   return (
     bodyshop?.features?.allAccess ||
-    bodyshop?.features?.[featureName] ||
-    dayjs(bodyshop?.features[featureName]).isAfter(dayjs())
+    (typeof bodyshop?.features?.[featureName] === "boolean"
+      ? bodyshop?.features?.[featureName]
+      : dayjs(bodyshop?.features?.[featureName]).isAfter(dayjs()))
   );
 }
 

client/src/components/production-board-kanban/trello-board/controllers/Board.jsx

@@ -20,7 +20,7 @@ const Board = ({ id, className, orientation, cardSettings, ...additionalProps })
       default:
         return cardSizesVertical.small;
     }
-  }, [cardSettings?.cardSize]);
+  }, [cardSettings]);
 
   return (
     <>

client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx

@@ -101,33 +101,11 @@ const BoardContainer = ({
     async ({ draggableId, type, source, reason, mode, destination, combine }) => {
       setIsDragging(false);
 
-      // Validate drag type and source
-      if (type !== "lane" || !source) {
-        // Invalid drag type or missing source, attempt to revert if possible
-        if (source) {
-          dispatch(
-            actions.moveCardAcrossLanes({
-              fromLaneId: source.droppableId,
-              toLaneId: source.droppableId,
-              cardId: draggableId,
-              index: source.index
-            })
-          );
-        }
-        setIsProcessing(false);
-        try {
-          await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
-        } catch (err) {
-          console.error("Error in onLaneDrag for invalid drag type or source", err);
-        }
-        return;
-      }
+      // Only update drag time if it's a valid drop with a different destination
+      if (type === "lane" && source && destination && !isEqual(source, destination)) {
+        setDragTime(source.droppableId);
+        setIsProcessing(true);
 
-      setDragTime(source.droppableId);
-      setIsProcessing(true);
-
-      // Handle valid drop to a different lane or position
-      if (destination && !isEqual(source, destination)) {
         dispatch(
           actions.moveCardAcrossLanes({
             fromLaneId: source.droppableId,
@@ -136,33 +114,14 @@ const BoardContainer = ({
             index: destination.index
           })
         );
-      } else {
-        // Same-lane drop or no destination, revert to original position
-        dispatch(
-          actions.moveCardAcrossLanes({
-            fromLaneId: source.droppableId,
-            toLaneId: source.droppableId,
-            cardId: draggableId,
-            index: source.index
-          })
-        );
-      }
 
-      try {
-        await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
-      } catch (err) {
-        console.error("Error in onLaneDrag", err);
-        // Ensure revert on error
-        dispatch(
-          actions.moveCardAcrossLanes({
-            fromLaneId: source.droppableId,
-            toLaneId: source.droppableId,
-            cardId: draggableId,
-            index: source.index
-          })
-        );
-      } finally {
-        setIsProcessing(false);
+        try {
+          await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
+        } catch (err) {
+          console.error("Error in onLaneDrag", err);
+        } finally {
+          setIsProcessing(false);
+        }
       }
     },
     [dispatch, onDragEnd, setDragTime]

client/src/components/production-board-kanban/trello-board/controllers/Lane.jsx

@@ -133,9 +133,7 @@ const Lane = ({
           Item: ItemComponent
         },
         itemContent: (index, item) => <ItemWrapper>{renderDraggable(index, item)}</ItemWrapper>,
-        overscan: { main: 10, reverse: 10 },
-        // Ensure a minimum height for empty lanes to allow dropping
-        style: renderedCards.length === 0 ? { minHeight: "5px" } : {}
+        overscan: { main: 10, reverse: 10 }
       };
 
       const horizontalProps = {
@@ -151,6 +149,8 @@ const Lane = ({
 
       const componentProps = orientation === "vertical" ? verticalProps : horizontalProps;
 
+      // If the lane is collapsed, we want to render a div instead of the virtualized list, and we want to set the height to the max height of the lane so that
+      // the lane doesn't shrink when collapsed (in horizontal mode)
       const finalComponentProps = collapsed
         ? orientation === "horizontal"
           ? {
@@ -161,8 +161,9 @@ const Lane = ({
           : {}
         : componentProps;
 
-      // Always render placeholder for empty lanes in vertical mode to ensure droppable area
-      const shouldRenderPlaceholder = orientation === "vertical" ? collapsed || renderedCards.length === 0 : collapsed;
+      // If the lane is horizontal and collapsed, we want to render a placeholder so that the lane doesn't shrink to 0 height and grows when
+      // a card is dragged over it
+      const shouldRenderPlaceholder = orientation !== "horizontal" && (collapsed || renderedCards.length === 0);
 
       return (
         <HeightMemoryWrapper
@@ -177,8 +178,8 @@ const Lane = ({
           override={orientation !== "horizontal" && (collapsed || !renderedCards.length)}
         >
           <div
-            ref={laneRef}
-            style={{ height: "100%", width: "100%" }}
+            ref={laneRef} // Ensure laneRef is set here
+            style={{ height: "100%", width: "100%" }} // Make it scrollable
             className={`react-trello-lane ${collapsed ? "lane-collapsed" : ""}`}
           >
             <div {...provided.droppableProps} ref={provided.innerRef} style={{ ...provided.droppableProps.style }}>