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

feature/IO-3255-simplified-parts-management - Checkpoint

Browse Source
This commit is contained in:
Dave
2025-08-13 15:48:09 -04:00
parent 898b97151f
commit 0d570d0323
8 changed files with 246 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/src/pages/simplified-parts/simplified-parts.page.component.jsx
View File

@@ -29,6 +29,8 @@ const ReportCenterModal = lazy(() => import("../../components/report-center-moda
const PrintCenterModalContainer = lazy(
() => import("../../components/print-center-modal/print-center-modal.container")
);
const VehiclesContainer = lazy(() => import("../vehicles/vehicles.page.container.jsx"));
const VehiclesDetailContainer = lazy(() => import("../vehicles-detail/vehicles-detail.page.container.jsx"));
const { Content } = Layout;
const mapStateToProps = createStructuredSelector({
@@ -146,6 +148,22 @@ export function SimplifiedPartsPage({ conflict, bodyshop, alerts, setAlerts }) {
</Suspense>
}
/>
<Route
path="/vehicles"
element={
<Suspense fallback={<Spin />}>
<VehiclesContainer />
</Suspense>
}
/>
<Route
path="/vehicles/:vehId"
element={
<Suspense fallback={<Spin />}>
<VehiclesDetailContainer />
</Suspense>
}
/>
<Route
path="/shop/vendors"
element={

47
client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import VehicleDetailComponent from "./vehicles-detail.page.component";
import { useQuery } from "@apollo/client";
import { useParams } from "react-router-dom";
@@ -11,6 +11,12 @@ import { connect } from "react-redux";
import { CreateRecentItem } from "../../utils/create-recent-item";
import NotFound from "../../components/not-found/not-found.component";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
import { selectIsPartsEntry } from "../../redux/application/application.selectors";
import { createStructuredSelector } from "reselect";
const mapStateToProps = createStructuredSelector({
isPartsEntry: selectIsPartsEntry
});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -18,9 +24,10 @@ const mapDispatchToProps = (dispatch) => ({
setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
});
export function VehicleDetailContainer({ setBreadcrumbs, addRecentItem, setSelectedHeader }) {
export function VehicleDetailContainer({ setBreadcrumbs, addRecentItem, setSelectedHeader, isPartsEntry }) {
const { vehId } = useParams();
const { t } = useTranslation();
const basePath = isPartsEntry ? "/parts" : "/manage";
const { loading, data, error, refetch } = useQuery(QUERY_VEHICLE_BY_ID, {
variables: { id: vehId },
@@ -43,20 +50,22 @@ export function VehicleDetailContainer({ setBreadcrumbs, addRecentItem, setSelec
});
setSelectedHeader("vehicles");
setBreadcrumbs([
{ link: "/manage/vehicles", label: t("titles.bc.vehicles") },
{
link: `/manage/vehicles/${vehId}`,
label: t("titles.bc.vehicle-details", {
vehicle:
data && data.vehicles_by_pk
? `${(data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr) || ""} ${
(data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc) || ""
} ${(data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc) || ""}`
: ""
})
}
]);
const crumbs = [];
if (isPartsEntry) crumbs.push({ link: "/parts/", label: t("titles.bc.jobs") });
crumbs.push({ link: `${basePath}/vehicles`, label: t("titles.bc.vehicles") });
crumbs.push({
link: `${basePath}/vehicles/${vehId}`,
label: t("titles.bc.vehicle-details", {
vehicle:
data && data.vehicles_by_pk
? `${(data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr) || ""} ${
(data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc) || ""
} ${(data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc) || ""}`
: ""
})
});
setBreadcrumbs(crumbs);
if (data && data.vehicles_by_pk)
addRecentItem(
@@ -66,10 +75,10 @@ export function VehicleDetailContainer({ setBreadcrumbs, addRecentItem, setSelec
`${data.vehicles_by_pk.v_vin || "N/A"} | ${
data.vehicles_by_pk.v_model_yr || ""
} ${data.vehicles_by_pk.v_make_desc || ""} ${data.vehicles_by_pk.v_model_desc || ""}`.trim(),
`/manage/vehicles/${vehId}`
`${basePath}/vehicles/${vehId}`
)
);
}, [t, data, setBreadcrumbs, vehId, addRecentItem, setSelectedHeader]);
}, [t, data, setBreadcrumbs, vehId, addRecentItem, setSelectedHeader, basePath, isPartsEntry]);
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />;
@@ -77,4 +86,4 @@ export function VehicleDetailContainer({ setBreadcrumbs, addRecentItem, setSelec
return <VehicleDetailComponent vehicle={data.vehicles_by_pk} refetch={refetch} />;
}
export default connect(null, mapDispatchToProps)(VehicleDetailContainer);
export default connect(mapStateToProps, mapDispatchToProps)(VehicleDetailContainer);

25
client/src/pages/vehicles/vehicles.page.container.jsx
View File

@@ -1,18 +1,25 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import VehiclesPageComponent from "./vehicles.page.component";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
import { createStructuredSelector } from "reselect";
import { selectIsPartsEntry } from "../../redux/application/application.selectors.js";
const mapStateToProps = createStructuredSelector({
isPartsEntry: selectIsPartsEntry
});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
});
export function VehiclesPageContainer({ setBreadcrumbs, setSelectedHeader }) {
export function VehiclesPageContainer({ setBreadcrumbs, setSelectedHeader, isPartsEntry }) {
const { t } = useTranslation();
const basePath = isPartsEntry ? "/parts" : "/manage";
useEffect(() => {
document.title = t("titles.vehicles", {
@@ -22,10 +29,18 @@ export function VehiclesPageContainer({ setBreadcrumbs, setSelectedHeader }) {
})
});
setSelectedHeader("vehicles");
setBreadcrumbs([{ link: "/manage/vehicles", label: t("titles.bc.vehicles") }]);
}, [t, setBreadcrumbs, setSelectedHeader]);
if (isPartsEntry) {
setBreadcrumbs([
{ link: "/parts/", label: t("titles.bc.jobs") },
{ link: `${basePath}/vehicles`, label: t("titles.bc.vehicles") }
]);
} else {
setBreadcrumbs([{ link: `${basePath}/vehicles`, label: t("titles.bc.vehicles") }]);
}
}, [t, setBreadcrumbs, setSelectedHeader, basePath, isPartsEntry]);
return <VehiclesPageComponent />;
}
export default connect(null, mapDispatchToProps)(VehiclesPageContainer);
export default connect(mapStateToProps, mapDispatchToProps)(VehiclesPageContainer);