Big progress!

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -24,7 +24,7 @@ import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaHardHat, FaRegStickyNote, FaShieldAlt } from "react-icons/fa";
 import { connect } from "react-redux";
-import {useNavigate, useSearchParams} from "react-router-dom";
+import {useNavigate, useLocation} from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
 import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
@@ -79,7 +79,7 @@ export function JobsDetailPage({
   const [form] = Form.useForm();
   const history = useNavigate();
   const [loading, setLoading] = useState(false);
-  const search = queryString.parse(useSearchParams().toString());
+  const search = queryString.parse(useLocation().search);
   const formItemLayout = {
     layout: "vertical",
   };

client/src/pages/jobs-detail/jobs-detail.page.container.jsx

@@ -2,6 +2,7 @@ import { useMutation, useQuery } from "@apollo/client";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import {useParams} from 'react-router-dom';
 import { createStructuredSelector } from "reselect";
 import AlertComponent from "../../components/alert/alert.component";
 import SpinComponent from "../../components/loading-spinner/loading-spinner.component";
@@ -32,14 +33,12 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 function JobsDetailPageContainer({
-  bodyshop,
-  match,
   setBreadcrumbs,
   addRecentItem,
   setSelectedHeader,
   setJobReadOnly,
 }) {
-  const { jobId } = match.params;
+  const { jobId } = useParams();
   const { t } = useTranslation();
 
   const { loading, error, data, refetch } = useQuery(GET_JOB_BY_PK, {