From 697ad237f72cb702ec82d899dbbf139a090451c2 Mon Sep 17 00:00:00 2001 From: Darren Boss Date: Wed, 30 Oct 2024 11:30:24 -0700 Subject: [PATCH 1/5] Fix missing mountain in prod --- web/public/images/mountain.svg | 28 +++++++++++++++++++ .../fba/components/viz/ElevationStatus.tsx | 4 +-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 web/public/images/mountain.svg diff --git a/web/public/images/mountain.svg b/web/public/images/mountain.svg new file mode 100644 index 000000000..109e98dc0 --- /dev/null +++ b/web/public/images/mountain.svg @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/web/src/features/fba/components/viz/ElevationStatus.tsx b/web/src/features/fba/components/viz/ElevationStatus.tsx index 12c137621..75fbce781 100644 --- a/web/src/features/fba/components/viz/ElevationStatus.tsx +++ b/web/src/features/fba/components/viz/ElevationStatus.tsx @@ -6,7 +6,7 @@ import ElevationFlag from 'features/fba/components/viz/ElevationFlag' import ElevationLabel from 'features/fba/components/viz/ElevationLabel' import { Box } from '@mui/material' import { FireZoneTPIStats } from '@/api/fbaAPI' -import Mountain from '@/features/fba/images/mountain.svg' +import Mountain from '/images/mountain.svg' enum ElevationOption { BOTTOM = 'Valley Bottom', @@ -62,7 +62,7 @@ const ElevationStatus = ({ tpiStats }: ElevationStatusProps) => { display: 'flex', width: '100%' }} - data-testId="tpi-mountain" + data-testid="tpi-mountain" > From 015b1a8785310ed1e53fe8ae2be260965bf307b4 Mon Sep 17 00:00:00 2001 From: Darren Boss Date: Wed, 30 Oct 2024 12:08:14 -0700 Subject: [PATCH 2/5] quotes --- web/src/features/fba/components/viz/ElevationStatus.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/features/fba/components/viz/ElevationStatus.tsx b/web/src/features/fba/components/viz/ElevationStatus.tsx index 75fbce781..2eb1ceb18 100644 --- a/web/src/features/fba/components/viz/ElevationStatus.tsx +++ b/web/src/features/fba/components/viz/ElevationStatus.tsx @@ -6,7 +6,7 @@ import ElevationFlag from 'features/fba/components/viz/ElevationFlag' import ElevationLabel from 'features/fba/components/viz/ElevationLabel' import { Box } from '@mui/material' import { FireZoneTPIStats } from '@/api/fbaAPI' -import Mountain from '/images/mountain.svg' +import Mountain from 'features/fba/images/mountain.svg' enum ElevationOption { BOTTOM = 'Valley Bottom', @@ -57,7 +57,7 @@ const ElevationStatus = ({ tpiStats }: ElevationStatusProps) => { sx={{ backgroundBlendMode: 'overlay', backgroundColor: 'rgba(255, 255, 255, 0.6)', - backgroundImage: `url(${Mountain})`, + backgroundImage: `url("${Mountain}")`, backgroundRepeat: 'round', display: 'flex', width: '100%' From 972efa7cd6a4244ef4b0ce491aeb26d2ba68d8c9 Mon Sep 17 00:00:00 2001 From: Darren Boss Date: Wed, 30 Oct 2024 14:06:56 -0700 Subject: [PATCH 3/5] Use png instead of svg --- web/public/images/mountain.svg | 28 ------------------- .../fba/components/viz/ElevationStatus.tsx | 4 +-- web/src/features/fba/images/mountain.svg | 28 ------------------- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 web/public/images/mountain.svg delete mode 100644 web/src/features/fba/images/mountain.svg diff --git a/web/public/images/mountain.svg b/web/public/images/mountain.svg deleted file mode 100644 index 109e98dc0..000000000 --- a/web/public/images/mountain.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/web/src/features/fba/components/viz/ElevationStatus.tsx b/web/src/features/fba/components/viz/ElevationStatus.tsx index 2eb1ceb18..54fc786ac 100644 --- a/web/src/features/fba/components/viz/ElevationStatus.tsx +++ b/web/src/features/fba/components/viz/ElevationStatus.tsx @@ -6,7 +6,7 @@ import ElevationFlag from 'features/fba/components/viz/ElevationFlag' import ElevationLabel from 'features/fba/components/viz/ElevationLabel' import { Box } from '@mui/material' import { FireZoneTPIStats } from '@/api/fbaAPI' -import Mountain from 'features/fba/images/mountain.svg' +import Mountain from 'features/fba/images/mountain.png' enum ElevationOption { BOTTOM = 'Valley Bottom', @@ -57,7 +57,7 @@ const ElevationStatus = ({ tpiStats }: ElevationStatusProps) => { sx={{ backgroundBlendMode: 'overlay', backgroundColor: 'rgba(255, 255, 255, 0.6)', - backgroundImage: `url("${Mountain}")`, + background: `url(${Mountain})`, backgroundRepeat: 'round', display: 'flex', width: '100%' diff --git a/web/src/features/fba/images/mountain.svg b/web/src/features/fba/images/mountain.svg deleted file mode 100644 index 109e98dc0..000000000 --- a/web/src/features/fba/images/mountain.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - \ No newline at end of file From bee6900007aa2248b6a6387c4018a4434a4d0d86 Mon Sep 17 00:00:00 2001 From: Darren Boss Date: Wed, 30 Oct 2024 14:15:33 -0700 Subject: [PATCH 4/5] missing image and warnings --- web/src/components/FilterColumnsModal.tsx | 2 +- web/src/features/fba/images/mountain.png | Bin 0 -> 5341 bytes .../fbaCalculator/components/FBATable.tsx | 2 +- .../features/moreCast2/components/ActualCell.tsx | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 web/src/features/fba/images/mountain.png diff --git a/web/src/components/FilterColumnsModal.tsx b/web/src/components/FilterColumnsModal.tsx index 30c1986eb..ae9ce9e18 100644 --- a/web/src/components/FilterColumnsModal.tsx +++ b/web/src/components/FilterColumnsModal.tsx @@ -114,7 +114,7 @@ export const FilterColumnsModal = (props: ModalProps): JSX.Element => { aria-label="apply" onClick={handleApplyAndClose} variant="extended" - data-testId="apply-btn" + data-testid="apply-btn" > Apply diff --git a/web/src/features/fba/images/mountain.png b/web/src/features/fba/images/mountain.png new file mode 100644 index 0000000000000000000000000000000000000000..af5a323c6c390128b227a2fa62d7253ec78e2081 GIT binary patch literal 5341 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 { parentCallback={filterColumnsCallback} /> - + { title={MISSING_ACTUAL_MESSAGE} > Date: Wed, 30 Oct 2024 14:37:53 -0700 Subject: [PATCH 5/5] Remove unnecessary properties --- web/src/features/fba/components/viz/ElevationStatus.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/src/features/fba/components/viz/ElevationStatus.tsx b/web/src/features/fba/components/viz/ElevationStatus.tsx index 54fc786ac..9614ac300 100644 --- a/web/src/features/fba/components/viz/ElevationStatus.tsx +++ b/web/src/features/fba/components/viz/ElevationStatus.tsx @@ -55,8 +55,6 @@ const ElevationStatus = ({ tpiStats }: ElevationStatusProps) => {