diff --git a/src/renderer/src/components/sidebar/workspace-card/review/use-workspace-reference-details.ts b/src/renderer/src/components/sidebar/workspace-card/review/use-workspace-reference-details.ts index 2aae3fbb190..a983629b8fa 100644 --- a/src/renderer/src/components/sidebar/workspace-card/review/use-workspace-reference-details.ts +++ b/src/renderer/src/components/sidebar/workspace-card/review/use-workspace-reference-details.ts @@ -36,11 +36,14 @@ export function useWorkspaceReferenceDetails( })), [workspace, repo, runtimeVersion, review?.state, review?.provider] ) - useAppStore( - useShallow((state) => - requests.map((request) => getWorkspaceReferenceLookup(request, state)?.rawEntry) - ) + const cacheReads = useMemo( + () => + requests.map( + (request) => getWorkspaceReferenceLookup(request, useAppStore.getState())?.getRawEntry + ), + [requests] ) + useAppStore(useShallow((state) => cacheReads.map((read) => read?.(state)))) useEffect(() => { if (!hoverOpen || hostOff) { return diff --git a/src/renderer/src/components/sidebar/workspace-card/review/workspace-reference-detail-read.ts b/src/renderer/src/components/sidebar/workspace-card/review/workspace-reference-detail-read.ts index ea49073aa14..5dc60f9ec75 100644 --- a/src/renderer/src/components/sidebar/workspace-card/review/workspace-reference-detail-read.ts +++ b/src/renderer/src/components/sidebar/workspace-card/review/workspace-reference-detail-read.ts @@ -19,12 +19,15 @@ type Entry = { data: T | null; fetchedAt: number; stale?: boolean } const reads = new PrioritySemaphore(3) function lookup( - entry: Entry | undefined, + state: AppState, + getRawEntry: (state: AppState) => Entry | undefined, read: (signal?: AbortSignal) => Promise, project: (value: T) => WorkspaceReferenceDetails | null ) { + const entry = getRawEntry(state) return { rawEntry: entry, + getRawEntry, getEntry: () => entry && { ...entry, data: entry.data && project(entry.data) }, read: async (signal?: AbortSignal) => { const value = await read(signal) @@ -40,7 +43,8 @@ export function getWorkspaceReferenceLookup(request: WorkspaceReferenceRequest, return null } return lookup( - state.hostedReviewCache?.[request.key], + state, + (state) => state.hostedReviewCache?.[request.key], () => state.fetchHostedReviewForBranch(repo.path, workspace.branch ?? '', { exactReviewKey: request.key, @@ -69,8 +73,10 @@ export function getWorkspaceReferenceLookup(request: WorkspaceReferenceRequest, item.linearWorkspaceId, sourceContext ) + const cacheKey = `${scope}::${workspaceId}::${identifier}` return lookup( - state.linearIssueCache?.[`${scope}::${workspaceId}::${identifier}`], + state, + (state) => state.linearIssueCache?.[cacheKey], async (signal) => { let issue: LinearIssue | null = null await consumeLinearIssueRead( @@ -102,8 +108,10 @@ export function getWorkspaceReferenceLookup(request: WorkspaceReferenceRequest, if (!siteId) { return null } + const cacheKey = `${scope}::${siteId}::${identifier.toUpperCase()}` return lookup( - state.jiraIssueSummaryCache?.[`${scope}::${siteId}::${identifier.toUpperCase()}`], + state, + (state) => state.jiraIssueSummaryCache?.[cacheKey], () => state.lookupJiraIssueSummary(sourceContext, identifier, siteId), (issue) => issue.key.toLowerCase() === identifier.toLowerCase() && @@ -131,8 +139,10 @@ export function getWorkspaceReferenceLookup(request: WorkspaceReferenceRequest, sourceContext.provider === 'github' && isWorkspaceRepositoryAttachment(item, repo) ) { + const cacheKey = `${scope}::${repo.id}::${item.number}` return lookup( - state.issueCache?.[`${scope}::${repo.id}::${item.number}`], + state, + (state) => state.issueCache?.[cacheKey], () => state.fetchIssue(repo.path, item.number, { repoId: repo.id, sourceContext }), (issue) => issue.number === item.number && matchesWorkspaceReferenceUrl(item, issue.url)