From c4c65d1696cd518515e693e4bd0097e3940d8ca8 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 31 Jan 2024 13:03:51 -0800 Subject: [PATCH 1/3] CI Updates. --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 596d65894..2f3802f29 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,6 +3,7 @@ orbs: #snyk: snyk/snyk@0.0.8 #cypress: cypress-io/cypress@1.23.0 aws-s3: circleci/aws-s3@4.0.0 + aws-cli: circleci/aws-cli@4.0 eb: circleci/aws-elastic-beanstalk@2.0.1 jobs: api-deploy: @@ -135,6 +136,11 @@ jobs: - 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: from: build to: "s3://imex-online-test-beta/" From 6b0c211084876c622867ea50cbef65877ab76450 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 31 Jan 2024 13:14:01 -0800 Subject: [PATCH 2/3] Resolve CI for master. --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f3802f29..fc5216ffc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,6 +72,11 @@ jobs: command: npm i - 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: from: build From 498292c2ec98dfc0237e8d2fe307ab3da8e52735 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Mon, 5 Feb 2024 11:35:24 -0500 Subject: [PATCH 3/3] - Fix for job line null check Signed-off-by: Dave Richer --- .../jobs-detail-dates/jobs-detail-dates.component.jsx | 4 ++-- .../jobs-detail-header-actions.component.jsx | 2 +- .../jobs-detail-header/jobs-detail-header.component.jsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx index dcd6fd941..c2e2091d1 100644 --- a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx +++ b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx @@ -23,9 +23,9 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) { ); }, [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) / - (bodyshop.target_touchtime === 0 ? 1 : bodyshop.target_touchtime); + (bodyshop.target_touchtime === 0 ? 1 : bodyshop.target_touchtime) : []; return (
diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx index e396982d8..cd7b81456 100644 --- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx +++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx @@ -879,7 +879,7 @@ export function JobsDetailHeaderActions({ }, ]; - if (job.csiinvites.length) { + if (job?.csiinvites?.length) { children.push( { type: "divider" diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx index 7c58eda52..cbcb91807 100644 --- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx +++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx @@ -121,7 +121,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) { {job.alt_transport} - {job.cccontracts.length > 0 && ( + {job?.cccontracts?.length > 0 && ( {job.cccontracts.map((c) => (