Change to show challenges related to logged in user.

Author: jmgasper

src/actions/challenges.js

@@ -65,6 +65,7 @@ import { removeChallengeFromPhaseProduct, saveChallengeAsPhaseProduct } from '..
  * @param {string} filterChallengeName
  * @param {bool} selfService
  * @param {string} userHandle this will be null for admin user(we will return all datas for admin user)
+ * @param {number} userId this will be null for admin user(we will return all datas for admin user)
  * @param {string} filterChallengeType
  * @param {object} filterDate
  * @param {string} filterSortBy
@@ -79,6 +80,7 @@ export function loadChallengesByPage (
   filterChallengeName = null,
   selfService = false,
   userHandle = null,
+  userId = 0,
   filterChallengeType = {},
   filterDate = {},
   filterSortBy = null,
@@ -138,8 +140,8 @@ export function loadChallengesByPage (
     if (filterSortBy) {
       filters['sortBy'] = filterSortBy
     }
-    if (userHandle) {
-      filters['createdBy'] = userHandle
+    if (userId) {
+      filters['memberId'] = userId
     }
     if (filterSortOrder) {
       filters['sortOrder'] = filterSortOrder

src/components/ChallengesComponent/ChallengeList/index.js

@@ -116,6 +116,7 @@ class ChallengeList extends Component {
             searchText,
             selfService,
             this.getHandle(),
+            this.getUserId(),
             challengeType,
             challengeDate
           )
@@ -152,6 +153,7 @@ class ChallengeList extends Component {
         searchText,
         selfService,
         this.getHandle(),
+        this.getUserId(),
         filterChallengeType,
         filterDate,
         sortBy,
@@ -189,6 +191,7 @@ class ChallengeList extends Component {
         searchText,
         selfService,
         this.getHandle(),
+        this.getUserId(),
         filterChallengeType,
         filterDate,
         sortBy,
@@ -216,7 +219,8 @@ class ChallengeList extends Component {
       status,
       searchText,
       selfService,
-      this.getHandle()
+      this.getHandle(),
+      this.getUserId()
     )
   }
 
@@ -254,12 +258,25 @@ class ChallengeList extends Component {
     return this.getLoginHandle()
   }
 
+  getUserId () {
+    if (checkAdmin(this.props.auth.token)) {
+      return null
+    }
+    return this.getLoginUserId()
+  }
+
   getLoginHandle () {
     return this.props.auth && this.props.auth.user
       ? this.props.auth.user.handle
       : null
   }
 
+  getLoginUserId () {
+    return this.props.auth && this.props.auth.user
+      ? this.props.auth.user.userId
+      : null
+  }
+
   /**
    * Hide error message
    */
@@ -294,6 +311,7 @@ class ChallengeList extends Component {
       searchText,
       selfService,
       this.getHandle(),
+      this.getUserId(),
       challengeType,
       challengeDate,
       name,
@@ -339,6 +357,7 @@ class ChallengeList extends Component {
       '',
       selfService,
       this.getHandle(),
+      this.getUserId(),
       null,
       {},
       null,

src/containers/Challenges/index.js

@@ -84,7 +84,8 @@ class Challenges extends Component {
         dashboard ? 'all' : '',
         '',
         selfService,
-        isAdmin ? null : this.props.auth.user.handle
+        isAdmin ? null : this.props.auth.user.handle,
+        isAdmin ? null : this.props.auth.user.userId
       )
       const projectLoading =
         window.localStorage.getItem('projectLoading') !== null