Skip to content

Path builder imageNew -> imagesNew, etc, to match route paths #2030

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
merged 1 commit into from
Mar 5, 2024
Merged

Path builder imageNew -> imagesNew, etc, to match route paths #2030

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
2 changes: 1 addition & 1 deletion app/forms/instance-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ export function CreateInstanceForm() {
title="No project images found"
body="An image needs to be uploaded to be seen here"
buttonText="Upload image"
onClick={() => navigate(pb.projectImageNew(projectSelector))}
onClick={() => navigate(pb.projectImagesNew(projectSelector))}
/>
</div>
) : (
Expand Down
6 changes: 3 additions & 3 deletions app/pages/ProjectsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const EmptyState = () => (
title="No projects"
body="You need to create a project to be able to see it here"
buttonText="New project"
buttonTo={pb.projectNew()}
buttonTo={pb.projectsNew()}
/>
)

Expand Down Expand Up @@ -90,7 +90,7 @@ export default function ProjectsPage() {
() => [
{
value: 'New project',
onSelect: () => navigate(pb.projectNew()),
onSelect: () => navigate(pb.projectsNew()),
},
...(projects?.items || []).map((p) => ({
value: p.name,
Expand All @@ -108,7 +108,7 @@ export default function ProjectsPage() {
<PageTitle icon={<Folder24Icon />}>Projects</PageTitle>
</PageHeader>
<TableActions>
<Link to={pb.projectNew()} className={buttonStyle({ size: 'sm' })}>
<Link to={pb.projectsNew()} className={buttonStyle({ size: 'sm' })}>
New Project
</Link>
</TableActions>
Expand Down
4 changes: 2 additions & 2 deletions app/pages/project/disks/DisksPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const EmptyState = () => (
title="No disks"
body="You need to create a disk to be able to see it here"
buttonText="New disk"
buttonTo={pb.diskNew(useProjectSelector())}
buttonTo={pb.disksNew(useProjectSelector())}
/>
)

Expand Down Expand Up @@ -117,7 +117,7 @@ export function DisksPage() {
<PageTitle icon={<Storage24Icon />}>Disks</PageTitle>
</PageHeader>
<TableActions>
<Link to={pb.diskNew(projectSelector)} className={buttonStyle({ size: 'sm' })}>
<Link to={pb.disksNew(projectSelector)} className={buttonStyle({ size: 'sm' })}>
New Disk
</Link>
</TableActions>
Expand Down
4 changes: 2 additions & 2 deletions app/pages/project/floating-ips/FloatingIpsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const EmptyState = () => (
title="No Floating IPs"
body="You need to create a Floating IP to be able to see it here"
buttonText="New Floating IP"
buttonTo={pb.floatingIpNew(useProjectSelector())}
buttonTo={pb.floatingIpsNew(useProjectSelector())}
/>
)

Expand Down Expand Up @@ -147,7 +147,7 @@ export function FloatingIpsPage() {
<PageTitle icon={<IpGlobal24Icon />}>Floating IPs</PageTitle>
</PageHeader>
<TableActions>
<Link to={pb.floatingIpNew({ project })} className={buttonStyle({ size: 'sm' })}>
<Link to={pb.floatingIpsNew({ project })} className={buttonStyle({ size: 'sm' })}>
New Floating IP
</Link>
</TableActions>
Expand Down
2 changes: 1 addition & 1 deletion app/pages/project/images/ImagesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export function ImagesPage() {
</PageHeader>
<TableActions>
<Link
to={pb.projectImageNew(projectSelector)}
to={pb.projectImagesNew(projectSelector)}
className={buttonStyle({ size: 'sm' })}
>
Upload image
Expand Down
6 changes: 3 additions & 3 deletions app/pages/project/instances/InstancesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const EmptyState = () => (
title="No instances"
body="You need to create an instance to be able to see it here"
buttonText="New instance"
buttonTo={pb.instanceNew(useProjectSelector())}
buttonTo={pb.instancesNew(useProjectSelector())}
/>
)

Expand Down Expand Up @@ -62,7 +62,7 @@ export function InstancesPage() {
() => [
{
value: 'New instance',
onSelect: () => navigate(pb.instanceNew(projectSelector)),
onSelect: () => navigate(pb.instancesNew(projectSelector)),
},
...(instances?.items || []).map((i) => ({
value: i.name,
Expand Down Expand Up @@ -97,7 +97,7 @@ export function InstancesPage() {
>
<Refresh16Icon />
</Button>
<Link to={pb.instanceNew(projectSelector)} className={buttonStyle({ size: 'sm' })}>
<Link to={pb.instancesNew(projectSelector)} className={buttonStyle({ size: 'sm' })}>
New Instance
</Link>
</TableActions>
Expand Down
6 changes: 3 additions & 3 deletions app/pages/project/snapshots/SnapshotsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const EmptyState = () => (
title="No snapshots"
body="You need to create a snapshot to be able to see it here"
buttonText="New snapshot"
buttonTo={pb.snapshotNew(useProjectSelector())}
buttonTo={pb.snapshotsNew(useProjectSelector())}
/>
)

Expand All @@ -72,7 +72,7 @@ export function SnapshotsPage() {
{
label: 'Create image',
onActivate() {
navigate(pb.snapshotImageCreate({ ...projectSelector, snapshot: snapshot.name }))
navigate(pb.snapshotImagesNew({ ...projectSelector, snapshot: snapshot.name }))
},
},
{
Expand All @@ -94,7 +94,7 @@ export function SnapshotsPage() {
<PageTitle icon={<Snapshots24Icon />}>Snapshots</PageTitle>
</PageHeader>
<TableActions>
<Link to={pb.snapshotNew(projectSelector)} className={buttonStyle({ size: 'sm' })}>
<Link to={pb.snapshotsNew(projectSelector)} className={buttonStyle({ size: 'sm' })}>
New Snapshot
</Link>
</TableActions>
Expand Down
4 changes: 2 additions & 2 deletions app/pages/project/vpcs/VpcsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const EmptyState = () => (
title="No VPCs"
body="You need to create a VPC to be able to see it here"
buttonText="New VPC"
buttonTo={pb.vpcNew(useProjectSelector())}
buttonTo={pb.vpcsNew(useProjectSelector())}
/>
)

Expand Down Expand Up @@ -98,7 +98,7 @@ export function VpcsPage() {
<PageTitle icon={<Networking24Icon />}>VPCs</PageTitle>
</PageHeader>
<TableActions>
<Link to={pb.vpcNew(projectSelector)} className={buttonStyle({ size: 'sm' })}>
<Link to={pb.vpcsNew(projectSelector)} className={buttonStyle({ size: 'sm' })}>
New Vpc
</Link>
</TableActions>
Expand Down
4 changes: 2 additions & 2 deletions app/pages/settings/SSHKeysPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function SSHKeysPage() {
<PageTitle icon={<Key24Icon />}>SSH Keys</PageTitle>
</PageHeader>
<TableActions>
<Link className={buttonStyle({ size: 'sm' })} to={pb.sshKeyNew()}>
<Link className={buttonStyle({ size: 'sm' })} to={pb.sshKeysNew()}>
Add SSH key
</Link>
</TableActions>
Expand All @@ -65,7 +65,7 @@ export function SSHKeysPage() {
title="No SSH keys"
body="You need to add a SSH key to be able to see it here"
buttonText="Add SSH key"
onClick={() => navigate(pb.sshKeyNew())}
onClick={() => navigate(pb.sshKeysNew())}
/>
}
>
Expand Down
6 changes: 3 additions & 3 deletions app/pages/system/networking/IpPoolsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const EmptyState = () => (
title="No IP pools"
body="You need to create an IP pool to be able to see it here"
buttonText="New IP pool"
buttonTo={pb.ipPoolNew()}
buttonTo={pb.ipPoolsNew()}
/>
)

Expand Down Expand Up @@ -77,7 +77,7 @@ export function IpPoolsTab() {
() => [
{
value: 'New IP pool',
onSelect: () => navigate(pb.projectNew()),
onSelect: () => navigate(pb.projectsNew()),
},
...(pools.items || []).map((p) => ({
value: p.name,
Expand All @@ -92,7 +92,7 @@ export function IpPoolsTab() {
return (
<>
<div className="mb-3 flex justify-end space-x-2">
<Link to={pb.ipPoolNew()} className={buttonStyle({ size: 'sm' })}>
<Link to={pb.ipPoolsNew()} className={buttonStyle({ size: 'sm' })}>
New IP Pool
</Link>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/pages/system/silos/SiloIdpsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function SiloIdpsTab() {
return (
<>
<div className="mb-3 flex justify-end space-x-2">
<Link to={pb.siloIdpNew(siloSelector)} className={buttonStyle({ size: 'sm' })}>
<Link to={pb.siloIdpsNew(siloSelector)} className={buttonStyle({ size: 'sm' })}>
New provider
</Link>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/pages/system/silos/SiloIpPoolsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const EmptyState = () => (
title="No IP pools"
body="You need to create an IP pool to be able to see it here"
buttonText="New IP pool"
buttonTo={pb.ipPoolNew()}
buttonTo={pb.ipPoolsNew()}
/>
)

Expand Down
6 changes: 3 additions & 3 deletions app/pages/system/silos/SilosPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const EmptyState = () => (
title="No silos"
body="You need to create a silo to be able to see it here"
buttonText="New silo"
buttonTo={pb.siloNew()}
buttonTo={pb.silosNew()}
/>
)

Expand Down Expand Up @@ -75,7 +75,7 @@ export default function SilosPage() {
useQuickActions(
useMemo(
() => [
{ value: 'New silo', onSelect: () => navigate(pb.siloNew()) },
{ value: 'New silo', onSelect: () => navigate(pb.silosNew()) },
...silos.items.map((o) => ({
value: o.name,
onSelect: () => navigate(pb.silo({ silo: o.name })),
Expand All @@ -92,7 +92,7 @@ export default function SilosPage() {
<PageTitle icon={<Cloud24Icon />}>Silos</PageTitle>
</PageHeader>
<TableActions>
<Link to={pb.siloNew()} className={buttonStyle({ size: 'sm' })}>
<Link to={pb.silosNew()} className={buttonStyle({ size: 'sm' })}>
New silo
</Link>
</TableActions>
Expand Down
2 changes: 1 addition & 1 deletion app/routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ export const routes = createRoutesFromElements(
handle={{ crumb: 'New snapshot' }}
/>
<Route
path="snapshots/:snapshot/image-new"
path="snapshots/:snapshot/images-new"
Copy link
Collaborator Author

@david-crespo david-crespo Mar 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

zero grep results for image-new after changing this

element={<CreateImageFromSnapshotSideModalForm />}
loader={CreateImageFromSnapshotSideModalForm.loader}
handle={{ crumb: 'Create image from snapshot' }}
Expand Down
24 changes: 12 additions & 12 deletions app/util/path-builder.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,63 +29,63 @@ test('path builder', () => {
{
"deviceSuccess": "/device/success",
"diskInventory": "/system/inventory/disks",
"diskNew": "/projects/p/disks-new",
"disks": "/projects/p/disks",
"floatingIpNew": "/projects/p/floating-ips-new",
"disksNew": "/projects/p/disks-new",
"floatingIps": "/projects/p/floating-ips",
"floatingIpsNew": "/projects/p/floating-ips-new",
"instance": "/projects/p/instances/i",
"instanceConnect": "/projects/p/instances/i/connect",
"instanceMetrics": "/projects/p/instances/i/metrics",
"instanceNew": "/projects/p/instances-new",
"instancePage": "/projects/p/instances/i/storage",
"instanceStorage": "/projects/p/instances/i/storage",
"instances": "/projects/p/instances",
"instancesNew": "/projects/p/instances-new",
"inventory": "/system/inventory",
"ipPool": "/system/networking/ip-pools/pl",
"ipPoolEdit": "/system/networking/ip-pools/pl/edit",
"ipPoolNew": "/system/networking/ip-pools-new",
"ipPoolRangeAdd": "/system/networking/ip-pools/pl/ranges-add",
"ipPools": "/system/networking/ip-pools",
"ipPoolsNew": "/system/networking/ip-pools-new",
"nics": "/projects/p/instances/i/network-interfaces",
"profile": "/settings/profile",
"project": "/projects/p",
"projectAccess": "/projects/p/access",
"projectEdit": "/projects/p/edit",
"projectImage": "/projects/p/images/im",
"projectImageEdit": "/projects/p/images/im/edit",
"projectImageNew": "/projects/p/images-new",
"projectImages": "/projects/p/images",
"projectNew": "/projects-new",
"projectImagesNew": "/projects/p/images-new",
"projects": "/projects",
"projectsNew": "/projects-new",
"rackInventory": "/system/inventory/racks",
"samlIdp": "/system/silos/s/idps/saml/pr",
"serialConsole": "/projects/p/instances/i/serial-console",
"silo": "/system/silos/s",
"siloAccess": "/access",
"siloIdpNew": "/system/silos/s/idps-new",
"siloIdpsNew": "/system/silos/s/idps-new",
"siloImage": "/images/im",
"siloImageEdit": "/images/im/edit",
"siloImages": "/images",
"siloIpPools": "/system/silos/s?tab=ip-pools",
"siloNew": "/system/silos-new",
"siloUtilization": "/utilization",
"silos": "/system/silos",
"silosNew": "/system/silos-new",
"sled": "/system/inventory/sleds/sl",
"sledInstances": "/system/inventory/sleds/sl/instances",
"sledInventory": "/system/inventory/sleds",
"snapshotImageCreate": "/projects/p/snapshots/sn/image-new",
"snapshotNew": "/projects/p/snapshots-new",
"snapshotImagesNew": "/projects/p/snapshots/sn/images-new",
"snapshots": "/projects/p/snapshots",
"sshKeyNew": "/settings/ssh-keys-new",
"snapshotsNew": "/projects/p/snapshots-new",
"sshKeys": "/settings/ssh-keys",
"sshKeysNew": "/settings/ssh-keys-new",
"system": "/system",
"systemHealth": "/system/health",
"systemIssues": "/system/issues",
"systemUtilization": "/system/utilization",
"vpc": "/projects/p/vpcs/v",
"vpcEdit": "/projects/p/vpcs/v/edit",
"vpcNew": "/projects/p/vpcs-new",
"vpcs": "/projects/p/vpcs",
"vpcsNew": "/projects/p/vpcs-new",
}
`)
})
Loading