Skip to content

fix(site): proxy menu not showing latency #7785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 1, 2023
Merged

fix(site): proxy menu not showing latency #7785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions site/src/components/Navbar/NavbarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,11 @@ const ProxyMenu: FC<{ proxyContextValue: ProxyContextValue }> = ({
const refreshLatencies = proxyContextValue.refetchProxyLatencies
const closeMenu = () => setIsOpen(false)
const navigate = useNavigate()
const latencies = proxyContextValue.proxyLatencies
const isLoadingLatencies = Object.keys(latencies).length === 0
const isLoading = proxyContextValue.isLoading || isLoadingLatencies

if (!proxyContextValue.isFetched) {
if (isLoading) {
return (
<Skeleton
width="160px"
Expand Down Expand Up @@ -230,9 +233,7 @@ const ProxyMenu: FC<{ proxyContextValue: ProxyContextValue }> = ({
{selectedProxy.display_name}
<ProxyStatusLatency
proxy={selectedProxy}
latency={
proxyContextValue.proxyLatencies?.[selectedProxy.id]?.latencyMS
}
latency={latencies?.[selectedProxy.id]?.latencyMS}
/>
</Box>
) : (
Expand Down Expand Up @@ -278,9 +279,7 @@ const ProxyMenu: FC<{ proxyContextValue: ProxyContextValue }> = ({
{proxy.display_name}
<ProxyStatusLatency
proxy={proxy}
latency={
proxyContextValue.proxyLatencies?.[proxy.id]?.latencyMS
}
latency={latencies?.[proxy.id]?.latencyMS}
/>
</Box>
</MenuItem>
Expand Down
7 changes: 4 additions & 3 deletions site/src/contexts/useProxyLatency.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ const proxyLatenciesReducer = (
state: Record<string, ProxyLatencyReport>,
action: ProxyLatencyAction,
): Record<string, ProxyLatencyReport> => {
// Just overwrite any existing latency.
state[action.proxyID] = action.report
return state
return {
...state,
[action.proxyID]: action.report,
}
}

export const useProxyLatency = (
Expand Down