Merge branch 'archiving' of https://github.com/osmlab/maproulette3 into qa

Author: jschwarz2030

src/components/AdminPane/HOCs/WithChallengeManagement/WithChallengeManagement.js

@@ -15,6 +15,7 @@ import {
   fetchChallenge,
   fetchChallengeActions,
   deleteChallenge,
+  archiveChallenge,
 } from "../../../../services/Challenge/Challenge";
 import { recordChallengeSnapshot } from "../../../../services/Challenge/ChallengeSnapshot";
 import {
@@ -249,7 +250,6 @@ async function deleteIncompleteTasks(dispatch, ownProps, challenge) {
 
 const mapDispatchToProps = (dispatch, ownProps) => ({
   saveChallenge: async (challengeData) => {
-    debugger;
     const prebundled = await convertAndBundleGeoJson(challengeData);
 
     //If the prebundler succeeds, mutate challenge data to fit line-by-line criteria
@@ -351,6 +351,18 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
     );
   },
 
+  archiveChallenge: (projectId, challengeId, pathname) => {
+    dispatch(archiveChallenge(challengeId, true)).then(() =>
+      ownProps.history.replace(pathname)
+    );
+  },
+
+  unarchiveChallenge: (projectId, challengeId, pathname) => {
+    dispatch(archiveChallenge(challengeId, false)).then(() =>
+      ownProps.history.replace(pathname)
+    );
+  },
+
   updateEnabled: (challengeId, isEnabled) => {
     dispatch(setIsEnabled(challengeId, isEnabled));
   },

src/components/AdminPane/HOCs/WithProjectManagement/WithProjectManagement.js

@@ -0,0 +1,27 @@
+import { connect } from "react-redux";
+import { archiveProject } from "../../../../services/Project/Project";
+
+/**
+ * WithProjectManagement provides functions to its WrappedComponent that can
+ * support management capabilities.
+ */
+
+const mapDispatchToProps = (dispatch, ownProps) => ({
+  archiveProject: (projectId) => {
+    dispatch(archiveProject(projectId, true)).then(() =>
+      ownProps.history.replace(ownProps.location.pathname)
+    );
+  },
+
+  unarchiveProject: (projectId) => {
+    dispatch(archiveProject(projectId, false)).then(() =>
+      ownProps.history.replace(ownProps.location.pathname)
+    );
+  },
+});
+
+const WithProjectManagement = (Component) => {
+  return connect(null, mapDispatchToProps)(Component);
+};
+
+export default WithProjectManagement;

src/components/AdminPane/Manage/ChallengeCard/ChallengeControls.js

@@ -49,6 +49,26 @@ export default class ChallengeControls extends Component {
     this.props.deleteChallenge(parent.id, this.props.challenge.id);
   };
 
+  refresh = () => {
+    this.props.history.push(this.props.location.pathname);
+  };
+
+  archiveChallenge = (parent) => {
+    this.props.archiveChallenge(
+      parent.id,
+      this.props.challenge.id,
+      this.props.location.pathname
+    );
+  };
+
+  unarchiveChallenge = (parent) => {
+    this.props.unarchiveChallenge(
+      parent.id,
+      this.props.challenge.id,
+      this.props.location.pathname
+    );
+  };
+
   render() {
     if (!this.props.challenge) {
       return null;
@@ -74,6 +94,7 @@ export default class ChallengeControls extends Component {
     const status = _get(this.props.challenge, "status", ChallengeStatus.none);
     const hasTasks = _get(this.props.challenge, "actions.total", 0) > 0;
     const requiresEmail = isEmailRequired(this.props.user);
+    const isArchived = _get(this.props.challenge, "isArchived");
 
     if (requiresEmail) {
       return (
@@ -179,6 +200,28 @@ export default class ChallengeControls extends Component {
                 </a>
               </ConfirmAction>
             )}
+            {manager.canAdministrateProject(parent) && !isArchived ? (
+              <>
+                {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
+                <a
+                  onClick={() => this.archiveChallenge(parent)}
+                  className={this.props.controlClassName}
+                >
+                  <FormattedMessage {...messages.archiveChallengeLabel} />
+                </a>
+              </>
+            ) : null}
+            {manager.canAdministrateProject(parent) && isArchived ? (
+              <>
+                {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
+                <a
+                  onClick={() => this.unarchiveChallenge(parent)}
+                  className={this.props.controlClassName}
+                >
+                  <FormattedMessage {...messages.unarchiveChallengeLabel} />
+                </a>
+              </>
+            ) : null}
             {this.state.pickingProject && (
               <ProjectPickerModal
                 {...this.props}
@@ -199,6 +242,8 @@ ChallengeControls.propTypes = {
   challenge: PropTypes.object,
   /** Invoked when the user wishes to delete the challenge */
   deleteChallenge: PropTypes.func.isRequired,
+  /** Invoked when the user wishes to archive the challenge */
+  archiveChallenge: PropTypes.func.isRequired,
   /** Invoked when the user wishes to move the challenge */
   moveChallenge: PropTypes.func.isRequired,
   /** Invoked when an in-situ control is completed */

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

@@ -1,4 +1,4 @@
-import { defineMessages } from 'react-intl'
+import { defineMessages } from "react-intl";
 
 /**
  * Internationalized messages for use with ChallengeDashboard
@@ -39,13 +39,23 @@ export default defineMessages({
     defaultMessage: "Delete Challenge",
   },
 
+  archiveChallengeLabel: {
+    id: "Admin.Challenge.controls.archive.label",
+    defaultMessage: "Archive Challenge",
+  },
+
+  unarchiveChallengeLabel: {
+    id: "Admin.Challenge.controls.unarchive.label",
+    defaultMessage: "Unarchive Challenge",
+  },
+
   deleteChallengeConfirm: {
     id: "Admin.Challenge.controls.delete.confirm",
-    defaultMessage: "Are you sure you wish to delete this challenge?"
+    defaultMessage: "Are you sure you wish to delete this challenge?",
   },
 
   deleteChallengeWarn: {
     id: "Admin.Challenge.controls.delete.warn",
-    defaultMessage: "This action cannot be undone."
-  }
-})
+    defaultMessage: "This action cannot be undone.",
+  },
+});

src/components/AdminPane/Manage/ChallengeFilterGroup/ChallengeFilterGroup.js

@@ -1,26 +1,37 @@
-import React, { Component } from 'react'
-import { FormattedMessage } from 'react-intl'
-import { messagesByFilter }
-       from '../../../../services/Widget/ChallengeFilter/ChallengeFilter'
-import DashboardFilterToggle
-       from '../DashboardFilterToggle/DashboardFilterToggle'
+import React, { Component } from "react";
+import { FormattedMessage } from "react-intl";
+import { messagesByFilter } from "../../../../services/Widget/ChallengeFilter/ChallengeFilter";
+import DashboardFilterToggle from "../DashboardFilterToggle/DashboardFilterToggle";
 
-const VisibleFilterToggle = DashboardFilterToggle('challenge', 'visible')
-const PinnedFilterToggle = DashboardFilterToggle('challenge', 'pinned')
+const VisibleFilterToggle = DashboardFilterToggle("challenge", "visible");
+const PinnedFilterToggle = DashboardFilterToggle("challenge", "pinned");
+const ArchivedFilterToggle = DashboardFilterToggle("challenge", "archived");
 
 export default class ChallengeFilterGroup extends Component {
   render() {
     return (
       <React.Fragment>
-        <VisibleFilterToggle {...this.props}
-                             dashboardEntityFilters={this.props.dashboardChallengeFilters}
-                             toggleEntityFilter={this.props.toggleDashboardChallengeFilter}
-                             filterToggleLabel={<FormattedMessage {...messagesByFilter.visible} />} />
-        <PinnedFilterToggle {...this.props}
-                            dashboardEntityFilters={this.props.dashboardChallengeFilters}
-                            toggleEntityFilter={this.props.toggleDashboardChallengeFilter}
-                            filterToggleLabel={<FormattedMessage {...messagesByFilter.pinned} />} />
+        <VisibleFilterToggle
+          {...this.props}
+          dashboardEntityFilters={this.props.dashboardChallengeFilters}
+          toggleEntityFilter={this.props.toggleDashboardChallengeFilter}
+          filterToggleLabel={<FormattedMessage {...messagesByFilter.visible} />}
+        />
+        <PinnedFilterToggle
+          {...this.props}
+          dashboardEntityFilters={this.props.dashboardChallengeFilters}
+          toggleEntityFilter={this.props.toggleDashboardChallengeFilter}
+          filterToggleLabel={<FormattedMessage {...messagesByFilter.pinned} />}
+        />
+        <ArchivedFilterToggle
+          {...this.props}
+          dashboardEntityFilters={this.props.dashboardChallengeFilters}
+          toggleEntityFilter={this.props.toggleDashboardChallengeFilter}
+          filterToggleLabel={
+            <FormattedMessage {...messagesByFilter.archived} />
+          }
+        />
       </React.Fragment>
-    )
+    );
   }
 }

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

@@ -1,4 +1,4 @@
-import { defineMessages } from 'react-intl'
+import { defineMessages } from "react-intl";
 
 /**
  * Internationalized messages for use with ProjectCard
@@ -39,6 +39,16 @@ export default defineMessages({
     defaultMessage: "Edit Project",
   },
 
+  archiveProjectLabel: {
+    id: "Admin.ProjectCard.controls.archiveProject.label",
+    defaultMessage: "Archive Project",
+  },
+
+  unarchiveProjectLabel: {
+    id: "Admin.ProjectCard.controls.unarchiveProject.label",
+    defaultMessage: "Unarchive Project",
+  },
+
   pinProjectLabel: {
     id: "Admin.ProjectCard.controls.pinProject.label",
     defaultMessage: "Pin Project",
@@ -50,12 +60,12 @@ export default defineMessages({
   },
 
   addChallengeLabel: {
-    id: 'Admin.Project.controls.addChallenge.label',
+    id: "Admin.Project.controls.addChallenge.label",
     defaultMessage: "Add Challenge",
   },
 
   manageChallengeListLabel: {
-    id: 'Admin.Project.controls.manageChallengeList.label',
+    id: "Admin.Project.controls.manageChallengeList.label",
     defaultMessage: "Manage Challenge List",
   },
 
@@ -78,4 +88,4 @@ export default defineMessages({
     id: "Admin.Project.controls.exportReviewCSV.label",
     defaultMessage: "Export Mapper Review CSV",
   },
-})
+});