- merge adjustments

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -56,6 +56,7 @@ import UndefinedToNull from "../../utils/undefinedtonull";
 import _ from "lodash";
 import JobProfileDataWarning from "../../components/job-profile-data-warning/job-profile-data-warning.component";
 import { DateTimeFormat } from "./../../utils/DateFormatter";
+import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -371,7 +372,15 @@ export function JobsDetailPage({
           >
             <JobsDetailLaborContainer job={job} jobId={job.id} />
           </Tabs.TabPane>
-          <Tabs.TabPane
+            <Tabs.TabPane
+                forceRender
+                tab={<span><BarsOutlined />{t('menus.jobsdetail.lifecycle')}</span>}
+                key="lifecycle"
+            >
+                <JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses}/>
+            </Tabs.TabPane>
+
+            <Tabs.TabPane
             forceRender
             tab={
               <span>