Merge branch 'develop' of https://gitlab.coko.foundation/xpub/xpub-faraday into develop

packages/component-manuscript-manager/src/routes/fragments/post.js

@@ -48,6 +48,9 @@ module.exports = models => async (req, res) => {
     })
     email.setupManuscriptSubmittedEmail()
 
+    collection.status = 'submitted'
+    collection.save()
+
     return res.status(200).json(fragment)
   } catch (e) {
     const notFoundError = await services.handleNotFoundError(e, 'Item')

packages/component-wizard/src/components/WizardFormStep.js

@@ -7,7 +7,11 @@ import { reduxForm, formValueSelector, SubmissionError } from 'redux-form'
 
 import WizardStep from './WizardStep'
 import { autosaveRequest } from '../redux/autosave'
-import { submitRevision, isRevisionFlow } from '../redux/conversion'
+import {
+  submitRevision,
+  isRevisionFlow,
+  submitManuscript as submitNewManuscript,
+} from '../redux/conversion'
 
 const wizardSelector = formValueSelector('wizard')
 
@@ -38,21 +42,7 @@ const submitManuscript = ({
   dispatch,
   redirectPath = '/',
 }) => {
-  dispatch(
-    actions.updateFragment(project, {
-      id: version.id,
-      submitted: new Date(),
-      ...values,
-    }),
-  )
-    .then(() =>
-      dispatch(
-        actions.updateCollection({
-          id: project.id,
-          status: 'submitted',
-        }),
-      ),
-    )
+  submitNewManuscript(project.id, version.id)
     .then(() => {
       history.push(redirectPath, {
         project: project.id,

packages/component-wizard/src/redux/conversion.js

@@ -75,6 +75,9 @@ export const createDraftSubmission = history => (dispatch, getState) => {
   })
 }
 
+export const submitManuscript = (collectionId, fragmentId) =>
+  create(`/collections/${collectionId}/fragments/${fragmentId}/submit`)
+
 export const createRevision = (
   collection,
   previousVersion,

packages/components-faraday/src/components/Filters/priorityFilter.js

@@ -37,7 +37,10 @@ const filterFn = (filterValue, { currentUser, userPermissions = [] }) => ({
     case FILTER_VALUES.NEEDS_ATTENTION:
       return get(statuses, `${status}.${userRole}.needsAttention`)
     case FILTER_VALUES.IN_PROGRESS:
-      return !get(statuses, `${status}.${userRole}.needsAttention`)
+      return (
+        !archivedStatuses.includes(status) &&
+        !get(statuses, `${status}.${userRole}.needsAttention`)
+      )
     default:
       return true
   }