Merge pull request #1219 from osmlab/prerelease

v3.6.1

Author: nrotstan

CHANGELOG.md

@@ -8,6 +8,15 @@ This project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 
+## [v3.6.1] - 2020-04-28
+### Added
+- Links to review tasks on Browse Challenge and Browse Project pages
+
+### Fixed
+- User metrics failing to load
+- Remove limit when fetching lists of challenges and projects for review
+
+
 ## [v3.6.0] - 2020-04-23
 ### Added
 - Cooperative challenges

package.json

@@ -1,6 +1,6 @@
 {
   "name": "maproulette3",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "private": true,
   "dependencies": {
     "@mapbox/geo-viewport": "^0.4.0",

src/components/ChallengeDetail/ChallengeDetail.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react'
 import { Link } from 'react-router-dom'
 import { FormattedMessage, FormattedRelative, injectIntl } from 'react-intl'
+import classNames from 'classnames'
 import _isObject from 'lodash/isObject'
 import _get from 'lodash/get'
 import _findIndex from 'lodash/findIndex'
@@ -225,7 +226,19 @@ export class ChallengeDetail extends Component {
                         {unsaveControl}
                       </li>
                     )}
-                    {manageControl && <li>{manageControl}</li>}
+                    <li>
+                      {_get(this.props.user, 'settings.isReviewer') &&
+                        <Link
+                          className={classNames(
+                            "mr-text-green-lighter hover:mr-text-white mr-mr-4 mr-leading-none",
+                            {"mr-border-r-2 mr-border-white-10 mr-pr-4 mr-mr-4": manageControl})}
+                          to={`/review?challengeId=${challenge.id}&challengeName=${challenge.name}`}
+                        >
+                          <FormattedMessage {...messages.viewReviews} />
+                        </Link>
+                      }
+                      {manageControl}
+                    </li>
                   </ul>
                 </div>
               </div>

src/components/ChallengeDetail/Messages.js

@@ -54,4 +54,9 @@ export default defineMessages({
     defaultMessage: "View Leaderboard",
   },
 
+  viewReviews: {
+    id: "ChallengeDetails.fields.viewReviews.label",
+    defaultMessage: "Review",
+  },
+
 })

src/components/ProjectDetail/Messages.js

@@ -55,4 +55,9 @@ export default defineMessages({
     id: "ProjectDetails.fields.viewLeaderboard.label",
     defaultMessage: "View Leaderboard",
   },
+
+  viewReviews: {
+    id: "ProjectDetails.fields.viewReviews.label",
+    defaultMessage: "Review",
+  },
 })

src/components/ProjectDetail/ProjectDetail.js

@@ -1,5 +1,6 @@
 import React, { Component } from 'react'
 import { Link } from 'react-router-dom'
+import classNames from 'classnames'
 import { FormattedMessage, FormattedRelative, injectIntl } from 'react-intl'
 import _isObject from 'lodash/isObject'
 import _get from 'lodash/get'
@@ -124,8 +125,20 @@ export class ProjectDetail extends Component {
 
                   <ProjectProgress className="mr-my-4" {...this.props} />
 
-                  <ul className="mr-card-challenge__actions">
-                    {manageControl && <li>{manageControl}</li>}
+                  <ul className="mr-card-challenge__actions mr-mt-4 mr-leading-none mr-text-base">
+                    <li>
+                      {_get(this.props.user, 'settings.isReviewer') &&
+                        <Link
+                          className={classNames(
+                            "mr-text-green-lighter hover:mr-text-white mr-mr-4",
+                            {"mr-border-r-2 mr-border-white-10 mr-pr-4 mr-mr-4": manageControl})}
+                          to={`/review?projectId=${project.id}&projectName=${project.displayName}`}
+                        >
+                          <FormattedMessage {...messages.viewReviews} />
+                        </Link>
+                      }
+                      {manageControl}
+                    </li>
                   </ul>
                 </div>
               </div>

src/lang/en-US.json

@@ -309,6 +309,7 @@
   "ChallengeDetails.fields.lastChallengeDetails.TaskRefresh.label": "Tasks From",
   "ChallengeDetails.fields.lastChallengeDetails.DataOriginDate.label": "Tasks built on {refreshDate} from data sourced on {sourceDate}.",
   "ChallengeDetails.fields.viewLeaderboard.label": "View Leaderboard",
+  "ChallengeDetails.fields.viewReviews.label": "Review",
   "ChallengeEndModal.header": "Challenge End",
   "ChallengeEndModal.primaryMessage": "You have marked all remaining tasks in this challenge as either skipped or too hard.",
   "ChallengeEndModal.control.dismiss.label": "Continue",
@@ -613,6 +614,7 @@
   "ProjectDetails.fields.created.label": "Created",
   "ProjectDetails.fields.modified.label": "Modified",
   "ProjectDetails.fields.viewLeaderboard.label": "View Leaderboard",
+  "ProjectDetails.fields.viewReviews.label": "Review",
   "Admin.TaskReview.controls.updateReviewStatusTask.label": "Update Review Status",
   "Admin.TaskReview.controls.currentTaskStatus.label": "Task Status:",
   "Admin.TaskReview.controls.currentReviewStatus.label": "Review Status:",
@@ -1021,7 +1023,7 @@
   "Review.Dashboard.myReviewTasks": "My Reviewed Tasks",
   "Review.Dashboard.allReviewedTasks": "All Review-related Tasks",
   "Review.Dashboard.volunteerAsReviewer.label": "Volunteer as a Reviewer",
-  "Review.Dashboard.goBack.label": "Go Back",
+  "Review.Dashboard.goBack.label": "Reconfigure Reviews",
   "ReviewStatus.metrics.title": "Review Status",
   "ReviewStatus.metrics.awaitingReview": "Tasks awaiting review",
   "ReviewStatus.metrics.approvedReview": "Review tasks that passed",

src/pages/Review/Messages.js

@@ -31,6 +31,6 @@ export default defineMessages({
 
   goBack: {
     id: "Review.Dashboard.goBack.label",
-    defaultMessage: "Go Back",
+    defaultMessage: "Reconfigure Reviews",
   }
 })

src/pages/Review/Review.js

@@ -4,9 +4,12 @@ import PropTypes from 'prop-types'
 import { Link } from 'react-router-dom'
 import { injectIntl } from 'react-intl'
 import MediaQuery from 'react-responsive'
+import queryString from 'query-string'
 import classNames from 'classnames'
 import _cloneDeep from 'lodash/cloneDeep'
 import _get from 'lodash/get'
+import _isFinite from 'lodash/isFinite'
+import _parseInt from 'lodash/parseInt'
 import _isUndefined from 'lodash/isUndefined'
 import AsEndUser from '../../interactions/User/AsEndUser'
 import WithCurrentUser from '../../components/HOCs/WithCurrentUser/WithCurrentUser'
@@ -63,6 +66,19 @@ export class ReviewTasksDashboard extends Component {
   }
 
   componentDidUpdate(prevProps) {
+    if (!this.state.filterSelected[this.state.showType] &&
+        _get(this.props.history, 'location.search')) {
+      const urlParams = queryString.parse(_get(this.props, 'location.search'))
+      if (_isFinite(_parseInt(urlParams.challengeId))) {
+        this.setSelectedChallenge(urlParams.challengeId, urlParams.challengeName)
+        return
+      }
+      else if (_isFinite(_parseInt(urlParams.projectId))) {
+        this.setSelectedProject(urlParams.projectId, urlParams.projectName)
+        return
+      }
+    }
+
     if (this.props.location.pathname !== prevProps.location.pathname &&
         this.props.location.search !== prevProps.location.search) {
       window.scrollTo(0, 0)
@@ -103,6 +119,9 @@ export class ReviewTasksDashboard extends Component {
     const filterSelected = _cloneDeep(this.state.filterSelected)
     filterSelected[this.state.showType] = null
     this.setState({filterSelected})
+    this.props.history.push({
+      pathname: `/review/${this.state.showType}`
+    })
   }
 
   changeTab = (tab) => {

src/services/Task/TaskReview/TaskReview.js

@@ -331,7 +331,8 @@ export const fetchReviewChallenges = function(reviewTasksType,
     return new Endpoint(
       api.challenges.withReviewTasks,
       {schema: [challengeSchema()],
-       params:{reviewTasksType: type, excludeOtherReviewers, tStatus}}
+       params:{reviewTasksType: type, excludeOtherReviewers, tStatus,
+               limit: -1}}
     ).execute().then(normalizedResults => {
       dispatch(receiveReviewChallenges(normalizedResults.entities.challenges, RequestStatus.success))
       dispatch(receiveReviewProjects(normalizedResults.entities.projects, RequestStatus.success))