fix some formatting

maproulette · Jan 9, 2024 · aac8fbd · aac8fbd
1 parent 678ee4e
commit aac8fbd
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 35 deletions.
diff --git a/src/components/HOCs/WithUserMetrics/WithUserMetrics.js b/src/components/HOCs/WithUserMetrics/WithUserMetrics.js
@@ -183,7 +183,7 @@ export const WithUserMetrics = function(WrappedComponent, userProp) {
                           setTasksReviewerMonthsPast={this.setTasksReviewerMonthsPast}
                           setTasksReviewerDateRange={this.setTasksReviewerDateRange}
                           loading={this.state.loading}
-                          {..._omit(this.props, ['fetchLeaderboardForUser'])} />)
+                          {..._omit(this.props, ['updateLeaderboardMetrics', 'fetchLeaderboardForUser'])} />)
     }
   }
 }

diff --git a/src/services/Leaderboard/Leaderboard.js b/src/services/Leaderboard/Leaderboard.js
@@ -39,35 +39,36 @@ export const fetchLeaderboard = (numberMonths=null, onlyEnabled=true,
                                        forProjects=null, forChallenges=null,
                                        forUsers=null, forCountries=null,
                                        limit=10, startDate=null, endDate=null) => {
-     const params = {
-     limit,
-     onlyEnabled
-     }
-     return async function (dispatch) {
-       initializeLeaderboardParams(params, numberMonths, forProjects, forChallenges,
-       forUsers, forCountries, startDate, endDate)
-
-       const cachedLeaderboard = leaderboardCache.get({}, params, GLOBAL_LEADERBOARD_CACHE);
-
-       if (cachedLeaderboard) {
-         return cachedLeaderboard;
-       }
-
-       try {
-         const results = await new Endpoint(api.users.leaderboard, { params }).execute()
-
-         if (results) {
-         leaderboardCache.set({}, params, results, GLOBAL_LEADERBOARD_CACHE)
-         }
-
-         return results
-       } catch (error) {
-         console.error('Error fetching leaderboard:', error)
-         dispatch(addError(AppErrors.leaderboard.fetchFailure))
-         return []
-       }
-     }
-   }
+  const params = {
+    limit,
+    onlyEnabled
+  }
+
+  return async function (dispatch) {
+    initializeLeaderboardParams(params, numberMonths, forProjects, forChallenges,
+    forUsers, forCountries, startDate, endDate)
+
+    const cachedLeaderboard = leaderboardCache.get({}, params, GLOBAL_LEADERBOARD_CACHE);
+
+    if (cachedLeaderboard) {
+      return cachedLeaderboard;
+    }
+
+    try {
+      const results = await new Endpoint(api.users.leaderboard, { params }).execute()
+
+      if (results) {
+        leaderboardCache.set({}, params, results, GLOBAL_LEADERBOARD_CACHE)
+      }
+
+      return results
+    } catch (error) {
+      console.error('Error fetching leaderboard:', error)
+      dispatch(addError(AppErrors.leaderboard.fetchFailure))
+      return []
+    }
+  }
+}
 
 /**
  * Retrieve leaderboard data for a user from the server for the given date range and
@@ -78,12 +79,13 @@ export const fetchLeaderboardForUser = (userId, bracket=0, numberMonths=1,
                                          onlyEnabled=true, forProjects=null, forChallenges=null,
                                          forUsers, forCountries=null, startDate=null,
                                          endDate=null) => {
-  return async function (dispatch) {
   const params = {
     bracket,
     onlyEnabled
   }
 
+  return async function (dispatch) {
+
   const variables = {
     id: userId
   }
@@ -122,12 +124,14 @@ export const fetchReviewerLeaderboard = (numberMonths=null, onlyEnabled=true,
                                                  forProjects=null, forChallenges=null,
                                                  forUsers=null, forCountries=null,
                                                  limit=10, startDate=null, endDate=null) => {
+
+  const params = {
+    limit,
+    onlyEnabled
+  }
+
   return async function (dispatch) {
     try {
-      const params = {
-        limit,
-        onlyEnabled
-      }
 
       initializeLeaderboardParams(params, numberMonths, forProjects, forChallenges,
                                   forUsers, forCountries, startDate, endDate)