Fixed layout

bcgov · Mar 6, 2025 · 9ad5b35 · 9ad5b35
1 parent 57c543d
commit 9ad5b35
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 39 deletions.
diff --git a/source/backend/entities/Partials/PropertyMgmtActivitySubtype.cs b/source/backend/entities/Partials/PropertyMgmtActivitySubtype.cs
diff --git a/.../frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap b/.../frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap
@@ -545,11 +545,21 @@ exports[`AcquisitionView component > renders as expected 1`] = `
 }
 
 .c21 {
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
   text-align: left;
   padding: 0px;
   margin: 0px;
   width: 100%;
   color: var(--surface-color-primary-button-default);
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
 }
 
 .c23 {

diff --git a/source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionMenu.tsx b/source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionMenu.tsx
@@ -11,6 +11,7 @@ import { Claims } from '@/constants/index';
 import { useKeycloakWrapper } from '@/hooks/useKeycloakWrapper';
 import { ApiGen_Concepts_AcquisitionFile } from '@/models/api/generated/ApiGen_Concepts_AcquisitionFile';
 
+import { StyledMenuWrapper } from '../../shared/FileMenuView';
 import AcquisitionFileStatusUpdateSolver from '../tabs/fileDetails/detail/AcquisitionFileStatusUpdateSolver';
 import { cannotEditMessage } from './constants';
 import GenerateFormContainer from './GenerateForm/GenerateFormContainer';
@@ -121,14 +122,6 @@ const AcquisitionMenu: React.FunctionComponent<
 
 export default AcquisitionMenu;
 
-const StyledMenuWrapper = styled.div`
-  text-align: left;
-  padding: 0px;
-  margin: 0px;
-  width: 100%;
-  color: ${props => props.theme.css.linkColor};
-`;
-
 const StyledMenuCol = styled(Col)`
   min-height: 2.5rem;
   line-height: 3rem;

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
@@ -270,11 +270,21 @@ exports[`AcquisitionMenu component > matches snapshot 1`] = `
 }
 
 .c0 {
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
   text-align: left;
   padding: 0px;
   margin: 0px;
   width: 100%;
   color: var(--surface-color-primary-button-default);
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
 }
 
 .c2 {

diff --git a/.../frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap b/.../frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap
@@ -517,11 +517,21 @@ exports[`DispositionView component > renders as expected 1`] = `
 }
 
 .c21 {
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
   text-align: left;
   padding: 0px;
   margin: 0px;
   width: 100%;
   color: var(--surface-color-primary-button-default);
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
 }
 
 .c23 {

diff --git a/source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.tsx b/source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.tsx
@@ -12,6 +12,7 @@ import { useKeycloakWrapper } from '@/hooks/useKeycloakWrapper';
 import { ApiGen_Concepts_DispositionFile } from '@/models/api/generated/ApiGen_Concepts_DispositionFile';
 
 import { cannotEditMessage } from '../../acquisition/common/constants';
+import { StyledMenuWrapper } from '../../shared/FileMenuView';
 import DispositionStatusUpdateSolver from '../tabs/fileDetails/detail/DispositionStatusUpdateSolver';
 
 export interface IDispositionMenuProps {
@@ -112,14 +113,6 @@ const DispositionMenu: React.FunctionComponent<
 
 export default DispositionMenu;
 
-const StyledMenuWrapper = styled.div`
-  text-align: left;
-  padding: 0px;
-  margin: 0px;
-  width: 100%;
-  color: ${props => props.theme.css.linkColor};
-`;
-
 const StyledMenuCol = styled(Col)`
   min-height: 2.5rem;
   line-height: 3rem;

diff --git a/...nd/src/features/mapSideBar/disposition/common/__snapshots__/DispositionMenu.test.tsx.snap b/...nd/src/features/mapSideBar/disposition/common/__snapshots__/DispositionMenu.test.tsx.snap
@@ -215,11 +215,21 @@ exports[`DispositionMenu component > matches snapshot 1`] = `
 }
 
 .c0 {
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
   text-align: left;
   padding: 0px;
   margin: 0px;
   width: 100%;
   color: var(--surface-color-primary-button-default);
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
 }
 
 .c2 {

diff --git a/...e/frontend/src/features/mapSideBar/research/__snapshots__/ResearchContainer.test.tsx.snap b/...e/frontend/src/features/mapSideBar/research/__snapshots__/ResearchContainer.test.tsx.snap
@@ -507,11 +507,21 @@ exports[`ResearchContainer component > renders as expected 1`] = `
 }
 
 .c21 {
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
   text-align: left;
   padding: 0px;
   margin: 0px;
   width: 100%;
   color: var(--surface-color-primary-button-default);
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
 }
 
 .c23 {

diff --git a/source/frontend/src/features/mapSideBar/research/common/ResearchMenu.tsx b/source/frontend/src/features/mapSideBar/research/common/ResearchMenu.tsx
@@ -11,6 +11,7 @@ import { useKeycloakWrapper } from '@/hooks/useKeycloakWrapper';
 import { ApiGen_Concepts_ResearchFile } from '@/models/api/generated/ApiGen_Concepts_ResearchFile';
 
 import { cannotEditMessage } from '../../acquisition/common/constants';
+import { StyledMenuWrapper } from '../../shared/FileMenuView';
 import ResearchStatusUpdateSolver from '../tabs/fileDetails/ResearchStatusUpdateSolver';
 
 export interface IResearchMenuProps {
@@ -99,14 +100,6 @@ const ResearchMenu: React.FunctionComponent<
 
 export default ResearchMenu;
 
-const StyledMenuWrapper = styled.div`
-  text-align: left;
-  padding: 0px;
-  margin: 0px;
-  width: 100%;
-  color: ${({ theme }) => theme.css.linkColor};
-`;
-
 const StyledMenuCol = styled(Col)`
   min-height: 2.5rem;
   line-height: 3rem;

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
@@ -270,11 +270,21 @@ exports[`ResearchMenu component > renders as expected when provided no research
 }
 
 .c0 {
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
   text-align: left;
   padding: 0px;
   margin: 0px;
   width: 100%;
   color: var(--surface-color-primary-button-default);
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
 }
 
 .c2 {

diff --git a/source/frontend/src/features/mapSideBar/shared/FileMenuView.tsx b/source/frontend/src/features/mapSideBar/shared/FileMenuView.tsx
@@ -93,7 +93,7 @@ const FileMenu: React.FunctionComponent<React.PropsWithChildren<IFileMenuProps>>
               <Col xs="1">{currentPropertyIndex === index && <FaCaretRight />}</Col>
               <Col xs="auto" className="pr-2">
                 <StyledIconWrapper className={cx({ selected: currentPropertyIndex === index })}>
-                  {index}
+                  {index + 1}
                 </StyledIconWrapper>
               </Col>
               <Col>
@@ -114,7 +114,7 @@ const FileMenu: React.FunctionComponent<React.PropsWithChildren<IFileMenuProps>>
 
 export default FileMenu;
 
-const StyledMenuWrapper = styled.div`
+export const StyledMenuWrapper = styled.div`
   flex: 1;
   text-align: left;
   padding: 0px;