Merge pull request #755 from digirati-co-uk/hotfix/v2.1.2

v2.1.2 - hotfix progress submissions

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/digirati-co-uk/madoc-platform/compare/v2.1.1...main)
+## [Unreleased](https://github.com/digirati-co-uk/madoc-platform/compare/v2.1.2...main)
 
 <!-- 
 ### Fixed
@@ -14,6 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 -->
 
+## [v2.1.2](https://github.com/digirati-co-uk/madoc-platform/compare/v2.1.1...v2.1.2)
+Hotfix release for submissions in progress.
+
+### Fixed
+- Fixed bug with save for later
+
 ## [v2.1.1](https://github.com/digirati-co-uk/madoc-platform/compare/v2.1.0...v2.1.1)
 
 ### Fixed

services/madoc-ts/src/frontend/shared/capture-models/new/CoreModelEditor.tsx

@@ -328,19 +328,20 @@ export function CoreModelEditor({
  {preventFurtherSubmission ? (
  <>
  <EmptyState style={{ fontSize: '1.25em' }} $box $noMargin>
- <ButtonIcon>
- <TickIcon />
- </ButtonIcon>
- <strong>{t('Task is complete!')}</strong>
+ <strong style={{ display: 'flex' }}>
+ <TickIcon style={{ marginRight: '0.5em', marginBottom: 0 }} /> {t('Task is complete!')}
+ </strong>
  </EmptyState>
  <EmptyState>
  {markedAsUnusable ? (
  t('You have marked this as unusable')
  ) : (
  <>
- {t('Thank you for your submission.')}
- {t('You can view your contribution in the left sidebar.')}
- {t('You can continue working on another canvas.')}
+ <p>{t('Thank you for your submission.')}</p>
+ <p>
+ {t('You can view your contribution in the left sidebar.')}{' '}
+ {t('You can continue working on another canvas.')}
+ </p>
  </>
  )}
  </EmptyState>

services/madoc-ts/src/frontend/site/features/contributor/CanvasSimpleEditor.tsx

@@ -26,7 +26,7 @@ export function CanvasSimpleEditor({ revision, isSegmentation }: CanvasSimpleEdi
  const { projectId, canvasId } = useRouteContext();
  const { data: projectModel } = useCanvasModel();
  const [{ captureModel }, , modelRefetch] = useLoadedCaptureModel(projectModel?.model?.id, undefined, canvasId);
- const { updateClaim, allTasksDone, maxContributorsReached, markedAsUnusable } = useCanvasUserTasks();
+ const { updateClaim, allTasksDone, maxContributorsReached, canUserSubmit, markedAsUnusable } = useCanvasUserTasks();
  const { isPreparing } = useProjectStatus();
  const annotationTheme = useProjectAnnotationStyles();
  const user = useCurrentUser(true);
@@ -44,7 +44,7 @@ export function CanvasSimpleEditor({ revision, isSegmentation }: CanvasSimpleEdi
  const allowMultiple = !config.project.modelPageOptions?.preventMultipleUserSubmissionsPerResource;
  const hideViewerControls = !!config.project.modelPageOptions?.hideViewerControls;
  const forkMode = !!config.project.forkMode;
- const preventFurtherSubmission = (!allowMultiple && allTasksDone) || maxContributorsReached;
+ const preventFurtherSubmission = (!allowMultiple && allTasksDone) || (allTasksDone && maxContributorsReached);
  const isEditing = isEditingAnotherUsersRevision(captureModel, revision, user.user);
  const { isAdmin } = useUserPermissions();
  const canContribute =

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

@@ -768,6 +768,7 @@
  "Text justification": "Text justification",
  "Thank you": "Thank you",
  "Thank you for your submission": "Thank you for your submission",
+ "Thank you for your submission.": "Thank you for your submission.",
  "Thank you for your submission. You can view your contribution below. You can continue working on another manifest": "Thank you for your submission. You can view your contribution below. You can continue working on another manifest",
  "Thank you for your submission. You can view your contribution in the left sidebar. You can continue working on another canvas": "Thank you for your submission. You can view your contribution in the left sidebar. You can continue working on another canvas",
  "Thank you. You finished this manifest. Go back to the project to find a new manifest to transcribe.": "Thank you. You finished this manifest. Go back to the project to find a new manifest to transcribe.",
@@ -877,6 +878,8 @@
  "You are currently working on this": "You are currently working on this",
  "You are currently working on this manifest": "You are currently working on this manifest",
  "You are editing another user's submission": "You are editing another user's submission",
+ "You can continue working on another canvas.": "You can continue working on another canvas.",
+ "You can view your contribution in the left sidebar.": "You can view your contribution in the left sidebar.",
  "You cannot edit annotations if you are rotating": "You cannot edit annotations if you are rotating",
  "You have already completed this item": "You have already completed this item",
  "You have already completed this manifest": "You have already completed this manifest",