Merge pull request #1489 from appirio-tech/dev

Production release for connect `Admin functionality update 01` milestone

Author: mtwomey

README.md

@@ -1,3 +1,5 @@
+#### For folks working on this code base, we're ogaznizing coding style and general guidelines [here](https://github.com/appirio-tech/connect-app/wiki/Community-Work-Read-Me-First!).
+
 # TC Deployment Notes
 _[TC Deployment Notes should always be kept up to date **on the default branch**. Update these notes when changes to this information occur]_
 

circle.yml

@@ -19,7 +19,7 @@ compile:
 
 deployment:
   development:
-    branch: [dev, 'feature/performance-testing']
+    branch: dev
     owner: appirio-tech
     commands:
       - ./deploy.sh DEV

npm-shrinkwrap.json

@@ -1,5 +1,14 @@
 import _ from 'lodash'
-import { ACCOUNTS_APP_CONNECTOR_URL, LOAD_USER_SUCCESS, LOAD_USER_FAILURE, ROLE_ADMINISTRATOR, ROLE_CONNECT_COPILOT, ROLE_TOPCODER_USER, ROLE_CONNECT_MANAGER } from '../config/constants'
+import {
+  ACCOUNTS_APP_CONNECTOR_URL,
+  LOAD_USER_SUCCESS,
+  LOAD_USER_FAILURE,
+  ROLE_ADMINISTRATOR,
+  ROLE_CONNECT_COPILOT,
+  ROLE_TOPCODER_USER,
+  ROLE_CONNECT_MANAGER,
+  ROLE_CONNECT_ADMIN
+} from '../config/constants'
 import { getFreshToken, configureConnector, decodeToken } from 'tc-accounts'
 import { getUserProfile } from '../api/users'
 import { EventTypes } from 'redux-segment'
@@ -46,6 +55,8 @@ export function loadUserSuccess(dispatch, token) {
       let userRole
       if (_.indexOf(currentUser.roles, ROLE_ADMINISTRATOR) > -1) {
         userRole = ROLE_ADMINISTRATOR
+      } else if (_.indexOf(currentUser.roles, ROLE_CONNECT_ADMIN) > -1) {
+        userRole = ROLE_CONNECT_ADMIN
       } else if (_.indexOf(currentUser.roles, ROLE_CONNECT_MANAGER) > -1) {
         userRole = ROLE_CONNECT_MANAGER
       } else if (_.indexOf(currentUser.roles, ROLE_CONNECT_COPILOT) > -1) {

src/actions/loadUser.js

@@ -1,13 +1,13 @@
 import _ from 'lodash'
 import { axiosInstance as axios } from './requestInterceptor'
-import { TC_API_URL } from '../config/constants'
+import { TC_API_URL, PROJECT_LIST_PAGE_SIZE } from '../config/constants'
 
 export function getProjects(criteria, pageNum) {
   // add default params
   const includeFields = ['id', 'name', 'description', 'members', 'status', 'type', 'actualPrice', 'estimatedPrice', 'createdAt', 'updatedAt', 'details']
   const params = {
-    limit: 20,
-    offset: (pageNum - 1) * 20,
+    limit: PROJECT_LIST_PAGE_SIZE,
+    offset: (pageNum - 1) * PROJECT_LIST_PAGE_SIZE,
     fields: includeFields.join(',')
   }
   // filters