From 1d157f843abe728b86be8c89cfc661a4c7968f77 Mon Sep 17 00:00:00 2001 From: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> Date: Fri, 21 Feb 2025 12:33:01 +0300 Subject: [PATCH 1/7] FIx dropdown search btn --- .../src/components/DropdownSearch/DownloadSearch.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/climatemappedafrica/src/components/DropdownSearch/DownloadSearch.js b/apps/climatemappedafrica/src/components/DropdownSearch/DownloadSearch.js index 8b8c45e3e..a5800362a 100644 --- a/apps/climatemappedafrica/src/components/DropdownSearch/DownloadSearch.js +++ b/apps/climatemappedafrica/src/components/DropdownSearch/DownloadSearch.js @@ -6,13 +6,13 @@ import { ListItem, SvgIcon, Box, + Button, } from "@mui/material"; import { useRouter } from "next/router"; import PropTypes from "prop-types"; import React, { useEffect, useState } from "react"; import SearchIcon from "@/climatemappedafrica/assets/icons/search.svg"; -import Link from "@/climatemappedafrica/components/Link"; function DropdownSearch({ IconButtonProps, @@ -174,7 +174,7 @@ function DropdownSearch({ > {suggestions.map(({ name, code }) => ( handleSelect(code, name)} From da2789c06c2fb2f953a2398faedc048c760a4309 Mon Sep 17 00:00:00 2001 From: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> Date: Fri, 21 Feb 2025 18:05:34 +0300 Subject: [PATCH 2/7] Fix location navigation Signed-off-by: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> --- apps/climatemappedafrica/src/components/ExplorePage/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/climatemappedafrica/src/components/ExplorePage/index.js b/apps/climatemappedafrica/src/components/ExplorePage/index.js index 3449e5482..c92939648 100644 --- a/apps/climatemappedafrica/src/components/ExplorePage/index.js +++ b/apps/climatemappedafrica/src/components/ExplorePage/index.js @@ -82,7 +82,7 @@ function ExplorePage({ if (geoCode) { dispatch({ type: "fetch", - payload: { code: geoCode, onClick: handleClickTag }, + payload: { code: geoCode }, }); } }, [dispatch, geoCode]); @@ -129,6 +129,8 @@ function ExplorePage({ }; const handleClickMap = (_, feature) => { + const code = feature?.properties?.code; + setGeoCode(code); return handleSelectLocation(feature.properties); }; From 28a9679e0b9cdc583f87d717bc79d2179c588f15 Mon Sep 17 00:00:00 2001 From: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> Date: Fri, 21 Feb 2025 18:47:08 +0300 Subject: [PATCH 3/7] Fix drawer variant --- .../src/components/HURUmap/Panel/DesktopPanel/DesktopPanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/climatemappedafrica/src/components/HURUmap/Panel/DesktopPanel/DesktopPanel.js b/apps/climatemappedafrica/src/components/HURUmap/Panel/DesktopPanel/DesktopPanel.js index 2a17f726b..67117244b 100644 --- a/apps/climatemappedafrica/src/components/HURUmap/Panel/DesktopPanel/DesktopPanel.js +++ b/apps/climatemappedafrica/src/components/HURUmap/Panel/DesktopPanel/DesktopPanel.js @@ -47,7 +47,7 @@ function DesktopPanel({ sx, ...props }) { overscrollBehaviorBlock: "none", }, }} - variant="persistent" + {...(open && { variant: "persistent" })} PaperProps={{ elevation: 0, square: true, From a2dc9082ffa6010c4d249a1fd08432769dc11287 Mon Sep 17 00:00:00 2001 From: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> Date: Mon, 24 Feb 2025 14:27:35 +0300 Subject: [PATCH 4/7] Revert axis tooltip --- .../src/components/HURUmap/Chart/index.js | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/apps/climatemappedafrica/src/components/HURUmap/Chart/index.js b/apps/climatemappedafrica/src/components/HURUmap/Chart/index.js index 5ac66afd9..df51f08fd 100644 --- a/apps/climatemappedafrica/src/components/HURUmap/Chart/index.js +++ b/apps/climatemappedafrica/src/components/HURUmap/Chart/index.js @@ -2,7 +2,6 @@ import { RichTypography } from "@commons-ui/next"; import { ChartTooltip, IndicatorTitle, Download, Share } from "@hurumap/core"; import { Source } from "@hurumap/next"; import { Box, useMediaQuery, useTheme } from "@mui/material"; -import { debounce } from "lodash"; import React, { useState, useRef, useCallback, useEffect } from "react"; import * as vega from "vega"; import embed from "vega-embed"; @@ -68,25 +67,9 @@ function Chart({ const handler = useCallback( (_, event, item, value) => { - const debouncedTooltip = debounce((e, i, v) => { - if (!v) { - setTooltipData(null); - return; - } - if ( - !tooltipData || - tooltipData.value?.group !== v?.group || - tooltipData.event?.clientX !== e?.clientX || - tooltipData.event?.clientY !== e?.clientY - ) { - setTooltipData({ item: i, value: v, id, geoCode, event: e }); - } - }, 50); - - debouncedTooltip(event, item, value); - return () => debouncedTooltip.cancel(); + setTooltipData({ item, value, id, geoCode, event }); }, - [id, geoCode, tooltipData], + [id, geoCode], ); useEffect(() => { From 00ebede2ef5d4accff7cf06b71b0ee6e93da0394 Mon Sep 17 00:00:00 2001 From: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> Date: Mon, 24 Feb 2025 15:47:16 +0300 Subject: [PATCH 5/7] Pesayetu fix handleClickMap --- apps/pesayetu/src/components/ExplorePage/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/pesayetu/src/components/ExplorePage/index.js b/apps/pesayetu/src/components/ExplorePage/index.js index 38a2f6dae..570958691 100644 --- a/apps/pesayetu/src/components/ExplorePage/index.js +++ b/apps/pesayetu/src/components/ExplorePage/index.js @@ -72,6 +72,8 @@ function ExplorePage({ panelProps, profile: profileProp, ...props }) { }; const handleClickMap = (_, feature) => { + const code = feature?.properties?.code; + setGeoCode(code); return handleSelectLocation(feature.properties); }; From 1e0748c05b3d357ca95481349d984fc8274ddc2e Mon Sep 17 00:00:00 2001 From: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> Date: Mon, 24 Feb 2025 16:22:31 +0300 Subject: [PATCH 6/7] Fix Hero page search and map click --- apps/climatemappedafrica/src/lib/data/blockify/hero.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/climatemappedafrica/src/lib/data/blockify/hero.js b/apps/climatemappedafrica/src/lib/data/blockify/hero.js index d4142c684..cfc753309 100644 --- a/apps/climatemappedafrica/src/lib/data/blockify/hero.js +++ b/apps/climatemappedafrica/src/lib/data/blockify/hero.js @@ -24,8 +24,8 @@ export default async function hero(block, _api, _context, { hurumap }) { }); const { level } = geometries.boundary?.properties ?? {}; const childLevelMaps = { - continent: "country", - country: "region", + Continent: "Country", + Country: "Region", }; const childLevel = childLevelMaps[level]; const { locations, preferredChildren } = await fetchProfile({ From c05ad0f50fcafa54dd22f0bf10f623a2432e0f94 Mon Sep 17 00:00:00 2001 From: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> Date: Tue, 25 Feb 2025 11:08:40 +0300 Subject: [PATCH 7/7] Add Dropdown link --- .../src/components/DropdownSearch/DownloadSearch.js | 5 +++-- apps/pesayetu/src/components/DropdownSearch/index.js | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/climatemappedafrica/src/components/DropdownSearch/DownloadSearch.js b/apps/climatemappedafrica/src/components/DropdownSearch/DownloadSearch.js index a5800362a..a5a129e48 100644 --- a/apps/climatemappedafrica/src/components/DropdownSearch/DownloadSearch.js +++ b/apps/climatemappedafrica/src/components/DropdownSearch/DownloadSearch.js @@ -6,13 +6,13 @@ import { ListItem, SvgIcon, Box, - Button, } from "@mui/material"; import { useRouter } from "next/router"; import PropTypes from "prop-types"; import React, { useEffect, useState } from "react"; import SearchIcon from "@/climatemappedafrica/assets/icons/search.svg"; +import Link from "@/climatemappedafrica/components/Link"; function DropdownSearch({ IconButtonProps, @@ -174,7 +174,8 @@ function DropdownSearch({ > {suggestions.map(({ name, code }) => ( handleSelect(code, name)} diff --git a/apps/pesayetu/src/components/DropdownSearch/index.js b/apps/pesayetu/src/components/DropdownSearch/index.js index 2b5eabc00..36f05875f 100644 --- a/apps/pesayetu/src/components/DropdownSearch/index.js +++ b/apps/pesayetu/src/components/DropdownSearch/index.js @@ -151,6 +151,7 @@ function DropdownSearch({ {suggestions.map(({ name, code }) => ( handleSelect(code, name)}