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

feature/IO-3357-Reynolds-and-Reynolds-DMS-API-Integration - Checkpoint

Browse Source
This commit is contained in:
Dave
2025-10-14 14:26:15 -04:00
parent 5a9381ebdb
commit 6671db1724
4 changed files with 242 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
client/src/pages/dms/dms.container.jsx
View File

@@ -37,21 +37,20 @@ const mapDispatchToProps = (dispatch) => ({
export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
export const socket = SocketIO(
import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "", // for dev testing,
{
path: "/ws",
withCredentials: true,
auth: async (callback) => {
const token = auth.currentUser && (await auth.currentUser.getIdToken());
callback({ token });
}
// Legacy /ws socket (CDK/PBS)
export const socket = SocketIO(import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "", {
path: "/ws",
withCredentials: true,
auth: async (callback) => {
const token = auth.currentUser && (await auth.currentUser.getIdToken());
callback({ token });
}
);
});
export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
const { t } = useTranslation();
const [logLevel, setLogLevel] = useState(determineDmsType(bodyshop) === "pbs" ? "INFO" : "DEBUG");
const dms = determineDmsType(bodyshop);
const [logLevel, setLogLevel] = useState(dms === "pbs" ? "INFO" : "DEBUG");
const history = useNavigate();
const [logs, setLogs] = useState([]);
const search = queryString.parse(useLocation().search);
@@ -64,6 +63,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
names: ["Fortellis"],
splitKey: bodyshop.imexshopid
});
// New unified wss socket (Fortellis, RR)
const { socket: wsssocket } = useSocket();
const { loading, error, data } = useQuery(QUERY_JOB_EXPORT_DMS, {
@@ -95,19 +95,59 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
}, [t, setBreadcrumbs, setSelectedHeader]);
useEffect(() => {
// ✅ RR uses the new wss socket and takes precedence over Fortellis flag
if (dms === "rr") {
// set log level on connect and immediately
wsssocket.emit("set-log-level", logLevel);
const handleConnect = () => wsssocket.emit("set-log-level", logLevel);
const handleReconnect = () =>
setLogs((prev) => [
...prev,
{ timestamp: new Date(), level: "warn", message: "Reconnected to RR Export Service" }
]);
const handleConnectError = (err) => {
console.log(`connect_error due to ${err}`, err);
notification.error({ message: err.message });
};
const handleLogEvent = (payload) => setLogs((prev) => [...prev, payload]);
const handleExportSuccess = (payload) => {
notification.success({ message: t("jobs.successes.exported") });
insertAuditTrail({
jobid: payload,
operation: AuditTrailMapping.jobexported(),
type: "jobexported"
});
history("/manage/accounting/receivables");
};
const handleRrExportResult = (payload) => handleExportSuccess(payload);
wsssocket.on("connect", handleConnect);
wsssocket.on("reconnect", handleReconnect);
wsssocket.on("connect_error", handleConnectError);
// RR channels (over wss)
wsssocket.on("rr-log-event", handleLogEvent);
wsssocket.on("export-success", handleExportSuccess);
wsssocket.on("rr-export-job:result", handleRrExportResult);
return () => {
wsssocket.off("connect", handleConnect);
wsssocket.off("reconnect", handleReconnect);
wsssocket.off("connect_error", handleConnectError);
wsssocket.off("rr-log-event", handleLogEvent);
wsssocket.off("export-success", handleExportSuccess);
wsssocket.off("rr-export-job:result", handleRrExportResult);
};
}
// Fortellis / CDK behavior (when not RR)
if (Fortellis.treatment === "on") {
wsssocket.emit("set-log-level", logLevel);
const handleLogEvent = (payload) => {
setLogs((logs) => {
return [...logs, payload];
});
};
const handleLogEvent = (payload) => setLogs((prev) => [...prev, payload]);
const handleExportSuccess = (payload) => {
notification.success({
message: t("jobs.successes.exported")
});
notification.success({ message: t("jobs.successes.exported") });
insertAuditTrail({
jobid: payload,
operation: AuditTrailMapping.jobexported(),
@@ -116,6 +156,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
history("/manage/accounting/receivables");
};
// Fortellis logs (wss)
wsssocket.on("fortellis-log-event", handleLogEvent);
wsssocket.on("export-success", handleExportSuccess);
@@ -124,32 +165,21 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
wsssocket.off("export-success", handleExportSuccess);
};
} else {
// CDK/PBS via legacy /ws socket
socket.on("connect", () => socket.emit("set-log-level", logLevel));
socket.on("reconnect", () => {
setLogs((logs) => {
return [
...logs,
{
timestamp: new Date(),
level: "warn",
message: "Reconnected to CDK Export Service"
}
];
});
setLogs((prev) => [
...prev,
{ timestamp: new Date(), level: "warn", message: "Reconnected to CDK Export Service" }
]);
});
socket.on("connect_error", (err) => {
console.log(`connect_error due to ${err}`, err);
notification.error({ message: err.message });
});
socket.on("log-event", (payload) => {
setLogs((logs) => {
return [...logs, payload];
});
});
socket.on("log-event", (payload) => setLogs((prev) => [...prev, payload]));
socket.on("export-success", (payload) => {
notification.success({
message: t("jobs.successes.exported")
});
notification.success({ message: t("jobs.successes.exported") });
insertAuditTrail({
jobid: payload,
operation: AuditTrailMapping.jobexported(),
@@ -164,7 +194,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
socket.disconnect();
};
}
}, []);
}, [dms, Fortellis?.treatment, logLevel, history, insertAuditTrail, notification, t, wsssocket]);
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />;
@@ -176,15 +206,14 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
return (
<div>
{Fortellis.treatment === "on" && (
<AlertComponent
style={{ marginBottom: 10 }}
message={`Posting to ${determineDmsType(bodyshop)}`}
type="warning"
showIcon
closable
/>
)}
<AlertComponent
style={{ marginBottom: 10 }}
message={`Posting to ${determineDmsType(bodyshop)}`}
type="warning"
showIcon
closable
/>
<Row gutter={[16, 16]}>
<Col md={24} lg={10}>
<DmsAllocationsSummary
@@ -219,7 +248,12 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
value={logLevel}
onChange={(value) => {
setLogLevel(value);
socket.emit("set-log-level", value);
// Send to the active socket type
if (dms === "rr" || Fortellis.treatment === "on") {
wsssocket.emit("set-log-level", value);
} else {
socket.emit("set-log-level", value);
}
}}
>
<Select.Option key="DEBUG">DEBUG</Select.Option>
@@ -231,8 +265,14 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
<Button
onClick={() => {
setLogs([]);
socket.disconnect();
socket.connect();
// Reconnect appropriate socket
if (dms === "rr" || Fortellis.treatment === "on") {
// wsssocket is managed by provider; emit a ping
wsssocket.emit("set-log-level", logLevel);
} else {
socket.disconnect();
socket.connect();
}
}}
>
Reconnect