Apply memberID flag to all users

Author: jmgasper

src/components/ChallengesComponent/ChallengeList/index.js

@@ -116,7 +116,7 @@ class ChallengeList extends Component {
             searchText,
             selfService,
             this.getHandle(),
-            this.getUserId(),
+            this.getLoginUserId(),
             challengeType,
             challengeDate
           )
@@ -153,7 +153,7 @@ class ChallengeList extends Component {
         searchText,
         selfService,
         this.getHandle(),
-        this.getUserId(),
+        this.getLoginUserId(),
         filterChallengeType,
         filterDate,
         sortBy,
@@ -191,7 +191,7 @@ class ChallengeList extends Component {
         searchText,
         selfService,
         this.getHandle(),
-        this.getUserId(),
+        this.getLoginUserId(),
         filterChallengeType,
         filterDate,
         sortBy,
@@ -220,7 +220,7 @@ class ChallengeList extends Component {
       searchText,
       selfService,
       this.getHandle(),
-      this.getUserId()
+      this.getLoginUserId()
     )
   }
 
@@ -258,13 +258,6 @@ 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
@@ -311,7 +304,7 @@ class ChallengeList extends Component {
       searchText,
       selfService,
       this.getHandle(),
-      this.getUserId(),
+      this.getLoginUserId(),
       challengeType,
       challengeDate,
       name,
@@ -357,7 +350,7 @@ class ChallengeList extends Component {
       '',
       selfService,
       this.getHandle(),
-      this.getUserId(),
+      this.getLoginUserId(),
       null,
       {},
       null,

src/containers/Challenges/index.js

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