From 0a7eb64b07a10d52ebcbb685e0e50f6857c9aca0 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 25 Sep 2019 10:33:37 -0400
Subject: [PATCH 1/2] fix(user-admin): remove eTID; filter permissions on
 module

Only show the feed-specific permissions relevant for the enabled modules for the application
instance.
---
 lib/admin/components/ProjectAccessSettings.js |  6 ++++--
 lib/admin/components/permissions.js           | 21 ++++---------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/lib/admin/components/ProjectAccessSettings.js b/lib/admin/components/ProjectAccessSettings.js
index f64f7dd66..de410fa10 100644
--- a/lib/admin/components/ProjectAccessSettings.js
+++ b/lib/admin/components/ProjectAccessSettings.js
@@ -4,7 +4,7 @@ import React, {Component} from 'react'
 import {Row, Col, Checkbox, ButtonGroup} from 'react-bootstrap'
 
 import OptionButton from '../../common/components/OptionButton'
-import {getComponentMessages} from '../../common/util/config'
+import {getComponentMessages, isModuleEnabled} from '../../common/util/config'
 import * as feedActions from '../../manager/actions/feeds'
 import allPermissions from './permissions'
 
@@ -132,7 +132,9 @@ export default class ProjectAccessSettings extends Component<Props, State> {
               </Col>
               <Col xs={6}>
                 <h4>{this.messages('permissions')}</h4>
-                {allPermissions.map((permission, i) => (
+                {allPermissions
+                  .filter(permission => permission.module ? isModuleEnabled(permission.module) : true)
+                  .map((permission, i) => (
                   <Checkbox
                     // $FlowFixMe
                     inputRef={ref => { this[`permission-${permission.type}`] = ref }}
diff --git a/lib/admin/components/permissions.js b/lib/admin/components/permissions.js
index 77e9c9f88..1afc7ddd6 100644
--- a/lib/admin/components/permissions.js
+++ b/lib/admin/components/permissions.js
@@ -1,11 +1,6 @@
 // @flow
 
 export default [
-  /* {
-    type: 'administer-project',
-    name: 'Administer Project',
-    feedSpecific: false
-  }, */
   {
     type: 'manage-feed',
     name: 'Manage Feed Configuration',
@@ -24,21 +19,13 @@ export default [
   {
     type: 'edit-alert',
     name: 'Edit GTFS-RT Alerts',
-    feedSpecific: true
+    feedSpecific: true,
+    module: 'alerts'
   },
   {
     type: 'approve-alert',
     name: 'Approve GTFS-RT Alerts',
-    feedSpecific: true
-  },
-  {
-    type: 'edit-etid',
-    name: 'Edit eTID Configurations',
-    feedSpecific: true
-  },
-  {
-    type: 'approve-etid',
-    name: 'Approve eTID Configurations',
-    feedSpecific: true
+    feedSpecific: true,
+    module: 'alerts'
   }
 ]

From e2a9ff46e3c1ce46f6898507eb59fe8c315d632b Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Mon, 30 Sep 2019 12:10:23 -0400
Subject: [PATCH 2/2] refactor(lint): fix whitespace

---
 lib/admin/components/ProjectAccessSettings.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/admin/components/ProjectAccessSettings.js b/lib/admin/components/ProjectAccessSettings.js
index de410fa10..b5755988f 100644
--- a/lib/admin/components/ProjectAccessSettings.js
+++ b/lib/admin/components/ProjectAccessSettings.js
@@ -135,15 +135,16 @@ export default class ProjectAccessSettings extends Component<Props, State> {
                 {allPermissions
                   .filter(permission => permission.module ? isModuleEnabled(permission.module) : true)
                   .map((permission, i) => (
-                  <Checkbox
-                    // $FlowFixMe
-                    inputRef={ref => { this[`permission-${permission.type}`] = ref }}
-                    key={permission.type}
-                    checked={settings.permissions.indexOf(permission.type) !== -1}
-                    onChange={this.permissionsUpdated}>
-                    {permission.name}
-                  </Checkbox>
-                ))}
+                    <Checkbox
+                      // $FlowFixMe
+                      inputRef={ref => { this[`permission-${permission.type}`] = ref }}
+                      key={permission.type}
+                      checked={settings.permissions.indexOf(permission.type) !== -1}
+                      onChange={this.permissionsUpdated}>
+                      {permission.name}
+                    </Checkbox>
+                  ))
+                }
               </Col>
             </Row>
             : ''