From 5f494e4b784b8aa1cf034c680dd613d331f2a969 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Fri, 26 Jul 2024 13:28:29 -0700 Subject: [PATCH] IO-2564 Revert location of query Signed-off-by: Allan Carr --- .../jobs-detail-pli/jobs-detail-pli.container.jsx | 10 +++++++++- .../pages/jobs-detail/jobs-detail.page.component.jsx | 11 +---------- client/src/translations/en_us/common.json | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/client/src/components/jobs-detail-pli/jobs-detail-pli.container.jsx b/client/src/components/jobs-detail-pli/jobs-detail-pli.container.jsx index 25b8081d0..ac2f6015d 100644 --- a/client/src/components/jobs-detail-pli/jobs-detail-pli.container.jsx +++ b/client/src/components/jobs-detail-pli/jobs-detail-pli.container.jsx @@ -1,9 +1,17 @@ +import { useQuery } from "@apollo/client"; import queryString from "query-string"; import React from "react"; import { useLocation, useNavigate } from "react-router-dom"; +import { QUERY_PARTS_BILLS_BY_JOBID } from "../../graphql/bills.queries"; import JobsDetailPliComponent from "./jobs-detail-pli.component"; -export default function JobsDetailPliContainer({ job, billsQuery }) { +export default function JobsDetailPliContainer({ job }) { + const billsQuery = useQuery(QUERY_PARTS_BILLS_BY_JOBID, { + variables: { jobid: job.id }, + fetchPolicy: "network-only", + nextFetchPolicy: "network-only" + }); + const search = queryString.parse(useLocation().search); const history = useNavigate(); diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx index e2f251b79..c841fcaf7 100644 --- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx +++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx @@ -10,8 +10,6 @@ import Icon, { } from "@ant-design/icons"; import { PageHeader } from "@ant-design/pro-layout"; import { Badge, Button, Divider, Form, notification, Space, Tabs } from "antd"; - -import { useQuery } from "@apollo/client"; import Axios from "axios"; import _ from "lodash"; import queryString from "query-string"; @@ -46,7 +44,6 @@ import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container" import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container"; import ScheduleJobModalContainer from "../../components/schedule-job-modal/schedule-job-modal.container"; import TaskListContainer from "../../components/task-list/task-list.container.jsx"; -import { QUERY_PARTS_BILLS_BY_JOBID } from "../../graphql/bills.queries.js"; import { QUERY_JOB_TASKS_PAGINATED } from "../../graphql/tasks.queries.js"; import { insertAuditTrail } from "../../redux/application/application.actions"; import { selectJobReadOnly } from "../../redux/application/application.selectors"; @@ -98,12 +95,6 @@ export function JobsDetailPage({ layout: "vertical" }; - const billsQuery = useQuery(QUERY_PARTS_BILLS_BY_JOBID, { - variables: { jobid: job.id }, - fetchPolicy: "network-only", - nextFetchPolicy: "network-only" - }); - useEffect(() => { //form.setFieldsValue(transormJobToForm(job)); form.resetFields(); @@ -334,7 +325,7 @@ export function JobsDetailPage({ label: HasFeatureAccess({ featureName: "bills", bodyshop }) ? t("menus.jobsdetail.partssublet") : t("menus.jobsdetail.parts"), - children: + children: }, ...(InstanceRenderManager({ imex: true, diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index b46f3c553..a5a9d4ab7 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -230,7 +230,7 @@ "markexported": "Mark Exported", "markforreexport": "Mark for Re-export", "new": "New Bill", - "nobilllines": "", + "nobilllines": "This part has not yet been recieved.", "noneselected": "No bill selected.", "onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.", "printlabels": "Print Labels",