Merge pull request #805 from OpenKnowledgeMaps/refactor/remove-find-out-more-link-ORCID

refactor: remove the "Find out more" link in ORCID

Author: andreishket

vis/js/components/Toolbar.tsx

@@ -1,5 +1,4 @@
 // @ts-nocheck
-
 import React from "react";
 import { connect } from "react-redux";
 import ScaleToolbar from "../templates/ScaleToolbar";
@@ -14,8 +13,7 @@ const Toolbar = ({
   scaleBaseUnit,
   scaleValue,
   showCredit,
-  onInfoClick,
-  onScaleChange
+  onScaleChange,
 }) => {
   if (showScaleToolbar) {
     const handleScaleChange = (newScaleBy: string) => {
@@ -34,7 +32,6 @@ const Toolbar = ({
           explanations={scaleExplanations}
           value={scaleValue}
           showCredit={showCredit}
-          onInfoClick={onInfoClick}
           onChange={handleScaleChange}
         />
       </div>
@@ -55,7 +52,6 @@ const mapStateToProps = (state) => ({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  onInfoClick: () => dispatch(openInfoModal()),
   onScaleChange: (value, baseUnit, contentBased, sort) =>
     dispatch(scaleMap(value, baseUnit, contentBased, sort)),
 });

vis/js/i18n/localization.ts

@@ -103,7 +103,6 @@ export interface Localization {
   citations: string;
   social: string;
   references: string;
-  scale_by_infolink_label: string;
   metrics_label: string;
   researcher_details_label: string;
   scale_by_explanation: string;
@@ -398,7 +397,6 @@ export const localization: {
     citations: "citations",
     social: "social media mentions",
     references: "references outside academia",
-    scale_by_infolink_label: "Find out more",
     metrics_label: "Metrics",
     researcher_details_label: "Researcher details",
     scale_by_explanation:
@@ -456,7 +454,6 @@ export const localization: {
     citations: "citations",
     social: "social media mentions",
     references: "references outside academia",
-    scale_by_infolink_label: "Find out more",
     metrics_label: "Metrics",
     researcher_details_label: "Researcher details",
     scale_by_explanation:
@@ -500,10 +497,8 @@ export const localization: {
     publication: "papers",
     dataset: "datasets",
     items: "items",
-    scale_by_infolink_label: "notes on use of metrics",
     // citations_count_label: "citations",
     social_media_count_label: " social media mentions",
     references_count_label: "references outside academia",
-    // scale_by_infolink_label: 'Find out more'
   },
 };

vis/js/templates/ScaleToolbar.tsx

@@ -13,7 +13,6 @@ const ScaleToolbar = ({
   explanations,
   showCredit,
   onChange,
-  onInfoClick,
 }) => {
   const localization = useLocalizationContext();
   const { trackEvent } = useMatomo();
@@ -22,12 +21,6 @@ const ScaleToolbar = ({
     trackEvent("Added components", "Rescale map", labels[id]);
   };
 
-  const handleInfoClick = (event) => {
-    event.preventDefault();
-    onInfoClick();
-    trackEvent("Added components", "Open more info modal", "Toolbar");
-  };
-
   return (
     <div className="scale-toolbar btn-group dropup">
       <div className="dropdown">
@@ -36,20 +29,31 @@ const ScaleToolbar = ({
           noCaret
           title={
             <>
-              <span style={{
-                maxWidth: '100%',
-                display: 'flex',
-                justifyContent: 'center',
-                alignItems: 'center'
-              }}>
+              <span
+                style={{
+                  maxWidth: "100%",
+                  display: "flex",
+                  justifyContent: "center",
+                  alignItems: "center",
+                }}
+              >
                 <span>{localization.scale_by_label}</span>
-                <span id="curr-filter-type" className="truncate-text" style={{
-                  minWidth: '0px',
-                  marginLeft: "3px"
-                }}>{labels[value]}</span>
-                <i className="fas fa-chevron-down chevron" style={{
-                  marginLeft: "3px",
-                }}/>
+                <span
+                  id="curr-filter-type"
+                  className="truncate-text"
+                  style={{
+                    minWidth: "0px",
+                    marginLeft: "3px",
+                  }}
+                >
+                  {labels[value]}
+                </span>
+                <i
+                  className="fas fa-chevron-down chevron"
+                  style={{
+                    marginLeft: "3px",
+                  }}
+                />
               </span>
             </>
           }
@@ -69,14 +73,6 @@ const ScaleToolbar = ({
       </div>
       <div className="context-scale-toolbar">
         <span id="curr-scale-explanation">{explanations[value]}</span>
-        <a
-          id="infolink"
-          className="scale-infolink"
-          onClick={handleInfoClick}
-          href="#"
-        >
-          {localization.scale_by_infolink_label}
-        </a>
       </div>
       {showCredit && (
         <div id="credit">