Updates to all card components.

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

@@ -9,51 +9,51 @@ const errorLink = onError(
     console.log("networkError", networkError);
     console.log("operation", operation);
     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);
+    //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}` : ""
-                  }
-                }));
+            // 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);
-              });
+            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

@@ -7,6 +7,7 @@ export const GET_ALL_OPEN_JOBS = gql`
       est_number
       ro_number
       job_status {
+        id
         name
       }
       scheduled_completion
@@ -35,6 +36,7 @@ export const SUBSCRIPTION_ALL_OPEN_JOBS = gql`
       ro_number
       job_status {
         name
+        id
       }
       scheduled_completion
       scheduled_delivery
@@ -46,6 +48,7 @@ export const SUBSCRIPTION_ALL_OPEN_JOBS = gql`
         plate_no
       }
       owner {
+        id
         first_name
         last_name
       }
@@ -101,6 +104,7 @@ export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
           v_vin
         }
         owner {
+          id
           first_name
           last_name
         }
@@ -120,6 +124,7 @@ export const GET_JOB_BY_PK = gql`
       id
       local_tax_rate
       owner {
+        id
         first_name
         last_name
         phone
@@ -135,6 +140,7 @@ export const GET_JOB_BY_PK = gql`
       scheduled_in
       scheduled_delivery
       job_status {
+        id
         name
       }
       updated_at
@@ -161,10 +167,12 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       pit_owner_phone
       pit_owner_email
       owner {
+        id
         allow_text_message
         preferred_contact
       }
       vehicle {
+        id
         v_model_yr
         v_make_desc
         v_model_desc
@@ -175,27 +183,30 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       actual_completion
       actual_delivery
       actual_in
-      created_at
       est_number
       id
-      local_tax_rate
-
+      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
-      regie_number
+      clm_no
       ro_number
       scheduled_completion
       scheduled_in
       scheduled_delivery
       job_status {
+        id
         name
       }
       updated_at
       claim_total
-      deductible
+      ded_amt
       vehicle {
         id
         plate_no