Merge pull request #757 from digirati-co-uk/MAD-1293/feature/delete-t…

…asks-with-contributions

delete all tasks when removing all contributions

CHANGELOG.md

@@ -70,9 +70,9 @@ Hotfix release for submissions in progress.
 
 ### Changed
 - Changed language on user dash from 'reviews' to 'review tasks' to differentiate between the two
+- Improved 'delete all contributions' by deleting all user tasks as well as capture model
 - Changed the project heading block to contain optional image and start contributing button
 
-
 ## [v2.1.0](https://github.com/digirati-co-uk/madoc-platform/compare/v2.0.8...v2.1.0)
 
 This is a larger release and include changes to bring Madoc inline with Canvas Panel and Manifest Editor, and

services/madoc-ts/src/frontend/site/features/admin/CanvasTaskProgress.tsx

@@ -34,6 +34,7 @@ export const CanvasTaskProgress: React.FC = () => {
  const { data: canvasModel, refetch: refetchModel } = useCanvasModel();
 
  const canvasTask = projectTasks?.canvasTask;
+ const userTasks = projectTasks?.userTasks;
  const isManifestComplete = projectTasks?.isManifestComplete;
  const canBeMarkedAsComplete = !canvasTask || canvasTask.status <= 1;
  const totalContributors = projectTasks?.totalContributors;
@@ -83,7 +84,18 @@ export const CanvasTaskProgress: React.FC = () => {
  });
 
  const [deleteCaptureModel, deleteCaptureModelStatus] = useMutation(async () => {
- if (canvasModel && canvasModel.model && canvasModel.model.id) {
+ if (canvasModel && canvasModel.model && canvasModel.model.id && userTasks) {
+ await Promise.all(
+ userTasks.map(
+ userTask =>
+ userTask &&
+ userTask.id &&
+ api.deleteTask(userTask.id).catch(err => {
+ console.log(err);
+ })
+ )
+ );
+
  await api.deleteCaptureModel(canvasModel.model.id);
  await refetchModel();
  }

services/madoc-ts/translations/en/madoc.json

@@ -804,6 +804,7 @@
  "This manifest is not available to browse": "This manifest is not available to browse",
  "This merge may be corrupted": "This merge may be corrupted. Would you like to remove it?",
  "This page is complete": "This page is complete",
+ "This task is complete.": "This task is complete.",
  "This task is complete. You can make another contribution from the": "This task is complete. You can make another contribution from the",
  "This tasks parent is complete, you can no longer edit or submit this task": "This tasks parent is complete, you can no longer edit or submit this task",
  "Thumbnail background": "Thumbnail background",