admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
release/2022-05-20

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2022-05-20 16:20:12 +00:00
parent 8da2205a14 f3ee20e89d
commit 012d59e5b7
4 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/graphql/jobs.queries.js
View File

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

7
client/src/pages/parts-queue/parts-queue.page.component.jsx
View File

@@ -205,13 +205,6 @@ export function PartsQueuePageComponent({ bodyshop }) {
ellipsis: true, ellipsis: true,
sorter: (a, b) => alphaSort(a.clm_no, b.clm_no), sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
sortOrder: sortcolumn === "clm_no" && sortorder, 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"), // title: t("jobs.fields.clm_total"),

1
client/src/pages/phonebook/phonebook.page.component.jsx
View File

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

42
client/src/utils/GraphQLClient.js
View File

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