fix: Add omitempty for proper latency type (#3850)

kylecarbs · web-flow · commit ac500707138a · 2022-09-02T22:05:27.000Z
This was causing an error on the frontend, because this value can be nil!
diff --git a/codersdk/workspaceresources.go b/codersdk/workspaceresources.go
@@ -59,7 +59,7 @@ type WorkspaceAgent struct {
 	Version              string               `json:"version"`
 	Apps                 []WorkspaceApp       `json:"apps"`
 	// DERPLatency is mapped by region name (e.g. "New York City", "Seattle").
-	DERPLatency map[string]DERPRegion `json:"latency"`
+	DERPLatency map[string]DERPRegion `json:"latency,omitempty"`
 }
 
 type WorkspaceAgentResourceMetadata struct {
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -536,7 +536,7 @@ export interface WorkspaceAgent {
   readonly directory?: string
   readonly version: string
   readonly apps: WorkspaceApp[]
-  readonly latency: Record<string, DERPRegion>
+  readonly latency?: Record<string, DERPRegion>
 }
 
 // From codersdk/workspaceagents.go
diff --git a/site/src/components/Resources/ResourceAgentLatency.tsx b/site/src/components/Resources/ResourceAgentLatency.tsx
@@ -10,9 +10,13 @@ export interface ResourceAgentLatencyProps {
 
 export const ResourceAgentLatency: React.FC<ResourceAgentLatencyProps> = (props) => {
   const styles = useStyles()
+  if (!props.latency) {
+    return null
+  }
   if (Object.keys(props.latency).length === 0) {
     return null
   }
+  const latency = props.latency
   return (
     <div className={styles.root}>
       <div className={styles.title}>
@@ -24,10 +28,10 @@ export const ResourceAgentLatency: React.FC<ResourceAgentLatencyProps> = (props)
           </HelpTooltipText>
         </HelpTooltip>
       </div>
-      {Object.keys(props.latency)
+      {Object.keys(latency)
         .sort()
         .map((region) => {
-          const value = props.latency[region]
+          const value = latency[region]
           return (
             <div key={region} className={styles.region}>
               <b>{region}:</b>&nbsp;{Math.round(value.latency_ms * 100) / 100} ms

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ type WorkspaceAgent struct {`
`59`	`59`	Version string `json:"version"`
`60`	`60`	Apps []WorkspaceApp `json:"apps"`
`61`	`61`	`// DERPLatency is mapped by region name (e.g. "New York City", "Seattle").`
`62`		- DERPLatency map[string]DERPRegion `json:"latency"`
	`62`	+ DERPLatency map[string]DERPRegion `json:"latency,omitempty"`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`type WorkspaceAgentResourceMetadata struct {`
Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,7 @@ export interface WorkspaceAgent {`
`536`	`536`	`readonly directory?: string`
`537`	`537`	`readonly version: string`
`538`	`538`	`readonly apps: WorkspaceApp[]`
`539`		`- readonly latency: Record<string, DERPRegion>`
	`539`	`+ readonly latency?: Record<string, DERPRegion>`
`540`	`540`	`}`
`541`	`541`
`542`	`542`	`// From codersdk/workspaceagents.go`