Merge pull request #8 from eea/118769_glossary_search

Implemented Glossary search and Search result page

package.json

@@ -70,6 +70,7 @@
     "npm": "^6.13.7",
     "react": "^16.13.0",
     "react-component-queries": "^2.3.0",
+    "react-highlight-words": "^0.16.0",
     "react-image-gallery": "^0.9.1",
     "react-infinite-scroll-component": "^5.0.4",
     "react-lazy-load-image-component": "^1.4.0",

src/actions/index.js

@@ -1,9 +1,12 @@
 import {
-    SET_SECTION_TABS,
-    GET_PARENT_FOLDER_DATA,
-    GET_NAV_ITEMS
+  SET_SECTION_TABS,
+  GET_PARENT_FOLDER_DATA,
+  GET_NAV_ITEMS,
+  QUICK_RESET_SEARCH_CONTENT,
+  QUICK_SEARCH_CONTENT,
 } from '~/constants/ActionTypes';
 
+import { compact, concat, isArray, join, map, pickBy, toPairs } from 'lodash';
 
 export function setSectionTabs(payload) {
   return {
@@ -12,7 +15,6 @@ export function setSectionTabs(payload) {
   };
 }
 
-
 export function getParentFolderData(url) {
   return {
     type: GET_PARENT_FOLDER_DATA,
@@ -22,3 +24,55 @@ export function getParentFolderData(url) {
     },
   };
 }
+
+export function quickSearchContent(url, options, subrequest = null) {
+  let queryArray = [];
+  const arrayOptions = pickBy(options, item => isArray(item));
+  console.log(options, arrayOptions);
+
+  queryArray = concat(
+    queryArray,
+    options
+      ? join(
+          map(toPairs(pickBy(options, item => !isArray(item))), item => {
+            if (item[0] === 'SearchableText') {
+              // Adds the wildcard to the SearchableText param
+              item[1] = `${item[1]}*`;
+            }
+            return join(item, '=');
+          }),
+          '&',
+        )
+      : '',
+  );
+
+  queryArray = concat(
+    queryArray,
+    arrayOptions
+      ? join(
+          map(pickBy(arrayOptions), (item, key) =>
+            join(item.map(value => `${key}:list=${value}`), '&'),
+          ),
+          '&',
+        )
+      : '',
+  );
+
+  const querystring = join(compact(queryArray), '&');
+
+  return {
+    type: QUICK_SEARCH_CONTENT,
+    subrequest,
+    request: {
+      op: 'get',
+      path: `${url}/@search${querystring ? `?${querystring}` : ''}`,
+    },
+  };
+}
+
+export function quickResetSearchContent(subrequest = null) {
+  return {
+    type: QUICK_RESET_SEARCH_CONTENT,
+    subrequest,
+  };
+}

src/components/theme/View/TabsChildView.jsx

@@ -90,7 +90,7 @@ const DefaultView = props => {
 
   return hasBlocksData(content) ? (
     <div className="ui wrapper">
-      <div className="glossary-search search">
+      <div className="glossary-search">
         <SearchWidget pathname={props.pathname} />
       </div>
 

src/constants/ActionTypes.js

@@ -1,5 +1,5 @@
 export const SET_SECTION_TABS = 'SET_SECTION_TABS';
 export const GET_PARENT_FOLDER_DATA = 'GET_PARENT_FOLDER_DATA';
 export const GET_NAV_ITEMS = 'GET_NAV_ITEMS';
-
-
+export const QUICK_RESET_SEARCH_CONTENT = 'QUICK_RESET_SEARCH_CONTENT';
+export const QUICK_SEARCH_CONTENT = 'QUICK_SEARCH_CONTENT';