From f3ee20e89da3ec0c78e61004a08bb81ec1cc034e Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Fri, 20 May 2022 09:19:54 -0700 Subject: [PATCH] Bug fixes for this weeks stories. --- client/src/graphql/jobs.queries.js | 1 + .../src/pages/parts-queue/parts-queue.page.component.jsx | 7 ------- client/src/pages/phonebook/phonebook.page.component.jsx | 1 + client/src/utils/GraphQLClient.js | 4 ++-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 8603fcfe6..706bf425e 100644 --- a/client/src/graphql/jobs.queries.js +++ b/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 diff --git a/client/src/pages/parts-queue/parts-queue.page.component.jsx b/client/src/pages/parts-queue/parts-queue.page.component.jsx index 651125800..b0b66cbf1 100644 --- a/client/src/pages/parts-queue/parts-queue.page.component.jsx +++ b/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 ? ( - {record.clm_no} - ) : ( - t("general.labels.unknown") - ); - }, }, // { // title: t("jobs.fields.clm_total"), diff --git a/client/src/pages/phonebook/phonebook.page.component.jsx b/client/src/pages/phonebook/phonebook.page.component.jsx index 883cb5d81..9a7a13777 100644 --- a/client/src/pages/phonebook/phonebook.page.component.jsx +++ b/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) }); }} /> diff --git a/client/src/utils/GraphQLClient.js b/client/src/utils/GraphQLClient.js index 258fdbd7e..eb631aff8 100644 --- a/client/src/utils/GraphQLClient.js +++ b/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, });