Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing mountain #4051

Merged
merged 5 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/src/components/FilterColumnsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
</Fab>
Expand Down
8 changes: 3 additions & 5 deletions web/src/features/fba/components/viz/ElevationStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -55,14 +55,12 @@ const ElevationStatus = ({ tpiStats }: ElevationStatusProps) => {
<Grid xs={12}>
<Box
sx={{
backgroundBlendMode: 'overlay',
backgroundColor: 'rgba(255, 255, 255, 0.6)',
backgroundImage: `url(${Mountain})`,
background: `url(${Mountain})`,
backgroundRepeat: 'round',
display: 'flex',
width: '100%'
}}
data-testId="tpi-mountain"
data-testid="tpi-mountain"
>
<Grid sx={{ paddingLeft: theme.spacing(0.5), paddingRight: theme.spacing(0.5) }} container xs={12}>
<Grid container sx={{ height: theme.spacing(8) }} xs={12}>
Expand Down
Binary file added web/src/features/fba/images/mountain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 0 additions & 28 deletions web/src/features/fba/images/mountain.svg

This file was deleted.

2 changes: 1 addition & 1 deletion web/src/features/fbaCalculator/components/FBATable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ const FBATable = (props: FBATableProps) => {
parentCallback={filterColumnsCallback}
/>

<FireTable ariaLabel="Fire Behaviour Analysis table" data-testId={props.testId}>
<FireTable ariaLabel="Fire Behaviour Analysis table" data-testid={props.testId}>
<FBATableHead
toggleSorting={toggleSorting}
order={order}
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/moreCast2/components/ActualCell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const ActualCell = ({ missingActual, value }: ActualCellProps) => {
title={MISSING_ACTUAL_MESSAGE}
>
<TextField
data-testId="actual-cell"
data-testid="actual-cell"
sx={{
backgroundColor: theme.palette.common.white,
border: '2px',
Expand Down
Loading