Merge pull request #742 from OpenKnowledgeMaps/themes-overviews

Themes overviews

Author: vrednyydragon

server/services/searchBASE.php

@@ -11,7 +11,7 @@
 $precomputed_id = (isset($_POST["unique_id"]))?($_POST["unique_id"]):(null);
 
 $params_array = array("from", "to", "document_types", "sorting", "min_descsize");
-$optional_get_params = ["repo", "coll", "vis_type", "q_advanced", "lang_id"];
+$optional_get_params = ["repo", "coll", "vis_type", "q_advanced", "lang_id", "custom_title"];
 
 function filterEmptyString($value)
 {

server/workers/api/src/apis/request_validators.py

@@ -32,6 +32,7 @@ class SearchParamSchema(Schema):
     repo_name = fields.Str()
     coll = fields.Str()
     list_size = fields.Int()
+    custom_title = fields.Str()
 
 
     @pre_load

vis/js/components/Heading.js

@@ -1,6 +1,7 @@
 import React from "react";
 import { connect } from "react-redux";
 
+
 import {
   BasicTitle,
   ProjectTitle,
@@ -19,7 +20,7 @@ const Heading = ({
                    headingParams,
                    streamgraph,
                    q_advanced,
-                   // customTitle,
+                     service,
                  }) => {
   if (zoomed) {
     const label = streamgraph
@@ -41,13 +42,11 @@ const Heading = ({
 
   let queryString = queryConcatenator([query, q_advanced])
 
-  // console.log("customTitle", headingParams.customTitle)
-
   return (
       // html template starts here
       <div className="heading-container">
         <h4 className="heading">
-          {renderTitle(localization, queryString, headingParams)}
+            {renderTitle(localization, queryString, headingParams, service)}
         </h4>
       </div>
       // html template ends here
@@ -62,10 +61,11 @@ const mapStateToProps = (state) => ({
   headingParams: state.heading,
   streamgraph: state.chartType === STREAMGRAPH_MODE,
   q_advanced: state.q_advanced.text,
-  // context: state,
-  // customTitle: state.heading.customTitle,
+    // get source BASE or PubMed
+    service: state.contextLine.dataSource,
 });
 
+
 export default connect(mapStateToProps)(Heading);
 
 // This should probably make its way to a more global config
@@ -75,7 +75,8 @@ const MAX_LENGTH_CUSTOM = 100;
 /**
  * Renders the title for the correct setup.
  */
-const renderTitle = (localization, query, headingParams) => {
+const renderTitle = (localization, query, headingParams, service) => {
+
   if (headingParams.presetTitle) {
     return <BasicTitle title={headingParams.presetTitle} />;
   }
@@ -104,10 +105,18 @@ const renderTitle = (localization, query, headingParams) => {
       );
     }
 
+    // this condition for BASE service and custom title if its value exists in config params
+      if (service === "BASE") {
+              if (headingParams.customTitle) {
+                  return <StandardTitle label={label} title={headingParams.customTitle}/>;
+              }
+      }
+
     return <StandardTitle label={label} title={query} />;
   }
 
-  return <BasicTitle title={localization.default_title} />;
+
+    return <BasicTitle title={localization.default_title} />;
 };
 
 const renderViperTitle = (title, acronym, projectId) => {

vis/js/reducers/heading.js

@@ -5,9 +5,6 @@ const context = (state = {}, action) => {
 
   switch (action.type) {
     case "INITIALIZE":
-      // console.log("action", action)
-      // console.log("params", action.contextObject.params)
-      // console.log("custom_title", action.contextObject.params.custom_title)
       return {
         title: action.contextObject.params
             ? action.contextObject.params.title
@@ -19,22 +16,22 @@ const context = (state = {}, action) => {
             ? action.contextObject.params.project_id
             : undefined,
         presetTitle: action.configObject.title,
-        titleStyle: getTitleStyle(action.configObject),
+        // Todo: set titleStyle = "custom" if custom_title exists
+        titleStyle: action.contextObject.params.custom_title ? 'custom' : getTitleStyle(action.configObject),
         titleLabelType: getTitleLabelType(action.configObject),
-        customTitle: action.configObject.custom_title,
-        // customTitle: action.contextObject.params.custom_title,
+        customTitle: action.configObject.custom_title ? action.configObject.custom_title : action.contextObject.params.custom_title,
       };
     default:
       return state;
   }
 };
 
 const getTitleStyle = (config) => {
+  
   if (config.create_title_from_context) {
     if (config.create_title_from_context_style) {
       return config.create_title_from_context_style;
     }
-
     return "standard";
   }
 

vis/js/templates/modals/CitationModal.jsx

@@ -11,6 +11,7 @@ import { formatString, removeEmbedParam } from "../../utils/string";
 import CopyButton from "../CopyButton";
 import useMatomo from "../../utils/useMatomo";
 import { queryConcatenator } from "../../utils/data";
+import {unescapeHTML} from "../../utils/unescapeHTMLentities.js";
 
 const CitationModal = ({
   open,
@@ -20,6 +21,7 @@ const CitationModal = ({
   customTitle,
   timestamp,
   q_advanced,
+                         titleStyle,
 }) => {
   const loc = useLocalizationContext();
   const { trackEvent } = useMatomo();
@@ -37,7 +39,7 @@ const CitationModal = ({
     customQuery = customQuery.substr(0, 100) + "[..]";
   }
   if (customTitle) {
-    customQuery = customTitle;
+    customQuery = unescapeHTML(customTitle);
   }
 
   const date = getDateFromTimestamp(timestamp);
@@ -88,9 +90,10 @@ const mapStateToProps = (state) => ({
   isStreamgraph: state.chartType === STREAMGRAPH_MODE,
   query: state.query.text,
   customTitle:
-    state.heading.titleStyle === "custom" ? state.heading.customTitle : null,
+      state.heading.titleStyle === "custom" ? state.heading.customTitle : null,
   timestamp: state.misc.timestamp,
   q_advanced: state.q_advanced.text,
+  titleStyle: state.heading.titleStyle
 });
 
 const mapDispatchToProps = (dispatch) => ({

vis/js/templates/modals/infomodal/subcomponents/StandardKMInfo.jsx

@@ -4,14 +4,20 @@ import { Modal } from "react-bootstrap";
 import AboutSoftware from "./AboutSoftware";
 import DataSource from "./DataSource";
 import { queryConcatenator } from "../../../../utils/data";
+import {unescapeHTML} from "../../../../utils/unescapeHTMLentities.js";
+
+
 
 const StandardKMInfo = ({
   serviceName,
   serviceDesc,
   serviceLogo,
-  params: { query, customTitle, repo_name, q_advanced },
+                          params: {query, customTitle, repo_name, q_advanced},
 }) => {
   let queryString = queryConcatenator([query, q_advanced])
+
+  customTitle = unescapeHTML(customTitle)
+
   return (
     // html template starts here
     <>
@@ -46,7 +52,7 @@ const StandardKMInfo = ({
         {!!customTitle && (
           <p>
             This map has a custom title and was created using the following
-            query: <strong className="hs-strong">{query}</strong>
+            query: <strong className="hs-strong">{queryString}</strong>
           </p>
         )}
         <p>

vis/js/utils/unescapeHTMLentities.js

@@ -0,0 +1,20 @@
+export const unescapeHTML = (string) => {
+    let entityMap = {
+        "&": "&",
+        "&lt;": "<",
+        "&gt;": ">",
+        "&quot;": '"',
+        "&#34;": '"',
+        "&#39;": "'",
+        "&#x2F;": "/",
+        "&#x60;": "`",
+        "&#x3D;": "=",
+    };
+
+    return String(string).replace(
+        /(&amp;|&lt;|&gt;|&quot;|&#34;|&#39;|&#x2F;|&#x60;|&#x3D;)/g,
+        function (s) {
+            return entityMap[s];
+        }
+    );
+};