Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00
Code Issues Projects Releases Wiki Activity

fix: revert form section 100 height (#3345)

Browse Source 
Small fix that reverts
https://github.com/Unleash/unleash/pull/3335/files#r1138829014 - Turns
out it wasn't totally harmless and broke some modals that had more than
100% height and no overflow.

This approach maintains the original logic and adds a new prop for the
segment forms to make them proper modals when used in the project
context.
This commit is contained in:
Nuno Góis 2023-03-17 13:59:46 +00:00 committed by GitHub
parent c68f0038a2
commit 71f6b8e172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/component/common/FormTemplate/FormTemplate.tsx
View File

@ -34,7 +34,6 @@ const StyledContainer = styled('section', {
minHeight: modal ? '100vh' : '80vh',
borderRadius: modal ? 0 : theme.spacing(2),
width: '100%',
height: '100%',
display: 'flex',
margin: '0 auto',
[theme.breakpoints.down(1100)]: {

4
frontend/src/component/project/Project/ProjectSettings/ProjectSegments/ProjectSegments.tsx
View File

@ -41,7 +41,7 @@ export const ProjectSegments = () => {
onClose={() => navigate(GO_BACK)}
label="Create segment"
>
<CreateSegment />
<CreateSegment modal />
</SidebarModal>
}
/>
@ -53,7 +53,7 @@ export const ProjectSegments = () => {
onClose={() => navigate(GO_BACK)}
label="Edit segment"
>
<EditSegment />
<EditSegment modal />
</SidebarModal>
}
/>

7
frontend/src/component/segments/CreateSegment/CreateSegment.tsx
View File

@ -18,7 +18,11 @@ import { SEGMENT_CREATE_BTN_ID } from 'utils/testIds';
import { useSegmentLimits } from 'hooks/api/getters/useSegmentLimits/useSegmentLimits';
import { useOptionalPathParam } from 'hooks/useOptionalPathParam';
export const CreateSegment = () => {
interface ICreateSegmentProps {
modal?: boolean;
}
export const CreateSegment = ({ modal }: ICreateSegmentProps) => {
const projectId = useOptionalPathParam('projectId');
const { uiConfig } = useUiConfig();
const { setToastData, setToastApiError } = useToast();
@ -87,6 +91,7 @@ export const CreateSegment = () => {
return (
<FormTemplate
loading={loading}
modal={modal}
title="Create segment"
description={segmentsFormDescription}
documentationLink={segmentsDocsLink}

7
frontend/src/component/segments/EditSegment/EditSegment.tsx
View File

@ -20,7 +20,11 @@ import { SEGMENT_SAVE_BTN_ID } from 'utils/testIds';
import { useSegmentLimits } from 'hooks/api/getters/useSegmentLimits/useSegmentLimits';
import { useOptionalPathParam } from 'hooks/useOptionalPathParam';
export const EditSegment = () => {
interface IEditSegmentProps {
modal?: boolean;
}
export const EditSegment = ({ modal }: IEditSegmentProps) => {
const projectId = useOptionalPathParam('projectId');
const segmentId = useRequiredPathParam('segmentId');
const { segment } = useSegment(Number(segmentId));
@ -91,6 +95,7 @@ export const EditSegment = () => {
return (
<FormTemplate
loading={loading}
modal={modal}
title="Edit segment"
description={segmentsFormDescription}
documentationLink={segmentsDocsLink}