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

PSP-10122 | Fixed layout #4680

Merged
merged 1 commit into from
Mar 6, 2025
Merged

PSP-10122 | Fixed layout #4680

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
13 changes: 0 additions & 13 deletions source/backend/entities/Partials/PropertyMgmtActivitySubtype.cs
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions .../frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 1 addition & 8 deletions source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions ...nd/src/features/mapSideBar/acquisition/common/__snapshots__/AcquisitionMenu.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 10 additions & 0 deletions .../frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 1 addition & 8 deletions source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions ...nd/src/features/mapSideBar/disposition/common/__snapshots__/DispositionMenu.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 10 additions & 0 deletions ...e/frontend/src/features/mapSideBar/research/__snapshots__/ResearchContainer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 1 addition & 8 deletions source/frontend/src/features/mapSideBar/research/common/ResearchMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions ...frontend/src/features/mapSideBar/research/common/__snapshots__/ResearchMenu.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions source/frontend/src/features/mapSideBar/shared/FileMenuView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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;
Expand Down
Loading