Fix sled instances prefetch (#1802)

* fix sled instances prefetch * do the same for /system/inventory and /system/inventory/sleds
oxidecomputer · Oct 31, 2023 · 57cc189 · 57cc189
1 parent 47d76db
commit 57cc189
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/app/layouts/SystemLayout.tsx b/app/layouts/SystemLayout.tsx
@@ -65,7 +65,7 @@ export default function SystemLayout() {
     const systemLinks = [
       { value: 'Silos', path: pb.silos() },
       { value: 'Utilization', path: pb.systemUtilization() },
-      { value: 'Inventory', path: pb.sledInventory() },
+      { value: 'Inventory', path: pb.inventory() },
     ]
       // filter out the entry for the path we're currently on
       .filter((i) => i.path !== pathname)

diff --git a/app/routes.tsx b/app/routes.tsx
@@ -147,6 +147,7 @@ export const routes = createRoutesFromElements(
           loader={InventoryPage.loader}
           handle={{ crumb: 'Inventory' }}
         >
+          <Route index element={<Navigate to="sleds" replace />} loader={SledsTab.loader} />
           <Route path="sleds" element={<SledsTab />} loader={SledsTab.loader} />
           <Route path="disks" element={<DisksTab />} loader={DisksTab.loader} />
         </Route>
@@ -156,7 +157,11 @@ export const routes = createRoutesFromElements(
           loader={SledPage.loader}
           handle={{ crumb: 'Sleds' }}
         >
-          <Route index element={<Navigate to="instances" replace />} />
+          <Route
+            index
+            element={<Navigate to="instances" replace />}
+            loader={SledInstancesTab.loader}
+          />
           <Route
             path="instances"
             element={<SledInstancesTab />}

diff --git a/app/util/path-builder.spec.ts b/app/util/path-builder.spec.ts
@@ -37,6 +37,7 @@ test('path builder', () => {
         "instancePage": "/projects/p/instances/i/storage",
         "instanceStorage": "/projects/p/instances/i/storage",
         "instances": "/projects/p/instances",
+        "inventory": "/system/inventory",
         "nics": "/projects/p/instances/i/network-interfaces",
         "profile": "/settings/profile",
         "project": "/projects/p",

diff --git a/app/util/path-builder.ts b/app/util/path-builder.ts
@@ -80,6 +80,7 @@ export const pb = {
   systemNetworking: () => '/system/networking',
   systemSettings: () => '/system/settings',
 
+  inventory: () => '/system/inventory',
   rackInventory: () => '/system/inventory/racks',
   sledInventory: () => '/system/inventory/sleds',
   diskInventory: () => '/system/inventory/disks',