{loading &&
}
- {error &&
}
+ {error &&
}
{selectedMedia.filter((s) => s.isSelected).length >= 10 ? (
{t("messaging.labels.maxtenimages")}
) : null}
diff --git a/client/src/components/chat-popup/chat-popup.component.jsx b/client/src/components/chat-popup/chat-popup.component.jsx
index 95513e09c..1ce052b11 100644
--- a/client/src/components/chat-popup/chat-popup.component.jsx
+++ b/client/src/components/chat-popup/chat-popup.component.jsx
@@ -1,5 +1,5 @@
import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined } from "@ant-design/icons";
-import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client";
+import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client/react";
import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
import { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
@@ -51,21 +51,29 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
// Query for unread count when chat is not visible and socket is not connected.
// (Once socket connects, we stop this query; we keep the last known value in state.)
- useQuery(UNREAD_CONVERSATION_COUNT, {
+ const { data: unreadData, error: unreadError } = useQuery(UNREAD_CONVERSATION_COUNT, {
fetchPolicy: "network-only",
nextFetchPolicy: "network-only",
skip: chatVisible || socket?.connected,
- pollInterval: socket?.connected ? 0 : 60 * 1000,
- onCompleted: (result) => {
- const nextCount = result?.messages_aggregate?.aggregate?.count;
- if (typeof nextCount === "number") setUnreadAggregateCount(nextCount);
- },
- onError: (err) => {
- // Keep last known count; do not force badge to zero on transient failures
- console.warn("UNREAD_CONVERSATION_COUNT failed:", err?.message || err);
- }
+ pollInterval: socket?.connected ? 0 : 60 * 1000
});
+ // Handle unread count updates in useEffect
+ useEffect(() => {
+ if (unreadData) {
+ const nextCount = unreadData?.messages_aggregate?.aggregate?.count;
+ if (typeof nextCount === "number") setUnreadAggregateCount(nextCount);
+ }
+ }, [unreadData]);
+
+ // Handle unread count errors in useEffect
+ useEffect(() => {
+ if (unreadError) {
+ // Keep last known count; do not force badge to zero on transient failures
+ console.warn("UNREAD_CONVERSATION_COUNT failed:", unreadError?.message || unreadError);
+ }
+ }, [unreadError]);
+
// Socket connection status -> polling strategy for CONVERSATION_LIST_QUERY
useEffect(() => {
const handleSocketStatus = () => {
@@ -97,9 +105,7 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
hasLoadedConversationsOnceRef.current = true;
- getConversations({
- variables: { offset: 0 }
- }).catch((err) => {
+ getConversations({ offset: 0 }).catch((err) => {
console.error(`Error fetching conversations: ${err?.message || ""}`, err);
});
}, [getConversations]);
@@ -107,9 +113,9 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
const handleManualRefresh = async () => {
try {
if (called && typeof refetch === "function") {
- await refetch({ offset: 0 });
+ await refetch({ variables: { offset: 0 } });
} else {
- await getConversations({ variables: { offset: 0 } });
+ await getConversations({ offset: 0 });
}
} catch (err) {
console.error(`Error refreshing conversations: ${err?.message || ""}`, err);
diff --git a/client/src/components/chat-send-message/chat-send-message.component.jsx b/client/src/components/chat-send-message/chat-send-message.component.jsx
index 5b4d31d14..83098d1f9 100644
--- a/client/src/components/chat-send-message/chat-send-message.component.jsx
+++ b/client/src/components/chat-send-message/chat-send-message.component.jsx
@@ -10,7 +10,7 @@ import { selectIsSending, selectMessage } from "../../redux/messaging/messaging.
import { selectBodyshop } from "../../redux/user/user.selectors";
import ChatMediaSelector from "../chat-media-selector/chat-media-selector.component";
import ChatPresetsComponent from "../chat-presets/chat-presets.component";
-import { useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client/react";
import { phone } from "phone";
import { GET_PHONE_NUMBER_OPT_OUT } from "../../graphql/phone-number-opt-out.queries";
@@ -68,13 +68,13 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
};
return (
-
+
{isOptedOut && (
}
- message={t("messaging.errors.no_consent")}
+ title={t("messaging.errors.no_consent")}
type="error"
/>
diff --git a/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx b/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx
index 3b4fb5c3d..e9dc14b07 100644
--- a/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx
+++ b/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx
@@ -10,12 +10,13 @@ export default function ChatTagRoComponent({ roOptions, loading, handleSearch, h
:
}
>
diff --git a/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx b/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx
index d6c5bef4c..2ef8bc63b 100644
--- a/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx
+++ b/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx
@@ -1,5 +1,5 @@
import { PlusOutlined } from "@ant-design/icons";
-import { useLazyQuery, useMutation } from "@apollo/client";
+import { useLazyQuery, useMutation } from "@apollo/client/react";
import { Tag } from "antd";
import _ from "lodash";
import { useState } from "react";
@@ -34,7 +34,7 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
const debouncedExecuteSearch = _.debounce(executeSearch, 500);
const handleSearch = (value) => {
- debouncedExecuteSearch({ variables: { search: value } });
+ debouncedExecuteSearch({ search: value });
};
const [insertTag] = useMutation(INSERT_CONVERSATION_TAG, {
diff --git a/client/src/components/contract-cars/contract-cars.component.jsx b/client/src/components/contract-cars/contract-cars.component.jsx
index ad606af1f..12ed17e89 100644
--- a/client/src/components/contract-cars/contract-cars.component.jsx
+++ b/client/src/components/contract-cars/contract-cars.component.jsx
@@ -104,7 +104,7 @@ export default function ContractsCarsComponent({ loading, data, selectedCarId, h
>
;
+ if (error) return
;
return (
{
- call({ variables: { id: jobId } });
+ call({ id: jobId });
};
useEffect(() => {
diff --git a/client/src/components/contract-form/contract-form.component.jsx b/client/src/components/contract-form/contract-form.component.jsx
index 2c868804d..5245348e6 100644
--- a/client/src/components/contract-form/contract-form.component.jsx
+++ b/client/src/components/contract-form/contract-form.component.jsx
@@ -67,7 +67,7 @@ export default function ContractFormComponent({ form, create = false, selectedJo
.isBefore(dayjs(form.getFieldValue("scheduledreturn")));
if (insuranceOver)
return (
-
+
{t("contracts.labels.insuranceexpired")}
@@ -107,7 +107,7 @@ export default function ContractFormComponent({ form, create = false, selectedJo
.isSameOrBefore(dayjs(form.getFieldValue("scheduledreturn")));
if (mileageOver || dueForService)
return (
-
+
{t("contracts.labels.cardueforservice")}
diff --git a/client/src/components/contract-jobs/contract-jobs.component.jsx b/client/src/components/contract-jobs/contract-jobs.component.jsx
index f35e5ff99..8ed060873 100644
--- a/client/src/components/contract-jobs/contract-jobs.component.jsx
+++ b/client/src/components/contract-jobs/contract-jobs.component.jsx
@@ -128,11 +128,7 @@ export default function ContractsJobsComponent({ loading, data, selectedJob, han
>
;
+ if (error) return ;
return (
form.submit()} type="primary" loading={loading}>
{t("general.labels.search")}
- {error && }
+ {error && }
+
{t("contracts.labels.cardueforservice")}
@@ -232,7 +232,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading, newC
if (dueForService)
return (
-
+
{t("contracts.labels.cardueforservice")}
@@ -265,7 +265,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading, newC
if (dateover)
return (
-
+
{t("contracts.labels.dateinpast")}
@@ -298,7 +298,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading, newC
if (dateover)
return (
-
+
{t("contracts.labels.dateinpast")}
diff --git a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx
index 98a8cbbf1..aa9ebd817 100644
--- a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx
+++ b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx
@@ -8,7 +8,7 @@ import { selectCourtesyCarReturn } from "../../redux/modals/modals.selectors";
import CourtesyCarReturnModalComponent from "./courtesy-car-return-modal.component";
import dayjs from "../../utils/day";
import { RETURN_CONTRACT } from "../../graphql/cccontracts.queries";
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
const mapStateToProps = createStructuredSelector({
diff --git a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
index aa64506da..4ef5d22ed 100644
--- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
+++ b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
@@ -278,7 +278,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
>
;
- if (error) return ;
+ if (error) return ;
return (
diff --git a/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx b/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx
index 530ab86e1..fc47e3df6 100644
--- a/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx
+++ b/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx
@@ -94,12 +94,7 @@ export default function CsiResponseListPaginated({ refetch, loading, responses,
>
-
+
diff --git a/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx b/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
index ca491fe8c..0bc11183f 100644
--- a/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
+++ b/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
@@ -105,7 +105,7 @@ export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
;
@@ -36,19 +34,17 @@ export default function DashboardMonthlyLaborSales({ data, ...cardProps }) {
return (
-
+
setActiveIndex(index)}
>
{chartData.map((entry, index) => (
|
@@ -95,7 +91,8 @@ const renderActiveShape = (props) => {
fill,
payload,
// percent,
- value
+ value,
+ isActive
} = props;
// const sin = Math.sin(-RADIAN * midAngle);
// const cos = Math.cos(-RADIAN * midAngle);
@@ -109,12 +106,16 @@ const renderActiveShape = (props) => {
return (
-
- {payload.name}
-
-
- {Dinero({ amount: Math.round(value * 100) }).toFormat()}
-
+ {isActive && (
+ <>
+
+ {payload.name}
+
+
+ {Dinero({ amount: Math.round(value * 100) }).toFormat()}
+
+
+ )}
{
endAngle={endAngle}
fill={fill}
/>
-
+ {isActive && (
+
+ )}
);
};
diff --git a/client/src/components/dashboard-components/monthly-parts-sales/monthly-parts-sales.component.jsx b/client/src/components/dashboard-components/monthly-parts-sales/monthly-parts-sales.component.jsx
index 23ffa8a86..a01424ff9 100644
--- a/client/src/components/dashboard-components/monthly-parts-sales/monthly-parts-sales.component.jsx
+++ b/client/src/components/dashboard-components/monthly-parts-sales/monthly-parts-sales.component.jsx
@@ -1,13 +1,11 @@
import { Card } from "antd";
import Dinero from "dinero.js";
-import { useState } from "react";
import { useTranslation } from "react-i18next";
import { Cell, Pie, PieChart, ResponsiveContainer, Sector } from "recharts";
import DashboardRefreshRequired from "../refresh-required.component";
export default function DashboardMonthlyPartsSales({ data, ...cardProps }) {
const { t } = useTranslation();
- const [activeIndex, setActiveIndex] = useState(0);
if (!data) return null;
if (!data.monthly_sales) return ;
@@ -34,19 +32,17 @@ export default function DashboardMonthlyPartsSales({ data, ...cardProps }) {
return (
-
+
setActiveIndex(index)}
>
{chartData.map((entry, index) => (
|
@@ -91,7 +87,8 @@ const renderActiveShape = (props) => {
fill,
payload,
// percent,
- value
+ value,
+ isActive
} = props;
// const sin = Math.sin(-RADIAN * midAngle);
// const cos = Math.cos(-RADIAN * midAngle);
@@ -105,12 +102,16 @@ const renderActiveShape = (props) => {
return (
-
- {payload.name}
-
-
- {Dinero({ amount: Math.round(value * 100) }).toFormat()}
-
+ {isActive && (
+ <>
+
+ {payload.name}
+
+
+ {Dinero({ amount: Math.round(value * 100) }).toFormat()}
+
+
+ )}
{
endAngle={endAngle}
fill={fill}
/>
-
+ {isActive && (
+
+ )}
);
};
diff --git a/client/src/components/dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component.jsx b/client/src/components/dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component.jsx
index c91e6b098..e6bd95183 100644
--- a/client/src/components/dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component.jsx
+++ b/client/src/components/dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component.jsx
@@ -40,7 +40,7 @@ export default function DashboardMonthlyRevenueGraph({ data, ...cardProps }) {
return (
-
+
diff --git a/client/src/components/dashboard-components/total-production-hours/total-production-hours.component.jsx b/client/src/components/dashboard-components/total-production-hours/total-production-hours.component.jsx
index 228e04c23..5c29a1962 100644
--- a/client/src/components/dashboard-components/total-production-hours/total-production-hours.component.jsx
+++ b/client/src/components/dashboard-components/total-production-hours/total-production-hours.component.jsx
@@ -36,7 +36,7 @@ export function DashboardTotalProductionHours({ bodyshop, data, ...cardProps })
diff --git a/client/src/components/dashboard-grid/dashboard-grid.component.jsx b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
index 85b79f166..b9f0a6145 100644
--- a/client/src/components/dashboard-grid/dashboard-grid.component.jsx
+++ b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
@@ -1,15 +1,15 @@
import Icon, { SyncOutlined } from "@ant-design/icons";
-import { useMutation, useQuery } from "@apollo/client";
+import { useMutation, useQuery } from "@apollo/client/react";
import { Button, Dropdown, Space } from "antd";
import { PageHeader } from "@ant-design/pro-layout";
-import { useMemo, useState, useEffect } from "react";
-import { Responsive, WidthProvider } from "react-grid-layout";
+import { useEffect, useMemo, useState } from "react";
+import { Responsive, WidthProvider } from "react-grid-layout/legacy";
import { useTranslation } from "react-i18next";
import { MdClose } from "react-icons/md";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { logImEXEvent } from "../../firebase/firebase.utils";
-import { UPDATE_DASHBOARD_LAYOUT, QUERY_USER_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
+import { QUERY_USER_DASHBOARD_LAYOUT, UPDATE_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
import { QUERY_DASHBOARD_BODYSHOP } from "../../graphql/bodyshop.queries";
import { selectCurrentUser } from "../../redux/user/user.selectors";
import AlertComponent from "../alert/alert.component";
@@ -156,7 +156,7 @@ export function DashboardGridComponent({ currentUser }) {
);
if (loading || dashboardLoading) return ;
- if (error || dashboardError) return ;
+ if (error || dashboardError) return ;
const handleLayoutChange = async (layout, layouts) => {
logImEXEvent("dashboard_change_layout");
diff --git a/client/src/components/data-label/data-label.component.jsx b/client/src/components/data-label/data-label.component.jsx
index bcb6fb638..c574600a6 100644
--- a/client/src/components/data-label/data-label.component.jsx
+++ b/client/src/components/data-label/data-label.component.jsx
@@ -5,7 +5,7 @@ export default function DataLabel({
hideIfNull,
children,
open = true,
- valueStyle = {},
+ styles,
valueClassName,
onValueClick,
...props
@@ -33,7 +33,11 @@ export default function DataLabel({
className={valueClassName}
onClick={onValueClick}
>
- {typeof children === "string" ? {children} : children}
+ {typeof children === "string" ? (
+ {children}
+ ) : (
+ children
+ )}
`${record.InvoiceNumber}${record.Account}`}
dataSource={allocationsSummary}
diff --git a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
index c985b7bd5..3ed0aaedd 100644
--- a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
+++ b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
@@ -112,11 +112,11 @@ export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title, on
}
>
{bodyshop.pbs_configuration?.disablebillwip && (
-
+
)}
{bodyshop.pbs_configuration?.disablebillwip && (
-
+
)}
- {error && }
+ {error && }
diff --git a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
index f64cd2216..1d1ec3d11 100644
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
@@ -1,4 +1,4 @@
-import { useLazyQuery } from "@apollo/client";
+import { useLazyQuery } from "@apollo/client/react";
import { Button, Input, Modal, Table } from "antd";
import { useState } from "react";
import { useTranslation } from "react-i18next";
@@ -56,11 +56,11 @@ export function DmsCdkVehicles({ form, job }) {
setOpen(false);
}}
>
- {error && }
+ {error && }
(
callSearch({ variables: { search: val } })}
+ onSearch={(val) => callSearch({ search: val })}
placeholder={t("general.labels.search")}
/>
)}
@@ -87,9 +87,7 @@ export function DmsCdkVehicles({ form, job }) {
onClick={() => {
setOpen(true);
callSearch({
- variables: {
- search: job?.v_model_desc && job.v_model_desc.substr(0, 3)
- }
+ search: job?.v_model_desc && job.v_model_desc.substr(0, 3)
});
}}
>
diff --git a/client/src/components/dms-customer-selector/cdk-customer-selector.jsx b/client/src/components/dms-customer-selector/cdk-customer-selector.jsx
index 861620832..479b23f0c 100644
--- a/client/src/components/dms-customer-selector/cdk-customer-selector.jsx
+++ b/client/src/components/dms-customer-selector/cdk-customer-selector.jsx
@@ -84,7 +84,7 @@ export default function CDKCustomerSelector({ bodyshop, socket }) {
)}
- pagination={{ position: "top" }}
+ pagination={{ placement: "top" }}
columns={columns}
rowKey={rowKey}
dataSource={customerList}
diff --git a/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx b/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx
index 6d9c05074..2cb396711 100644
--- a/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx
+++ b/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx
@@ -90,7 +90,7 @@ export default function FortellisCustomerSelector({ bodyshop, jobid, socket }) {
)}
- pagination={{ position: "top" }}
+ pagination={{ placement: "top" }}
columns={columns}
rowKey={(r) => r.customerId}
dataSource={customerList}
diff --git a/client/src/components/dms-customer-selector/pbs-customer-selector.jsx b/client/src/components/dms-customer-selector/pbs-customer-selector.jsx
index e2717327c..43fd28b02 100644
--- a/client/src/components/dms-customer-selector/pbs-customer-selector.jsx
+++ b/client/src/components/dms-customer-selector/pbs-customer-selector.jsx
@@ -78,7 +78,7 @@ export default function PBSCustomerSelector({ bodyshop, socket }) {
)}
- pagination={{ position: "top" }}
+ pagination={{ placement: "top" }}
columns={columns}
rowKey={(r) => r.ContactId}
dataSource={customerList}
diff --git a/client/src/components/dms-customer-selector/rr-customer-selector.jsx b/client/src/components/dms-customer-selector/rr-customer-selector.jsx
index 13d30f4c1..3622f61f1 100644
--- a/client/src/components/dms-customer-selector/rr-customer-selector.jsx
+++ b/client/src/components/dms-customer-selector/rr-customer-selector.jsx
@@ -179,7 +179,7 @@ export default function RRCustomerSelector({
@@ -201,7 +201,7 @@ export default function RRCustomerSelector({
@@ -234,7 +234,7 @@ export default function RRCustomerSelector({
@@ -251,7 +251,7 @@ export default function RRCustomerSelector({
)}
)}
- pagination={{ position: "top" }}
+ pagination={{ placement: "top" }}
columns={columns}
rowKey={(r) => r.custNo}
dataSource={customerList}
diff --git a/client/src/components/dms-log-events/dms-log-events.component.jsx b/client/src/components/dms-log-events/dms-log-events.component.jsx
index d71f3633f..25f8c27ff 100644
--- a/client/src/components/dms-log-events/dms-log-events.component.jsx
+++ b/client/src/components/dms-log-events/dms-log-events.component.jsx
@@ -70,17 +70,17 @@ export function DmsLogEvents({
key: idx,
color: logLevelColor(level),
children: (
-
+
{/* Row 1: summary + inline "Details" toggle */}
{level}
-
+
{dayjs(timestamp).format("MM/DD/YYYY HH:mm:ss")}
-
+
{message}
{hasMeta && (
<>
-
+
=
{t("help.labels.rescuedesc")}
;
+ if (error) return ;
return (
{
if (data?.jobs_by_pk) {
const totalHours =
@@ -87,7 +86,7 @@ export function ScheduleEventComponent({
});
const blockContent = (
-
+
setTitle(e.currentTarget.value)}
@@ -232,7 +231,10 @@ export function ScheduleEventComponent({
{(event.job && event.job.alt_transport) || ""}
-
+
@@ -409,7 +411,7 @@ export function ScheduleEventComponent({
onClick={(e) => {
if (event.job?.id) {
e.stopPropagation();
- getJobDetails();
+ getJobDetails({ id: event.job.id });
}
}}
getPopupContainer={(trigger) => trigger.parentNode}
diff --git a/client/src/components/job-at-change/schedule-event.container.jsx b/client/src/components/job-at-change/schedule-event.container.jsx
index 23c38b8cb..4354fa4bd 100644
--- a/client/src/components/job-at-change/schedule-event.container.jsx
+++ b/client/src/components/job-at-change/schedule-event.container.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { useTranslation } from "react-i18next";
import { useDispatch } from "react-redux";
import { logImEXEvent } from "../../firebase/firebase.utils";
diff --git a/client/src/components/job-at-change/schedule-event.note.component.jsx b/client/src/components/job-at-change/schedule-event.note.component.jsx
index 57cdbd07d..975cdb4af 100644
--- a/client/src/components/job-at-change/schedule-event.note.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.note.component.jsx
@@ -1,5 +1,5 @@
import { EditFilled, SaveFilled } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button, Input, Space } from "antd";
import { useState } from "react";
import { useTranslation } from "react-i18next";
diff --git a/client/src/components/job-audit-trail/job-audit-trail.component.jsx b/client/src/components/job-audit-trail/job-audit-trail.component.jsx
index dcf4ccb9e..9ad6a6b3c 100644
--- a/client/src/components/job-audit-trail/job-audit-trail.component.jsx
+++ b/client/src/components/job-audit-trail/job-audit-trail.component.jsx
@@ -1,5 +1,5 @@
import { SyncOutlined } from "@ant-design/icons";
-import { useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client/react";
import { Button, Card, Col, Row, Table, Tag } from "antd";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
diff --git a/client/src/components/job-bills-total/job-bills-total.component.jsx b/client/src/components/job-bills-total/job-bills-total.component.jsx
index 961579e8f..28a6c9fd6 100644
--- a/client/src/components/job-bills-total/job-bills-total.component.jsx
+++ b/client/src/components/job-bills-total/job-bills-total.component.jsx
@@ -33,7 +33,7 @@ export function JobBillsTotalComponent({
if (showWarning && warningCallback && typeof warningCallback === "function") {
warningCallback({ key: "bills", warning: t("jobs.errors.nofinancial") });
}
- return ;
+ return ;
}
const totals = jobTotals;
@@ -55,8 +55,9 @@ export function JobBillsTotalComponent({
);
if (pol.cm_received === null) {
- return; //TODO:AIO This was previously removed. Check if functionality impacted.
+ //TODO:AIO This was previously removed. Check if functionality impacted.
// Skip this calculation for bills posted prior to the CNR change.
+ return;
} else {
if (pol.cm_received === false) {
totalReturnsMarkedNotReceived = totalReturnsMarkedNotReceived.add(
@@ -174,8 +175,10 @@ export function JobBillsTotalComponent({
@@ -208,8 +211,10 @@ export function JobBillsTotalComponent({
@@ -242,8 +247,10 @@ export function JobBillsTotalComponent({
@@ -257,7 +264,7 @@ export function JobBillsTotalComponent({
)}
@@ -290,8 +297,10 @@ export function JobBillsTotalComponent({
= 0
@@ -313,8 +322,10 @@ export function JobBillsTotalComponent({
= 0
@@ -326,7 +337,7 @@ export function JobBillsTotalComponent({
{showWarning && calculatedCreditsNotReceived.getAmount() > 0 && (
-
+
)}
diff --git a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
index 013562906..e5a8480af 100644
--- a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
+++ b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button, Card, Form, Input, Switch } from "antd";
import queryString from "query-string";
import { useState } from "react";
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx b/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx
index 54adbbf2d..e856bf240 100644
--- a/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx
+++ b/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx
@@ -1,4 +1,4 @@
-import { useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client/react";
import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -30,7 +30,7 @@ export function JobCloseRoGuardLabor({ job, bodyshop, warningCallback }) {
});
if (loading) return ;
- if (error) return ;
+ if (error) return ;
return Enhanced_Payroll.treatment === "on" ? (
{total.toFormat()}
{balance.toFormat()}
{balance.getAmount() !== 0 && (
-
+
)}
);
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx
index e071f9ae2..6f8319e5d 100644
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx
@@ -1,4 +1,4 @@
-import { useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client/react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { QUERY_PARTS_BILLS_BY_JOBID } from "../../graphql/bills.queries";
@@ -18,7 +18,7 @@ export function JobCloseRoGuardBills({ job, warningCallback }) {
nextFetchPolicy: "network-only"
});
- if (error) return ;
+ if (error) return ;
return (
)}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {InstanceRenderManager({
+ rome: (
+
+ {/* */}
+
+
+ )
+ })}
+
+
+
+
+ ({
+ validator(_, value) {
+ if (
+ !PasswordCheck({ bodyshop, value }) &&
+ bodyshop.md_ro_guard.enforce_bills &&
+ warnings.find((w) => w.key === "bills")
+ ) {
+ return Promise.reject(
+ t("jobs.labels.ro_guard.enforce_validation", {
+ message: t("jobs.labels.ro_guard.enforce_bills")
+ })
+ );
+ }
+ return Promise.resolve();
+ }
+ }),
+ () => ({
+ validator(_, value) {
+ if (
+ !PasswordCheck({ bodyshop, value }) &&
+ bodyshop.md_ro_guard.enforce_cm &&
+ warnings.find((w) => w.key === "cm")
+ ) {
+ return Promise.reject(
+ t("jobs.labels.ro_guard.enforce_validation", {
+ message: t("jobs.labels.ro_guard.enforce_cm")
+ })
+ );
+ }
+ return Promise.resolve();
+ }
+ }),
+ () => ({
+ validator(_, value) {
+ if (
+ !PasswordCheck({ bodyshop, value }) &&
+ bodyshop.md_ro_guard.enforce_profit &&
+ warnings.find((w) => w.key === "profit")
+ ) {
+ return Promise.reject(
+ t("jobs.labels.ro_guard.enforce_validation", {
+ message: t("jobs.labels.ro_guard.enforce_profit")
+ })
+ );
+ }
+ return Promise.resolve();
+ }
+ }),
+ () => ({
+ validator(_, value) {
+ if (
+ !PasswordCheck({ bodyshop, value }) &&
+ bodyshop.md_ro_guard.enforce_ar &&
+ warnings.find((w) => w.key === "ar")
+ ) {
+ return Promise.reject(
+ t("jobs.labels.ro_guard.enforce_validation", {
+ message: t("jobs.labels.ro_guard.enforce_ar")
+ })
+ );
+ }
+ return Promise.resolve();
+ }
+ }),
+ () => ({
+ validator(_, value) {
+ if (
+ !PasswordCheck({ bodyshop, value }) &&
+ bodyshop.md_ro_guard.enforce_sublet &&
+ warnings.find((w) => w.key === "sublet")
+ ) {
+ return Promise.reject(
+ t("jobs.labels.ro_guard.enforce_validation", {
+ message: t("jobs.labels.ro_guard.enforce_sublet")
+ })
+ );
+ }
+ return Promise.resolve();
+ }
+ }),
+ () => ({
+ validator(_, value) {
+ if (
+ !PasswordCheck({ bodyshop, value }) &&
+ bodyshop.md_ro_guard.enforce_ppd &&
+ warnings.find((w) => w.key === "ppd")
+ ) {
+ return Promise.reject(
+ t("jobs.labels.ro_guard.enforce_validation", {
+ message: t("jobs.labels.ro_guard.enforce_ppd")
+ })
+ );
+ }
+ return Promise.resolve();
+ }
+ }),
+ () => ({
+ validator(_, value) {
+ if (
+ !PasswordCheck({ bodyshop, value }) &&
+ bodyshop.md_ro_guard.enforce_labor &&
+ warnings.find((w) => w.key === "labor")
+ ) {
+ return Promise.reject(
+ t("jobs.labels.ro_guard.enforce_validation", {
+ message: t("jobs.labels.ro_guard.enforce_labor")
+ })
+ );
+ }
+ return Promise.resolve();
+ }
+ })
+ ]}
+ >
+ } type="password" placeholder="Password" disabled={jobRO} />
+
+
+ )
+ },
+ {
+ key: "job-performance",
+ label: t("jobs.labels.performance"),
+ children: (
+
+
+
-
- {InstanceRenderManager({
- rome: (
-
- {/* */}
-
-
- )
- })}
-
-
-
-
- ({
- validator(_, value) {
- if (
- !PasswordCheck({ bodyshop, value }) &&
- bodyshop.md_ro_guard.enforce_bills &&
- warnings.find((w) => w.key === "bills")
- ) {
- return Promise.reject(
- t("jobs.labels.ro_guard.enforce_validation", {
- message: t("jobs.labels.ro_guard.enforce_bills")
- })
- );
- }
- return Promise.resolve();
- }
- }),
- () => ({
- validator(_, value) {
- if (
- !PasswordCheck({ bodyshop, value }) &&
- bodyshop.md_ro_guard.enforce_cm &&
- warnings.find((w) => w.key === "cm")
- ) {
- return Promise.reject(
- t("jobs.labels.ro_guard.enforce_validation", {
- message: t("jobs.labels.ro_guard.enforce_cm")
- })
- );
- }
- return Promise.resolve();
- }
- }),
- () => ({
- validator(_, value) {
- if (
- !PasswordCheck({ bodyshop, value }) &&
- bodyshop.md_ro_guard.enforce_profit &&
- warnings.find((w) => w.key === "profit")
- ) {
- return Promise.reject(
- t("jobs.labels.ro_guard.enforce_validation", {
- message: t("jobs.labels.ro_guard.enforce_profit")
- })
- );
- }
- return Promise.resolve();
- }
- }),
- () => ({
- validator(_, value) {
- if (
- !PasswordCheck({ bodyshop, value }) &&
- bodyshop.md_ro_guard.enforce_ar &&
- warnings.find((w) => w.key === "ar")
- ) {
- return Promise.reject(
- t("jobs.labels.ro_guard.enforce_validation", {
- message: t("jobs.labels.ro_guard.enforce_ar")
- })
- );
- }
- return Promise.resolve();
- }
- }),
- () => ({
- validator(_, value) {
- if (
- !PasswordCheck({ bodyshop, value }) &&
- bodyshop.md_ro_guard.enforce_sublet &&
- warnings.find((w) => w.key === "sublet")
- ) {
- return Promise.reject(
- t("jobs.labels.ro_guard.enforce_validation", {
- message: t("jobs.labels.ro_guard.enforce_sublet")
- })
- );
- }
- return Promise.resolve();
- }
- }),
- () => ({
- validator(_, value) {
- if (
- !PasswordCheck({ bodyshop, value }) &&
- bodyshop.md_ro_guard.enforce_ppd &&
- warnings.find((w) => w.key === "ppd")
- ) {
- return Promise.reject(
- t("jobs.labels.ro_guard.enforce_validation", {
- message: t("jobs.labels.ro_guard.enforce_ppd")
- })
- );
- }
- return Promise.resolve();
- }
- }),
- () => ({
- validator(_, value) {
- if (
- !PasswordCheck({ bodyshop, value }) &&
- bodyshop.md_ro_guard.enforce_labor &&
- warnings.find((w) => w.key === "labor")
- ) {
- return Promise.reject(
- t("jobs.labels.ro_guard.enforce_validation", {
- message: t("jobs.labels.ro_guard.enforce_labor")
- })
- );
- }
- return Promise.resolve();
- }
- })
- ]}
- >
- } type="password" placeholder="Password" disabled={jobRO} />
-
-
-
-
-
-
-
-
-
-
-
+ )
+ }
+ ]}
+ />
);
}
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx
index 2120ed928..b4ad9b6a8 100644
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx
@@ -70,7 +70,7 @@ export function JobCloseRGuardPpd({ job, warningCallback }) {
{linesWithPPD.length > 0 && (
-
+
)}
);
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx
index def9be44a..cad175e59 100644
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx
@@ -54,7 +54,7 @@ export function JobCloseRoGuardProfit({ job, bodyshop, warningCallback }) {
{enforceProfitPassword && (
-
+
)}
);
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx
index 5857b126a..2cfed2a88 100644
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx
@@ -64,7 +64,7 @@ export function JobCloseRGuardSublet({ job, warningCallback }) {
{subletsNotDone.length > 0 && (
-
+
)}
);
diff --git a/client/src/components/job-costing-modal/job-costing-modal.pie.component.jsx b/client/src/components/job-costing-modal/job-costing-modal.pie.component.jsx
index d1e72d45f..0fb51b07d 100644
--- a/client/src/components/job-costing-modal/job-costing-modal.pie.component.jsx
+++ b/client/src/components/job-costing-modal/job-costing-modal.pie.component.jsx
@@ -32,7 +32,7 @@ export default function JobCostingPieComponent({ type = "sales", costCenterData
const memoizedData = useMemo(() => Calculatedata(costCenterData), [costCenterData, Calculatedata]);
return (
-
+
-
+
{" "}
-
+
diff --git a/client/src/components/job-create-iou/job-create-iou.component.jsx b/client/src/components/job-create-iou/job-create-iou.component.jsx
index 60e0eed3b..18a66c4f9 100644
--- a/client/src/components/job-create-iou/job-create-iou.component.jsx
+++ b/client/src/components/job-create-iou/job-create-iou.component.jsx
@@ -1,4 +1,4 @@
-import { useApolloClient } from "@apollo/client";
+import { useApolloClient } from "@apollo/client/react";
import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
import { Button, Popconfirm } from "antd";
import { useState } from "react";
diff --git a/client/src/components/job-detail-cards/job-detail-cards.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.component.jsx
index ac94a7486..cfe42fa67 100644
--- a/client/src/components/job-detail-cards/job-detail-cards.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.component.jsx
@@ -1,5 +1,5 @@
import { PauseCircleOutlined, PlayCircleOutlined, PrinterFilled } from "@ant-design/icons";
-import { useMutation, useQuery } from "@apollo/client";
+import { useMutation, useQuery } from "@apollo/client/react";
import { Button, Card, Col, Divider, Drawer, Grid, Row, Space } from "antd";
import queryString from "query-string";
import { useTranslation } from "react-i18next";
@@ -93,9 +93,9 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext, insertAuditTra
};
return (
-
+
{loading ? : null}
- {error ? : null}
+ {error ? : null}
{data ? (
-
+
diff --git a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
index 4e1c3f4da..b894ea861 100644
--- a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
@@ -15,7 +15,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "date_last_contacted",
- children: (
+ content: (
<>
{data.date_last_contacted}
@@ -28,7 +28,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "date_open",
- children: (
+ content: (
<>
{data.date_open}
@@ -41,7 +41,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "date_estimated",
- children: (
+ content: (
<>
{data.date_estimated}
@@ -54,7 +54,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "date_scheduled",
- children: (
+ content: (
<>
{data.date_scheduled}
@@ -67,7 +67,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "scheduled_in",
- children: (
+ content: (
<>
{data.scheduled_in}
@@ -80,7 +80,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "actual_in",
- children: (
+ content: (
<>
{data.actual_in}
@@ -93,7 +93,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "date_repairstarted",
- children: (
+ content: (
<>
{data.date_repairstarted}
@@ -106,7 +106,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "scheduled_completion",
- children: (
+ content: (
<>
{data.scheduled_completion}
@@ -119,7 +119,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "actual_completion",
- children: (
+ content: (
<>
{data.actual_completion}
@@ -132,7 +132,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "scheduled_delivery",
- children: (
+ content: (
<>
{data.scheduled_delivery}
@@ -145,7 +145,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "actual_delivery",
- children: (
+ content: (
<>
{data.actual_delivery}
@@ -158,7 +158,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "date_invoiced",
- children: (
+ content: (
<>
{data.date_invoiced}
@@ -171,7 +171,7 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
? [
{
key: "date_exported",
- children: (
+ content: (
<>
{data.date_exported}
diff --git a/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
index 949d42eae..a8e749c9a 100644
--- a/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
@@ -18,9 +18,7 @@ const mapStateToProps = createStructuredSelector({
});
const mapDispatchToProps = () => ({});
-export default connect(mapStateToProps, mapDispatchToProps)(JobDetailCardsPartsComponent);
-
-export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
+function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
const { t } = useTranslation();
const { joblines_status } = data;
@@ -103,8 +101,10 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
);
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(JobDetailCardsPartsComponent);
diff --git a/client/src/components/job-detail-lines/job-lines-expander.component.jsx b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
index 136e5e8c0..76bd050b6 100644
--- a/client/src/components/job-detail-lines/job-lines-expander.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
@@ -1,4 +1,4 @@
-import { useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client/react";
import { Col, Row, Skeleton, Space, Timeline, Typography } from "antd";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -36,7 +36,7 @@ export function JobLinesExpander({ jobline, jobid, bodyshop, technician }) {
});
if (loading) return ;
- if (error) return ;
+ if (error) return ;
return (
diff --git a/client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx b/client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx
index 152ca7c56..39c49a7d3 100644
--- a/client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button, Form, Popover, Tooltip } from "antd";
import axios from "axios";
import { t } from "i18next";
diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index f4c8ceb1a..d58f592e7 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -9,7 +9,8 @@ import {
WarningFilled
} from "@ant-design/icons";
import { PageHeader } from "@ant-design/pro-layout";
-import { gql, useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
+import { gql } from "@apollo/client";
import { Button, Dropdown, Input, Modal, Select, Space, Table, Tag, Typography } from "antd";
import axios from "axios";
import { useMemo, useState } from "react";
@@ -509,7 +510,7 @@ export function JobLinesComponent({
}}
destroyOnHidden
>
-
+
{t("general.labels.selected")}: {selectedLineIds.length}
diff --git a/client/src/components/job-detail-lines/jobs-lines-expander-simple.component.jsx b/client/src/components/job-detail-lines/jobs-lines-expander-simple.component.jsx
index 882572bc1..88d94c0fa 100644
--- a/client/src/components/job-detail-lines/jobs-lines-expander-simple.component.jsx
+++ b/client/src/components/job-detail-lines/jobs-lines-expander-simple.component.jsx
@@ -1,4 +1,4 @@
-import { useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client/react";
import { Col, Row, Skeleton, Timeline, Typography } from "antd";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -28,7 +28,7 @@ export function JobLinesExpanderSimple({ jobline, jobid, technician }) {
});
if (loading) return ;
- if (error) return ;
+ if (error) return ;
return (
diff --git a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
index ee4f77d81..de00fa95a 100644
--- a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
+++ b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
@@ -46,11 +46,12 @@ export function JobEmployeeAssignments({
-
+
diff --git a/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx b/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
index c07ab0a6f..02645ad51 100644
--- a/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
+++ b/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Checkbox, Space, Spin } from "antd";
import { useState } from "react";
import { useTranslation } from "react-i18next";
diff --git a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
index 583b79b1a..f29860917 100644
--- a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
+++ b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
@@ -1,5 +1,5 @@
import { CheckCircleOutlined } from "@ant-design/icons";
-import { useLazyQuery, useMutation } from "@apollo/client";
+import { useLazyQuery, useMutation } from "@apollo/client/react";
import { Button, Card, Form, InputNumber, Popover, Space } from "antd";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
@@ -38,7 +38,7 @@ export function ScoreboardAddButton({ bodyshop, job, disabled, ...otherBtnProps
useEffect(() => {
if (visibility) {
- callQuery({ variables: { jobid: job.id } });
+ callQuery({ jobid: job.id });
}
}, [visibility, job.id, callQuery]);
diff --git a/client/src/components/job-search-select/job-search-select.component.jsx b/client/src/components/job-search-select/job-search-select.component.jsx
index 2f241f5af..0a425f9b9 100644
--- a/client/src/components/job-search-select/job-search-select.component.jsx
+++ b/client/src/components/job-search-select/job-search-select.component.jsx
@@ -1,5 +1,5 @@
import { LoadingOutlined } from "@ant-design/icons";
-import { useLazyQuery } from "@apollo/client";
+import { useLazyQuery } from "@apollo/client/react";
import { Select, Space, Spin, Tag } from "antd";
import _ from "lodash";
import { forwardRef, useEffect, useState } from "react";
@@ -29,22 +29,20 @@ const JobSearchSelect = (
const handleSearch = (value) => {
debouncedExecuteSearch({
- variables: {
- search: value,
- ...(convertedOnly || notExported
- ? {
- ...(convertedOnly ? { isConverted: true } : {}),
- ...(notExported ? { notExported: true } : {}),
- ...(notInvoiced ? { notInvoiced: true } : {})
- }
- : {})
- }
+ search: value,
+ ...(convertedOnly || notExported
+ ? {
+ ...(convertedOnly ? { isConverted: true } : {}),
+ ...(notExported ? { notExported: true } : {}),
+ ...(notInvoiced ? { notInvoiced: true } : {})
+ }
+ : {})
});
};
useEffect(() => {
if (restProps.value) {
- callIdSearch({ variables: { id: restProps.value } }); // Sometimes results in a no-op. Not sure how to fix.
+ callIdSearch({ id: restProps.value }); // Sometimes results in a no-op. Not sure how to fix.
}
}, [restProps.value, callIdSearch]);
@@ -62,14 +60,15 @@ const JobSearchSelect = (
}
notFoundContent={loading ? : null}
@@ -95,8 +94,8 @@ const JobSearchSelect = (
: null}
- {error ? : null}
- {idError ? : null}
+ {error ? : null}
+ {idError ? : null}
-
- {JSON.stringify(
- {
- CIECA: job.cieca_ttl?.data,
- CIECASTL: job.cieca_stl?.data,
- ImEXCalc: job.job_totals
- },
- null,
- 2
- )}
-
-
+ {JSON.stringify(
+ {
+ CIECA: job.cieca_ttl?.data,
+ CIECASTL: job.cieca_stl?.data,
+ ImEXCalc: job.job_totals
+ },
+ null,
+ 2
+ )}
+
+
+ )
+ }
+ ]}
+ />
)}
diff --git a/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx b/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx
index 5d366bacf..61a007c65 100644
--- a/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx
+++ b/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx
@@ -1,5 +1,5 @@
import { useCallback, useEffect, useMemo, useState } from "react";
-import { useMutation, useQuery } from "@apollo/client";
+import { useMutation, useQuery } from "@apollo/client/react";
import { ADD_JOB_WATCHER, GET_JOB_WATCHERS, REMOVE_JOB_WATCHER } from "../../graphql/jobs.queries.js";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
diff --git a/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx b/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
index b8881f6cc..d6e6f91da 100644
--- a/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
+++ b/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
@@ -1,5 +1,5 @@
import { DownCircleFilled } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button, Dropdown } from "antd";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
diff --git a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
index ba6d115b3..bc99535a5 100644
--- a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
+++ b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button, Form, Popconfirm, Select } from "antd";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
diff --git a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
index 7d2f40b41..dcb51be24 100644
--- a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
+++ b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button, Form } from "antd";
import dayjs from "../../utils/day";
import { useEffect, useState } from "react";
diff --git a/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx b/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx
index 74c6cd984..7a20c06b4 100644
--- a/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx
+++ b/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button, Space } from "antd";
import { useState } from "react";
import { useTranslation } from "react-i18next";
diff --git a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
index 52087ef74..f1650d201 100644
--- a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
+++ b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button, Space } from "antd";
import { useState } from "react";
import { useTranslation } from "react-i18next";
diff --git a/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx b/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
index 813d7f45a..c3459d7b6 100644
--- a/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
+++ b/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button, Form } from "antd";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
diff --git a/client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx b/client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx
index 904972a87..129ff9fb2 100644
--- a/client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx
+++ b/client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Switch } from "antd";
import { useState } from "react";
import { useTranslation } from "react-i18next";
diff --git a/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx b/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx
index d722c6418..3194f8b46 100644
--- a/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx
+++ b/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button } from "antd";
import { useState } from "react";
import { useTranslation } from "react-i18next";
diff --git a/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx b/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx
index 982ba49c0..30b322dce 100644
--- a/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx
+++ b/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button, Form } from "antd";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
diff --git a/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx b/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
index 27e12917f..15cc00a99 100644
--- a/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
+++ b/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
@@ -147,7 +147,7 @@ export function JobsAvailableScan({ partnerVersion, refetch }) {
>
)}
- {isClosed && }
+ {isClosed && }
);
}
diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
index d7142cd4a..e3380b197 100644
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -1,4 +1,5 @@
-import { gql, useApolloClient, useLazyQuery, useMutation, useQuery } from "@apollo/client";
+import { useApolloClient, useLazyQuery, useMutation, useQuery } from "@apollo/client/react";
+import { gql } from "@apollo/client";
import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
import { Col, Row } from "antd";
import Axios from "axios";
@@ -368,12 +369,12 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
};
const addJobAsNew = (record) => {
- loadEstData({ variables: { id: record.id } });
+ loadEstData({ id: record.id });
setOwnerModalVisible(true);
};
const addJobAsSupp = useCallback((record) => {
- loadEstData({ variables: { id: record.id } });
+ loadEstData({ id: record.id });
modalSearchState[1](record.clm_no);
setJobModalVisible(true);
}, []);
@@ -382,7 +383,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
if (availableJobId && clm_no) addJobAsSupp({ id: availableJobId, clm_no: clm_no });
}, [addJobAsSupp, availableJobId, clm_no]);
- if (error) return ;
+ if (error) return ;
return (
diff --git a/client/src/components/jobs-change-status/jobs-change-status.component.jsx b/client/src/components/jobs-change-status/jobs-change-status.component.jsx
index ad04ee980..4d8676b2a 100644
--- a/client/src/components/jobs-change-status/jobs-change-status.component.jsx
+++ b/client/src/components/jobs-change-status/jobs-change-status.component.jsx
@@ -1,5 +1,5 @@
import { DownCircleFilled } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button, Dropdown } from "antd";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
diff --git a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
index e811a9544..e7751b345 100644
--- a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
+++ b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
import { Button } from "antd";
import axios from "axios";
import { useState } from "react";
diff --git a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
index fd1652eac..f1a1bf3f2 100644
--- a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
+++ b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
@@ -131,12 +131,12 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
>