Merge pull request #1519 from topcoder-platform/release_0.20.4

Release 0.20.4
topcoder-platform · Apr 17, 2023 · 887b387 · 887b387
2 parents 9124501 + 62e77d1
commit 887b387
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/actions/challenges.js b/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

diff --git a/src/components/ChallengesComponent/ChallengeList/index.js b/src/components/ChallengesComponent/ChallengeList/index.js
@@ -116,6 +116,7 @@ class ChallengeList extends Component {
             searchText,
             selfService,
             this.getHandle(),
+            this.getLoginUserId(),
             challengeType,
             challengeDate
           )
@@ -152,6 +153,7 @@ class ChallengeList extends Component {
         searchText,
         selfService,
         this.getHandle(),
+        this.getLoginUserId(),
         filterChallengeType,
         filterDate,
         sortBy,
@@ -189,6 +191,7 @@ class ChallengeList extends Component {
         searchText,
         selfService,
         this.getHandle(),
+        this.getLoginUserId(),
         filterChallengeType,
         filterDate,
         sortBy,
@@ -216,7 +219,8 @@ class ChallengeList extends Component {
       status,
       searchText,
       selfService,
-      this.getHandle()
+      this.getHandle(),
+      this.getLoginUserId()
     )
   }
 
@@ -260,6 +264,12 @@ class ChallengeList extends Component {
       : null
   }
 
+  getLoginUserId () {
+    return this.props.auth && this.props.auth.user
+      ? this.props.auth.user.userId
+      : null
+  }
+
   /**
    * Hide error message
    */
@@ -294,6 +304,7 @@ class ChallengeList extends Component {
       searchText,
       selfService,
       this.getHandle(),
+      this.getLoginUserId(),
       challengeType,
       challengeDate,
       name,
@@ -339,6 +350,7 @@ class ChallengeList extends Component {
       '',
       selfService,
       this.getHandle(),
+      this.getLoginUserId(),
       null,
       {},
       null,

diff --git a/src/containers/Challenges/index.js b/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,
+        this.props.auth.user.userId
       )
       const projectLoading =
         window.localStorage.getItem('projectLoading') !== null