WIP for not found error pages BOD-119

This commit is contained in:
Patrick Fic
2020-08-25 11:17:01 -07:00
parent 5e4a825bcf
commit b78b6ef876
11 changed files with 121 additions and 31 deletions

View File

@@ -17,6 +17,7 @@ import {
} from "../../redux/application/application.actions";
import { CreateRecentItem } from "../../utils/create-recent-item";
import JobsDetailPage from "./jobs-detail.page.component";
import NotFound from "../../components/not-found/not-found.component";
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -53,9 +54,10 @@ function JobsDetailPageContainer({ match, setBreadcrumbs, addRecentItem }) {
: error
? t("titles.app")
: t("titles.jobsdetail", {
ro_number: data.jobs_by_pk.converted
? data.jobs_by_pk.ro_number
: `EST ${data.jobs_by_pk.est_number}`,
ro_number:
data.jobs_by_pk && data.jobs_by_pk.converted
? data.jobs_by_pk && data.jobs_by_pk.ro_number
: `EST ${data.jobs_by_pk && data.jobs_by_pk.est_number}`,
});
setBreadcrumbs([
{ link: "/manage/jobs", label: t("titles.bc.jobs") },
@@ -64,15 +66,16 @@ function JobsDetailPageContainer({ match, setBreadcrumbs, addRecentItem }) {
label: t("titles.bc.jobs-detail", {
number:
(data &&
(data.jobs_by_pk.converted
? data && data.jobs_by_pk.ro_number
: `EST ${data.jobs_by_pk.est_number}`)) ||
data.jobs_by_pk &&
(data.jobs_by_pk && data.jobs_by_pk.converted
? data && data.jobs_by_pk && data.jobs_by_pk.ro_number
: `EST ${data.jobs_by_pk && data.jobs_by_pk.est_number}`)) ||
"",
}),
},
]);
if (data)
if (data && data.jobs_by_pk)
addRecentItem(
CreateRecentItem(
jobId,
@@ -87,6 +90,7 @@ function JobsDetailPageContainer({ match, setBreadcrumbs, addRecentItem }) {
if (loading) return <SpinComponent />;
if (error) return <AlertComponent message={error.message} type="error" />;
if (!!!data.jobs_by_pk) return <NotFound />;
return data.jobs_by_pk ? (
<RbacWrapper action="jobs:detail">