Merged in release/2022-05-20 (pull request #488)

release/2022-05-20

Approved-by: Patrick Fic

client/src/graphql/jobs.queries.js

@@ -868,6 +868,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         v_model_desc
         v_color
         plate_no
+        notes
         jobs {
           id
           clm_no

client/src/pages/parts-queue/parts-queue.page.component.jsx

@@ -205,13 +205,6 @@ export function PartsQueuePageComponent({ bodyshop }) {
       ellipsis: true,
       sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder: sortcolumn === "clm_no" && sortorder,
-      render: (text, record) => {
-        return record.clm_no ? (
-          <span>{record.clm_no}</span>
-        ) : (
-          t("general.labels.unknown")
-        );
-      },
     },
     // {
     //   title: t("jobs.fields.clm_total"),

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

@@ -178,6 +178,7 @@ export function PhonebookPageComponent({ bodyshop, authLevel }) {
             placeholder={searchParams.search || t("general.labels.search")}
             onSearch={(value) => {
               searchParams.search = value;
+              searchParams.page = 1;
               history.push({ search: queryString.stringify(searchParams) });
             }}
           />

client/src/utils/GraphQLClient.js

@@ -6,10 +6,10 @@ import { WebSocketLink } from "@apollo/client/link/ws";
 import { getMainDefinition } from "@apollo/client/utilities";
 //import { split } from "apollo-link";
 import apolloLogger from "apollo-link-logger";
-import axios from "axios";
+//import axios from "axios";
 import { auth } from "../firebase/firebase.utils";
 import errorLink from "../graphql/apollo-error-handling";
-import { store } from "../redux/store";
+//import { store } from "../redux/store";
 const httpLink = new HttpLink({
   uri: process.env.REACT_APP_GRAPHQL_ENDPOINT,
 });
@@ -48,25 +48,25 @@ const roundTripLink = new ApolloLink((operation, forward) => {
 });
 
 const TrackExecutionTime = async (operationName, time) => {
-  if (process.env.NODE_ENV === "development") return;
-  const rdxStore = store.getState();
-  try {
-    axios.post("/ioevent", {
-      operationName,
-      time,
-      dbevent: true,
-      user:
-        rdxStore.user &&
-        rdxStore.user.currentUser &&
-        rdxStore.user.currentUser.email,
-      imexshopid:
-        rdxStore.user &&
-        rdxStore.user.bodyshop &&
-        rdxStore.user.bodyshop.imexshopid,
-    });
-  } catch (error) {
-    console.log("IOEvent Error", error);
-  }
+  // if (process.env.NODE_ENV === "development") return;
+  // const rdxStore = store.getState();
+  // try {
+  //   axios.post("/ioevent", {
+  //     operationName,
+  //     time,
+  //     dbevent: true,
+  //     user:
+  //       rdxStore.user &&
+  //       rdxStore.user.currentUser &&
+  //       rdxStore.user.currentUser.email,
+  //     imexshopid:
+  //       rdxStore.user &&
+  //       rdxStore.user.bodyshop &&
+  //       rdxStore.user.bodyshop.imexshopid,
+  //   });
+  // } catch (error) {
+  //   console.log("IOEvent Error", error);
+  // }
 };
 
 const subscriptionMiddleware = {