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.

Sign up for GitHub

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

Jump to bottom

psp-8549 correct property header retired status styling. #4060

Merged
merged 1 commit into from
May 30, 2024
Merged

psp-8549 correct property header retired status styling. #4060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 17 additions & 12 deletions source/frontend/src/features/mapSideBar/property/MotiInventoryHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import styled from 'styled-components';

import { StyledIconButton } from '@/components/common/buttons';
import { HeaderField } from '@/components/common/HeaderField/HeaderField';
import { StyledFiller } from '@/components/common/HeaderField/styles';
import LoadingBackdrop from '@/components/common/LoadingBackdrop';
import { InlineFlexDiv } from '@/components/common/styles';
import TooltipWrapper from '@/components/common/TooltipWrapper';
Expand Down Expand Up @@ -75,12 +76,22 @@ export const MotiInventoryHeader: React.FunctionComponent<IMotiInventoryHeaderPr
)}
</Col>
<Col className="text-right">
<HeaderField className="justify-content-end" label="PID:">
{pid}
</HeaderField>
<HeaderField label="Land parcel type:" className="justify-content-end">
{apiProperty?.propertyType?.description}
</HeaderField>
<StyledFiller>
<HeaderField className="justify-content-end" label="PID:">
{pid}
</HeaderField>
<HeaderField label="Land parcel type:" className="justify-content-end">
{apiProperty?.propertyType?.description}
</HeaderField>
{isRetired && (
<HeaderField label="" className="justify-content-end align-items-end mt-auto">
<RetiredWarning>
<AiOutlineExclamationCircle size={16} />
RETIRED
</RetiredWarning>
</HeaderField>
)}
</StyledFiller>
</Col>
<Col xs="auto" className="d-flex p-0 align-items-center justify-content-end">
{hasLocation && (
Expand All @@ -96,12 +107,6 @@ export const MotiInventoryHeader: React.FunctionComponent<IMotiInventoryHeaderPr
</TooltipWrapper>
)}
</Col>
{isRetired && (
<RetiredWarning>
<AiOutlineExclamationCircle size={16} />
RETIRED
</RetiredWarning>
)}
</Row>
<StyledDivider />
</>
Expand Down
63 changes: 39 additions & 24 deletions ...frontend/src/features/mapSideBar/property/__snapshots__/MotiInventoryHeader.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,18 @@ exports[`MotiInventoryHeader component > renders as expected 1`] = `
class="Toastify"
/>
<div />
<div
.c0 {
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
}
<div
class="no-gutters row"
>
<div
Expand Down Expand Up @@ -51,36 +62,40 @@ exports[`MotiInventoryHeader component > renders as expected 1`] = `
class="text-right col"
>
<div
class="justify-content-end row"
class="c0"
>
<div
class="pr-0 text-left col-auto"
class="justify-content-end row"
>
<strong>
<label>
PID:
</label>
</strong>
<div
class="pr-0 text-left col-auto"
>
<strong>
<label>
PID:
</label>
</strong>
</div>
<div
class="pl-1 text-left col-auto"
/>
</div>
<div
class="pl-1 text-left col-auto"
/>
</div>
<div
class="justify-content-end row"
>
<div
class="pr-0 text-left col-auto"
class="justify-content-end row"
>
<strong>
<label>
Land parcel type:
</label>
</strong>
<div
class="pr-0 text-left col-auto"
>
<strong>
<label>
Land parcel type:
</label>
</strong>
</div>
<div
class="pl-1 text-left col-auto"
/>
</div>
<div
class="pl-1 text-left col-auto"
/>
</div>
</div>
<div
Expand Down
Loading