Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions frontend/src/pages/Findings.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useMemo, useRef, useState } from 'react'
import { AnimatePresence, motion } from 'framer-motion'
import { useVirtualizer } from '@tanstack/react-virtual'
import { getFindings } from '../api'
import { getFindings, FindingsResponse } from '../api'
import { formatLocaleDate, parseDateSafe, getCurrentTimeZone } from '../utils/date'
import SavedViewsPanel from '../components/SavedViewsPanel'
import { useSavedViews, FilterPreset } from '../hooks/useSavedViews'
Expand Down Expand Up @@ -249,8 +249,10 @@ export default function Findings() {
useEffect(() => {
setLoading(true)
getFindings(1, perPage)
.then((data: any) => {
const nextFindings = data.findings || []
.then((data: FindingsResponse) => {
const nextFindings = (data.findings || []).filter(
(finding) => typeof finding.id === 'string',
) as Finding[]
setFindings(nextFindings)
setTotalItems(data.total ?? nextFindings.length)
setPage(1)
Expand Down Expand Up @@ -596,20 +598,23 @@ export default function Findings() {
}

async function loadMore() {
if (loadingMore) return
setLoadingMore(true)
const nextPage = page + 1
try {
const data = await getFindings(nextPage, perPage)
const moreFindings = (data.findings || []) as Finding[]
if (moreFindings.length > 0) {
setFindings((prev) => [...prev, ...moreFindings])
setPage(nextPage)
}
} finally {
setLoadingMore(false)
if (loadingMore) return
setLoadingMore(true)
const nextPage = page + 1
try {
const data = await getFindings(nextPage, perPage)
const rawFindings = data.findings || []
const moreFindings = rawFindings.filter(
(finding) => typeof finding.id === 'string',
) as Finding[]
if (rawFindings.length > 0) {
setFindings((prev) => [...prev, ...moreFindings])
setPage(nextPage)
}
} finally {
setLoadingMore(false)
}
}
// ─── Keyboard navigation ────────────────────────────────────────────────────

function handleListKeyDown(e: React.KeyboardEvent<HTMLDivElement>) {
Expand Down
Loading