IO-3582 Remove Unneeded Query - Data in billQuery

Signed-off-by: Allan Carr <allan@imexsystems.ca>
This commit is contained in:
Allan Carr
2026-03-11 13:03:56 -07:00
parent f1f705903a
commit 70e962540d

View File

@@ -1,17 +1,16 @@
import { DeleteFilled } from "@ant-design/icons"; import { DeleteFilled } from "@ant-design/icons";
import { PageHeader } from "@ant-design/pro-layout"; import { PageHeader } from "@ant-design/pro-layout";
import { useLazyQuery, useMutation } from "@apollo/client/react"; import { useMutation } from "@apollo/client/react";
import { Button, Drawer, Grid, Popconfirm, Space } from "antd"; import { Button, Drawer, Grid, Popconfirm, Space } from "antd";
import ResponsiveTable from "../responsive-table/responsive-table.component"; import ResponsiveTable from "../responsive-table/responsive-table.component";
import queryString from "query-string"; import queryString from "query-string";
import { useEffect, useState } from "react"; import { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { FaTasks } from "react-icons/fa"; import { FaTasks } from "react-icons/fa";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { useLocation } from "react-router-dom"; import { useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { logImEXEvent } from "../../firebase/firebase.utils"; import { logImEXEvent } from "../../firebase/firebase.utils";
import { QUERY_BILL_BY_PK } from "../../graphql/bills.queries";
import { DELETE_PARTS_ORDER } from "../../graphql/parts-orders.queries"; import { DELETE_PARTS_ORDER } from "../../graphql/parts-orders.queries";
import { selectIsPartsEntry, selectJobReadOnly } from "../../redux/application/application.selectors"; import { selectIsPartsEntry, selectJobReadOnly } from "../../redux/application/application.selectors";
import { setModalContext } from "../../redux/modals/modals.actions"; import { setModalContext } from "../../redux/modals/modals.actions";
@@ -92,34 +91,14 @@ export function PartsOrderListTableDrawerComponent({
sortedInfo: {} sortedInfo: {}
}); });
const [billData, setBillData] = useState(null);
const search = queryString.parse(useLocation().search); const search = queryString.parse(useLocation().search);
const selectedpartsorder = search.partsorderid; const selectedpartsorder = search.partsorderid;
const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER); const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : []; const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
const { refetch } = billsQuery; const { refetch } = billsQuery;
const [billQuery] = useLazyQuery(QUERY_BILL_BY_PK);
const selectedPartsOrderRecord = parts_orders.find((r) => r.id === selectedpartsorder); const selectedPartsOrderRecord = parts_orders.find((r) => r.id === selectedpartsorder);
useEffect(() => {
const fetchData = async () => {
if (selectedPartsOrderRecord?.returnfrombill) {
try {
const { data } = await billQuery({
variables: {
billid: selectedPartsOrderRecord.returnfrombill
}
});
setBillData(data);
} catch (error) {
console.error("Error fetching bill data:", error);
}
} else setBillData(null);
};
fetchData();
}, [selectedPartsOrderRecord, billQuery]);
const recordActions = (record) => ( const recordActions = (record) => (
<Space orientation="horizontal" wrap> <Space orientation="horizontal" wrap>
<Button <Button
@@ -363,9 +342,9 @@ export function PartsOrderListTableDrawerComponent({
<div> <div>
<PageHeader <PageHeader
title={ title={
billData selectedPartsOrderRecord.returnfrombill
? `${record.vendor.name} - ${record.order_number} - ${t("bills.labels.returnfrombill")}: ${billData.bills_by_pk.invoice_number}` ? `${selectedPartsOrderRecord.vendor.name} - ${selectedPartsOrderRecord.order_number} - ${t("bills.labels.returnfrombill")}: ${selectedPartsOrderRecord.bill.invoice_number}`
: `${record.vendor.name} - ${record.order_number}` : `${selectedPartsOrderRecord.vendor.name} - ${selectedPartsOrderRecord.order_number}`
} }
extra={recordActions(record)} extra={recordActions(record)}
/> />