Fix charts in bouts page due to missing timestamp conversion #716
Conversation
WalkthroughThe changes in Changes
Poem
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Outside diff range and nitpick comments (3)
ui/src/components/Bouts/FeedItem.tsx (3)
35-38: Consider moving static categories array outside componentThe categories array is static and never changes, making
useMemounnecessary here. Consider declaring it as a constant outside the component:+const DETECTION_CATEGORIES: Array<DetectionCategory> = ["WHALE", "VESSEL", "OTHER"]; export default function FeedItem({ - const categories: Array<DetectionCategory> = useMemo( - () => ["WHALE", "VESSEL", "OTHER"], - [], - ); + const categories = DETECTION_CATEGORIES;
84-84: Optimize chart data timestamp processingConsider converting timestamps to Date objects once during the initial data mapping to avoid repeated conversions:
const detectionChartData = useMemo( () => - recentDetections.map(({ timestamp, category }) => + recentDetections.map(({ timestamp, category }) => { + const detectionTime = new Date(timestamp); + return { cat: category, minutesAgo: Math.floor( - (now.valueOf() - new Date(timestamp).valueOf()) / (60 * 1000), + (now.valueOf() - detectionTime.valueOf()) / (60 * 1000), ), + }; + }), [recentDetections, now], );
99-114: Consider optimizing effect dependenciesThe effect has multiple dependencies which could cause frequent re-runs. Consider breaking it into smaller, more focused effects:
+ // Handle listener count updates + useEffect(() => { + if (onStatUpdate && listenerCount !== undefined) { + onStatUpdate(feed.id, "listeners", listenerCount); + } + }, [feed.id, onStatUpdate, listenerCount]); + // Handle total detection count updates + useEffect(() => { + if (onStatUpdate && typeof detsCount === "number") { + onStatUpdate(feed.id, "detections", detsCount); + } + }, [feed.id, onStatUpdate, detsCount]); + // Handle category-specific detection counts + useEffect(() => { if (onStatUpdate) { categories.forEach((cat) => { onStatUpdate( feed.id, cat, recentDetections.filter(({ category }) => category === cat).length, ); }); } - }, [feed.id, recentDetections, detsCount, onStatUpdate, listenerCount, categories]); + }, [feed.id, recentDetections, onStatUpdate, categories]);
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
📒 Files selected for processing (1)
ui/src/components/Bouts/FeedItem.tsx(4 hunks)
🔇 Additional comments (1)
ui/src/components/Bouts/FeedItem.tsx (1)
Line range hint 69-84: Timestamp conversion fixes look good
The changes properly address the timestamp conversion issues throughout the component, ensuring consistent Date object usage for:
- Recent detection filtering
- Chart data processing
- Time-based calculations
This should resolve the chart issues mentioned in the PR title.
| ({ timestamp }) => | ||
| new Date(timestamp) > new Date(now.valueOf() - 15 * 60 * 1000), | ||
| ).length; | ||
| const detsCount5MinAgo = recentDetections.filter( | ||
| ({ timestamp }) => timestamp > new Date(now.valueOf() - 5 * 60 * 1000), | ||
| ({ timestamp }) => | ||
| new Date(timestamp) > new Date(now.valueOf() - 5 * 60 * 1000), |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Optimize timestamp comparisons
While the timestamp conversion fixes are correct, creating Date objects inside filter callbacks may impact performance. Consider pre-calculating the comparison timestamps:
+ const fifteenMinutesAgo = new Date(now.valueOf() - 15 * 60 * 1000);
+ const fiveMinutesAgo = new Date(now.valueOf() - 5 * 60 * 1000);
const detsCount15MinAgo = recentDetections.filter(
- ({ timestamp }) =>
- new Date(timestamp) > new Date(now.valueOf() - 15 * 60 * 1000),
+ ({ timestamp }) => new Date(timestamp) > fifteenMinutesAgo,
).length;
const detsCount5MinAgo = recentDetections.filter(
- ({ timestamp }) =>
- new Date(timestamp) > new Date(now.valueOf() - 5 * 60 * 1000),
+ ({ timestamp }) => new Date(timestamp) > fiveMinutesAgo,
).length;📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| ({ timestamp }) => | |
| new Date(timestamp) > new Date(now.valueOf() - 15 * 60 * 1000), | |
| ).length; | |
| const detsCount5MinAgo = recentDetections.filter( | |
| ({ timestamp }) => timestamp > new Date(now.valueOf() - 5 * 60 * 1000), | |
| ({ timestamp }) => | |
| new Date(timestamp) > new Date(now.valueOf() - 5 * 60 * 1000), | |
| const fifteenMinutesAgo = new Date(now.valueOf() - 15 * 60 * 1000); | |
| const fiveMinutesAgo = new Date(now.valueOf() - 5 * 60 * 1000); | |
| const detsCount15MinAgo = recentDetections.filter( | |
| ({ timestamp }) => new Date(timestamp) > fifteenMinutesAgo, | |
| ).length; | |
| const detsCount5MinAgo = recentDetections.filter( | |
| ({ timestamp }) => new Date(timestamp) > fiveMinutesAgo, | |
| ).length; |
There was a problem hiding this comment.
this seems like a reasonable suggestion?
There was a problem hiding this comment.
@paulcretu, yes, this is a reasonable suggestion. Pre-calculating the comparison timestamps can improve performance by avoiding the creation of new Date objects inside the filter callbacks. This optimization can make your code more efficient.
| @@ -32,7 +32,10 @@ export default function FeedItem({ | |||
| feed: Pick<Feed, "id" | "name" | "slug" | "online">; | |||
| onStatUpdate?: (feedId: string, stat: string, value: number) => void; | |||
| }) { | |||
| const categories: Array<DetectionCategory> = ["WHALE", "VESSEL", "OTHER"]; | |||
| const categories: Array<DetectionCategory> = useMemo( | |||
There was a problem hiding this comment.
Doesn't need useMemo, this can just be moved outside the component (and then you can remove it from the useEffect dependency array)
| ({ timestamp }) => | ||
| new Date(timestamp) > new Date(now.valueOf() - 15 * 60 * 1000), | ||
| ).length; | ||
| const detsCount5MinAgo = recentDetections.filter( | ||
| ({ timestamp }) => timestamp > new Date(now.valueOf() - 5 * 60 * 1000), | ||
| ({ timestamp }) => | ||
| new Date(timestamp) > new Date(now.valueOf() - 5 * 60 * 1000), |
There was a problem hiding this comment.
this seems like a reasonable suggestion?
Summary by CodeRabbit
New Features
Bug Fixes
Improvements