fix(LabelEditor): show admin-only checkbox to project admins

ibi-group · Aug 16, 2021 · db2101c · db2101c
1 parent c6bffda
commit db2101c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
@@ -69,12 +69,6 @@ class LabelEditor extends React.Component<Props, State> {
       }
     }
 
-    userIsAdmin = (user: ManagerUserState) => {
-      const {permissions} = user
-      if (!permissions) return false
-      else return permissions.isApplicationAdmin() || permissions.canAdministerAnOrganization()
-    }
-
   _onFormChange = ({target}: {target: HTMLInputElement}) => {
     const {checked, name, value: targetValue, type} = target
 
@@ -146,7 +140,8 @@ class LabelEditor extends React.Component<Props, State> {
 
   render () {
     const { newLabel, validation } = this.state
-    const { user } = this.props
+    const { user, projectId } = this.props
+    const isProjectAdmin = user && user.permissions && user.permissions.isProjectAdmin(projectId)
 
     return (
       <Form onChange={(e) => this._onFormChange(e)}>
@@ -186,7 +181,7 @@ class LabelEditor extends React.Component<Props, State> {
                     <FormControl.Feedback />
                   </FormGroup>
                 </Col>
-                {this.userIsAdmin(user) && (
+                {isProjectAdmin && (
                   <Col xs={9}>
                     <Checkbox
                       checked={newLabel.adminOnly}

diff --git a/lib/manager/components/LabelEditorModal.js b/lib/manager/components/LabelEditorModal.js
@@ -60,7 +60,7 @@ export default class LabelEditorModal extends React.Component<
           <LabelEditor
             label={label}
             onDone={this.close}
-            projectId={projectId}
+            projectId={projectId || label.projectId}
           />
         </Body>
       </Modal>

diff --git a/lib/manager/components/LabelPanel.js b/lib/manager/components/LabelPanel.js
@@ -29,7 +29,7 @@ export default class LabelPanel extends Component<Props> {
     const { labels, id: projectId } = project
 
     const projectAdmin =
-      user && user.permissions && user.permissions.isProjectAdmin(project.id)
+      user && user.permissions && user.permissions.isProjectAdmin(projectId)
 
     let labelBody = (
       <div className='noLabelsMessage'>