feat(*): stagger imports to avoid overloading

packages/client/app/components/component-manuscripts/src/Manuscripts.jsx

@@ -5,8 +5,6 @@ import { useContext, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import styled from 'styled-components'
 import { Trans, useTranslation } from 'react-i18next'
-import { ToastContainer } from 'react-toastify'
-import 'react-toastify/dist/ReactToastify.css'
 
 import { grid } from '@coko/client'
 import Page from '../../../ui/shared/Page'
@@ -59,6 +57,7 @@ const FlexRow = styled.div`
   display: flex;
   gap: ${grid(2)};
   justify-content: flex-end;
+  margin-bottom: ${grid(2)};
 `
 
 const FlexRowWithSmallGapAbove = styled(FlexRow)`
@@ -416,17 +415,6 @@ const Manuscripts = props => {
       )}
     >
       <OuterContainer>
-        <ToastContainer
-          autoClose={5000}
-          closeOnClick
-          draggable
-          hideProgressBar={false}
-          newestOnTop={false}
-          pauseOnFocusLoss
-          pauseOnHover
-          position="top-center"
-          rtl={false}
-        />
         <ManuscriptsColumns>
           <ManuscriptsPane>
             <FlexRow>{topRightControls}</FlexRow>

packages/client/app/components/component-manuscripts/src/ManuscriptsPage.jsx

@@ -4,8 +4,6 @@
 
 import { useState, useContext, useRef, useEffect } from 'react'
 import { useLocation } from 'react-router-dom'
-import { toast } from 'react-toastify'
-import 'react-toastify/dist/ReactToastify.css'
 import { useTranslation } from 'react-i18next'
 import {
   useQuery,
@@ -16,6 +14,8 @@ import {
 } from '@apollo/client/react'
 import fnv from 'fnv-plus'
 import { saveAs } from 'file-saver'
+import { useNotification } from '@coko/client'
+
 import { ConfigContext } from '../../config/src'
 import {
   GET_MANUSCRIPTS_AND_FORM,
@@ -46,6 +46,7 @@ const ManuscriptsPage = () => {
   const location = useLocation()
   const { t } = useTranslation()
   const currentUser = useCurrentUser()
+  const notify = useNotification()
 
   const config = useContext(ConfigContext)
   const { urlFrag } = config
@@ -94,20 +95,14 @@ const ManuscriptsPage = () => {
   )
 
   useSubscription(IMPORTED_MANUSCRIPTS, {
-    onSubscriptionData: data => {
-      const {
-        subscriptionData: {
-          data: { manuscriptsImportStatus },
-        },
-      } = data
-
+    onData: ({ data }) => {
       setIsImporting(false)
       applyQueryParams({ [URI_PAGENUM_PARAM]: 1 })
+      queryObject.refetch()
 
-      toast.success(
-        manuscriptsImportStatus && 'Manuscripts successfully imported',
-        { hideProgressBar: true },
-      )
+      if (data.data.manuscriptsImportStatus) {
+        notify.success({ title: 'Manuscripts successfully imported' })
+      }
     },
   })
 

packages/client/package.json

@@ -76,7 +76,6 @@
     "react-router": "^7.14.2",
     "react-router-dom": "^7.14.2",
     "react-select": "^4.2.1",
-    "react-toastify": "^7.0.4",
     "react-uid": "^2.3.3",
     "reactjs-popup": "^2.0.5",
     "recharts": "^3.8.1",

packages/client/yarn.lock

@@ -3622,13 +3622,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clsx@npm:^1.1.1":
-  version: 1.2.1
-  resolution: "clsx@npm:1.2.1"
-  checksum: 10c0/34dead8bee24f5e96f6e7937d711978380647e936a22e76380290e35486afd8634966ce300fc4b74a32f3762c7d4c0303f442c3e259f4ce02374eb0c82834f27
-  languageName: node
-  linkType: hard
-
 "clsx@npm:^2.1.1":
   version: 2.1.1
   resolution: "clsx@npm:2.1.1"
@@ -5434,7 +5427,6 @@ __metadata:
     react-router: "npm:^7.14.2"
     react-router-dom: "npm:^7.14.2"
     react-select: "npm:^4.2.1"
-    react-toastify: "npm:^7.0.4"
     react-uid: "npm:^2.3.3"
     reactjs-popup: "npm:^2.0.5"
     recharts: "npm:^3.8.1"
@@ -7233,18 +7225,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-toastify@npm:^7.0.4":
-  version: 7.0.4
-  resolution: "react-toastify@npm:7.0.4"
-  dependencies:
-    clsx: "npm:^1.1.1"
-  peerDependencies:
-    react: ">=16"
-    react-dom: ">=16"
-  checksum: 10c0/2aa396f2aefe4c30498eca3e4bbb560c1b6503065808c98003711cc6273bc1328160cb2a2e844e05ff29ee8d52ad9094d0ebd6ea233d32e38f8516c859c009d6
-  languageName: node
-  linkType: hard
-
 "react-transition-group@npm:^4.3.0":
   version: 4.4.5
   resolution: "react-transition-group@npm:4.4.5"

packages/server/controllers/manuscript/importManuscripts.js

@@ -18,19 +18,19 @@ const shouldRunDefaultImportsForColab = [true, 'true'].includes(
 )
 
 const importManuscripts = async (groupId, ctx) => {
-  // eslint-disable-next-line no-console
-  console.log(`Importing manuscripts. Triggered by ${ctx.userId ?? 'system'}`)
+  logger.info(`Importing manuscripts. Triggered by ${ctx.userId ?? 'system'}`)
   const key = `${groupId}-imports`
 
   if (importsInProgress.has(key)) {
-    // eslint-disable-next-line no-console
-    console.log('Import already in progress. Aborting new import')
+    logger.info('Import already in progress. Aborting new import')
     return false
   }
 
-  try {
-    importsInProgress.add(key)
+  importsInProgress.add(key)
+
+  let promises
 
+  try {
     const activeConfig = await Config.query().findOne({
       groupId,
       active: true,
@@ -42,7 +42,7 @@ const importManuscripts = async (groupId, ctx) => {
       ? 'evaluated'
       : 'accepted'
 
-    const promises = [runImports(groupId, evaluatedStatusString, ctx.userId)]
+    promises = [runImports(groupId, evaluatedStatusString, ctx.userId)]
 
     if (activeConfig.formData.instanceName === 'preprint2') {
       promises.push(importArticlesFromBiorxiv(groupId, ctx))
@@ -53,57 +53,71 @@ const importManuscripts = async (groupId, ctx) => {
     ) {
       promises.push(importArticlesFromBiorxivWithFullTextSearch(groupId, ctx))
     }
+  } catch (error) {
+    importsInProgress.delete(key)
+    throw error
+  }
 
-    if (!promises.length) return false
+  if (!promises.length) {
+    importsInProgress.delete(key)
+    return false
+  }
 
-    Promise.all(promises)
-      .catch(error => logger.error(error))
-      .finally(async () => {
-        subscriptionManager.publish('IMPORT_MANUSCRIPTS_STATUS', {
-          manuscriptsImportStatus: true,
-        })
+  Promise.all(promises)
+    .catch(error => logger.error(error))
+    .finally(() => {
+      importsInProgress.delete(key)
+      subscriptionManager.publish('IMPORT_MANUSCRIPTS_STATUS', {
+        manuscriptsImportStatus: true,
       })
+    })
 
-    return true
-  } finally {
-    importsInProgress.delete(key)
-  }
+  return true
 }
 
 const importManuscriptsFromSemanticScholar = async (groupId, ctx) => {
   const key = `${groupId}-SemanticScholar`
   if (importsInProgress.has(key)) return false
 
-  try {
-    importsInProgress.add(key)
+  importsInProgress.add(key)
+
+  let promises
 
+  try {
     const activeConfig = await Config.query().findOne({
       groupId,
       active: true,
     })
 
-    const promises = []
+    promises = []
 
     if (
       activeConfig.formData.integrations?.semanticScholar.enableSemanticScholar
     ) {
       promises.push(importArticlesFromSemanticScholar(groupId, ctx))
     }
+  } catch (error) {
+    importsInProgress.delete(key)
+    throw error
+  }
 
-    if (!promises.length) return false
+  if (!promises.length) {
+    importsInProgress.delete(key)
+    return false
+  }
 
-    Promise.all(promises)
-      .catch(error => logger.error(error))
-      .finally(async () => {
-        subscriptionManager.publish('IMPORT_MANUSCRIPTS_STATUS', {
-          manuscriptsImportStatus: true,
-        })
+  // The import lock is held until this background work settles, not until
+  // this function returns, since the caller doesn't await it.
+  Promise.all(promises)
+    .catch(error => logger.error(error))
+    .finally(() => {
+      importsInProgress.delete(key)
+      subscriptionManager.publish('IMPORT_MANUSCRIPTS_STATUS', {
+        manuscriptsImportStatus: true,
       })
+    })
 
-    return true
-  } finally {
-    importsInProgress.delete(key)
-  }
+  return true
 }
 
 module.exports = {

packages/server/package.json

@@ -32,7 +32,7 @@
     "citeproc-js-node": "^0.0.3",
     "fast-xml-parser": "^4.0.7",
     "fnv-plus": "^1.3.1",
-    "form-data": "^4.0.0",
+    "form-data": "^4.0.6",
     "fs-extra": "4.0.3",
     "google-spreadsheet": "^3.1.15",
     "graphql": "16.9.0",