IO-3230 Customer List Excel

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

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 }}>

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -6,6 +6,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { QUERY_ACTIVE_EMPLOYEES, QUERY_ACTIVE_EMPLOYEES_WITH_EMAIL } from "../../graphql/employees.queries";
 import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import { selectReportCenter } from "../../redux/modals/modals.selectors";
@@ -18,11 +19,10 @@ import EmployeeSearchSelectEmail from "../employee-search-select/employee-search
 import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
 import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import ReportCenterModalFiltersSortersComponent from "./report-center-modal-filters-sorters-component";
 import "./report-center-modal.styles.scss";
-import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   reportCenterModal: selectReportCenter,
@@ -389,5 +389,7 @@ const restrictedReports = [
   { key: "job_costing_ro_date_detail", days: 183 },
   { key: "job_costing_ro_estimator", days: 183 },
   { key: "job_lifecycle_date_detail", days: 183 },
-  { key: "job_lifecycle_date_summary", days: 183 }
+  { key: "job_lifecycle_date_summary", days: 183 },
+  { key: "customer_list", days: 183 },
+  { key: "customer_list_excel", days: 183 }
 ];

client/src/translations/en_us/common.json

@@ -3099,6 +3099,7 @@
         "credits_not_received_date_vendorid": "Credits not Received by Vendor",
         "csi": "CSI Responses",
         "customer_list": "Customer List",
+        "customer_list_excel": "Customer List - Excel",
         "cycle_time_analysis": "Cycle Time Analysis",
         "estimates_written_converted": "Estimates Written/Converted",
         "estimator_detail": "Jobs by Estimator (Detail)",

client/src/translations/es/common.json

@@ -3100,6 +3100,7 @@
         "credits_not_received_date_vendorid": "",
         "csi": "",
         "customer_list": "",
+        "customer_list_excel": "",
         "cycle_time_analysis": "",
         "estimates_written_converted": "",
         "estimator_detail": "",

client/src/translations/fr/common.json

@@ -3100,6 +3100,7 @@
         "credits_not_received_date_vendorid": "",
         "csi": "",
         "customer_list": "",
+        "customer_list_excel": "",
         "cycle_time_analysis": "",
         "estimates_written_converted": "",
         "estimator_detail": "",

client/src/utils/TemplateConstants.js

@@ -2004,6 +2004,18 @@ export const TemplateList = (type, context) => {
             },
             group: "customers"
           },
+          customer_list_excel: {
+            title: i18n.t("reportcenter.templates.customer_list_excel"),
+            subject: i18n.t("reportcenter.templates.customer_list_excel"),
+            key: "customer_list_excel",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced")
+            },
+            group: "customers"
+          },
           exported_gsr_by_ro: {
             title: i18n.t("reportcenter.templates.exported_gsr_by_ro"),
             subject: i18n.t("reportcenter.templates.exported_gsr_by_ro"),
@@ -2241,7 +2253,7 @@ export const TemplateList = (type, context) => {
               field: i18n.t("bills.fields.date")
             },
             group: "purchases"
-          },
+          }
         }
       : {}),
     ...(!type || type === "courtesycarcontract"