refactor(renterd): migrate hosts apis

SiaFoundation · Sep 11, 2024 · 9c5242c · 9c5242c
1 parent ff5dc11
commit 9c5242c
Show file tree

Hide file tree

Showing 19 changed files with 318 additions and 297 deletions.
diff --git a/.changeset/early-bobcats-fry.md b/.changeset/early-bobcats-fry.md
@@ -0,0 +1,6 @@
+---
+'renterd': patch
+'@siafoundation/renterd-react': patch
+---
+
+Fixed a bug optimistically updating last scan information when initiating a host scan.
diff --git a/.changeset/eighty-eagles-taste.md b/.changeset/eighty-eagles-taste.md
@@ -0,0 +1,5 @@
+---
+'renterd': minor
+---
+
+The hosts explorer now uses the new combined hosts API.
diff --git a/.changeset/fair-carrots-reflect.md b/.changeset/fair-carrots-reflect.md
@@ -0,0 +1,7 @@
+---
+'@siafoundation/renterd-js': minor
+'@siafoundation/renterd-react': minor
+'@siafoundation/renterd-types': minor
+---
+
+Added the bus list autopilots API.
diff --git a/.changeset/late-onions-hammer.md b/.changeset/late-onions-hammer.md
@@ -0,0 +1,7 @@
+---
+'@siafoundation/renterd-js': minor
+'@siafoundation/renterd-react': minor
+'@siafoundation/renterd-types': minor
+---
+
+Added new combined hosts API.
diff --git a/.changeset/tiny-mails-guess.md b/.changeset/tiny-mails-guess.md
@@ -0,0 +1,7 @@
+---
+'@siafoundation/renterd-js': minor
+'@siafoundation/renterd-react': minor
+'@siafoundation/renterd-types': minor
+---
+
+Removed deprecated search hosts and autopilot hosts APIs.
diff --git a/apps/renterd/contexts/app/useAutopilot.tsx b/apps/renterd/contexts/app/useAutopilot.tsx
@@ -1,8 +1,17 @@
 import { secondsInMilliseconds } from '@siafoundation/units'
-import { useAutopilotState } from '@siafoundation/renterd-react'
+import { useAutopilotState, useAutopilots } from '@siafoundation/renterd-react'
 import { useEffect, useState } from 'react'
 
 export function useAutopilot() {
+  // Assume there is only one autopilot.
+  const autopilots = useAutopilots({
+    config: {
+      swr: {
+        revalidateOnFocus: false,
+      },
+    },
+  })
+  const id = autopilots.data?.[0]?.id
   const state = useAutopilotState({
     config: {
       swr: {
@@ -31,6 +40,7 @@ export function useAutopilot() {
   }, [state])
 
   return {
+    id: id || 'autopilot',
     status,
     state,
   }

diff --git a/apps/renterd/contexts/hosts/columns.tsx b/apps/renterd/contexts/hosts/columns.tsx
@@ -21,7 +21,8 @@ import { format, formatDistance, formatRelative } from 'date-fns'
 import { HostContextMenu } from '../../components/Hosts/HostContextMenu'
 import { useWorkflows } from '@siafoundation/react-core'
 import {
-  AutopilotHost,
+  HostPriceTable,
+  HostSettings,
   RhpScanPayload,
   workerRhpScanRoute,
 } from '@siafoundation/renterd-types'
@@ -135,15 +136,15 @@ export const columns: HostsTableColumn[] = (
         return (
           <Tooltip
             side="right"
-            content={data.usable ? 'Host is usable' : 'Host is not usable'}
+            content={data.isUsable ? 'Host is usable' : 'Host is not usable'}
           >
             <div className="flex gap-2 items-center">
               <div className="mt-[5px]">
                 <Text
-                  aria-label={data.usable ? 'usable' : 'not usable'}
-                  color={data.usable ? 'green' : 'red'}
+                  aria-label={data.isUsable ? 'usable' : 'not usable'}
+                  color={data.isUsable ? 'green' : 'red'}
                 >
-                  {data.usable ? (
+                  {data.isUsable ? (
                     <CheckboxCheckedFilled16 />
                   ) : (
                     <WarningSquareFilled16 />
@@ -198,7 +199,7 @@ export const columns: HostsTableColumn[] = (
                 </Text>
               </div>
               <div className="flex flex-col">
-                {Object.entries(data.gougingBreakdown)
+                {Object.entries(data.gouging)
                   .filter(([_, reason]) => reason && typeof reason === 'string')
                   .map(([key, reason]) => (
                     <Text key={key} size="10" noWrap>
@@ -451,29 +452,30 @@ export const columns: HostsTableColumn[] = (
         />
       ),
     },
-    {
-      id: 'ap_scoreOverall',
-      label: 'overall score',
-      category: 'autopilot',
-      contentClassName: 'w-[120px] justify-end',
-      render: ({ data, context }) => {
-        if (!context.isAutopilotConfigured) {
-          return (
-            <Tooltip content="Autopilot is not configured">
-              <Text color="verySubtle">-</Text>
-            </Tooltip>
-          )
-        }
-        return (
-          <ValueNum
-            size="12"
-            value={data.score}
-            variant="value"
-            format={(v) => v.toPrecision(2)}
-          />
-        )
-      },
-    },
+    // TODO?
+    // {
+    //   id: 'ap_scoreOverall',
+    //   label: 'overall score',
+    //   category: 'autopilot',
+    //   contentClassName: 'w-[120px] justify-end',
+    //   render: ({ data, context }) => {
+    //     if (!context.isAutopilotConfigured) {
+    //       return (
+    //         <Tooltip content="Autopilot is not configured">
+    //           <Text color="verySubtle">-</Text>
+    //         </Tooltip>
+    //       )
+    //     }
+    //     return (
+    //       <ValueNum
+    //         size="12"
+    //         value={data.score}
+    //         variant="value"
+    //         format={(v) => v.toPrecision(2)}
+    //       />
+    //     )
+    //   },
+    // },
     {
       id: 'ap_scoreAge',
       label: 'age score',
@@ -490,7 +492,7 @@ export const columns: HostsTableColumn[] = (
         return (
           <ValueNum
             size="12"
-            value={data.scoreBreakdown.age}
+            value={data.score.age}
             variant="value"
             format={(v) => v.toPrecision(2)}
           />
@@ -513,7 +515,7 @@ export const columns: HostsTableColumn[] = (
         return (
           <ValueNum
             size="12"
-            value={data.scoreBreakdown.collateral}
+            value={data.score.collateral}
             variant="value"
             format={(v) => v.toPrecision(2)}
           />
@@ -536,7 +538,7 @@ export const columns: HostsTableColumn[] = (
         return (
           <ValueNum
             size="12"
-            value={data.scoreBreakdown.interactions}
+            value={data.score.interactions}
             variant="value"
             format={(v) => v.toPrecision(2)}
           />
@@ -559,7 +561,7 @@ export const columns: HostsTableColumn[] = (
         return (
           <ValueNum
             size="12"
-            value={data.scoreBreakdown.prices}
+            value={data.score.prices}
             variant="value"
             format={(v) => v.toPrecision(2)}
           />
@@ -582,7 +584,7 @@ export const columns: HostsTableColumn[] = (
         return (
           <ValueNum
             size="12"
-            value={data.scoreBreakdown.storageRemaining}
+            value={data.score.storageRemaining}
             variant="value"
             format={(v) => v.toPrecision(2)}
           />
@@ -605,7 +607,7 @@ export const columns: HostsTableColumn[] = (
         return (
           <ValueNum
             size="12"
-            value={data.scoreBreakdown.uptime}
+            value={data.score.uptime}
             variant="value"
             format={(v) => v.toPrecision(2)}
           />
@@ -628,7 +630,7 @@ export const columns: HostsTableColumn[] = (
         return (
           <ValueNum
             size="12"
-            value={data.scoreBreakdown.version}
+            value={data.score.version}
             variant="value"
             format={(v) =>
               context.isAutopilotConfigured ? '-' : v.toPrecision(2)
@@ -1078,9 +1080,7 @@ function getFullLabelAndTip(col: HostsTableColumn): {
   }
 }
 
-type Key =
-  | keyof AutopilotHost['host']['priceTable']
-  | keyof AutopilotHost['host']['settings']
+type Key = keyof HostPriceTable | keyof HostSettings
 
 function makeRenderSc(section: 'priceTable' | 'settings', name: Key) {
   return memo(function RenderPriceTableNumber({ data }: { data: HostData }) {