- PR Change Requests (Progress)

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

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

@@ -45,7 +45,7 @@ import ScheduleJobModalContainer from "../../components/schedule-job-modal/sched
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import _ from "lodash";
@@ -58,8 +58,7 @@ import { QUERY_JOB_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly,
-  currentUser: selectCurrentUser
+  jobRO: selectJobReadOnly
 });
 const mapDispatchToProps = (dispatch) => ({
   setPrintCenterContext: (context) =>
@@ -85,8 +84,6 @@ export function JobsDetailPage({
   jobRO,
   job,
   mutationUpdateJob,
-  handleSubmit,
-  currentUser,
   insertAuditTrail,
   refetch
 }) {
@@ -394,8 +391,6 @@ export function JobsDetailPage({
               ),
               children: (
                 <TaskListContainer
-                  currentUser={currentUser}
-                  bodyshop={bodyshop}
                   relationshipType={"jobid"}
                   relationshipId={job.id}
                   query={{ QUERY_JOB_TASKS_PAGINATED }}

client/src/pages/tasks/allTasksPageContainer.jsx

@@ -7,15 +7,11 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 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,
-  currentUser: selectCurrentUser
-});
+const mapStateToProps = createStructuredSelector({});
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -23,13 +19,7 @@ const mapDispatchToProps = (dispatch) => ({
   setTaskUpsertContext: (context) => dispatch(setModalContext({ context, modal: "taskUpsert" }))
 });
 
-export function AllTasksPageContainer({
-  bodyshop,
-  currentUser,
-  setBreadcrumbs,
-  setSelectedHeader,
-  setTaskUpsertContext
-}) {
+export function AllTasksPageContainer({ setBreadcrumbs, setSelectedHeader, setTaskUpsertContext }) {
   const { t } = useTranslation();
   const searchParams = queryString.parse(useLocation().search);
   useEffect(() => {
@@ -64,7 +54,7 @@ export function AllTasksPageContainer({
     }
   }, [setTaskUpsertContext, searchParams]);
 
-  return <TasksPageComponent type={TaskPageTypes.ALL_TASKS} currentUser={currentUser} bodyshop={bodyshop} />;
+  return <TasksPageComponent type={TaskPageTypes.ALL_TASKS} />;
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(AllTasksPageContainer);

client/src/pages/tasks/myTasksPageContainer.jsx

@@ -6,20 +6,16 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
 import TaskPageTypes from "./taskPageTypes.jsx";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-  currentUser: selectCurrentUser
-});
+const mapStateToProps = createStructuredSelector({});
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
   setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
 });
 
-export function MyTasksPageContainer({ bodyshop, currentUser, setBreadcrumbs, setSelectedHeader }) {
+export function MyTasksPageContainer({ setBreadcrumbs, setSelectedHeader }) {
   const { t } = useTranslation();
   useEffect(() => {
     document.title = t("titles.my_tasks", {
@@ -38,7 +34,7 @@ export function MyTasksPageContainer({ bodyshop, currentUser, setBreadcrumbs, se
     ]);
   }, [t, setBreadcrumbs, setSelectedHeader]);
 
-  return <TasksPageComponent type={TaskPageTypes.MY_TASKS} currentUser={currentUser} bodyshop={bodyshop} />;
+  return <TasksPageComponent type={TaskPageTypes.MY_TASKS} />;
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(MyTasksPageContainer);

client/src/pages/tasks/tasks.page.component.jsx

@@ -2,8 +2,15 @@ import React from "react";
 import TaskListContainer from "../../components/task-list/task-list.container.jsx";
 import { QUERY_ALL_TASKS_PAGINATED, QUERY_MY_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
 import taskPageTypes from "./taskPageTypes.jsx";
+import { createStructuredSelector } from "reselect";
+import { selectCurrentUser } from "../../redux/user/user.selectors.js";
 
-export default function TasksPageComponent({ bodyshop, currentUser, type }) {
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({});
+
+export default function TasksPageComponent({ currentUser, type }) {
   switch (type) {
     case taskPageTypes.MY_TASKS:
       return (
@@ -12,20 +19,11 @@ export default function TasksPageComponent({ bodyshop, currentUser, type }) {
           relationshipId={currentUser.email}
           relationshipType={"user"}
           query={{ QUERY_MY_TASKS_PAGINATED }}
-          bodyshop={bodyshop}
           titleTranslation={"tasks.titles.my_tasks"}
-          currentUser={currentUser}
         />
       );
     case taskPageTypes.ALL_TASKS:
-      return (
-        <TaskListContainer
-          query={{ QUERY_ALL_TASKS_PAGINATED }}
-          bodyshop={bodyshop}
-          titleTranslation={"tasks.titles.all_tasks"}
-          currentUser={currentUser}
-        />
-      );
+      return <TaskListContainer query={{ QUERY_ALL_TASKS_PAGINATED }} titleTranslation={"tasks.titles.all_tasks"} />;
     default:
       return <></>;
   }