Merge branch 'feature/project-listing-updates#1268' into dev

Author: mtwomey

npm-shrinkwrap.json

@@ -80,6 +80,7 @@
     "react": "^15.6.1",
     "react-addons-css-transition-group": "^15.6.0",
     "react-addons-pure-render-mixin": "^15.6.0",
+    "react-circular-progressbar": "^0.5.0",
     "react-color": "^2.13.1",
     "react-datetime": "2.7.1",
     "react-dom": "^15.6.1",

package.json

@@ -14,6 +14,9 @@ export function loadMembers(userIds) {
         type: LOAD_MEMBERS,
         payload: getMembersById(userIds)
       })
+    } else {
+      // returns empty resolved promise to avoid error when we call then on this action
+      return Promise.resolve()
     }
   }
 }

src/actions/members.js

@@ -4,7 +4,7 @@ import { TC_API_URL } from '../config/constants'
 
 export function getProjects(criteria, pageNum) {
   // add default params
-  const includeFields = ['id', 'name', 'members', 'status', 'type', 'actualPrice', 'estimatedPrice', 'createdAt', 'updatedAt', 'details']
+  const includeFields = ['id', 'name', 'description', 'members', 'status', 'type', 'actualPrice', 'estimatedPrice', 'createdAt', 'updatedAt', 'details']
   const params = {
     limit: 20,
     offset: (pageNum - 1) * 20,