Merge branch 'feature/IO-1828-Front-End-Package-Updates' into feature/IO-2456-Customized-Report-Filtering
This commit is contained in:
@@ -3,6 +3,7 @@ orbs:
|
|||||||
#snyk: snyk/snyk@0.0.8
|
#snyk: snyk/snyk@0.0.8
|
||||||
#cypress: cypress-io/cypress@1.23.0
|
#cypress: cypress-io/cypress@1.23.0
|
||||||
aws-s3: circleci/aws-s3@4.0.0
|
aws-s3: circleci/aws-s3@4.0.0
|
||||||
|
aws-cli: circleci/aws-cli@4.0
|
||||||
eb: circleci/aws-elastic-beanstalk@2.0.1
|
eb: circleci/aws-elastic-beanstalk@2.0.1
|
||||||
jobs:
|
jobs:
|
||||||
api-deploy:
|
api-deploy:
|
||||||
@@ -71,6 +72,11 @@ jobs:
|
|||||||
command: npm i
|
command: npm i
|
||||||
|
|
||||||
- run: npm run build
|
- run: npm run build
|
||||||
|
|
||||||
|
- aws-cli/setup:
|
||||||
|
aws_access_key_id: AWS_ACCESS_KEY_ID
|
||||||
|
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
|
||||||
|
region: AWS_REGION
|
||||||
|
|
||||||
- aws-s3/sync:
|
- aws-s3/sync:
|
||||||
from: build
|
from: build
|
||||||
@@ -135,6 +141,11 @@ jobs:
|
|||||||
|
|
||||||
- run: npm run sentry:sourcemaps
|
- run: npm run sentry:sourcemaps
|
||||||
|
|
||||||
|
- aws-cli/setup:
|
||||||
|
aws_access_key_id: AWS_ACCESS_KEY_ID
|
||||||
|
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
|
||||||
|
region: AWS_REGION
|
||||||
|
|
||||||
- aws-s3/sync:
|
- aws-s3/sync:
|
||||||
from: build
|
from: build
|
||||||
to: "s3://imex-online-test-beta/"
|
to: "s3://imex-online-test-beta/"
|
||||||
|
|||||||
@@ -23,9 +23,9 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
|
|||||||
);
|
);
|
||||||
}, [job.status, bodyshop.md_ro_statuses.post_production_statuses]);
|
}, [job.status, bodyshop.md_ro_statuses.post_production_statuses]);
|
||||||
|
|
||||||
const calcRepairDays =
|
const calcRepairDays = job?.joblines?.length ?
|
||||||
job.joblines.reduce((acc, val) => acc + val.mod_lb_hrs, 0) /
|
job.joblines.reduce((acc, val) => acc + val.mod_lb_hrs, 0) /
|
||||||
(bodyshop.target_touchtime === 0 ? 1 : bodyshop.target_touchtime);
|
(bodyshop.target_touchtime === 0 ? 1 : bodyshop.target_touchtime) : [];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -879,7 +879,7 @@ export function JobsDetailHeaderActions({
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
if (job.csiinvites.length) {
|
if (job?.csiinvites?.length) {
|
||||||
children.push(
|
children.push(
|
||||||
{
|
{
|
||||||
type: "divider"
|
type: "divider"
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
|
|||||||
{job.alt_transport}
|
{job.alt_transport}
|
||||||
<JobAltTransportChange job={job} />
|
<JobAltTransportChange job={job} />
|
||||||
</DataLabel>
|
</DataLabel>
|
||||||
{job.cccontracts.length > 0 && (
|
{job?.cccontracts?.length > 0 && (
|
||||||
<DataLabel label={t("jobs.labels.contracts")}>
|
<DataLabel label={t("jobs.labels.contracts")}>
|
||||||
{job.cccontracts.map((c) => (
|
{job.cccontracts.map((c) => (
|
||||||
<Link
|
<Link
|
||||||
|
|||||||
Reference in New Issue
Block a user