Merge branch 'release/2024-01-26' into feature/IO-1828-Front-End-Package-Updates

# Conflicts:
#	client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
#	client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
#	client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx
#	client/src/components/report-center-modal/report-center-modal.component.jsx

client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx

@@ -1,5 +1,5 @@
-import { gql, useMutation } from "@apollo/client";
-import { Button, notification } from "antd";
+import { useMutation } from "@apollo/client";
+import { Button, Space, notification } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -7,6 +7,11 @@ import dayjs from "../../utils/day";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import {
+  MARK_JOB_AS_EXPORTED,
+  MARK_JOB_AS_UNINVOICED,
+  MARK_JOB_FOR_REEXPORT,
+} from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
@@ -35,58 +40,18 @@ export function JobAdminMarkReexport({
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
-  const [markJobForReexport] = useMutation(gql`
-    mutation MARK_JOB_FOR_REEXPORT($jobId: uuid!) {
-      update_jobs_by_pk(
-        pk_columns: { id: $jobId }
-        _set: { date_exported: null
-        status: "${bodyshop.md_ro_statuses.default_invoiced}"
-        }
-      ) {
-        id
-        date_exported
-        status
-        date_invoiced
-      }
-    }
-  `);
 
-  const [markJobExported] = useMutation(gql`
-    mutation MARK_JOB_AS_EXPORTED($jobId: uuid!, $date_exported: timestamptz!) {
-      update_jobs_by_pk(
-        pk_columns: { id: $jobId }
-        _set: { date_exported: $date_exported
-        status: "${bodyshop.md_ro_statuses.default_exported}"
-        }
-      ) {
-        id
-        date_exported
-        date_invoiced
-        status
-      }
-    }
-  `);
-  const [markJobUninvoiced] = useMutation(gql`
-    mutation MARK_JOB_AS_UNINVOICED($jobId: uuid!, ) {
-      update_jobs_by_pk(
-        pk_columns: { id: $jobId }
-        _set: { date_exported: null
-          date_invoiced: null
-        status: "${bodyshop.md_ro_statuses.default_delivered}"
-        }
-      ) {
-        id
-        date_exported
-        date_invoiced
-        status
-      }
-    }
-  `);
+  const [markJobForReexport] = useMutation(MARK_JOB_FOR_REEXPORT);
+  const [markJobExported] = useMutation(MARK_JOB_AS_EXPORTED);
+  const [markJobUninvoiced] = useMutation(MARK_JOB_AS_UNINVOICED);
 
   const handleMarkForExport = async () => {
     setLoading(true);
     const result = await markJobForReexport({
-      variables: { jobId: job.id },
+      variables: {
+        jobId: job.id,
+        default_invoiced: bodyshop.md_ro_statuses.default_invoiced,
+      },
     });
 
     if (!result.errors) {
@@ -108,7 +73,11 @@ export function JobAdminMarkReexport({
   const handleMarkExported = async () => {
     setLoading(true);
     const result = await markJobExported({
-      variables: { jobId: job.id, date_exported: dayjs() },
+      variables: {
+        jobId: job.id,
+        date_exported: dayjs(),
+        default_exported: bodyshop.md_ro_statuses.default_exported,
+      },
     });
 
     await insertExportLog({
@@ -144,7 +113,10 @@ export function JobAdminMarkReexport({
   const handleUninvoice = async () => {
     setLoading(true);
     const result = await markJobUninvoiced({
-      variables: { jobId: job.id },
+      variables: {
+        jobId: job.id,
+        default_delivered: bodyshop.md_ro_statuses.default_delivered,
+      },
     });
 
     if (!result.errors) {
@@ -165,27 +137,29 @@ export function JobAdminMarkReexport({
 
   return (
     <>
-      <Button
-        loading={loading}
-        disabled={!job.date_exported}
-        onClick={handleMarkForExport}
-      >
-        {t("jobs.labels.markforreexport")}
-      </Button>
-      <Button
-        loading={loading}
-        disabled={job.date_exported}
-        onClick={handleMarkExported}
-      >
-        {t("jobs.actions.markasexported")}
-      </Button>
-      <Button
-        loading={loading}
-        disabled={!job.date_invoiced || job.date_exported}
-        onClick={handleUninvoice}
-      >
-        {t("jobs.actions.uninvoice")}
-      </Button>
+      <Space>
+        <Button
+          loading={loading}
+          disabled={!job.date_exported}
+          onClick={handleMarkForExport}
+        >
+          {t("jobs.labels.markforreexport")}
+        </Button>
+        <Button
+          loading={loading}
+          disabled={job.date_exported}
+          onClick={handleMarkExported}
+        >
+          {t("jobs.actions.markasexported")}
+        </Button>
+        <Button
+          loading={loading}
+          disabled={!job.date_invoiced || job.date_exported}
+          onClick={handleUninvoice}
+        >
+          {t("jobs.actions.uninvoice")}
+        </Button>
+      </Space>
     </>
   );
 }