Create and edit VPC subnets and routers #593
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| import { | ||
| fireEvent, | ||
| // logRoles, | ||
| renderAppAt, | ||
| screen, | ||
| // userEvent, | ||
| } from '../../../../test-utils' | ||
|
|
||
| describe('VpcPage', () => { | ||
| describe('subnets tab', () => { | ||
| it('does something', async () => { | ||
| renderAppAt('/orgs/maze-war/projects/prod-online/vpcs/default') | ||
| screen.getByText('Subnets') | ||
| const newSubnet = screen.getByRole('button', { name: 'New Subnet' }) | ||
| expect(screen.queryByRole('button', { name: 'Create subnet' })).toBeNull() | ||
| fireEvent.click(newSubnet) | ||
|
|
||
| // const ipv4 = screen.getByRole('textbox', { name: 'IPv4 block' }) | ||
| // const ipv6 = screen.getByRole('textbox', { name: 'IPv6 block' }) | ||
| // const name = screen.getByRole('textbox', { name: 'Name' }) | ||
|
|
||
| // this pisses off testing library, "formik change outside of act()". ugh | ||
| // userEvent.type(ipv4, 'new-subnet') | ||
|
|
||
| // const form = document.getElementById('create-vpc-subnet-form')! | ||
| // screen.debug(form, 10000) | ||
| // logRoles(form) | ||
|
|
||
| // const submit = screen.getByRole('button', { name: 'Create subnet' }) | ||
| }) | ||
| }) | ||
| }) | ||
|
There was a problem hiding this comment. So this test is kind of wild. It takes a few seconds. I'm not sure how brittle it is, it's pretty generic and would be robust to a lot of insignificant things about the page changing. I have liked these kinds of tests in the past because they recreate the kind of manual testing you would do in the browser to make sure happy paths work. But I've never had a whole app full of them, so I don't know how they scale. Curious how you feel about it @zephraph. There was a problem hiding this comment. One thing I was thinking while doing the mocks is that MSW would make that part better because when we create the subnet it would actually go into the list of subnets and automatically be returned in the subsequent fetch. There was a problem hiding this comment. Yeah, I'm not super keen on the That said, impact over perfection. I'm fine with this as is b/c it gives us more test coverage than we had. It'd just be nice to come back through and clean it up once we have a better primitive in place. There was a problem hiding this comment. Yeah, I'd like to leave this in, as it gives me a lot more to work with when I make MSW work in #571. It will be very cool if we can delete the mock lines and have the rest of test work as-is. |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| import React from 'react' | ||
| import { Formik, Form } from 'formik' | ||
|
|
||
| import { Button, FieldTitle, SideModal, TextField } from '@oxide/ui' | ||
| import { useApiMutation, useApiQueryClient } from '@oxide/api' | ||
|
|
||
| type Props = { | ||
| isOpen: boolean | ||
| onDismiss: () => void | ||
| orgName: string | ||
| projectName: string | ||
| vpcName: string | ||
| } | ||
|
|
||
| export function CreateVpcSubnetModal({ | ||
| isOpen, | ||
| onDismiss, | ||
| orgName, | ||
| projectName, | ||
| vpcName, | ||
| }: Props) { | ||
| const parentIds = { | ||
| organizationName: orgName, | ||
| projectName, | ||
| vpcName, | ||
| } | ||
| const queryClient = useApiQueryClient() | ||
| const createSubnet = useApiMutation('vpcSubnetsPost', { | ||
| onSuccess() { | ||
| queryClient.invalidateQueries('vpcSubnetsGet', parentIds) | ||
| onDismiss() | ||
| }, | ||
| }) | ||
| const formId = 'create-vpc-subnet-form' | ||
| return ( | ||
| <SideModal | ||
| id="create-vpc-subnet-modal" | ||
| title="Create subnet" | ||
| isOpen={isOpen} | ||
| onDismiss={onDismiss} | ||
| > | ||
| <Formik | ||
| initialValues={{ | ||
| name: '', | ||
| description: '', | ||
| ipv4Block: '', | ||
| ipv6Block: '', | ||
| }} | ||
| onSubmit={({ name, description, ipv4Block, ipv6Block }) => { | ||
| createSubnet.mutate({ | ||
| ...parentIds, | ||
| // XXX body is optional. useApiMutation should be smarter and require body when it's required | ||
| body: { | ||
| name, | ||
| description, | ||
| // TODO: validate these client-side using the patterns. sadly non-trivial | ||
| ipv4Block: ipv4Block || null, | ||
| ipv6Block: ipv6Block || null, | ||
| }, | ||
| }) | ||
| }} | ||
| > | ||
| <Form id={formId}> | ||
| <SideModal.Section> | ||
| <div className="space-y-0.5"> | ||
| <FieldTitle htmlFor="subnet-ipv4-block" tip="TBA"> | ||
| IPv4 block | ||
| </FieldTitle> | ||
| <TextField id="subnet-ipv4-block" name="ipv4Block" /> | ||
| </div> | ||
| <div className="space-y-0.5"> | ||
| <FieldTitle htmlFor="subnet-ipv6-block" tip="TBA"> | ||
| IPv6 block | ||
| </FieldTitle> | ||
| <TextField id="subnet-ipv6-block" name="ipv6Block" /> | ||
| </div> | ||
| </SideModal.Section> | ||
| <SideModal.Section className="border-t"> | ||
| <div className="space-y-0.5"> | ||
| <FieldTitle htmlFor="subnet-name" tip="The name of the subnet"> | ||
| Name | ||
| </FieldTitle> | ||
| <TextField id="subnet-name" name="name" /> | ||
| </div> | ||
| <div className="space-y-0.5"> | ||
| <FieldTitle | ||
| htmlFor="subnet-description" | ||
| tip="A description for the subnet" | ||
| > | ||
| Description {/* TODO: indicate optional */} | ||
| </FieldTitle> | ||
| <TextField id="subnet-description" name="description" /> | ||
| </div> | ||
| </SideModal.Section> | ||
| </Form> | ||
| </Formik> | ||
| <SideModal.Footer> | ||
| <Button variant="dim" className="mr-2.5" onClick={onDismiss}> | ||
| Cancel | ||
| </Button> | ||
| <Button form={formId} type="submit"> | ||
| Create subnet | ||
| </Button> | ||
| </SideModal.Footer> | ||
| </SideModal> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| import React from 'react' | ||
| import { Formik, Form } from 'formik' | ||
|
|
||
| import { Button, FieldTitle, SideModal, TextField } from '@oxide/ui' | ||
| import type { VpcSubnet } from '@oxide/api' | ||
| import { useApiMutation, useApiQueryClient } from '@oxide/api' | ||
|
|
||
| type Props = { | ||
| onDismiss: () => void | ||
| orgName: string | ||
| projectName: string | ||
| vpcName: string | ||
| originalSubnet: VpcSubnet | null | ||
| } | ||
|
|
||
| export function EditVpcSubnetModal({ | ||
| onDismiss, | ||
| orgName, | ||
| projectName, | ||
| vpcName, | ||
| originalSubnet, | ||
| }: Props) { | ||
| const parentIds = { | ||
| organizationName: orgName, | ||
| projectName, | ||
| vpcName, | ||
| } | ||
| const queryClient = useApiQueryClient() | ||
| const updateSubnet = useApiMutation('vpcSubnetsPutSubnet', { | ||
| onSuccess() { | ||
| queryClient.invalidateQueries('vpcSubnetsGet', parentIds) | ||
| onDismiss() | ||
| }, | ||
| }) | ||
|
|
||
| if (!originalSubnet) return null | ||
|
|
||
| const formId = 'edit-vpc-subnet-form' | ||
| return ( | ||
| <SideModal | ||
| id="edit-vpc-subnet-modal" | ||
| title="Edit subnet" | ||
| onDismiss={onDismiss} | ||
| > | ||
| <Formik | ||
| initialValues={{ | ||
| name: originalSubnet.identity.name, | ||
| description: originalSubnet.identity.description, | ||
| ipv4Block: originalSubnet.ipv4_block || '', | ||
| ipv6Block: originalSubnet.ipv6_block || '', | ||
| }} | ||
| onSubmit={({ name, description, ipv4Block, ipv6Block }) => { | ||
| updateSubnet.mutate({ | ||
| ...parentIds, | ||
| subnetName: originalSubnet.identity.name, | ||
| body: { | ||
| name, | ||
| description, | ||
| // TODO: validate these client-side using the patterns. sadly non-trivial | ||
| ipv4Block: ipv4Block || null, | ||
| ipv6Block: ipv6Block || null, | ||
| }, | ||
| }) | ||
| }} | ||
| > | ||
| <Form id={formId}> | ||
| <SideModal.Section> | ||
| <div className="space-y-0.5"> | ||
| <FieldTitle htmlFor="subnet-ipv4-block" tip="TBA"> | ||
| IPv4 block | ||
| </FieldTitle> | ||
| <TextField id="subnet-ipv4-block" name="ipv4Block" /> | ||
| </div> | ||
| <div className="space-y-0.5"> | ||
| <FieldTitle htmlFor="subnet-ipv6-block" tip="TBA"> | ||
| IPv6 block | ||
| </FieldTitle> | ||
| <TextField id="subnet-ipv6-block" name="ipv6Block" /> | ||
| </div> | ||
| </SideModal.Section> | ||
| <SideModal.Section className="border-t"> | ||
| <div className="space-y-0.5"> | ||
| <FieldTitle htmlFor="subnet-name" tip="The name of the subnet"> | ||
| Name | ||
| </FieldTitle> | ||
| <TextField id="subnet-name" name="name" /> | ||
| </div> | ||
| <div className="space-y-0.5"> | ||
| <FieldTitle | ||
| htmlFor="subnet-description" | ||
| tip="A description for the subnet" | ||
| > | ||
| Description {/* TODO: indicate optional */} | ||
| </FieldTitle> | ||
| <TextField id="subnet-description" name="description" /> | ||
| </div> | ||
| </SideModal.Section> | ||
| </Form> | ||
| </Formik> | ||
| <SideModal.Footer> | ||
| <Button variant="dim" className="mr-2.5" onClick={onDismiss}> | ||
| Cancel | ||
| </Button> | ||
| <Button form={formId} type="submit"> | ||
| Update subnet | ||
| </Button> | ||
| </SideModal.Footer> | ||
| </SideModal> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,71 @@ | ||
| import React, { useState } from 'react' | ||
| import { useParams } from '../../../../../hooks' | ||
| import type { MenuAction } from '@oxide/table' | ||
| import { useQueryTable, TwoLineCell, DateCell } from '@oxide/table' | ||
| import { Button } from '@oxide/ui' | ||
| import { CreateVpcSubnetModal } from '../modals/create-subnet' | ||
| import { EditVpcSubnetModal } from '../modals/edit-subnet' | ||
| import type { VpcSubnet } from '@oxide/api' | ||
|
|
||
| export const VpcSubnetsTab = () => { | ||
| const { orgName, projectName, vpcName } = useParams( | ||
| 'orgName', | ||
| 'projectName', | ||
| 'vpcName' | ||
| ) | ||
|
|
||
| const { Table, Column } = useQueryTable('vpcSubnetsGet', { | ||
| organizationName: orgName, | ||
| projectName, | ||
| vpcName, | ||
| }) | ||
|
|
||
| const [createModalOpen, setCreateModalOpen] = useState(false) | ||
| const [editingSubnet, setEditingSubnet] = useState<VpcSubnet | null>(null) | ||
|
|
||
| const actions = (subnet: VpcSubnet): MenuAction[] => [ | ||
| { | ||
| label: 'Edit', | ||
| onActivate: () => setEditingSubnet(subnet), | ||
| // TODO: disable for default? can you edit it? | ||
| }, | ||
| ] | ||
|
|
||
| return ( | ||
| <> | ||
| <div className="mb-3 flex justify-end space-x-4"> | ||
| <Button | ||
| size="xs" | ||
| variant="dim" | ||
| onClick={() => setCreateModalOpen(true)} | ||
| > | ||
| New Subnet | ||
| </Button> | ||
| <CreateVpcSubnetModal | ||
| orgName={orgName} | ||
| projectName={projectName} | ||
| vpcName={vpcName} | ||
| isOpen={createModalOpen} | ||
| onDismiss={() => setCreateModalOpen(false)} | ||
| /> | ||
| <EditVpcSubnetModal | ||
| orgName={orgName} | ||
| projectName={projectName} | ||
| vpcName={vpcName} | ||
| originalSubnet={editingSubnet} // modal is open if this is non-null | ||
| onDismiss={() => setEditingSubnet(null)} | ||
| /> | ||
| </div> | ||
| <Table selectable actions={actions}> | ||
| <Column id="name" accessor="identity.name" /> | ||
| <Column | ||
| id="ip-block" | ||
| header="IP Block" | ||
| accessor={(vpc) => [vpc.ipv4_block, vpc.ipv6_block]} | ||
| cell={TwoLineCell} | ||
| /> | ||
| <Column id="created" accessor="identity.timeCreated" cell={DateCell} /> | ||
| </Table> | ||
| </> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😭