Merge remote-tracking branch 'origin/release/2025-06-02' into feature/IO-3182-Phone-Number-Consent

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -9,6 +9,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENTS_BY_JOB_ID, INSERT_MANUAL_APPT } from "../../graphql/appointments.queries";
@@ -32,7 +33,6 @@ import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
 import JobsDetailHeaderActionsToggleProduction from "./jobs-detail-header-actions.toggle-production";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -1078,17 +1078,26 @@ export function JobsDetailHeaderActions({
     menuItems.push({
       key: "deletejob",
       id: "job-actions-deletejob",
-      label: (
+      label:
-        <Popconfirm
+        job.job_watchers.length === 0 ? (
-          title={t("jobs.labels.deleteconfirm")}
+          <Popconfirm
-          okText={t("general.labels.yes")}
+            title={t("jobs.labels.deleteconfirm")}
-          cancelText={t("general.labels.no")}
+            okText={t("general.labels.yes")}
-          onClick={(e) => e.stopPropagation()}
+            cancelText={t("general.labels.no")}
-          onConfirm={handleDeleteJob}
+            onClick={(e) => e.stopPropagation()}
-        >
+            onConfirm={handleDeleteJob}
-          {t("menus.jobsactions.deletejob")}
+          >
-        </Popconfirm>
+            {t("menus.jobsactions.deletejob")}
-      )
+          </Popconfirm>
+        ) : (
+          <Popconfirm
+            title={t("jobs.labels.deletewatchers")}
+            onClick={(e) => e.stopPropagation()}
+            showCancel={false}
+          >
+            {t("menus.jobsactions.deletejob")}
+          </Popconfirm>
+        )
     });
   }
 
@@ -1109,8 +1118,8 @@ export function JobsDetailHeaderActions({
         <RbacWrapper action="jobs:void" noauth>
           <Popconfirm
             title={t("jobs.labels.voidjob")}
-            okText="Yes"
+            okText={t("general.labels.yes")}
-            cancelText="No"
+            cancelText={t("general.labels.no")}
             onClick={(e) => e.stopPropagation()}
             onConfirm={handleVoidJob}
           >

client/src/translations/en_us/common.json

@@ -2031,9 +2031,10 @@
           "stands": "Stands",
           "waived": "Waived"
         },
-        "deleteconfirm": "Are you sure you want to delete this Job? This cannot be undone. ",
+        "deleteconfirm": "Are you sure you want to delete this Job? This cannot be undone.",
         "deletedelivery": "Delete Delivery Checklist",
         "deleteintake": "Delete Intake Checklist",
+        "deletewatchers": "Remove Watchers before deleting this Job.",
         "deliverchecklist": "Deliver Checklist",
         "difference": "Difference",
         "diskscan": "Scan Disk for Estimates",

client/src/translations/es/common.json

@@ -2034,6 +2034,7 @@
         "deleteconfirm": "",
         "deletedelivery": "",
         "deleteintake": "",
+        "deletewatchers": "",
         "deliverchecklist": "",
         "difference": "",
         "diskscan": "",

client/src/translations/fr/common.json

@@ -2034,6 +2034,7 @@
         "deleteconfirm": "",
         "deletedelivery": "",
         "deleteintake": "",
+        "deletewatchers": "",
         "deliverchecklist": "",
         "difference": "",
         "diskscan": "",