For admin, fetch all projects

Author: vas3a

src/actions/sidebar.js

@@ -11,6 +11,7 @@ import {
   UNLOAD_PROJECTS_SUCCESS,
   PROJECTS_PAGE_SIZE
 } from '../config/constants'
+import { checkAdmin } from '../util/tc'
 import _ from 'lodash'
 
 /**
@@ -29,7 +30,7 @@ export function setActiveProject (projectId) {
 /**
  * Loads projects of the authenticated user
  */
-export function loadProjects (filterProjectName = '', myProjects = true, paramFilters = {}) {
+export function loadProjects (filterProjectName = '', paramFilters = {}) {
   return (dispatch, getState) => {
     dispatch({
       type: LOAD_PROJECTS_PENDING
@@ -48,18 +49,18 @@ export function loadProjects (filterProjectName = '', myProjects = true, paramFi
       }
     }
 
-    if (myProjects) {
+    if (!checkAdmin(getState().auth.token)) {
       filters['memberOnly'] = true
     }
 
+    // eslint-disable-next-line no-debugger
     const state = getState().sidebar
-    // eslint-disable-next-line no-sequences
-    fetchMemberProjects(filters).then(({ projects, pagination }) => (console.log('here', pagination), dispatch({
+    fetchMemberProjects(filters).then(({ projects, pagination }) => dispatch({
       type: LOAD_PROJECTS_SUCCESS,
       projects: _.uniqBy((state.projects || []).concat(projects), 'id'),
       total: pagination.xTotal,
       page: pagination.xPage
-    }))).catch(() => dispatch({
+    })).catch(() => dispatch({
       type: LOAD_PROJECTS_FAILURE
     }))
   }
@@ -68,19 +69,19 @@ export function loadProjects (filterProjectName = '', myProjects = true, paramFi
 /**
  * Load more projects for the authenticated user
  */
-export function loadMoreProjects (filterProjectName = '', myProjects = true, paramFilters = {}) {
+export function loadMoreProjects (filterProjectName = '', paramFilters = {}) {
   return (dispatch, getState) => {
     const state = getState().sidebar
 
-    loadProjects(filterProjectName, myProjects, _.assignIn({}, paramFilters, {
+    loadProjects(filterProjectName, _.assignIn({}, paramFilters, {
       perPage: PROJECTS_PAGE_SIZE,
       page: state.page + 1
     }))(dispatch, getState)
   }
 }
 
-export function loadTaasProjects (filterProjectName = '', myProjects = true, paramFilters = {}) {
-  return loadProjects(filterProjectName, myProjects, Object.assign({
+export function loadTaasProjects (filterProjectName = '', paramFilters = {}) {
+  return loadProjects(filterProjectName, Object.assign({
     type: 'talent-as-a-service'
   }, paramFilters))
 }

src/actions/users.js

@@ -28,7 +28,7 @@ export function loadAllUserProjects (isAdmin = true) {
       filters['memberOnly'] = true
     }
 
-    fetchMemberProjects(filters).then(projects => dispatch({
+    fetchMemberProjects(filters).then(({ projects }) => dispatch({
       type: LOAD_ALL_USER_PROJECTS_SUCCESS,
       projects
     })).catch(() => dispatch({