fix: adding filtering manuscripts by topic

app/components/component-manuscripts/src/Manuscript.js

@@ -63,7 +63,7 @@ const User = ({ manuscriptId, manuscript, submitter, history, ...props }) => {
     })
   }
 
-  const filterByTopic = (topic) => {
+  const filterByTopic = topic => {
     props.setSelectedTopic(topic)
     history.replace(`${urlFrag}/admin/manuscripts?topic=${topic}`)
   }
@@ -80,10 +80,16 @@ const User = ({ manuscriptId, manuscript, submitter, history, ...props }) => {
       <Cell>{convertTimestampToDate(manuscript.updated)}</Cell>
       {process.env.INSTANCE_NAME === 'ncrc' && (
         <Cell>
-          {manuscript.submission.topics.map((topic) => {
-            return <StyledTopic key={topic} title={convertCamelCaseToText(topic)} onClick={() => filterByTopic(topic)}>
+          {manuscript.submission.topics.map(topic => {
+            return (
+              <StyledTopic
+                key={topic}
+                onClick={() => filterByTopic(topic)}
+                title={convertCamelCaseToText(topic)}
+              >
                 {convertCamelCaseToText(topic)}
               </StyledTopic>
+            )
           })}
         </Cell>
       )}

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

@@ -71,14 +71,14 @@ const Manuscripts = ({ history, ...props }) => {
       sort,
       offset: (page - 1) * limit,
       limit,
-      filter: { submission: JSON.stringify({ topics: selectedTopic }) }
+      filter: history.location.search ? { submission: JSON.stringify({ topics: selectedTopic }) } : {}
     },
     fetchPolicy: 'network-only',
   })
 
   useEffect(() => {
     refetch()
-  }, [selectedTopic])
+  }, [history.location.search])
 
   if (loading) return <Spinner />
   if (error) return `Error! ${error.message}`

app/components/component-manuscripts/src/style.js

@@ -52,4 +52,4 @@ export const StyledTableLabel = styled.p`
   padding: 0 10px;
   text-align: center;
   white-space: nowrap;
-`
+`
\ No newline at end of file

server/model-manuscript/src/graphql.js

@@ -378,8 +378,12 @@ const resolvers = {
       }
     },
     async paginatedManuscripts(_, { sort, offset, limit, filter }, ctx) {
-      const parsedSubmission = JSON.parse(filter?.submission)
+      let parsedSubmission;
 
+      if(filter.submission) {
+        parsedSubmission = JSON.parse(filter.submission)
+      }
+      
       const query = ctx.models.Manuscript.query()
         .where({ parentId: null })
         .withGraphFetched('[submitter, manuscriptVersions(orderByCreated)]')
@@ -394,11 +398,13 @@ const resolvers = {
       }
 
       if (process.env.INSTANCE_NAME === 'ncrc') {
-        if (filter && parsedSubmission.topics ) {
-          query.whereRaw("(submission->'topics')::jsonb \\? ?", [parsedSubmission.topics])
+        if (filter && parsedSubmission) {
+          query.whereRaw("(submission->'topics')::jsonb \\? ?", [
+            parsedSubmission.topics,
+          ])
         }
       }
-     
+
       const totalCount = await query.resultSize()
 
       if (sort) {