Allow admins to see all projects in the projects dropdown, regardless of their membership

Author: jmgasper

src/components/Sidebar/Sidebar.module.scss

@@ -57,6 +57,10 @@ export const LOAD_PROJECTS_PENDING = 'LOAD_PROJECTS_PENDING'
 export const LOAD_PROJECTS_FAILURE = 'LOAD_PROJECTS_FAILURE'
 export const UNLOAD_PROJECTS_SUCCESS = 'UNLOAD_PROJECTS_SUCCESS'
 
+export const LOAD_ALL_USER_PROJECTS_SUCCESS = 'LOAD_ALL_USER_PROJECTS_SUCCESS'
+export const LOAD_ALL_USER_PROJECTS_PENDING = 'LOAD_ALL_USER_PROJECTS_PENDING'
+export const LOAD_ALL_USER_PROJECTS_FAILURE = 'LOAD_ALL_USER_PROJECTS_FAILURE'
+
 // project billingAccount
 export const LOAD_PROJECT_BILLING_ACCOUNT = 'LOAD_PROJECT_BILLING_ACCOUNT'
 export const LOAD_PROJECT_BILLING_ACCOUNT_PENDING = 'LOAD_PROJECT_BILLING_ACCOUNT_PENDING'

src/components/Sidebar/index.js

@@ -17,13 +17,25 @@ class TabContainer extends Component {
       searchProjectName: '',
       currentTab: 1
     }
-    this.updateProjectName = this.updateProjectName.bind(this)
     this.onTabChange = this.onTabChange.bind(this)
   }
 
   componentDidMount () {
-    const { projectId, activeProjectId, isLoading, selfService } = this.props
-    if (!projectId && activeProjectId === -1 && !isLoading && !selfService) {
+    const {
+      projectId,
+      activeProjectId,
+      isLoading,
+      selfService,
+      history
+    } = this.props
+    if (
+      !projectId &&
+      activeProjectId === -1 &&
+      !isLoading &&
+      !selfService &&
+      // do not fetch projects for users page
+      history.location.pathname !== '/users'
+    ) {
       this.props.loadProjects()
     }
 
@@ -46,15 +58,22 @@ class TabContainer extends Component {
     } else {
       this.setState({ currentTab: 0 })
     }
+    if (
+      isLoading ||
+      // do not fetch projects for users page
+      nextProps.history.location.pathname === '/users'
+    ) {
+      return
+    }
     // if we're viewing a specific project,
     // or we're viewing the self serve page,
     // or if the project is already loading,
     // don't load the projects
-    if (!!projectId || selfService || isLoading) {
+    if (!!projectId || selfService) {
       // if we're not in the middle of loading,
       // and we have projects to unload,
       // unload them
-      if (!isLoading && !!projects && !!projects.length) {
+      if (!!projects && !!projects.length) {
         this.props.unloadProjects()
       }
 
@@ -71,11 +90,6 @@ class TabContainer extends Component {
     this.props.loadProjects()
   }
 
-  updateProjectName (val) {
-    this.setState({ searchProjectName: val })
-    this.props.loadProjects(val)
-  }
-
   onTabChange (tab) {
     const { history, resetSidebarActiveParams } = this.props
     if (tab === 1) {

src/config/constants.js

@@ -5,6 +5,11 @@ import PT from 'prop-types'
 import UsersComponent from '../../components/Users'
 import { PROJECT_ROLES } from '../../config/constants'
 import { fetchProjectById } from '../../services/projects'
+import { checkAdmin } from '../../util/tc'
+
+import {
+  loadAllUserProjects
+} from '../../actions/users'
 
 class Users extends Component {
   constructor (props) {
@@ -21,6 +26,11 @@ class Users extends Component {
   }
 
   componentDidMount () {
+    const { token, isLoading, loadAllUserProjects } = this.props
+    if (!isLoading) {
+      const isAdmin = checkAdmin(token)
+      loadAllUserProjects(isAdmin)
+    }
   }
 
   isEditable () {
@@ -118,18 +128,27 @@ class Users extends Component {
   }
 }
 
-const mapStateToProps = ({ sidebar, auth }) => {
+const mapStateToProps = ({ users, auth }) => {
   return {
-    projects: sidebar.projects,
+    projects: users.allUserProjects,
+    isLoading: users.isLoadingAllUserProjects,
     auth,
-    loggedInUser: auth.user
+    loggedInUser: auth.user,
+    token: auth.token
   }
 }
 
 Users.propTypes = {
   projects: PT.arrayOf(PT.object),
   auth: PT.object,
-  loggedInUser: PT.object
+  loggedInUser: PT.object,
+  token: PT.string,
+  isLoading: PT.bool,
+  loadAllUserProjects: PT.func.isRequired
+}
+
+const mapDispatchToProps = {
+  loadAllUserProjects
 }
 
-export default connect(mapStateToProps)(Users)
+export default connect(mapStateToProps, mapDispatchToProps)(Users)

src/containers/Sidebar/index.js

@@ -9,6 +9,7 @@ import projects from './projects'
 import challengeSubmissions from './challengeSubmissions'
 import sidebar from './sidebar'
 import members from './members'
+import users from './users'
 
 export default combineReducers({
   auth,
@@ -17,5 +18,6 @@ export default combineReducers({
   sidebar,
   toastr: toastrReducer,
   projects,
-  members
+  members,
+  users
 })