Merge pull request #924 from osmlab/prerelease

Prepare for v3.4.2

Author: nrotstan

.env

@@ -56,6 +56,9 @@ REACT_APP_GEOGRAPHIC_INDEXING_DELAY=2
 # iD editor base URL
 REACT_APP_ID_EDITOR_SERVER_URL='https://www.openstreetmap.org/edit'
 
+# RapiD editor base URL
+REACT_APP_RAPID_EDITOR_SERVER_URL='https://mapwith.ai/rapid'
+
 # Level0 editor base URL
 REACT_APP_LEVEL0_EDITOR_SERVER_URL='http://level0.osmz.ru/index.php'
 

CHANGELOG.md

@@ -7,6 +7,31 @@ The format is based on
 This project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v3.4.2] - 2019-10-04
+### Added
+- Completion and review of multiple tasks together
+- Templates for generating forms to be filled by mapper during task completion
+- RapiD editor option by @gaoxm
+- Updated help links by @mvexel
+- Additional resiliency to missing task geometries
+- Option to include specific task properties as columns in CSV exports
+- Minor updates to home page
+
+### Fixed
+- Keyboard shortcuts not correctly accounting for modifier keys
+- Broken profile pics for some users who uploaded their own avatars to OSM
+- Error at end of challenge for users viewing nearby-tasks map
+- Erroneous link that implied mappers could review their own tasks
+- Locked tasks erroneously offered to users when browsing a challenge
+- OSM elements not automatically selected in iD editor (#906)
+- Quick-fix task properties not reflecting current OSM tags (#915)
+- Task reset back to created status not served to recent viewer
+- Potential divide-by-zero error when no results for challenge stats
+
+### Changed
+- Control for viewing all tags on a quick-fix tag diff from icon to text
+
+
 ## [v3.4.1] - 2019-09-17
 ### Added
 - Current Month option to leaderboard (#885)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "maproulette3",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "private": true,
   "dependencies": {
     "@mapbox/geojsonhint": "^2.0.1",
@@ -23,6 +23,7 @@
     "downshift": "^2.0.3",
     "file-saver": "^2.0.2",
     "fuse.js": "^3.1.0",
+    "handlebars": "^4.2.0",
     "leaflet": "^1.5.1",
     "leaflet-vectoricon": "https://github.com/nrotstan/Leaflet.VectorIcon.git#with-viewbox",
     "leaflet.markercluster": "^1.4.1",
@@ -73,6 +74,7 @@
     "route-matcher": "^0.1.0",
     "stale-lru-cache": "^5.1.1",
     "uuid": "^3.3.2",
+    "uuid-time": "^1.0.0",
     "vkbeautify": "^0.99.3",
     "xmltojson": "^1.3.5"
   },

src/components/AdminPane/HOCs/WithCurrentTask/WithCurrentTask.js

@@ -3,7 +3,7 @@ import { connect } from 'react-redux'
 import _get from 'lodash/get'
 import { saveTask,
          deleteTask } from '../../../../services/Task/Task'
-import WithLoadedTask from '../WithLoadedTask/WithLoadedTask'
+import WithLoadedTask from '../../../HOCs/WithLoadedTask/WithLoadedTask'
 
 /**
  * WithCurrentTask makes available to the WrappedComponent the current task

src/components/AdminPane/Manage/ChallengeDashboard/ChallengeDashboard.js

@@ -20,7 +20,7 @@ import WithCurrentChallenge
 import WithWidgetWorkspaces
        from '../../../HOCs/WithWidgetWorkspaces/WithWidgetWorkspaces'
 import WithFilteredClusteredTasks
-       from '../../HOCs/WithFilteredClusteredTasks/WithFilteredClusteredTasks'
+       from '../../../HOCs/WithFilteredClusteredTasks/WithFilteredClusteredTasks'
 import WithChallengeMetrics
        from '../../HOCs/WithChallengeMetrics/WithChallengeMetrics'
 import WithChallengeReviewMetrics

src/components/AdminPane/Manage/ChallengeTaskMap/Messages.js

@@ -161,7 +161,7 @@ export default defineMessages({
   categoryDescription: {
     id: 'Admin.EditChallenge.form.category.description',
     defaultMessage: "Selecting an appropriate high-level category for your " +
-      "challenge can aid users in quickly discovering challenges that " + 
+      "challenge can aid users in quickly discovering challenges that " +
       "match their interests. Choose the Other category if nothing seems " +
       "appropriate.",
   },
@@ -423,4 +423,16 @@ will not be able to make sense of it.
     id: "Admin.EditChallenge.form.customBasemap.description",
     defaultMessage: "Insert a custom base map URL here. E.g. `https://\\{s\\}.tile.openstreetmap.org/\\{z\\}/\\{x\\}/\\{y\\}.png` {dummy}",
   },
+
+  exportablePropertiesLabel: {
+    id: 'Admin.EditChallenge.form.exportableProperties.label',
+    defaultMessage: "Properties to export in CSV",
+  },
+
+  exportablePropertiesDescription: {
+    id: 'Admin.EditChallenge.form.exportableProperties.description',
+    defaultMessage: "Any properties included in this comma separated list " +
+      "will be exported as a column in the CSV export and populated with the " +
+      "first matching feature property from each task.",
+  },
 })

src/components/AdminPane/Manage/ManageChallenges/EditChallenge/Messages.js

@@ -80,6 +80,10 @@ export const jsSchema = intl => {
         enumNames: _map(defaultBasemapChoices, 'name'),
         default: ChallengeBasemap.none.toString(),
       },
+      exportableProperties: {
+        title: intl.formatMessage(messages.exportablePropertiesLabel),
+        type: "string",
+      },
     },
     dependencies: { // Only show customBasemap if defaultBasemap set to Custom
       defaultBasemap: {
@@ -144,6 +148,10 @@ export const uiSchema = intl => ({
     "ui:emptyValue": "",
     "ui:help": intl.formatMessage(messages.customBasemapDescription, {dummy: ''}),
   },
+  exportableProperties: {
+    "ui:emptyValue": "",
+    "ui:help": intl.formatMessage(messages.exportablePropertiesDescription),
+  },
 })
 
 export const numericEnvSetting = (settingName, defaultValue) => {

src/components/AdminPane/Manage/ManageChallenges/EditChallenge/Step4Schema.js

@@ -48,46 +48,16 @@ export default defineMessages({
                     "searches until indexing is complete."
   },
 
-  bulkSelectionTooltip: {
-    id: "Admin.manageTasks.controls.bulkSelection.tooltip",
-    defaultMessage: "Select tasks for bulk operation",
-  },
-
-  changeStatusToLabel: {
-    id: "Admin.manageTasks.controls.changeStatusTo.label",
-    defaultMessage: "Change status to ",
-  },
-
-  chooseStatusLabel: {
-    id: "Admin.manageTasks.controls.chooseStatus.label",
-    defaultMessage: "Choose ... ",
-  },
-
   changePriorityLabel: {
     id: "Admin.manageTasks.controls.changePriority.label",
     defaultMessage: "Change Priority",
   },
 
-  showReviewColumnsLabel: {
-    id: "Admin.manageTasks.controls.showReviewColumns.label",
-    defaultMessage: "Show Review Columns",
-  },
-
-  hideReviewColumnsLabel: {
-    id: "Admin.manageTasks.controls.hideReviewColumns.label",
-    defaultMessage: "Hide Review Columns",
-  },
-
   priorityLabel: {
     id: "Admin.manageTasks.priorityLabel",
     defaultMessage: "Priority",
   },
 
-  exportCSVLabel: {
-    id: "Admin.manageTasks.controls.exportCSV.label",
-    defaultMessage: "Export CSV",
-  },
-
   filterByStatusLabel: {
     id: "Admin.manageTasks.controls.filterByStatus.label",
     defaultMessage: "Filter by Status",
@@ -103,23 +73,28 @@ export default defineMessages({
     defaultMessage: "Filter by Priority",
   },
 
-  exportGeoJSONLabel: {
-    id: "Admin.manageTasks.controls.exportGeoJSON.label",
-    defaultMessage: "Export GeoJSON",
-  },
-
   clearFiltersLabel: {
     id: "Admin.manageTasks.controls.clearFilters.label",
     defaultMessage: "Clear Filters",
   },
 
-  taskCountShownStatus: {
-    id: "Admin.TaskAnalysisTableHeader.taskCountStatus",
-    defaultMessage: "Shown: {countShown} Tasks",
+  inspectTaskLabel: {
+    id: "Admin.ChallengeTaskMap.controls.inspectTask.label",
+    defaultMessage: "Inspect Task",
+  },
+
+  editTaskLabel: {
+    id: "Admin.ChallengeTaskMap.controls.editTask.label",
+    defaultMessage: "Edit Task",
+  },
+
+  nameLabel: {
+    id: "Admin.Task.fields.name.label",
+    defaultMessage: "Task:",
   },
 
-  taskPercentShownStatus: {
-    id: "Admin.TaskAnalysisTableHeader.taskPercentStatus",
-    defaultMessage: "Shown: {percentShown}% ({countShown}) of {countTotal} Tasks",
+  statusLabel: {
+    id: "Admin.Task.fields.status.label",
+    defaultMessage: "Status:",
   },
 })

src/components/AdminPane/Manage/ViewChallengeTasks/Messages.js

@@ -17,19 +17,22 @@ import { TaskPriority,
        from '../../../../services/Task/TaskPriority/TaskPriority'
 import { TaskStatusColors }
        from '../../../../services/Task/TaskStatus/TaskStatus'
+import AsManager from '../../../../interactions/User/AsManager'
 import WithBoundedTasks
-       from '../../HOCs/WithBoundedTasks/WithBoundedTasks'
+       from '../../../HOCs/WithBoundedTasks/WithBoundedTasks'
 import MapPane from '../../../EnhancedMap/MapPane/MapPane'
 import SvgSymbol from '../../../SvgSymbol/SvgSymbol'
 import BusySpinner from '../../../BusySpinner/BusySpinner'
 import IntervalRender from '../../../IntervalRender/IntervalRender'
-import ChallengeTaskMap from '../ChallengeTaskMap/ChallengeTaskMap'
-import TaskAnalysisTable from '../TaskAnalysisTable/TaskAnalysisTable'
+import ChallengeTaskMap from '../../../ChallengeTaskMap/ChallengeTaskMap'
+import TaskAnalysisTable from '../../../TaskAnalysisTable/TaskAnalysisTable'
 import TaskBuildProgress from './TaskBuildProgress'
 import GeographicIndexingNotice from './GeographicIndexingNotice'
 import messages from './Messages'
 import Dropdown from '../../../Dropdown/Dropdown'
 
+const TaskMap = ChallengeTaskMap('challengeOwner')
+
 /**
  * ViewChallengeTasks displays challenge tasks as both a map and a table,
  * along with filtering controls for showing subsets of tasks.
@@ -177,16 +180,21 @@ export class ViewChallengeTasks extends Component {
       <div className='admin__manage-tasks'>
         <GeographicIndexingNotice challenge={this.props.challenge} />
 
-        <MapPane>
-          <ChallengeTaskMap taskInfo={this.props.taskInfo}
-            setChallengeOwnerMapBounds={this.props.setChallengeOwnerMapBounds}
-            lastBounds={this.props.mapBounds}
-            lastZoom={this.props.mapZoom}
-            statusColors={TaskStatusColors}
-            filterOptions={filterOptions}
-            monochromaticClusters
-            {...this.props} />
-        </MapPane>
+        <div className="mr-h-100">
+          <MapPane>
+            <TaskMap
+              taskInfo={this.props.taskInfo}
+              setMapBounds={this.props.setChallengeOwnerMapBounds}
+              lastBounds={this.props.mapBounds}
+              lastZoom={this.props.mapZoom}
+              statusColors={TaskStatusColors}
+              filterOptions={filterOptions}
+              taskMarkerContent={TaskMarkerContent}
+              challengeId={this.props.challenge.id}
+              monochromaticClusters
+              {...this.props} />
+          </MapPane>
+        </div>
 
         <div className="mr-my-4 xl:mr-flex mr-justify-between">
           <ul className="mr-mb-4 xl:mr-mb-0 md:mr-flex">
@@ -201,13 +209,15 @@ export class ViewChallengeTasks extends Component {
             </li>
           </ul>
 
-          {_get(this.props, 'clusteredTasks.tasks.length') !== _get(this.props, 'taskInfo.tasks.length', 0) ? clearFiltersControl : null}
-        </div>
+            {_get(this.props, 'clusteredTasks.tasks.length') !== _get(this.props, 'taskInfo.tasks.length', 0) ? clearFiltersControl : null}
+          </div>
 
-        <TaskAnalysisTable filterOptions={filterOptions}
-          changeStatus={this.changeStatus}
-          totalTaskCount={_get(this.props, 'clusteredTasks.tasks.length')}
-          {...this.props} />
+          <TaskAnalysisTable
+            filterOptions={filterOptions}
+            changeStatus={this.changeStatus}
+            totalTaskCount={_get(this.props, 'clusteredTasks.tasks.length')}
+            {...this.props}
+          />
       </div>
     )
   }
@@ -238,6 +248,50 @@ const buildFilterDropdown = (titleId, filters) => {
   )
 }
 
+const TaskMarkerContent = props => {
+  const manager = AsManager(props.user)
+  const taskBaseRoute =
+    `/admin/project/${props.challenge.parent.id}` +
+    `/challenge/${props.challengeId}/task/${props.marker.options.taskId}`
+
+  return (
+    <React.Fragment>
+      <div>
+        {
+          props.intl.formatMessage(messages.nameLabel)
+        } {
+          props.marker.options.name
+        }
+      </div>
+      <div>
+        {
+          props.intl.formatMessage(messages.statusLabel)
+        } {
+          props.intl.formatMessage(messagesByStatus[props.marker.options.status])
+        }
+      </div>
+
+      <div className="marker-popup-content__links">
+        <div>
+          {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
+          <a onClick={() => props.history.push(`${taskBaseRoute}/inspect`)}>
+            {props.intl.formatMessage(messages.inspectTaskLabel)}
+          </a>
+        </div>
+
+        {manager.canWriteProject(props.challenge.parent) &&
+          <div>
+            {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
+            <a onClick={() => props.history.push(`${taskBaseRoute}/edit`)}>
+              {props.intl.formatMessage(messages.editTaskLabel)}
+            </a>
+          </div>
+        }
+      </div>
+    </React.Fragment>
+  )
+}
+
 ViewChallengeTasks.propTypes = {
   /** The tasks to display */
   filteredClusteredTasks: PropTypes.shape({