Merge pull request #761 from digirati-co-uk/hotfix/MAD-1403/MAD-1405

Hotfix/mad 1403/mad 1405
digirati-co-uk · Jun 29, 2023 · 658ab45 · 658ab45
2 parents a551c04 + b939628
commit 658ab45
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 54 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -99,6 +99,7 @@ services:
  tasks-api:
  tty: true
  image: ghcr.io/digirati-co-uk/tasks-api:latest
+ platform: linux/amd64
  environment:
  - SERVER_PORT=3000
  - DATABASE_HOST=shared-postgres
@@ -119,6 +120,7 @@ services:
  model-api:
  tty: true
  image: digirati/capture-models:latest
+ platform: linux/amd64
  environment:
  - SERVER_PORT=3000
  - DATABASE_HOST=shared-postgres
@@ -171,6 +173,7 @@ services:
 
  config-service:
  image: digirati/madoc_config_service_django:175410fc5b7dbef4cc259686564fbedeb60c8789
+ platform: linux/amd64
  environment:
  - USE_DOCKER=yes
  - IPYTHONDIR=/app/.ipython
@@ -194,6 +197,7 @@ services:
  storage-api:
  tty: true
  image: ghcr.io/digirati-co-uk/storage-api:main
+ platform: linux/amd64
  environment:
  - GATEWAY_HOST=${GATEWAY_HOST}
  volumes:
@@ -204,9 +208,10 @@ services:
 
  search:
  image: ghcr.io/digirati-co-uk/madoc-search-service:247f854b1258e3971907e6912cef2374a1da8474
-# build:
-# context: services/search
-# dockerfile: Dockerfile
+ platform: linux/amd64
+ # build:
+ # context: services/search
+ # dockerfile: Dockerfile
  environment:
  - BROWSABLE=False
  - USE_DOCKER=yes
@@ -225,9 +230,9 @@ services:
  - DATABASE_URL=postgres://${POSTGRES_SEARCH_API_USER}:${POSTGRES_SEARCH_API_PASSWORD}@shared-postgres:${POSTGRES_PORT}/${POSTGRES_DB}
  links:
  - shared-postgres
-# volumes:
-# - ./services/search/search_service:/app
+ # volumes:
+ # - ./services/search/search_service:/app
 
  okra:
  image: digirati/okra:latest
-
+ platform: linux/amd64
diff --git a/services/madoc-ts/src/frontend/shared/capture-models/helpers/validate-revision.ts b/services/madoc-ts/src/frontend/shared/capture-models/helpers/validate-revision.ts
@@ -28,7 +28,7 @@ export function validateRevision(
  const filteredDocument = filterDocumentByRevision(req.document, req.revision, captureModel.revisions);
 
  if (!filteredDocument && (req.revision.deletedFields || []).length === 0) {
- throw new RequestError('Invalid revision');
+ throw new RequestError('Invalid revision: No changes');
  }
 
  // If the source is `structure` we want to make sure a user was associated. We add this to the revision.

diff --git a/services/madoc-ts/src/frontend/shared/capture-models/new/components/DefaultSubmitButton.tsx b/services/madoc-ts/src/frontend/shared/capture-models/new/components/DefaultSubmitButton.tsx
@@ -9,6 +9,7 @@ import { HrefLink } from '../../../utility/href-link';
 import { Revisions } from '../../editor/stores/revisions';
 import { useDeselectRevision } from '../hooks/use-deselect-revision';
 import { EditorRenderingConfig, useSlotContext } from './EditorSlots';
+import { ErrorMessage } from '../../../callouts/ErrorMessage';
 
 export const DefaultSubmitButton: EditorRenderingConfig['SubmitButton'] = ({ afterSave, canSubmit = true }) => {
  const { t } = useTranslation();
@@ -38,7 +39,6 @@ export const DefaultSubmitButton: EditorRenderingConfig['SubmitButton'] = ({ aft
  // Change this to "draft" to save for later.
  await updateFunction(currentRevision, status);
  } catch (e) {
- console.error(e);
  throw new Error(t('Unable to save your submission'));
  }
  });
@@ -63,49 +63,56 @@ export const DefaultSubmitButton: EditorRenderingConfig['SubmitButton'] = ({ aft
  }}
  footerAlignRight
  renderFooter={({ close }) => {
- return isSuccess ? (
- <>
- <ButtonRow $noMargin>
- {projectId ? (
- <Button data-cy="back-to-project" as={HrefLink} href={`/projects/${projectId}`}>
- {t('Back to project')}
+ return (
+ <div>
+ {status === 'error' && (
+ <div style={{ color: '#c74158', marginBottom: '0.5em' }}>
+ {t('Error - Unable to save your submission')}
+ </div>
+ )}
+ {isSuccess ? (
+ <ButtonRow $noMargin>
+ {projectId ? (
+ <Button data-cy="back-to-project" as={HrefLink} href={`/projects/${projectId}`}>
+ {t('Back to project')}
+ </Button>
+ ) : null}
+ <Button data-cy="close-add-another" onClick={close}>
+ {t('Close and keep working')}
  </Button>
- ) : null}
- <Button data-cy="close-add-another" onClick={close}>
- {t('Close and keep working')}
- </Button>
- </ButtonRow>
- </>
- ) : (
- <ButtonRow $noMargin>
- {!disableSaveForLater ? (
- <Button
- data-cy="save-later-button"
- disabled={isLoading}
- onClick={() => {
- saveRevision('draft').then(() => {
- deselectRevision();
- close();
- });
- }}
- >
- {t('Save for later')}
- </Button>
- ) : null}
- <Button
- data-cy="publish-button"
- data-testid="publish-button"
- disabled={isLoading || !canSubmit}
- $primary
- onClick={() => {
- saveRevision('submitted').then(() => {
- deselectRevision();
- });
- }}
- >
- {isLoading ? t('Saving...') : t('Submit')}
- </Button>
- </ButtonRow>
+ </ButtonRow>
+ ) : (
+ <ButtonRow $noMargin>
+ {!disableSaveForLater ? (
+ <Button
+ data-cy="save-later-button"
+ disabled={isLoading}
+ onClick={() => {
+ saveRevision('draft').then(() => {
+ deselectRevision();
+ close();
+ });
+ }}
+ >
+ {t('Save for later')}
+ </Button>
+ ) : null}
+ <Button
+ data-cy="publish-button"
+ data-testid="publish-button"
+ disabled={isLoading || !canSubmit}
+ $primary
+ onClick={() => {
+ saveRevision('submitted').then(() => {
+ deselectRevision();
+ });
+ }}
+ >
+ {isLoading ? t('Saving...') : t('Submit')}
+ </Button>
+ </ButtonRow>
+ )}
+ </div>
  );
  }}
  >

diff --git a/services/madoc-ts/src/frontend/shared/hooks/use-viewer-saving.ts b/services/madoc-ts/src/frontend/shared/hooks/use-viewer-saving.ts
@@ -1,6 +1,6 @@
 import { Revisions } from '../capture-models/editor/stores/revisions/index';
 import { RevisionRequest } from '../capture-models/types/revision-request';
-import { useApi, useOptionalApi } from './use-api';
+import { useOptionalApi } from './use-api';
 import { useMutation } from 'react-query';
 import { createContext, useCallback, useContext } from 'react';
 import { useUser } from './use-site';

diff --git a/services/madoc-ts/src/frontend/site/pages/tasks/review-listing/single-review.tsx b/services/madoc-ts/src/frontend/site/pages/tasks/review-listing/single-review.tsx
@@ -194,9 +194,11 @@ function ViewSingleReview({
  const limitedReviewer =
  user && user.scope && user.scope.indexOf('models.revision') !== -1 && user.scope.indexOf('models.create') === -1;
  const reviewer =
- (user && user.scope && user.scope.indexOf('models.revision') !== -1) ||
- user.scope.indexOf('site.admin') ||
- (-1 && user.scope.indexOf('models.admin'));
+ user &&
+ user.scope &&
+ (user.scope.indexOf('models.revision') !== -1 ||
+ user.scope.indexOf('site.admin') !== -1 ||
+ user.scope.indexOf('models.admin') !== -1);
 
  const canReview = limitedReviewer ? review?.assignee?.id === user.user?.id : reviewer;
  const isDone = task?.status === 3;

diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
@@ -314,6 +314,7 @@
  "Enter scope": "Enter scope",
  "Entity from model": "Entity from model",
  "Entity labelled by property": "Entity labelled by property",
+ "Error - Unable to save your submission": "Error - Unable to save your submission",
  "Errored": "Errored",
  "Errored / Rejected": "Errored / Rejected",
  "Exit edit mode": "Exit edit mode",
@@ -885,6 +886,7 @@
  "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 do not have the correct permissions to review this task": "You do not have the correct permissions to review this task",
  "You have already completed this item": "You have already completed this item",
  "You have already completed this manifest": "You have already completed this manifest",
  "You have been assigned a manifest": "You have been assigned a manifest",