From 778d4ac3772fab3e0407b8eeaebf7a8ccd2f1558 Mon Sep 17 00:00:00 2001
From: Markus Tacker <Markus.Tacker@NordicSemi.no>
Date: Wed, 8 Nov 2023 12:39:53 +0100
Subject: [PATCH] feat(map): only show favorited devices

Closes #46
---
 src/Settings.tsx            |  6 +++++-
 src/map/DeviceLocations.tsx | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Settings.tsx b/src/Settings.tsx
index b71b60b3..ee74ac73 100644
--- a/src/Settings.tsx
+++ b/src/Settings.tsx
@@ -156,7 +156,7 @@ const FavButton = ({ id }: { id: string }) => {
 }
 
 const FavoriteSelector = () => {
-	const { devices, alias } = useDevices()
+	const { devices, alias, lastUpdateTs } = useDevices()
 	const {
 		settings: { favorites },
 		update,
@@ -165,6 +165,10 @@ const FavoriteSelector = () => {
 	return (
 		<ul class="list-group">
 			{Object.entries(devices)
+				.filter(
+					([, d]) =>
+						(lastUpdateTs(d.id) ?? 0) > Date.now() - 24 * 60 * 60 * 1000,
+				)
 				.sort(([id1], [id2]) => {
 					const i1 = favorites.indexOf(id1)
 					const i2 = favorites.indexOf(id2)
diff --git a/src/map/DeviceLocations.tsx b/src/map/DeviceLocations.tsx
index 29849e02..f6e48b97 100644
--- a/src/map/DeviceLocations.tsx
+++ b/src/map/DeviceLocations.tsx
@@ -1,13 +1,21 @@
 import { useEffect } from 'preact/hooks'
 import { useDevices } from '../context/Devices.js'
 import { useMap } from '../context/Map.js'
+import { useSettings } from '../context/Settings.js'
 
 export const DeviceLocations = () => {
 	const { devices, alias } = useDevices()
+	const {
+		settings: { showFavorites, favorites },
+	} = useSettings()
 	const map = useMap()
 
 	useEffect(() => {
 		if (map === undefined) return
+		const hiddenDevices = Object.keys(devices).filter((deviceId) => {
+			if (!showFavorites) return false
+			return !favorites.includes(deviceId)
+		})
 		for (const [deviceId, { location, hiddenLocations }] of Object.entries(
 			devices,
 		)) {
@@ -18,11 +26,13 @@ export const DeviceLocations = () => {
 					deviceId,
 					deviceAlias: deviceAlias ?? deviceId,
 					location: l,
-					hidden: hiddenLocations?.[l.source] ?? false,
+					hidden:
+						hiddenDevices.includes(deviceId) ||
+						(hiddenLocations?.[l.source] ?? false),
 				})
 			}
 		}
-	}, [devices, map])
+	}, [devices, map, showFavorites, favorites])
 
 	return null
 }