IO-2564 Row Expander Links

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx

@@ -3,7 +3,7 @@ import React from "react";
 import { useQuery } from "@apollo/client";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { QUERY_BILLS_BY_JOBID } from "../../graphql/bills.queries";
+import { QUERY_PARTS_BILLS_BY_JOBID } from "../../graphql/bills.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
@@ -19,7 +19,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardBills);
 
 export function JobCloseRoGuardBills({ job, jobRO, bodyshop, form, warningCallback }) {
-  const { loading, error, data } = useQuery(QUERY_BILLS_BY_JOBID, {
+  const { loading, error, data } = useQuery(QUERY_PARTS_BILLS_BY_JOBID, {
     variables: { jobid: job.id },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"

client/src/components/job-detail-lines/job-lines-expander.component.jsx

@@ -2,17 +2,17 @@ import { useQuery } from "@apollo/client";
 import { Col, Row, Skeleton, Space, Timeline, Typography } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { Link } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import { GET_JOB_LINE_ORDERS } from "../../graphql/jobs.queries";
+import { QUERY_JOBLINE_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { QUERY_JOBLINE_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
-import TaskListContainer from "../task-list/task-list.container.jsx";
 import FeatureWrapper from "../feature-wrapper/feature-wrapper.component.jsx";
+import TaskListContainer from "../task-list/task-list.container.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -84,17 +84,17 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
                   key: line.id,
                   children: (
                     <Row>
-                      <Col span={8}>
-                        <Link to={`/manage/jobs/${jobid}?partsorderid=${line.id}`}>{line.parts_dispatch.number}</Link>
-                      </Col>
+                      <Col span={8}>{line.parts_dispatch.number}</Col>
                       <Col span={8}>
                         {bodyshop.employees.find((e) => e.id === line.parts_dispatch.employeeid)?.first_name}
                       </Col>
                       <Col span={8}>
-                        <Space>
-                          {t("parts_dispatch_lines.fields.accepted_at")}
-                          <DateFormatter>{line.accepted_at}</DateFormatter>
-                        </Space>
+                        {line.accepted_at ? (
+                          <Space>
+                            {t("parts_dispatch_lines.fields.accepted_at")}
+                            <DateFormatter>{line.accepted_at}</DateFormatter>
+                          </Space>
+                        ) : null}
                       </Col>
                     </Row>
                   )

client/src/components/jobs-detail-pli/jobs-detail-pli.container.jsx

@@ -1,17 +1,9 @@
-import { useQuery } from "@apollo/client";
 import queryString from "query-string";
 import React from "react";
 import { useLocation, useNavigate } from "react-router-dom";
-import { QUERY_BILLS_BY_JOBID } from "../../graphql/bills.queries";
 import JobsDetailPliComponent from "./jobs-detail-pli.component";
 
-export default function JobsDetailPliContainer({ job }) {
-  const billsQuery = useQuery(QUERY_BILLS_BY_JOBID, {
-    variables: { jobid: job.id },
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only"
-  });
-
+export default function JobsDetailPliContainer({ job, billsQuery }) {
   const search = queryString.parse(useLocation().search);
   const history = useNavigate();
 

client/src/graphql/bills.queries.js

@@ -50,7 +50,7 @@ export const QUERY_ALL_BILLS_PAGINATED = gql`
   }
 `;
 
-export const QUERY_BILLS_BY_JOBID = gql`
+export const QUERY_PARTS_BILLS_BY_JOBID = gql`
   query QUERY_PARTS_BILLS_BY_JOBID($jobid: uuid!) {
     parts_orders(where: { jobid: { _eq: $jobid } }, order_by: { order_date: desc }) {
       id

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -8,11 +8,12 @@ import Icon, {
   SyncOutlined,
   ToolFilled
 } from "@ant-design/icons";
-import { Badge, Button, Divider, Form, notification, Space, Tabs } from "antd";
 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 dayjs from "../../utils/day";
+import _ from "lodash";
 import queryString from "query-string";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,11 +21,13 @@ import { FaHardHat, FaRegStickyNote, FaShieldAlt, FaTasks } from "react-icons/fa
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
 import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
 import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
 import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
 import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
 import JobLineUpsertModalContainer from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
+import JobProfileDataWarning from "../../components/job-profile-data-warning/job-profile-data-warning.component";
 import JobReconciliationModal from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
 import JobSyncButton from "../../components/job-sync-button/job-sync-button.component";
 import JobsChangeStatus from "../../components/jobs-change-status/jobs-change-status.component";
@@ -42,19 +45,18 @@ import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gal
 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";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import UndefinedToNull from "../../utils/undefinedtonull";
-import _ from "lodash";
-import JobProfileDataWarning from "../../components/job-profile-data-warning/job-profile-data-warning.component";
 import { DateTimeFormat } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
-import TaskListContainer from "../../components/task-list/task-list.container.jsx";
-import { QUERY_JOB_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
+import UndefinedToNull from "../../utils/undefinedtonull";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -96,6 +98,12 @@ 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();
@@ -326,7 +334,7 @@ export function JobsDetailPage({
               label: HasFeatureAccess({ featureName: "bills", bodyshop })
                 ? t("menus.jobsdetail.partssublet")
                 : t("menus.jobsdetail.parts"),
-              children: <JobsDetailPliContainer job={job} />
+              children: <JobsDetailPliContainer job={job} billsQuery={billsQuery} />
             },
             ...(InstanceRenderManager({
               imex: true,