merge main, bump api, and fix type errors

Author: david-crespo

OMICRON_VERSION

@@ -1 +1 @@
-ae1c739ca12f3d3fc94e78fb024bcaf2e2cbca56
+8bb4c1163ec57f2915fc0aa40b7dc96821079a64

app/api/__generated__/Api.ts

@@ -18,9 +18,9 @@ import { intersperse } from '~/util/array'
 import { pb } from '~/util/path-builder'
 import type * as PP from '~/util/path-params'
 
-/** Move ephemeral IP (if present) to the end of the list of external IPs */
-export const orderIps = (ips: ExternalIp[]) =>
-  R.sortBy(ips, (a) => (a.kind === 'ephemeral' ? 1 : -1))
+/** Order IPs: floating first, then ephemeral, then SNAT */
+const IP_ORDER = { floating: 0, ephemeral: 1, snat: 2 } as const
+export const orderIps = (ips: ExternalIp[]) => R.sortBy(ips, (a) => IP_ORDER[a.kind])
 
 export function ExternalIps({ project, instance }: PP.Instance) {
   const { data, isPending } = useApiQuery('instanceExternalIpList', {
@@ -29,7 +29,11 @@ export function ExternalIps({ project, instance }: PP.Instance) {
   })
   if (isPending) return <SkeletonCell />
 
-  const ips = data?.items
+  // Exclude SNAT IPs from the properties table because they are rarely going
+  // to be what the user wants as the "external IP" of the instance -- they
+  // want one that can receive inbound traffic. This will have to change with
+  // https://github.com/oxidecomputer/omicron/issues/4317
+  const ips = data?.items.filter((ip) => ip.kind !== 'snat')
   if (!ips || ips.length === 0) return <EmptyCell />
   const orderedIps = orderIps(ips)
   const ipsToShow = orderedIps.slice(0, 2)

app/api/__generated__/OMICRON_VERSION

@@ -71,8 +71,10 @@ async function refreshData() {
     apiQueryClient.invalidateQueries('instanceExternalIpList'),
     apiQueryClient.invalidateQueries('instanceNetworkInterfaceList'),
     apiQueryClient.invalidateQueries('instanceDiskList'), // storage tab
-    apiQueryClient.invalidateQueries('diskMetricsList'), // metrics tab
     apiQueryClient.invalidateQueries('antiAffinityGroupMemberList'),
+    // note that we do not include timeseriesQuery because the charts on the
+    // metrics tab will manage their own refresh intervals when we turn that
+    // back on
   ])
 }
 
@@ -261,7 +263,7 @@ export default function InstancePage() {
         <PropertiesTable.DateRow date={instance.timeCreated} label="Created" />
         <PropertiesTable.IdRow id={instance.id} />
         <PropertiesTable.Row label="external IPs">
-          {<ExternalIps {...instanceSelector} />}
+          <ExternalIps {...instanceSelector} />
         </PropertiesTable.Row>
       </PropertiesTable>
       <RouteTabs fullWidth>