IO-3604 Tech Job Drawer

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/production-list-columns/production-list-columns.comment.component.jsx

@@ -1,7 +1,7 @@
 import Icon from "@ant-design/icons";
 import { useMutation } from "@apollo/client/react";
 import { Button, Input, Popover, Tooltip } from "antd";
-import { useState, useRef } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
@@ -9,10 +9,10 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function ProductionListColumnComment({ record, usePortal = false }) {
   const { t } = useTranslation();
+
   const [note, setNote] = useState(record.comment || "");
+
   const [open, setOpen] = useState(false);
-  const textAreaRef = useRef(null);
-  const rafIdRef = useRef(null);
 
   const [updateAlert] = useMutation(UPDATE_JOB);
 
@@ -38,35 +38,23 @@ export default function ProductionListColumnComment({ record, usePortal = false
   };
 
   const handleOpenChange = (flag) => {
-    if (rafIdRef.current) {
-      cancelAnimationFrame(rafIdRef.current);
-      rafIdRef.current = null;
-    }
     setOpen(flag);
-    if (flag) {
-      setNote(record.comment || "");
-      rafIdRef.current = requestAnimationFrame(() => {
-        rafIdRef.current = null;
-        if (textAreaRef.current?.focus) {
-          try {
-            textAreaRef.current.focus({ preventScroll: true });
-          } catch {
-            textAreaRef.current.focus();
-          }
-        }
-      });
-    }
+    if (flag) setNote(record.comment || "");
   };
 
   const content = (
-    <div style={{ width: "30em" }} onClick={(e) => e.stopPropagation()} onPointerDown={(e) => e.stopPropagation()}>
+    <div 
+      style={{ width: "30em" }} 
+      onClick={(e) => e.stopPropagation()}
+      onPointerDown={(e) => e.stopPropagation()}
+    >
       <Input.TextArea
         id={`job-comment-${record.id}`}
         name="comment"
         rows={5}
         value={note}
         onChange={handleChange}
-        ref={textAreaRef}
+        autoFocus
         allowClear
         style={{ marginBottom: "1em" }}
       />
@@ -79,13 +67,13 @@ export default function ProductionListColumnComment({ record, usePortal = false
   );
 
   return (
-    <Popover
-      onOpenChange={handleOpenChange}
-      open={open}
-      content={content}
-      trigger="click"
+    <Popover 
+      onOpenChange={handleOpenChange} 
+      open={open} 
+      content={content} 
+      trigger="click" 
       destroyOnHidden
-      styles={{ body: { padding: "12px" } }}
+      styles={{ body: { padding: '12px' } }}
       {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
     >
       <div

client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx

@@ -1,7 +1,7 @@
 import Icon from "@ant-design/icons";
 import { useMutation } from "@apollo/client/react";
 import { Button, Input, Popover, Space } from "antd";
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -20,8 +20,6 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
   const { t } = useTranslation();
   const [note, setNote] = useState(record.production_vars?.note || "");
   const [open, setOpen] = useState(false);
-  const textAreaRef = useRef(null);
-  const rafIdRef = useRef(null);
 
   const [updateAlert] = useMutation(UPDATE_JOB);
 
@@ -54,37 +52,25 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
 
   const handleOpenChange = useCallback(
     (flag) => {
-      if (rafIdRef.current) {
-        cancelAnimationFrame(rafIdRef.current);
-        rafIdRef.current = null;
-      }
       setOpen(flag);
-      if (flag) {
-        setNote(record.production_vars?.note || "");
-        rafIdRef.current = requestAnimationFrame(() => {
-          rafIdRef.current = null;
-          if (textAreaRef.current?.focus) {
-            try {
-              textAreaRef.current.focus({ preventScroll: true });
-            } catch {
-              textAreaRef.current.focus();
-            }
-          }
-        });
-      }
+      if (flag) setNote(record.production_vars?.note || "");
     },
     [record]
   );
 
   const content = (
-    <div style={{ width: "30em" }} onClick={(e) => e.stopPropagation()} onPointerDown={(e) => e.stopPropagation()}>
+    <div 
+      style={{ width: "30em" }} 
+      onClick={(e) => e.stopPropagation()}
+      onPointerDown={(e) => e.stopPropagation()}
+    >
       <Input.TextArea
         id={`job-production-note-${record.id}`}
         name="production_note"
         rows={5}
         value={note}
         onChange={handleChange}
-        ref={textAreaRef}
+        autoFocus
         allowClear
         style={{ marginBottom: "1em" }}
       />
@@ -110,13 +96,13 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
   );
 
   return (
-    <Popover
-      onOpenChange={handleOpenChange}
-      open={open}
-      content={content}
-      trigger="click"
+    <Popover 
+      onOpenChange={handleOpenChange} 
+      open={open} 
+      content={content} 
+      trigger="click" 
       destroyOnHidden
-      styles={{ body: { padding: "12px" } }}
+      styles={{ body: { padding: '12px' } }}
       {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
     >
       <div

client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx

@@ -25,10 +25,7 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
-  const breakpoints = Grid.useBreakpoint();
-  const selectedBreakpoint = Object.entries(breakpoints)
-    .filter(([, isOn]) => !!isOn)
-    .slice(-1)[0];
+  const screens = Grid.useBreakpoint();
 
   const bpoints = {
     xs: "100%",
@@ -36,10 +33,16 @@ export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
     md: "100%",
     lg: "100%",
     xl: "90%",
-    xxl: "85%"
+    xxl: "90%"
   };
 
-  const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
+  let drawerPercentage = "100%";
+  if (screens.xxl) drawerPercentage = bpoints.xxl;
+  else if (screens.xl) drawerPercentage = bpoints.xl;
+  else if (screens.lg) drawerPercentage = bpoints.lg;
+  else if (screens.md) drawerPercentage = bpoints.md;
+  else if (screens.sm) drawerPercentage = bpoints.sm;
+  else if (screens.xs) drawerPercentage = bpoints.xs;
 
   const location = useLocation();
   const history = useNavigate();