hotfix - consolidation/subdivision button display (#4042)

* psp-8441 correct missing subdivision icon. * bump hotfix version. * snapshot updates.
bcgov · May 24, 2024 · 866d310 · 866d310
1 parent a94c3a6
commit 866d310
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 33 deletions.
diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj
@@ -2,9 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>5.2.3-79.18</Version>
-    <Version>5.2.3-79.18</Version>
-    <AssemblyVersion>5.2.3.79</AssemblyVersion>
+    <Version>5.2.4-79.18</Version>
+    <Version>5.2.4-79.18</Version>
+    <AssemblyVersion>5.2.4.79</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>
     <TargetFramework>net8.0</TargetFramework>

diff --git 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
diff --git a/source/frontend/src/components/common/buttons/EditPropertiesButton.tsx 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 <EditMapMarkerButton width="2.4rem" height="2.4rem" />;
+};
+
+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
@@ -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() && (
                     <EditButton
                       title="Change properties"
-                      icon={<EditMapMarker width="2.4rem" height="2.4rem" />}
+                      icon={<EditPropertiesIcon />}
                       onClick={props.onShowPropertySelector}
                     />
                   )}

diff --git a/...nd/src/features/mapSideBar/acquisition/common/__snapshots__/AcquisitionMenu.test.tsx.snap b/...nd/src/features/mapSideBar/acquisition/common/__snapshots__/AcquisitionMenu.test.tsx.snap
@@ -110,22 +110,15 @@ exports[`AcquisitionMenu component > matches snapshot 1`] = `
           type="button"
         >
           <svg
+            class=""
             data-name="Layer 2"
             height="2.4rem"
             id="Layer_2"
             viewBox="0 0 56.95 85.87"
             width="2.4rem"
             xmlns="http://www.w3.org/2000/svg"
           >
-            <defs>
-              <style>
-                
-      .cls-1 {
-        fill: #036;
-      }
-    
-              </style>
-            </defs>
+            <defs />
             <g
               data-name="PDF preview"
               id="PDF_preview"

diff --git a/source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.tsx b/source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.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';
@@ -56,7 +56,7 @@ const DispositionMenu: React.FunctionComponent<
                   {hasClaim(Claims.DISPOSITION_EDIT) && canEditDetails() && (
                     <EditButton
                       title="Change properties"
-                      icon={<EditMapMarker width="2.4rem" height="2.4rem" />}
+                      icon={<EditPropertiesIcon />}
                       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
@@ -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) && (
                 <EditButton
                   title="Change properties"
-                  icon={<EditMapMarker width="2.4rem" height="2.4rem" />}
+                  icon={<EditPropertiesIcon />}
                   onClick={() => {
                     props.onEdit();
                   }}

diff --git a/...frontend/src/features/mapSideBar/research/common/__snapshots__/ResearchMenu.test.tsx.snap b/...frontend/src/features/mapSideBar/research/common/__snapshots__/ResearchMenu.test.tsx.snap
@@ -110,22 +110,15 @@ exports[`ResearchMenu component > renders as expected when provided no research
           type="button"
         >
           <svg
+            class=""
             data-name="Layer 2"
             height="2.4rem"
             id="Layer_2"
             viewBox="0 0 56.95 85.87"
             width="2.4rem"
             xmlns="http://www.w3.org/2000/svg"
           >
-            <defs>
-              <style>
-                
-      .cls-1 {
-        fill: #036;
-      }
-    
-              </style>
-            </defs>
+            <defs />
             <g
               data-name="PDF preview"
               id="PDF_preview"