Merge pull request #1494 from topcoder-platform/hotfix-pagination-issue

Filter challenges by logged in user
topcoder-platform · Feb 15, 2023 · 4915462 · 4915462
2 parents 8b15e66 + 17c8f6a
commit 4915462
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/actions/challenges.js b/src/actions/challenges.js
@@ -66,6 +66,7 @@ export function loadChallengesByPage (
   filterChallengeName = null,
   selfService = false,
   userHandle = null,
+  filterCreatedBy = null,
   filterChallengeType = {},
   filterDate = {},
   filterSortBy = null,
@@ -125,6 +126,9 @@ export function loadChallengesByPage (
     if (filterSortBy) {
       filters['sortBy'] = filterSortBy
     }
+    if (filterCreatedBy) {
+      filters['createdBy'] = filterCreatedBy
+    }
     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.getLoginHandle(),
             challengeType,
             challengeDate
           )
@@ -152,6 +153,7 @@ class ChallengeList extends Component {
         searchText,
         selfService,
         this.getHandle(),
+        this.getLoginHandle(),
         filterChallengeType,
         filterDate,
         sortBy,
@@ -189,6 +191,7 @@ class ChallengeList extends Component {
         searchText,
         selfService,
         this.getHandle(),
+        this.getLoginHandle(),
         filterChallengeType,
         filterDate,
         sortBy,
@@ -216,7 +219,8 @@ class ChallengeList extends Component {
       status,
       searchText,
       selfService,
-      this.getHandle()
+      this.getHandle(),
+      this.getLoginHandle()
     )
   }
 
@@ -251,6 +255,10 @@ class ChallengeList extends Component {
     if (checkAdmin(this.props.auth.token)) {
       return null
     }
+    return this.getLoginHandle()
+  }
+
+  getLoginHandle () {
     return this.props.auth && this.props.auth.user
       ? this.props.auth.user.handle
       : null
@@ -290,6 +298,7 @@ class ChallengeList extends Component {
       searchText,
       selfService,
       this.getHandle(),
+      this.getLoginHandle(),
       challengeType,
       challengeDate,
       name,
@@ -335,6 +344,7 @@ class ChallengeList extends Component {
       '',
       selfService,
       this.getHandle(),
+      this.getLoginHandle(),
       null,
       {},
       null,

diff --git a/src/containers/Challenges/index.js b/src/containers/Challenges/index.js
@@ -44,7 +44,7 @@ class Challenges extends Component {
     } = this.props
     loadChallengeTypes()
     if (dashboard) {
-      this.reloadChallenges(this.props, true)
+      this.reloadChallenges(this.props, true, true)
     }
     if (menu === 'NULL' && activeProjectId !== -1) {
       resetSidebarActiveParams()
@@ -62,11 +62,11 @@ class Challenges extends Component {
       (nextProps.dashboard && this.props.dashboard !== nextProps.dashboard) ||
       this.props.activeProjectId !== nextProps.activeProjectId
     ) {
-      this.reloadChallenges(nextProps)
+      this.reloadChallenges(nextProps, false, true)
     }
   }
 
-  reloadChallenges (props, forceLoad) {
+  reloadChallenges (props, forceLoad, loadMyChallenge) {
     const {
       activeProjectId,
       projectDetail: reduxProjectInfo,
@@ -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,
+        loadMyChallenge ? this.props.auth.user.handle : ''
       )
       const projectLoading =
         window.localStorage.getItem('projectLoading') !== null