Merge pull request #738 from OpenKnowledgeMaps/dev

Dev

Author: chreman

vis/js/dataprocessing/managers/DataManager.js

@@ -147,16 +147,18 @@ class DataManager {
         this.config.convert_author_names
     );
 
-      // old variable with all authors_string
+    // old variable with all authors_string
     // paper.authors_string = paper.authors_list.join(", ");
 
-    if (paper.authors_list.length > 15) {
-        const firstAuthors = paper.authors_list.slice(0, 14).join(", ");
+    if (paper.authors_list.length > 20) {
+      const firstAuthors = paper.authors_list.slice(0, 19).join(", ");
       const lastAuthor = paper.authors_list[paper.authors_list.length - 1];
-        // get first 14 authors and add "..." and last author for the visual part the map
-        paper.authors_string = `${firstAuthors}, ... ${lastAuthor}`;
-        // in the case of more than 15 authors left an array of 16 authors for further processing in the visual part with "..." between the authors
-        paper.authors_list = paper.authors_list.slice(0, 15).concat(lastAuthor);
+      // get first 19 authors and add "..." and last author for the visual part the map
+      paper.authors_string = `${firstAuthors}, ... ${lastAuthor}`;
+      // in the case of more than 19 authors left an array of 20 authors for further processing in the visual part with "..." between the authors
+      paper.authors_list = paper.authors_list.slice(0, 20).concat(lastAuthor);
+    } else {
+      paper.authors_string = paper.authors_list.join(", ");
     }
   }
 

vis/js/templates/Paper.jsx

@@ -100,7 +100,7 @@ class Paper extends React.Component {
     const { maxSize, enlargeFactor } = this.props;
     const { onClick, onMouseOver, onMouseOut } = this.props;
 
-    const { title, authors_string: authors, year, area } = data;
+    const {title, authors_string: authors, authors_list: authors_list, year, area} = data;
     const { num_readers: readers, published_in: publisher } = data;
     const { x, y, width: baseWidth, height: baseHeight } = this.state;
     const { path: basePath, dogEar: baseDogEar } = this.state;
@@ -168,6 +168,19 @@ class Paper extends React.Component {
       eventHandlers.onMouseOut = handleMouseOut;
     }
 
+
+    // function returns a string of authors with conditionals if the list is too long, it's cut off and an ellipsis is added
+    // if less than maxLength authors, the full list is returned
+    function cutAuthors(authorsList, maxLength) {
+      if (authorsList.length > maxLength) {
+        const firstAuthors = authorsList.slice(0, maxLength - 1).join(', ');
+        const lastAuthor = authorsList[authorsList.length - 1];
+        return `${firstAuthors}, ... ${lastAuthor}`;
+      } else {
+        return authors
+      }
+    }
+
     return (
       // html template starts here
       <g className={gClass} {...eventHandlers}>
@@ -222,7 +235,8 @@ class Paper extends React.Component {
                 <p id="details" className={sizeModifierClass}>
                   <Hyphenate>
                     <Highlight hyphenated queryHighlight>
-                      {authors}
+                      {/*{authors}*/}
+                      {cutAuthors(authors_list, 15)}
                     </Highlight>
                   </Hyphenate>
                 </p>
@@ -478,7 +492,7 @@ export const isNonTextDocument = (paper) => {
   }
 
   const knownTypes = paper.resulttype.filter((t) => t.toLowerCase() !== UNKNOWN_TYPE);
-  
+
   // the only type is unknown
   if (knownTypes.length === 0) {
     return true;

vis/js/templates/listentry/Details.jsx

@@ -53,11 +53,12 @@ const getAuthorsString = (authorsList, maxLength) => {
 
   const ellipsis = "...";
   const join = ", ";
+  const maxLengthAuthors = 15;
   let finalString = authorsListCopy.shift();
-  if (authorsList.length > 15) {
-    const first19Authors = authorsList.slice(0, 14).join(", ");
+  if (authorsList.length > maxLengthAuthors) {
+    const firstAuthors = authorsList.slice(0, maxLengthAuthors - 1).join(join);
     const lastAuthor = authorsList[authorsList.length - 1];
-    finalString = `${first19Authors}, ... ${lastAuthor}`;
+    finalString = `${firstAuthors}, ... ${lastAuthor}`;
     return finalString;
   }
   while (authorsListCopy.length > 0) {