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

fix: take into account project segments permission in form (#5352)

Browse Source 
https://linear.app/unleash/issue/SR-184/ticket-1106-users-with-createedit-project-segment-dont-see-all-the

https://github.com/Unleash/unleash/pull/5304 did not take into account
permissions further into the Segment form.

This PR fixes the remaining permission checks to take into consideration
the project-level permission: `UPDATE_PROJECT_SEGMENT`.
This commit is contained in:
Nuno Góis 2023-11-16 11:54:56 +00:00 committed by GitHub
parent 2dd2d520e3
commit f8a9d7f355
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/component/segments/SegmentEmpty.tsx
View File

@ -1,9 +1,13 @@
import { styled, Typography } from '@mui/material'; import { styled, Typography } from '@mui/material';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { CREATE_SEGMENT } from 'component/providers/AccessProvider/permissions'; import {
CREATE_SEGMENT,
UPDATE_PROJECT_SEGMENT,
} from 'component/providers/AccessProvider/permissions';
import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
import AccessContext from 'contexts/AccessContext'; import AccessContext from 'contexts/AccessContext';
import { useContext } from 'react'; import { useContext } from 'react';
import { useOptionalPathParam } from 'hooks/useOptionalPathParam';
const StyledDiv = styled('div')(({ theme }) => ({ const StyledDiv = styled('div')(({ theme }) => ({
display: 'flex', display: 'flex',
@ -35,6 +39,7 @@ const StyledLink = styled(Link)(({ theme }) => ({
})); }));
export const SegmentEmpty = () => { export const SegmentEmpty = () => {
const projectId = useOptionalPathParam('projectId');
const { hasAccess } = useContext(AccessContext); const { hasAccess } = useContext(AccessContext);
return ( return (
@ -46,7 +51,10 @@ export const SegmentEmpty = () => {
and can be reused. and can be reused.
</StyledParagraph> </StyledParagraph>
<ConditionallyRender <ConditionallyRender
condition={hasAccess(CREATE_SEGMENT)} condition={hasAccess(
[CREATE_SEGMENT, UPDATE_PROJECT_SEGMENT],
projectId,
)}
show={ show={
<StyledLink to='/segments/create'> <StyledLink to='/segments/create'>
Create your first segment Create your first segment

1
frontend/src/component/segments/SegmentForm.tsx
View File

@ -72,6 +72,7 @@ export const SegmentForm: React.FC<ISegmentProps> = ({
condition={currentStep === 2} condition={currentStep === 2}
show={ show={
<SegmentFormStepTwo <SegmentFormStepTwo
project={project}
constraints={constraints} constraints={constraints}
setConstraints={setConstraints} setConstraints={setConstraints}
setCurrentStep={setCurrentStep} setCurrentStep={setCurrentStep}

10
frontend/src/component/segments/SegmentFormStepTwo.tsx
View File

@ -8,6 +8,7 @@ import { CreateUnleashContext } from 'component/context/CreateUnleashContext/Cre
import { import {
CREATE_CONTEXT_FIELD, CREATE_CONTEXT_FIELD,
CREATE_SEGMENT, CREATE_SEGMENT,
UPDATE_PROJECT_SEGMENT,
UPDATE_SEGMENT, UPDATE_SEGMENT,
} from 'component/providers/AccessProvider/permissions'; } from 'component/providers/AccessProvider/permissions';
import useUnleashContext from 'hooks/api/getters/useUnleashContext/useUnleashContext'; import useUnleashContext from 'hooks/api/getters/useUnleashContext/useUnleashContext';
@ -32,6 +33,7 @@ import { useSegmentLimits } from 'hooks/api/getters/useSegmentLimits/useSegmentL
import { GO_BACK } from 'constants/navigate'; import { GO_BACK } from 'constants/navigate';
interface ISegmentFormPartTwoProps { interface ISegmentFormPartTwoProps {
project?: string;
constraints: IConstraint[]; constraints: IConstraint[];
setConstraints: React.Dispatch<React.SetStateAction<IConstraint[]>>; setConstraints: React.Dispatch<React.SetStateAction<IConstraint[]>>;
setCurrentStep: React.Dispatch<React.SetStateAction<SegmentFormStep>>; setCurrentStep: React.Dispatch<React.SetStateAction<SegmentFormStep>>;
@ -101,6 +103,7 @@ const StyledCancelButton = styled(Button)(({ theme }) => ({
export const SegmentFormStepTwo: React.FC<ISegmentFormPartTwoProps> = ({ export const SegmentFormStepTwo: React.FC<ISegmentFormPartTwoProps> = ({
children, children,
project,
constraints, constraints,
setConstraints, setConstraints,
setCurrentStep, setCurrentStep,
@ -112,7 +115,10 @@ export const SegmentFormStepTwo: React.FC<ISegmentFormPartTwoProps> = ({
const { context = [] } = useUnleashContext(); const { context = [] } = useUnleashContext();
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const segmentValuesCount = useSegmentValuesCount(constraints); const segmentValuesCount = useSegmentValuesCount(constraints);
const modePermission = mode === 'create' ? CREATE_SEGMENT : UPDATE_SEGMENT; const modePermission =
mode === 'create'
? [CREATE_SEGMENT, UPDATE_PROJECT_SEGMENT]
: [UPDATE_SEGMENT, UPDATE_PROJECT_SEGMENT];
const { segmentValuesLimit } = useSegmentLimits(); const { segmentValuesLimit } = useSegmentLimits();
const overSegmentValuesLimit: boolean = Boolean( const overSegmentValuesLimit: boolean = Boolean(
@ -197,7 +203,7 @@ export const SegmentFormStepTwo: React.FC<ISegmentFormPartTwoProps> = ({
ref={constraintsAccordionListRef} ref={constraintsAccordionListRef}
constraints={constraints} constraints={constraints}
setConstraints={ setConstraints={
hasAccess(modePermission) hasAccess(modePermission, project)
? setConstraints ? setConstraints
: undefined : undefined
} }