Merge pull request #782 from digirati-co-uk/NS-31/hotfix/max-contribu…

…tors-fix check if max contributors includes current user
digirati-co-uk · Aug 7, 2023 · 3809283 · 3809283
2 parents d7fd161 + 4fc491f
commit 3809283
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-canvas-user-tasks.ts b/services/madoc-ts/src/frontend/site/hooks/use-canvas-user-tasks.ts
@@ -63,11 +63,14 @@ export function useCanvasUserTasks() {
  const completedAndHide = !config.project.allowSubmissionsWhenCanvasComplete && canvasTask?.canvasTask?.status === 3;
  const completed = canvasTask?.canvasTask?.status === 3;
 
- const maxContributorsReached =
+ const maxContributors =
  canvasTask?.maxContributors && canvasTask.totalContributors
- ? canvasTask.maxContributors <= canvasTask.totalContributors
+ ? canvasTask.maxContributors >= canvasTask.totalContributors
  : false;
 
+ // if max contributors reached check that the current user isnt one of them
+ const maxContributorsReached = maxContributors ? !userTasks?.some(t => t.type === 'crowdsourcing-task') : false;
+
  const canClaimCanvas =
  user && (config.project.claimGranularity ? config.project.claimGranularity === 'canvas' : true);
  const canUserSubmit = user && !!canvasTask?.canUserSubmit;

diff --git a/services/madoc-ts/src/utility/claim-utilities.ts b/services/madoc-ts/src/utility/claim-utilities.ts
@@ -139,7 +139,7 @@ export function canUserClaimCanvas(options: {
  const users: string[] = [];
  for (const task of subtasks) {
  if (task.assignee) {
- if (!users.includes(task.assignee.id)) {
+ if (task.assignee.id !== `urn:madoc:user:${options.userId}` && !users.includes(task.assignee.id)) {
  users.push(task.assignee.id);
  }
  }