OCLOMRS-955 and OCLOMRS-956: Add missing permissions checks for organizations #676
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…955 and Missing Permissions Check for Edit Organization button:OCLOMRS-956
| @@ -25,6 +25,7 @@ import {ConfirmationDialog} from "../../../utils"; | |||
|
|
|||
| interface Props { | |||
| members?: OrgMember[]; | |||
| canModifyMembers:boolean; | |||
There was a problem hiding this comment.
Suggested change
| canModifyMembers:boolean; | |
| canModifyMembers: boolean; |
| @@ -59,7 +60,7 @@ const confirmationMsg = () => { | |||
| </div> | |||
| ); | |||
| }; | |||
| const OrganisationMembers: React.FC<Props> = ({ members, orgUrl, addMember, loading, addError, deleteMember ,deleteError}) => { | |||
| const OrganisationMembers: React.FC<Props> = ({ canModifyMembers,members, orgUrl, addMember, loading, addError, deleteMember ,deleteError}) => { | |||
There was a problem hiding this comment.
Suggested change
| const OrganisationMembers: React.FC<Props> = ({ canModifyMembers,members, orgUrl, addMember, loading, addError, deleteMember ,deleteError}) => { | |
| const OrganisationMembers: React.FC<Props> = ({ canModifyMembers, members, orgUrl, addMember, loading, addError, deleteMember ,deleteError}) => { |
| @@ -109,9 +115,10 @@ const ViewOrganisationPage: React.FC<Props> = ({ | |||
| retrieveOrgCollections(orgUrl); | |||
| retrieveOrgMembers(orgUrl); | |||
| }, [orgUrl, retrieveOrg, retrieveOrgCollections, retrieveOrgSources,retrieveOrgMembers]); | |||
| const isAnOrgMember = (owner: string, id:string) => Boolean(profile?.username === owner || usersOrgs?.map(org => org.id).includes(id)); | |||
| const canModify=isAnOrgMember(organisation.created_by, organisation.id); | |||
There was a problem hiding this comment.
Suggested change
| const canModify=isAnOrgMember(organisation.created_by, organisation.id); | |
| const canModify = isAnOrgMember(organisation.created_by, organisation.id); |
| @@ -1,6 +1,6 @@ | |||
| import React, {useEffect} from "react"; | |||
| import {connect} from "react-redux"; | |||
| import {useLocation} from "react-router-dom"; | |||
| import {useLocation, useParams} from "react-router-dom"; | |||
There was a problem hiding this comment.
I don't think we need this import useParams
| @@ -29,8 +29,12 @@ import {Grid, makeStyles, createStyles} from "@material-ui/core"; | |||
| import {EditButton} from "../../containers/components/EditButton"; | |||
| import {getPrettyError} from "../../../utils"; | |||
| import { AppState } from "../../../redux"; | |||
| import {APIOrg, APIProfile, canModifyContainer, profileSelector} from "../../authentication"; | |||
There was a problem hiding this comment.
Please remove this import of canModifyContainer since you are not using it.
|
Thanks, @hadijahkyampeire for the review, I have updated the PR with improved formatting. |
hadijahkyampeire
approved these changes
Mar 21, 2021
ibacher
approved these changes
Mar 22, 2021
ibacher
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Missing Permissions Check for Organization Member Management:OCLOMRS-955 and Missing Permissions Check for "Edit Organization" button:OCLOMRS-956"