From 3c3f1e8650da47bbc8457ae7c3d0f1f9d4c61c3d Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Wed, 11 Dec 2019 18:50:48 -0800
Subject: [PATCH] Further cleanup of components for subscription use

---
 client/src/App/App.container.jsx                            | 2 +-
 client/src/App/App.js                                       | 2 +-
 .../src/components/sign-in-form/sign-in-form.component.jsx  | 6 +-----
 client/src/components/sign-out/sign-out.component.jsx       | 2 +-
 client/src/graphql/jobs.queries.js                          | 2 +-
 client/src/pages/jobs/jobs.page.jsx                         | 5 ++---
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx
index 1072fafbe..d4de1e230 100644
--- a/client/src/App/App.container.jsx
+++ b/client/src/App/App.container.jsx
@@ -38,7 +38,7 @@ class AppContainer extends Component {
       // split based on operation type
       ({ query }) => {
         const definition = getMainDefinition(query);
-        console.log("000000", definition.operation);
+        console.log("##Intercepted GQL Transaction##", query);
         return (
           definition.kind === "OperationDefinition" &&
           definition.operation === "subscription"
diff --git a/client/src/App/App.js b/client/src/App/App.js
index 02ebfddcd..ec1fd98d4 100644
--- a/client/src/App/App.js
+++ b/client/src/App/App.js
@@ -64,7 +64,7 @@ export default () => {
             mutation: UPSERT_USER,
             variables: { authEmail: user.email, authToken: user.uid }
           })
-          .then(r => console.log("Successful Upsert", r))
+          .then()
           .catch(error => {
             console.log("Upsert error!!!!", error);
           });
diff --git a/client/src/components/sign-in-form/sign-in-form.component.jsx b/client/src/components/sign-in-form/sign-in-form.component.jsx
index 2a38f481d..2038e12d8 100644
--- a/client/src/components/sign-in-form/sign-in-form.component.jsx
+++ b/client/src/components/sign-in-form/sign-in-form.component.jsx
@@ -12,16 +12,12 @@ class SignInForm extends React.Component {
 
   handleSubmit = e => {
     e.preventDefault();
-    const { apolloClient } = this.props;
 
     this.props.form.validateFields(async (err, values) => {
       if (!err) {
         const { email, password } = values;
         try {
-          const { user } = await auth.signInWithEmailAndPassword(
-            email,
-            password
-          );
+          await auth.signInWithEmailAndPassword(email, password);
 
           this.props.form.resetFields();
         } catch (error) {
diff --git a/client/src/components/sign-out/sign-out.component.jsx b/client/src/components/sign-out/sign-out.component.jsx
index edfcd4e9a..22c58c61e 100644
--- a/client/src/components/sign-out/sign-out.component.jsx
+++ b/client/src/components/sign-out/sign-out.component.jsx
@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { Redirect } from "react-router-dom";
+//import { Redirect } from "react-router-dom";
 import firebase from "../../firebase/firebase.utils";
 export default class SignOut extends Component {
   state = {
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 0383b3426..6bf2412bd 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -1,7 +1,7 @@
 import { gql } from "apollo-boost";
 
 export const GET_ALL_OPEN_JOBS = gql`
-  query {
+  {
     jobs {
       id
       est_number
diff --git a/client/src/pages/jobs/jobs.page.jsx b/client/src/pages/jobs/jobs.page.jsx
index 53e3e59c1..9d4979a0a 100644
--- a/client/src/pages/jobs/jobs.page.jsx
+++ b/client/src/pages/jobs/jobs.page.jsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { useQuery, useSubscription } from "@apollo/react-hooks";
+import AlertComponent from "../../components/alert/alert.component";
 //import { GET_ALL_OPEN_JOBS } from "../../graphql/jobs.queries";
 import { Table, Divider, Icon } from "antd";
 
@@ -76,9 +77,7 @@ export default function JobsPage() {
   ];
 
   //if (loading) return "Loading";
-  if (error) return `Error! ${error.message}`;
-  //console.log("$$$Develop (jobs.page.jsx) | jobs", jobs);
-  console.log("JobsPage Rendering...");
+  if (error) return <AlertComponent message={error.message} />;
 
   return (
     <div>