Jobs list page updates & note adding modal.

client/src/graphql/apollo-error-handling.js

@@ -11,49 +11,49 @@ const errorLink = onError(
     console.log("forward", forward);
     //if (graphQLErrors) {
     // User access token has expired
-    // if (graphQLErrors[0].message.includes("JWTExpired")) {
-    console.log("Got to the error check.");
-    if (access_token && access_token !== "undefined") {
-      // Let's refresh token through async request
-      return new Observable(observer => {
-        auth.currentUser
-          .getIdToken(true)
-          .then(function(idToken) {
-            if (!idToken) {
-              window.localStorage.removeItem("token");
-              return console.log("Refresh token has expired");
-            }
-            console.log("Got a new token", idToken);
-            window.localStorage.setItem("token", idToken);
-
-            // reset the headers
-            operation.setContext(({ headers = {} }) => ({
-              headers: {
-                // Re-add old headers
-                ...headers,
-                // Switch out old access token for new one
-                authorization: idToken ? `Bearer ${idToken}` : ""
+    if (networkError.message.includes("JWTExpired")) {
+      console.log("Got to the error check.");
+      if (access_token && access_token !== "undefined") {
+        // Let's refresh token through async request
+        return new Observable(observer => {
+          auth.currentUser
+            .getIdToken(true)
+            .then(function(idToken) {
+              if (!idToken) {
+                window.localStorage.removeItem("token");
+                return console.log("Refresh token has expired");
               }
-            }));
+              console.log("Got a new token", idToken);
+              window.localStorage.setItem("token", idToken);
 
-            const subscriber = {
-              next: observer.next.bind(observer),
-              error: observer.error.bind(observer),
-              complete: observer.complete.bind(observer)
-            };
-            console.log("About to resend the request.");
-            // Retry last failed request
-            forward(operation).subscribe(subscriber);
-          })
-          .catch(error => {
-            // No refresh or client token available, we force user to login
-            console.log("Hit an error.");
-            observer.error(error);
-          });
-      });
+              // reset the headers
+              operation.setContext(({ headers = {} }) => ({
+                headers: {
+                  // Re-add old headers
+                  ...headers,
+                  // Switch out old access token for new one
+                  authorization: idToken ? `Bearer ${idToken}` : ""
+                }
+              }));
+
+              // const subscriber = {
+              //   next: observer.next.bind(observer),
+              //   error: observer.error.bind(observer),
+              //   complete: observer.complete.bind(observer)
+              // };
+              console.log("About to resend the request.");
+              // Retry last failed request
+              forward(operation); //.subscribe(subscriber);
+            })
+            .catch(error => {
+              // No refresh or client token available, we force user to login
+              console.log("Hit an error.");
+              observer.error(error);
+            });
+        });
+      }
     }
     //}
-    //}
 
     if (networkError) {
       console.log(`[Network error]: ${networkError}`);

client/src/graphql/jobs.queries.js

@@ -30,27 +30,61 @@ export const GET_ALL_OPEN_JOBS = gql`
 export const SUBSCRIPTION_ALL_OPEN_JOBS = gql`
   subscription SUBSCRIPTION_ALL_OPEN_JOBS {
     jobs {
-      id
-      updated_at
-      est_number
-      ro_number
-      job_status {
-        name
+      pit_owner_first_name
+      pit_owner_last_name
+      pit_owner_phone
+      pit_owner_email
+      owner {
         id
+        allow_text_message
+        preferred_contact
       }
-      scheduled_completion
-      scheduled_delivery
       vehicle {
         id
         v_model_yr
         v_make_desc
         v_model_desc
+        v_color
         plate_no
       }
-      owner {
+      pit_vehicle_plate_no
+      actual_completion
+      actual_delivery
+      actual_in
+      est_number
+      id
+      ins_co_nm
+      ins_ct_fn
+      ins_ct_ln
+      ins_ph1
+      ins_ea
+      est_co_nm
+      est_ph1
+      est_ea
+      est_ct_fn
+      est_ct_ln
+      clm_no
+      clm_total
+      owner_owing
+      ro_number
+      scheduled_completion
+      scheduled_in
+      scheduled_delivery
+      job_status {
         id
-        first_name
-        last_name
+        name
+      }
+      updated_at
+      claim_total
+      ded_amt
+      vehicle {
+        id
+        plate_no
+        v_vin
+        v_model_yr
+        v_model_desc
+        v_make_desc
+        v_color
       }
     }
   }
@@ -200,6 +234,13 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       scheduled_completion
       scheduled_in
       scheduled_delivery
+      notes {
+        id
+        text
+        critical
+        private
+        created_at
+      }
       job_status {
         id
         name

client/src/graphql/notes.queries.js

@@ -0,0 +1,11 @@
+import { gql } from "apollo-boost";
+
+export const INSERT_NEW_NOTE = gql`
+  mutation INSERT_NEW_JOB($noteInput: [notes_insert_input!]!) {
+    insert_notes(objects: $noteInput) {
+      returning {
+        id
+      }
+    }
+  }
+`;