Skip to content

Commit 4a92762

Browse files
committed
refactor: remove the "Find out more" link
1 parent 7ad7706 commit 4a92762

2 files changed

Lines changed: 25 additions & 33 deletions

File tree

vis/js/components/Toolbar.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// @ts-nocheck
2-
32
import React from "react";
43
import { connect } from "react-redux";
54
import ScaleToolbar from "../templates/ScaleToolbar";
@@ -14,8 +13,7 @@ const Toolbar = ({
1413
scaleBaseUnit,
1514
scaleValue,
1615
showCredit,
17-
onInfoClick,
18-
onScaleChange
16+
onScaleChange,
1917
}) => {
2018
if (showScaleToolbar) {
2119
const handleScaleChange = (newScaleBy: string) => {
@@ -34,7 +32,6 @@ const Toolbar = ({
3432
explanations={scaleExplanations}
3533
value={scaleValue}
3634
showCredit={showCredit}
37-
onInfoClick={onInfoClick}
3835
onChange={handleScaleChange}
3936
/>
4037
</div>
@@ -55,7 +52,6 @@ const mapStateToProps = (state) => ({
5552
});
5653

5754
const mapDispatchToProps = (dispatch) => ({
58-
onInfoClick: () => dispatch(openInfoModal()),
5955
onScaleChange: (value, baseUnit, contentBased, sort) =>
6056
dispatch(scaleMap(value, baseUnit, contentBased, sort)),
6157
});

vis/js/templates/ScaleToolbar.tsx

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ const ScaleToolbar = ({
1313
explanations,
1414
showCredit,
1515
onChange,
16-
onInfoClick,
1716
}) => {
1817
const localization = useLocalizationContext();
1918
const { trackEvent } = useMatomo();
@@ -22,12 +21,6 @@ const ScaleToolbar = ({
2221
trackEvent("Added components", "Rescale map", labels[id]);
2322
};
2423

25-
const handleInfoClick = (event) => {
26-
event.preventDefault();
27-
onInfoClick();
28-
trackEvent("Added components", "Open more info modal", "Toolbar");
29-
};
30-
3124
return (
3225
<div className="scale-toolbar btn-group dropup">
3326
<div className="dropdown">
@@ -36,20 +29,31 @@ const ScaleToolbar = ({
3629
noCaret
3730
title={
3831
<>
39-
<span style={{
40-
maxWidth: '100%',
41-
display: 'flex',
42-
justifyContent: 'center',
43-
alignItems: 'center'
44-
}}>
32+
<span
33+
style={{
34+
maxWidth: "100%",
35+
display: "flex",
36+
justifyContent: "center",
37+
alignItems: "center",
38+
}}
39+
>
4540
<span>{localization.scale_by_label}</span>
46-
<span id="curr-filter-type" className="truncate-text" style={{
47-
minWidth: '0px',
48-
marginLeft: "3px"
49-
}}>{labels[value]}</span>
50-
<i className="fas fa-chevron-down chevron" style={{
51-
marginLeft: "3px",
52-
}}/>
41+
<span
42+
id="curr-filter-type"
43+
className="truncate-text"
44+
style={{
45+
minWidth: "0px",
46+
marginLeft: "3px",
47+
}}
48+
>
49+
{labels[value]}
50+
</span>
51+
<i
52+
className="fas fa-chevron-down chevron"
53+
style={{
54+
marginLeft: "3px",
55+
}}
56+
/>
5357
</span>
5458
</>
5559
}
@@ -69,14 +73,6 @@ const ScaleToolbar = ({
6973
</div>
7074
<div className="context-scale-toolbar">
7175
<span id="curr-scale-explanation">{explanations[value]}</span>
72-
<a
73-
id="infolink"
74-
className="scale-infolink"
75-
onClick={handleInfoClick}
76-
href="#"
77-
>
78-
{localization.scale_by_infolink_label}
79-
</a>
8076
</div>
8177
{showCredit && (
8278
<div id="credit">

0 commit comments

Comments
 (0)