Skip to content

Add crumb for sled ID using middle-truncated UUID #2555

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
david-crespo merged 1 commit into from
Nov 14, 2024
Merged

Add crumb for sled ID using middle-truncated UUID #2555

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
10 changes: 9 additions & 1 deletion app/routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ import * as SiloImages from './pages/system/SiloImagesPage'
import * as SiloPage from './pages/system/silos/SiloPage'
import * as SilosPage from './pages/system/silos/SilosPage'
import * as SystemUtilization from './pages/system/UtilizationPage'
import { truncate } from './ui/lib/Truncate'
import { pb } from './util/path-builder'

export const routes = createRoutesFromElements(
Expand Down Expand Up @@ -157,7 +158,14 @@ export const routes = createRoutesFromElements(
<Route path="inventory" handle={{ crumb: 'Inventory' }}>
<Route path="sleds" handle={{ crumb: 'Sleds' }}>
{/* a crumb for the sled ID looks ridiculous, unfortunately */}
<Route path=":sledId" {...SledPage}>
<Route
path=":sledId"
{...SledPage}
handle={makeCrumb(
(p) => truncate(p.sledId!, 12, 'middle'),
(p) => pb.sled({ sledId: p.sledId! })
)}
>
<Route
index
element={<Navigate to="instances" replace />}
Expand Down
18 changes: 15 additions & 3 deletions app/util/__snapshots__/path-builder.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ exports[`breadcrumbs 2`] = `
"path": "/system/silos",
},
],
"sled (/system/inventory/sleds/sl)": [
"sled (/system/inventory/sleds/5c56b522-c9b8-49e4-9f9a-8d52a89ec3e0/instances)": [
{
"label": "Inventory",
"path": "/system/inventory",
Expand All @@ -472,8 +472,16 @@ exports[`breadcrumbs 2`] = `
"label": "Sleds",
"path": "/system/inventory/sleds",
},
{
"label": "5c56b…ec3e0",
"path": "/system/inventory/sleds/5c56b522-c9b8-49e4-9f9a-8d52a89ec3e0/instances",
},
{
"label": "Instances",
"path": "/system/inventory/sleds/5c56b522-c9b8-49e4-9f9a-8d52a89ec3e0/instances",
},
],
"sledInstances (/system/inventory/sleds/sl/instances)": [
"sledInstances (/system/inventory/sleds/5c56b522-c9b8-49e4-9f9a-8d52a89ec3e0/instances)": [
{
"label": "Inventory",
"path": "/system/inventory",
Expand All @@ -482,9 +490,13 @@ exports[`breadcrumbs 2`] = `
"label": "Sleds",
"path": "/system/inventory/sleds",
},
{
"label": "5c56b…ec3e0",
"path": "/system/inventory/sleds/5c56b522-c9b8-49e4-9f9a-8d52a89ec3e0/instances",
},
{
"label": "Instances",
"path": "/system/inventory/sleds/sl/instances",
"path": "/system/inventory/sleds/5c56b522-c9b8-49e4-9f9a-8d52a89ec3e0/instances",
},
],
"sledInventory (/system/inventory/sleds)": [
Expand Down
6 changes: 3 additions & 3 deletions app/util/path-builder.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const params = {
silo: 's',
version: 'vs',
provider: 'pr',
sledId: 'sl',
sledId: '5c56b522-c9b8-49e4-9f9a-8d52a89ec3e0',
image: 'im',
snapshot: 'sn',
pool: 'pl',
Expand Down Expand Up @@ -76,8 +76,8 @@ test('path builder', () => {
"siloUtilization": "/utilization",
"silos": "/system/silos",
"silosNew": "/system/silos-new",
"sled": "/system/inventory/sleds/sl",
"sledInstances": "/system/inventory/sleds/sl/instances",
"sled": "/system/inventory/sleds/5c56b522-c9b8-49e4-9f9a-8d52a89ec3e0/instances",
"sledInstances": "/system/inventory/sleds/5c56b522-c9b8-49e4-9f9a-8d52a89ec3e0/instances",
"sledInventory": "/system/inventory/sleds",
"snapshotImagesNew": "/projects/p/snapshots/sn/images-new",
"snapshots": "/projects/p/snapshots",
Expand Down
2 changes: 1 addition & 1 deletion app/util/path-builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export const pb = {

sledInventory: () => '/system/inventory/sleds',
diskInventory: () => '/system/inventory/disks',
sled: ({ sledId }: Sled) => `/system/inventory/sleds/${sledId}`,
sled: ({ sledId }: Sled) => `/system/inventory/sleds/${sledId}/instances`,
sledInstances: ({ sledId }: Sled) => `/system/inventory/sleds/${sledId}/instances`,

@david-crespo david-crespo Nov 14, 2024

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These don't both necessarily need to exist. Having sled link directly to the tab follows the same pattern as our other redirect-to-tabs things — never link to the thing that requires redirecting. The redirects are only there as a backstop in case someone goes to that path by handle.


silos: () => '/system/silos',
Expand Down