added "pdf" keyword support in search

Author: Konstiman

vis/js/templates/listentry/PaperButtons.jsx

@@ -4,6 +4,7 @@ import { connect } from "react-redux";
 import useMatomo from "../../utils/useMatomo";
 import { getPaperPDFClickHandler } from "../../utils/data";
 import { mapDispatchToListEntriesProps } from "../../utils/eventhandlers";
+import Highlight from "../../components/Highlight";
 
 const PaperButtons = ({ paper, handlePDFClick }) => {
   const { trackEvent } = useMatomo();
@@ -20,7 +21,7 @@ const PaperButtons = ({ paper, handlePDFClick }) => {
     <div className="paper_buttons_row">
       {!!onPDFClick && (
         <button className="paper_button" onClick={handlePDFButtonClick}>
-          <i className="fa fa-eye"></i>&nbsp;&nbsp;PDF
+          <i className="fa fa-eye"></i>&nbsp;&nbsp;<Highlight>PDF</Highlight>
         </button>
       )}
     </div>

vis/js/utils/data.js

@@ -83,54 +83,48 @@ const getParamFilterFunction = (param, field) => {
   };
 };
 
+const SEARCHED_PROPS = [
+  "title",
+  "authors_string",
+  "published_in",
+  "year",
+  "subject_orig",
+  "tags",
+  "comments_for_filtering",
+  "resulttype",
+  "paper_abstract",
+];
+
 /**
  * Creates a paper filtering function from the search words.
  *
- * Function taken from legacy list.js
- * @param {Array} search_words array of search words (plaintext strings)
+ * @param {Array} searchedKeywords array of search keywords (plaintext strings)
  *
- * @returns {Function} filtering function
+ * @returns {Function} filtering function that returns true if paper contains all the searched keywords
  */
-const getWordFilterFunction = (search_words) => {
-  return (d) => {
-    const abstract = getPropertyOrEmptyString(d, "paper_abstract");
-    const title = getPropertyOrEmptyString(d, "title");
-    const authors = getPropertyOrEmptyString(d, "authors_string");
-    const journals = getPropertyOrEmptyString(d, "published_in");
-    const year = getPropertyOrEmptyString(d, "year");
-    const keywords = getPropertyOrEmptyString(d, "subject_orig");
-    const tags = getPropertyOrEmptyString(d, "tags");
-    const comments = getPropertyOrEmptyString(d, "comments_for_filtering");
-    const resulttype = getPropertyOrEmptyString(d, "resulttype");
-    // TODO: make these two properties language-aware
-    const open_access = d.oa ? "open access" : "";
-    const free_access = d.free_access ? "free access" : "";
-
-    let i = 0;
-    let word_found = true;
-    while (word_found && i < search_words.length) {
-      word_found =
-        abstract.indexOf(search_words[i]) !== -1 ||
-        title.indexOf(search_words[i]) !== -1 ||
-        authors.indexOf(search_words[i]) !== -1 ||
-        journals.indexOf(search_words[i]) !== -1 ||
-        year.indexOf(search_words[i]) !== -1 ||
-        keywords.indexOf(search_words[i]) !== -1 ||
-        tags.indexOf(search_words[i]) !== -1 ||
-        comments.indexOf(search_words[i]) !== -1 ||
-        resulttype.indexOf(search_words[i]) !== -1 ||
-        open_access.indexOf(search_words[i]) !== -1 ||
-        free_access.indexOf(search_words[i]) !== -1;
-      i++;
+const getWordFilterFunction = (searchedKeywords) => {
+  return (paper) => {
+    const paperKeywords = SEARCHED_PROPS.map((prop) =>
+      getPropertyOrEmptyString(paper, prop)
+    );
+
+    if (paper.oa) {
+      paperKeywords.push("open access");
+      paperKeywords.push("pdf");
     }
+    if (paper.free_access) {
+      paperKeywords.push("free access");
+    }
+
+    const paperString = paperKeywords.join(" ");
 
-    return word_found;
+    return !searchedKeywords.some((keyword) => !paperString.includes(keyword));
   };
 };
 
 const getPropertyOrEmptyString = (object, property) => {
   if (Object.prototype.hasOwnProperty.call(object, property)) {
-    return object[property].toString().toLowerCase();
+    return object[property].toString().toLowerCase().trim();
   }
 
   return "";

vis/stylesheets/components/_buttons.scss

@@ -177,6 +177,10 @@ img#close-button {
     width: 100px;
     font-weight: normal;
 
+    .highlighted {
+        color: $okm-red;
+    }
+
     &:hover {
         color: $okm-red;
         background-color: white;

vis/test/snapshot/__snapshots__/list-base.test.js.snap

@@ -435,7 +435,8 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p
                   <i
                     className="fa fa-eye"
                   />
-                    PDF
+                    
+                  PDF
                 </button>
               </div>
               <div
@@ -865,7 +866,8 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
                   <i
                     className="fa fa-eye"
                   />
-                    PDF
+                    
+                  PDF
                 </button>
               </div>
               <div
@@ -1150,7 +1152,8 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
                   <i
                     className="fa fa-eye"
                   />
-                    PDF
+                    
+                  PDF
                 </button>
               </div>
               <div
@@ -1567,7 +1570,8 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
                   <i
                     className="fa fa-eye"
                   />
-                    PDF
+                    
+                  PDF
                 </button>
               </div>
               <div
@@ -2776,7 +2780,8 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
                   <i
                     className="fa fa-eye"
                   />
-                    PDF
+                    
+                  PDF
                 </button>
               </div>
               <div
@@ -3041,7 +3046,8 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
                   <i
                     className="fa fa-eye"
                   />
-                    PDF
+                    
+                  PDF
                 </button>
               </div>
               <div
@@ -3317,7 +3323,8 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
                   <i
                     className="fa fa-eye"
                   />
-                    PDF
+                    
+                  PDF
                 </button>
               </div>
               <div