Merge pull request #39 from PathwayCommons/24-improve-redirects

Improving redirects

Author: Suhyma

.github/workflows/ci-cd.yml

@@ -44,6 +44,12 @@ jobs:
       - name: Test with mocha
         run: npm run coverage
 
+      #----------------------------------------------
+      #       build
+      #----------------------------------------------
+      - name: Build code
+        run: npm run build
+
       #----------------------------------------------
       #              reporting
       #----------------------------------------------

src/dashboard/categories.js

@@ -6,7 +6,7 @@ const toDate = o => {
 };
 const byDate = (a, b) => { return b.date - a.date; };
 export const categories = data.map(({ id, name, description, img }) => ({ id, name, description, img }));
-export const getPapers = ({ id, limit = 20 }) => {
+export const getPapers = ({ id, limit = 100 }) => {
   let papers = [];
   const category = data.find(cat => cat.id === id);
   papers = category && category.papers.map(toDate).sort(byDate).slice(1, limit);

src/dashboard/category-results-screen.js

@@ -4,7 +4,7 @@ import CategoryCard from './category-card.js';
 
 function Paper ({ paper }) {
   return h('div', { class: 'paper' }, [
-    h('a', { href: `https://doi.org/${paper.doi}`, target: '_blank', class: 'paper-link' }, [
+    h('a', { href: paper.finalURL, target: '_blank', class: 'paper-link' }, [
       h('div', { class: 'paper-read' }),
       h('div', { class: 'paper-title' }, paper.title)
     ]),

src/data-search.js

@@ -38,9 +38,37 @@ export async function getData () {
   await searcher.articles(articles);
   const doSearches = async config => {
     const { keywords } = config;
-    const papers = await searcher.search(keywords, {
+    const allPapers = await searcher.search(keywords, {
       combineWith: 'AND'
     });
+
+    // Filter for multiple versions of the same paper
+    const papers = [];
+    for (const paper of allPapers) {
+      const exists = papers.find((obj) => obj.doi === paper.doi);
+
+      if (!exists) {
+        const allVersions = allPapers.filter((obj) => obj.doi === paper.doi);
+        if (allVersions.length > 1) {
+          const max = allVersions.reduce((maxObj, obj) => {
+            if (obj.version > maxObj.version) {
+              return obj;
+            } else {
+              return maxObj;
+            }
+          }, { version: -Infinity });
+          papers.push(max);
+        } else {
+          papers.push(paper);
+        }
+      }
+    }
+
+    // Find and save final link for each paper's DOI
+    for (const paper of papers) {
+      const finalURL = `https://www.${paper.server}.org/content/${paper.doi}v${paper.version}`;
+      paper.finalURL = finalURL;
+    }
     return _.assign({}, config, { papers });
   };
   const collection = await Promise.all(config.map(doSearches));

src/search.js

@@ -12,7 +12,7 @@ export class Search {
   constructor () {
     this.miniSearch = new MiniSearch({
       fields: ['title', 'authors', 'category', 'abstract'], // fields to index for full-text search
-      storeFields: ['title', 'authors', 'category', 'abstract', 'date', 'server', 'doi'] // fields to return with search results
+      storeFields: ['title', 'authors', 'category', 'abstract', 'date', 'server', 'doi', 'version'] // fields to return with search results
     });
   }