diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj index 4f25509a84..d59b215a43 100644 --- a/source/backend/api/Pims.Api.csproj +++ b/source/backend/api/Pims.Api.csproj @@ -2,9 +2,9 @@ 0ef6255f-9ea0-49ec-8c65-c172304b4926 - 5.2.3-79.18 - 5.2.3-79.18 - 5.2.3.79 + 5.2.4-79.18 + 5.2.4-79.18 + 5.2.4.79 true 16BC0468-78F6-4C91-87DA-7403C919E646 net8.0 diff --git a/source/frontend/package.json b/source/frontend/package.json index 316fdcfcab..a977cc9ec5 100644 --- a/source/frontend/package.json +++ b/source/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "5.2.3-79.18", + "version": "5.2.4-79.18", "private": true, "dependencies": { "@bcgov/bc-sans": "1.0.1", diff --git a/source/frontend/src/assets/images/edit-map-marker.svg b/source/frontend/src/assets/images/edit-map-marker.svg index 364fc8fdc9..3f4616318e 100644 --- a/source/frontend/src/assets/images/edit-map-marker.svg +++ b/source/frontend/src/assets/images/edit-map-marker.svg @@ -1,11 +1,6 @@ - diff --git a/source/frontend/src/components/common/buttons/EditPropertiesButton.tsx b/source/frontend/src/components/common/buttons/EditPropertiesButton.tsx new file mode 100644 index 0000000000..b5db42a3ce --- /dev/null +++ b/source/frontend/src/components/common/buttons/EditPropertiesButton.tsx @@ -0,0 +1,11 @@ +import styled from 'styled-components'; + +import EditMapMarkerIcon from '@/assets/images/edit-map-marker.svg?react'; + +export const EditPropertiesIcon: React.FC = () => { + return ; +}; + +const EditMapMarkerButton = styled(EditMapMarkerIcon)` + fill: ${props => props.theme.css.primaryColor}; +`; diff --git a/source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionMenu.tsx b/source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionMenu.tsx index f35b085d0f..bf3eed3db2 100644 --- a/source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionMenu.tsx +++ b/source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionMenu.tsx @@ -3,7 +3,7 @@ import { Col, Row } from 'react-bootstrap'; import { FaCaretRight } from 'react-icons/fa'; import styled from 'styled-components'; -import EditMapMarker from '@/assets/images/edit-map-marker.svg?react'; +import { EditPropertiesIcon } from '@/components/common/buttons/EditPropertiesButton'; import EditButton from '@/components/common/EditButton'; import TooltipIcon from '@/components/common/TooltipIcon'; import { Claims, Roles } from '@/constants/index'; @@ -57,7 +57,7 @@ const AcquisitionMenu: React.FunctionComponent< {hasClaim(Claims.ACQUISITION_EDIT) && canEditDetails() && ( } + icon={} onClick={props.onShowPropertySelector} /> )} diff --git a/source/frontend/src/features/mapSideBar/acquisition/common/__snapshots__/AcquisitionMenu.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/common/__snapshots__/AcquisitionMenu.test.tsx.snap index 1aa4c5ae4f..9009822ae2 100644 --- a/source/frontend/src/features/mapSideBar/acquisition/common/__snapshots__/AcquisitionMenu.test.tsx.snap +++ b/source/frontend/src/features/mapSideBar/acquisition/common/__snapshots__/AcquisitionMenu.test.tsx.snap @@ -110,6 +110,7 @@ exports[`AcquisitionMenu component > matches snapshot 1`] = ` type="button" > matches snapshot 1`] = ` width="2.4rem" xmlns="http://www.w3.org/2000/svg" > - - - + } + icon={} onClick={props.onShowPropertySelector} /> )} diff --git a/source/frontend/src/features/mapSideBar/research/common/ResearchMenu.tsx b/source/frontend/src/features/mapSideBar/research/common/ResearchMenu.tsx index c1871b2118..7c44f9f339 100644 --- a/source/frontend/src/features/mapSideBar/research/common/ResearchMenu.tsx +++ b/source/frontend/src/features/mapSideBar/research/common/ResearchMenu.tsx @@ -2,7 +2,7 @@ import { Col, Row } from 'react-bootstrap'; import { FaCaretRight } from 'react-icons/fa'; import styled from 'styled-components'; -import EditMapMarker from '@/assets/images/edit-map-marker.svg?react'; +import { EditPropertiesIcon } from '@/components/common/buttons/EditPropertiesButton'; import { EditButton } from '@/components/common/EditButton'; import { Claims } from '@/constants/index'; import { useKeycloakWrapper } from '@/hooks/useKeycloakWrapper'; @@ -45,7 +45,7 @@ const ResearchMenu: React.FunctionComponent< {hasClaim(Claims.RESEARCH_EDIT) && ( } + icon={} onClick={() => { props.onEdit(); }} diff --git a/source/frontend/src/features/mapSideBar/research/common/__snapshots__/ResearchMenu.test.tsx.snap b/source/frontend/src/features/mapSideBar/research/common/__snapshots__/ResearchMenu.test.tsx.snap index 90941731b9..abf28d4507 100644 --- a/source/frontend/src/features/mapSideBar/research/common/__snapshots__/ResearchMenu.test.tsx.snap +++ b/source/frontend/src/features/mapSideBar/research/common/__snapshots__/ResearchMenu.test.tsx.snap @@ -110,6 +110,7 @@ exports[`ResearchMenu component > renders as expected when provided no research type="button" > renders as expected when provided no research width="2.4rem" xmlns="http://www.w3.org/2000/svg" > - - - +