- Progress Commit

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/pages/tasks/allTasksPageContainer.jsx

@@ -1,6 +1,7 @@
 import React, {useEffect} from "react";
 import {useTranslation} from "react-i18next";
 import TasksPageComponent from "./tasks.page.component";
+import queryString from "query-string";
 
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
@@ -9,6 +10,7 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
 import {selectBodyshop, selectCurrentUser} from "../../redux/user/user.selectors.js";
 import TaskPageTypes from "./taskPageTypes.jsx";
 import {setModalContext} from "../../redux/modals/modals.actions.js";
+import {useLocation} from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -29,6 +31,7 @@ export function MyTasksPageContainer({
                                        setTaskUpsertContext
                                      }) {
   const {t} = useTranslation();
+  const searchParams = queryString.parse((useLocation().search));
   useEffect(() => {
     document.title = t("titles.all_tasks", {
       app: InstanceRenderManager({
@@ -48,8 +51,7 @@ export function MyTasksPageContainer({
   // This takes care of the ability to deep link a task from the URL (Dispatches the modal)
   useEffect(() => {
     // Check for a query string in the URL
-    const queryString = window.location.search;
-    const urlParams = new URLSearchParams(queryString);
+    const urlParams = new URLSearchParams(searchParams);
     const taskId = urlParams.get('taskid');
     if (taskId) {
       setTaskUpsertContext({
@@ -57,6 +59,7 @@ export function MyTasksPageContainer({
           taskId,
         },
       });
+      urlParams.delete('taskid');
     }
   }, [setTaskUpsertContext]);