feature/IO-3558-Reynolds-Part-2 - Admin Panel

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -111,8 +111,14 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
       title: t("jobs.successes.early_ro_created", "Early RO Created"),
       message: `RO Number: ${result.roNumber || "N/A"}`
     });
-    // Don't close the modal - just refetch so the form updates
-    refetch?.();
+    // Delay refetch to keep success message visible for 2 seconds
+    setTimeout(() => {
+      refetch?.();
+    }, 2000);
+  };
+
+  const handleModalClose = () => {
+    setOpen(false);
   };
 
   if (job.converted) return <></>;
@@ -136,7 +142,9 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
       {/* Convert Job Modal */}
       <Modal
         open={open}
-        onCancel={() => setOpen(false)}
+        onCancel={handleModalClose}
+        closable={!(earlyRoCreated && !job.converted)} // Disable X button if early RO created but not converted
+        maskClosable={!(earlyRoCreated && !job.converted)} // Disable clicking outside to close
         title={t("jobs.actions.convert")}
         footer={null}
         width={700}
@@ -157,6 +165,20 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
             referral_source_extra: job.referral_source_extra ?? ""
           }}
         >
+          {/* Show Reynolds Early RO section at the top if applicable */}
+          {isReynoldsMode && !job.dms_id && !earlyRoCreated && (
+            <>
+              <RREarlyROForm
+                bodyshop={bodyshop}
+                socket={socket}
+                job={job}
+                onSuccess={handleEarlyROSuccess}
+                showCancelButton={false}
+              />
+              <Divider />
+            </>
+          )}
+
           <Form.Item
             name={["ins_co_nm"]}
             label={t("jobs.fields.ins_co_nm")}
@@ -285,20 +307,6 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
             <Switch />
           </Form.Item>
 
-          {/* Show Reynolds Early RO section if applicable */}
-          {isReynoldsMode && !job.dms_id && !earlyRoCreated && (
-            <>
-              <Divider />
-              <RREarlyROForm
-                bodyshop={bodyshop}
-                socket={socket}
-                job={job}
-                onSuccess={handleEarlyROSuccess}
-                showCancelButton={false}
-              />
-            </>
-          )}
-
           <Space wrap style={{ marginTop: 16 }}>
             <Button
               disabled={submitDisabled() || (isReynoldsMode && !job.dms_id && !earlyRoCreated)}
@@ -309,7 +317,12 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
             >
               {t("jobs.actions.convert")}
             </Button>
-            <Button onClick={() => setOpen(false)}>{t("general.actions.close")}</Button>
+            <Button 
+              onClick={handleModalClose}
+              disabled={earlyRoCreated && !job.converted}
+            >
+              {t("general.actions.close")}
+            </Button>
           </Space>
         </Form>
       </Modal>