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 4282014ff..0d175b91a 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
@@ -31,7 +31,7 @@ const JobSearchSelect = (
const [
callIdSearch,
{
- //loading: idLoading,
+ loading: idLoading,
error: idError,
data: idData
}
diff --git a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
index 5be1fb010..f09483975 100644
--- a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
@@ -21,6 +21,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
const { t } = useTranslation();
const data = useMemo(() => {
+
return [
{
key: t("jobs.labels.subtotal"),
@@ -165,6 +166,8 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
bold: true
}
];
+ // TODO: was removed by Patrick during a CI bug fix.
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [job.job_totals, job.cieca_pft, t, bodyshop.md_responsibility_centers]);
const columns = [
diff --git a/client/src/components/task-list/task-list.component.jsx b/client/src/components/task-list/task-list.component.jsx
index 75100e0e3..17618ff20 100644
--- a/client/src/components/task-list/task-list.component.jsx
+++ b/client/src/components/task-list/task-list.component.jsx
@@ -90,7 +90,8 @@ function TaskListComponent({
relationshipType,
relationshipId,
onlyMine,
- parentJobId
+ parentJobId,
+ showRo = true,
}) {
const {t} = useTranslation();
@@ -126,18 +127,23 @@ function TaskListComponent({
);
}
+ if (showRo) {
+ columns.push(
+ {
+ title: t("tasks.fields.job.ro_number"),
+ dataIndex: ["job", "ro_number"],
+ key: "job.ro_number",
+ width: '8%',
+ render: (text, record) =>
+ record.job
+ ? {record.job.ro_number || t("general.labels.na")}
+ : t("general.labels.na")
+ }
+ );
+ }
+
columns.push(
- {
- title: t("tasks.fields.job.ro_number"),
- dataIndex: ["job", "ro_number"],
- key: "job.ro_number",
- width: '8%',
- render: (text, record) =>
- record.job
- ? {record.job.ro_number || t("general.labels.na")}
- : t("general.labels.na")
- },
{
title: t("tasks.fields.jobline"),
dataIndex: ["jobline", "id"],
diff --git a/client/src/components/task-list/task-list.container.jsx b/client/src/components/task-list/task-list.container.jsx
index 709da4a9b..f0f76cac7 100644
--- a/client/src/components/task-list/task-list.container.jsx
+++ b/client/src/components/task-list/task-list.container.jsx
@@ -23,7 +23,8 @@ export default function TaskListContainer({
relationshipId,
currentUser,
onlyMine,
- parentJobId
+ parentJobId,
+ showRo = true
}) {
const {t} = useTranslation();
const searchParams = queryString.parse(useLocation().search);
@@ -190,6 +191,7 @@ export default function TaskListContainer({
relationshipType={relationshipType}
relationshipId={relationshipId}
onlyMine={onlyMine}
+ showRo={showRo}
parentJobId={parentJobId}
/>
);
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
index a600faf57..fb7ab9d47 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -412,7 +412,7 @@ export function JobsDetailPage({
children:
+ titleTranslation='tasks.titles.job_tasks' showRo={false}/>
},
]}
/>