feature/IO-3357-Reynolds-and-Reynolds-DMS-API-Integration / RRScratch2 / Polish
This commit is contained in:
@@ -38,8 +38,6 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
|
||||
});
|
||||
|
||||
const SUMMARY_MIN_HEIGHT = 545;
|
||||
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
|
||||
|
||||
const DMS_SOCKET_EVENTS = {
|
||||
@@ -389,10 +387,9 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
|
||||
<AlertComponent style={{ marginBottom: 10 }} message={bannerMessage} type="warning" showIcon closable />
|
||||
|
||||
<Row gutter={[16, 16]}>
|
||||
<Col md={24} lg={10}>
|
||||
<Col md={24} lg={10} className="dms-equal-height-col">
|
||||
{!isRrMode ? (
|
||||
<DmsAllocationsSummary
|
||||
minHeight={SUMMARY_MIN_HEIGHT}
|
||||
key={resetKey}
|
||||
title={
|
||||
<span>
|
||||
@@ -410,7 +407,6 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
|
||||
/>
|
||||
) : (
|
||||
<RrAllocationsSummary
|
||||
minHeight={SUMMARY_MIN_HEIGHT}
|
||||
key={resetKey}
|
||||
title={
|
||||
<span>
|
||||
@@ -428,15 +424,8 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
|
||||
)}
|
||||
</Col>
|
||||
|
||||
<Col md={24} lg={14}>
|
||||
<DmsPostForm
|
||||
minHeight={SUMMARY_MIN_HEIGHT}
|
||||
key={resetKey}
|
||||
socket={activeSocket}
|
||||
job={data?.jobs_by_pk}
|
||||
logsRef={logsRef}
|
||||
mode={mode}
|
||||
/>
|
||||
<Col md={24} lg={14} className="dms-equal-height-col">
|
||||
<DmsPostForm key={resetKey} socket={activeSocket} job={data?.jobs_by_pk} logsRef={logsRef} mode={mode} />
|
||||
</Col>
|
||||
|
||||
<DmsCustomerSelector
|
||||
@@ -494,6 +483,8 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
|
||||
if (activeSocket) {
|
||||
activeSocket.disconnect();
|
||||
activeSocket.connect();
|
||||
// Re-emit reset after reconnect (we need to figure out how to make sure active socket has finished connecting first)
|
||||
// activeSocket.emit("dms-reset-context", { jobId, mode });
|
||||
}
|
||||
}}
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user