Replaced remaining parts of app to use Redux.

client/src/components/jobs-documents/jobs-documents.container.jsx

@@ -1,13 +1,22 @@
 import React from "react";
 import { useQuery } from "react-apollo";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import { QUERY_SHOP_ID } from "../../graphql/bodyshop.queries";
 import { GET_DOCUMENTS_BY_JOB } from "../../graphql/documents.queries";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import JobDocuments from "./jobs-documents.component";
-import { GET_CURRENT_USER } from "../../graphql/local.queries";
 
-export default function JobsDocumentsContainer({ jobId }) {
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser
+});
+
+export default connect(
+  mapStateToProps,
+  null
+)(function JobsDocumentsContainer({ jobId, currentUser }) {
   const { loading, error, data } = useQuery(GET_DOCUMENTS_BY_JOB, {
     variables: { jobId: jobId },
     fetchPolicy: "network-only"
@@ -17,14 +26,12 @@ export default function JobsDocumentsContainer({ jobId }) {
     fetchPolicy: "network-only"
   });
 
-  const user = useQuery(GET_CURRENT_USER);
-
-  if (loading || shopData.loading || user.loading) return <LoadingSpinner />;
-  if (error || shopData.error || user.error)
+  if (loading || shopData.loading) return <LoadingSpinner />;
+  if (error || shopData.error)
     return (
       <AlertComponent
-        type='error'
-        message={error.message || shopData.error.message || user.error.message}
+        type="error"
+        message={error.message || shopData.error.message}
       />
     );
 
@@ -32,7 +39,7 @@ export default function JobsDocumentsContainer({ jobId }) {
     <JobDocuments
       data={data.documents}
       jobId={jobId}
-      currentUser={user.data.currentUser}
+      currentUser={currentUser}
       shopId={
         shopData.data?.bodyshops[0]?.id
           ? shopData.data?.bodyshops[0]?.id
@@ -40,4 +47,4 @@ export default function JobsDocumentsContainer({ jobId }) {
       }
     />
   );
-}
+});