mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-18 19:50:38 +09:00
Broaden comment matches in issue search
This commit is contained in:
parent
fcab770518
commit
1f78e55072
7 changed files with 267 additions and 26 deletions
|
|
@ -98,7 +98,7 @@ import {
|
|||
getArchivedInboxSearchIssues,
|
||||
getInboxWorkItems,
|
||||
getInboxKeyboardSelectionIndex,
|
||||
getInboxSearchFallbackIssues,
|
||||
getInboxSearchSupplementIssues,
|
||||
getLatestFailedRunsByAgent,
|
||||
matchesInboxIssueSearch,
|
||||
getRecentTouchedIssues,
|
||||
|
|
@ -1022,15 +1022,13 @@ export function Inbox() {
|
|||
visibleTouchedIssues,
|
||||
],
|
||||
);
|
||||
const shouldUseIssueSearchFallback =
|
||||
const shouldUseIssueSearchSupplement =
|
||||
!!selectedCompanyId
|
||||
&& normalizedSearchQuery.length > 0
|
||||
&& filteredWorkItems.length === 0
|
||||
&& archivedSearchIssues.length === 0;
|
||||
&& normalizedSearchQuery.length > 0;
|
||||
const { data: remoteIssueSearchResults = [] } = useQuery({
|
||||
queryKey: [
|
||||
...queryKeys.issues.search(selectedCompanyId!, normalizedSearchQuery, undefined, 25),
|
||||
"inbox-fallback",
|
||||
"inbox-supplement",
|
||||
issueFilters,
|
||||
],
|
||||
queryFn: () =>
|
||||
|
|
@ -1039,12 +1037,12 @@ export function Inbox() {
|
|||
limit: 25,
|
||||
includeRoutineExecutions: true,
|
||||
}),
|
||||
enabled: shouldUseIssueSearchFallback,
|
||||
enabled: shouldUseIssueSearchSupplement,
|
||||
placeholderData: (previousData) => previousData,
|
||||
});
|
||||
const issueSearchFallbackResults = useMemo(
|
||||
const issueSearchSupplementResults = useMemo(
|
||||
() =>
|
||||
getInboxSearchFallbackIssues({
|
||||
getInboxSearchSupplementIssues({
|
||||
query: normalizedSearchQuery,
|
||||
filteredWorkItems,
|
||||
archivedSearchIssues,
|
||||
|
|
@ -1064,10 +1062,13 @@ export function Inbox() {
|
|||
);
|
||||
const effectiveWorkItems = useMemo(
|
||||
() =>
|
||||
issueSearchFallbackResults.length > 0
|
||||
? getInboxWorkItems({ issues: issueSearchFallbackResults, approvals: [] })
|
||||
issueSearchSupplementResults.length > 0
|
||||
? [
|
||||
...filteredWorkItems,
|
||||
...getInboxWorkItems({ issues: issueSearchSupplementResults, approvals: [] }),
|
||||
]
|
||||
: filteredWorkItems,
|
||||
[filteredWorkItems, issueSearchFallbackResults],
|
||||
[filteredWorkItems, issueSearchSupplementResults],
|
||||
);
|
||||
const archivedSearchIssueIds = useMemo(
|
||||
() => new Set(archivedSearchIssues.map((issue) => issue.id)),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue