Merge branch 'master' onto working copy

3 files changed, 16 insertions, 31 deletions

diff --git a/frontend/src/containers/projects/NewProjectButtonContainer.js b/frontend/src/containers/projects/NewProjectButtonContainer.js
index f1d83ea3..ffd4a4a3 100644
--- a/frontend/src/containers/projects/NewProjectButtonContainer.js
+++ b/frontend/src/containers/projects/NewProjectButtonContainer.js
@@ -2,14 +2,12 @@ import { connect } from 'react-redux'
 import { openNewProjectModal } from '../../actions/modals/projects'
 import NewProjectButtonComponent from '../../components/projects/NewProjectButtonComponent'
 
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
     return {
         onClick: () => dispatch(openNewProjectModal()),
     }
 }
 
-const NewProjectButtonContainer = connect(undefined, mapDispatchToProps)(
-    NewProjectButtonComponent,
-)
+const NewProjectButtonContainer = connect(undefined, mapDispatchToProps)(NewProjectButtonComponent)
 
 export default NewProjectButtonContainer
diff --git a/frontend/src/containers/projects/ProjectActions.js b/frontend/src/containers/projects/ProjectActions.js
index b9f9a534..8bcbb7fd 100644
--- a/frontend/src/containers/projects/ProjectActions.js
+++ b/frontend/src/containers/projects/ProjectActions.js
@@ -8,16 +8,13 @@ const mapStateToProps = (state, ownProps) => {
     }
 }
 
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
     return {
-        onViewUsers: id => {
-        }, // TODO implement user viewing
-        onDelete: id => dispatch(deleteProject(id)),
+        onViewUsers: (id) => {}, // TODO implement user viewing
+        onDelete: (id) => dispatch(deleteProject(id)),
     }
 }
 
-const ProjectActions = connect(mapStateToProps, mapDispatchToProps)(
-    ProjectActionButtons,
-)
+const ProjectActions = connect(mapStateToProps, mapDispatchToProps)(ProjectActionButtons)
 
 export default ProjectActions
diff --git a/frontend/src/containers/projects/VisibleProjectAuthList.js b/frontend/src/containers/projects/VisibleProjectAuthList.js
index b7ef6d24..f0010540 100644
--- a/frontend/src/containers/projects/VisibleProjectAuthList.js
+++ b/frontend/src/containers/projects/VisibleProjectAuthList.js
@@ -6,34 +6,24 @@ const getVisibleProjectAuths = (projectAuths, filter) => {
         case 'SHOW_ALL':
             return projectAuths
         case 'SHOW_OWN':
-            return projectAuths.filter(
-                projectAuth => projectAuth.authorizationLevel === 'OWN',
-            )
+            return projectAuths.filter((projectAuth) => projectAuth.authorizationLevel === 'OWN')
         case 'SHOW_SHARED':
-            return projectAuths.filter(
-                projectAuth => projectAuth.authorizationLevel !== 'OWN',
-            )
+            return projectAuths.filter((projectAuth) => projectAuth.authorizationLevel !== 'OWN')
         default:
             return projectAuths
     }
 }
 
-const mapStateToProps = state => {
-    const denormalizedAuthorizations = state.projectList.authorizationsOfCurrentUser.map(
-        authorizationIds => {
-            const authorization = state.objects.authorization[authorizationIds]
-            authorization.user = state.objects.user[authorization.userId]
-            authorization.project =
-                state.objects.project[authorization.projectId]
-            return authorization
-        },
-    )
+const mapStateToProps = (state) => {
+    const denormalizedAuthorizations = state.projectList.authorizationsOfCurrentUser.map((authorizationIds) => {
+        const authorization = state.objects.authorization[authorizationIds]
+        authorization.user = state.objects.user[authorization.userId]
+        authorization.project = state.objects.project[authorization.projectId]
+        return authorization
+    })
 
     return {
-        authorizations: getVisibleProjectAuths(
-            denormalizedAuthorizations,
-            state.projectList.authVisibilityFilter,
-        ),
+        authorizations: getVisibleProjectAuths(denormalizedAuthorizations, state.projectList.authVisibilityFilter),
     }
 }