fix(search): harden authorized results and ordering

This commit is contained in:
2026-07-21 17:42:22 +08:00
parent 000de4bcdb
commit 8cc130244b
12 changed files with 405 additions and 64 deletions

View File

@@ -18,6 +18,7 @@ import {
import type { SearchResultDTO } from '../api/search'
import { LoginPage } from '../pages/login'
import { ProjectActionModals, type CronDraft, type ProjectActionModal, type ProjectDraft, type SourceDraft, type TaskDraft } from '../pages/projects/project-action-modals'
import { SearchResultPreview } from '../pages/projects/search-result-preview'
import type { ProjectSettingsUpdate } from '../pages/projects/project-sidebar'
import { ProjectPage } from '../pages/workspace-home'
import type { WorkspaceTaskUpdate } from '../pages/workspace-body'
@@ -37,6 +38,7 @@ function App() {
const [loading, setLoading] = useState(false)
const [actionLoading, setActionLoading] = useState(false)
const [activeModal, setActiveModal] = useState<ProjectActionModal>(null)
const [searchResultPreview, setSearchResultPreview] = useState<SearchResultDTO | null>(null)
const workspaceSearch = useWorkbenchSearch(session)
const dark = theme === 'dark'
@@ -228,16 +230,20 @@ function App() {
}
function handleSelectSearchResult(result: SearchResultDTO) {
const owningWorkspace = workspaces.find((workspace) => workspace.project.id === result.projectId)
if (!owningWorkspace) {
Message.warning('该搜索结果所在项目当前不可访问')
return
}
const target = searchResultTarget(result.type)
if (!target) {
Message.warning('该搜索结果暂不支持导航')
return
}
const owningWorkspace = workspaces.find((workspace) => workspace.project.id === result.projectId)
if (!owningWorkspace) {
if (isAuthorizedExternalPreview(result)) {
setSearchResultPreview(result)
} else {
Message.warning('该搜索结果所在项目当前不可访问')
}
return
}
setActiveProjectID(owningWorkspace.project.id)
setActiveView('project')
setActiveChannel(target.channel)
@@ -304,6 +310,7 @@ function App() {
onCreateCronPlan={handleCreateCronPlan}
tagOptions={activeTagOptions}
/>
<SearchResultPreview result={searchResultPreview} onClose={() => setSearchResultPreview(null)} />
</main>
</ConfigProvider>
)
@@ -316,4 +323,15 @@ function searchResultTarget(type: string): { channel: ChannelKey; openTask: bool
return null
}
function isAuthorizedExternalPreview(result: SearchResultDTO) {
return (
(result.type === 'task' || result.type === 'note')
&& typeof result.projectId === 'string'
&& result.projectId.trim() !== ''
&& typeof result.title === 'string'
&& result.title.trim() !== ''
&& typeof result.snippet === 'string'
)
}
export default App

View File

@@ -0,0 +1,29 @@
export type SearchRequestTicket = {
signal: AbortSignal
isCurrent: () => boolean
}
export function createSearchRequestGate() {
let generation = 0
let controller: AbortController | null = null
return {
begin(): SearchRequestTicket {
generation += 1
controller?.abort()
controller = new AbortController()
const requestGeneration = generation
return {
signal: controller.signal,
isCurrent: () => requestGeneration === generation,
}
},
invalidate() {
generation += 1
controller?.abort()
controller = null
},
}
}
export type SearchRequestGate = ReturnType<typeof createSearchRequestGate>

View File

@@ -1,49 +1,63 @@
import { useRef, useState } from 'react'
import { useEffect, useRef, useState } from 'react'
import { Message } from '@arco-design/web-react'
import type { ApiSession } from '../api/client'
import { searchWorkspace, type SearchResultDTO } from '../api/search'
import { createSearchRequestGate, type SearchRequestGate } from './search-request-gate'
export function useWorkbenchSearch(session: ApiSession | null) {
const [query, setQuery] = useState('')
const [results, setResults] = useState<SearchResultDTO[]>([])
const [loading, setLoading] = useState(false)
const [searched, setSearched] = useState(false)
const requestSequence = useRef(0)
const requestGate = useRef<SearchRequestGate | null>(null)
if (!requestGate.current) requestGate.current = createSearchRequestGate()
useEffect(() => {
const gate = requestGate.current
gate?.invalidate()
setQuery('')
setResults([])
setLoading(false)
setSearched(false)
return () => gate?.invalidate()
}, [session])
function changeQuery(value: string) {
requestSequence.current += 1
requestGate.current?.invalidate()
setQuery(value)
setLoading(false)
setSearched(false)
}
async function submitSearch() {
const requestID = ++requestSequence.current
const trimmedQuery = query.trim()
if (!trimmedQuery) {
requestGate.current?.invalidate()
setResults([])
setSearched(false)
Message.warning('请输入搜索关键词')
return
}
if (!session) {
requestGate.current?.invalidate()
Message.error('未登录或登录已失效')
return
}
const request = requestGate.current!.begin()
setLoading(true)
setSearched(false)
try {
const response = await searchWorkspace(session, trimmedQuery)
if (requestID !== requestSequence.current) return
const response = await searchWorkspace(session, trimmedQuery, request.signal)
if (!request.isCurrent()) return
setResults(response.items)
setSearched(true)
} catch (error) {
if (requestID !== requestSequence.current) return
if (!request.isCurrent()) return
setResults([])
Message.error(error instanceof Error ? error.message : '搜索失败,请稍后重试')
} finally {
if (requestID === requestSequence.current) setLoading(false)
if (request.isCurrent()) setLoading(false)
}
}