Skip to content

feat: checkbox to make pool default when linking to silo #3267

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

Open
sudomateo wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −6
Open

feat: checkbox to make pool default when linking to silo #3267

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
12 changes: 9 additions & 3 deletions app/pages/system/silos/SiloIpPoolsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
import { Networking24Icon } from '@oxide/design-system/icons/react'
import { Badge } from '@oxide/design-system/ui'

import { CheckboxField } from '~/components/form/fields/CheckboxField'
import { ComboboxField } from '~/components/form/fields/ComboboxField'
import { HL } from '~/components/HL'
import { IpVersionBadge } from '~/components/IpVersionBadge'
Expand Down Expand Up @@ -263,9 +264,10 @@ export const handle = makeCrumb('IP Pools')

type LinkPoolFormValues = {
pool: string | undefined
isDefault: boolean
}

const defaultValues: LinkPoolFormValues = { pool: undefined }
const defaultValues: LinkPoolFormValues = { pool: undefined, isDefault: false }

function LinkPoolModal({ onDismiss }: { onDismiss: () => void }) {
const { silo } = useSiloSelector()
Expand All @@ -282,9 +284,9 @@ function LinkPoolModal({ onDismiss }: { onDismiss: () => void }) {
},
})

function onSubmit({ pool }: LinkPoolFormValues) {
function onSubmit({ pool, isDefault }: LinkPoolFormValues) {
if (!pool) return // can't happen, silo is required
linkPool.mutate({ path: { pool }, body: { silo, isDefault: false } })
linkPool.mutate({ path: { pool }, body: { silo, isDefault } })
}

const allLinkedPools = useQuery(allSiloPoolsQuery(silo).optionsFn())
Expand Down Expand Up @@ -334,6 +336,10 @@ function LinkPoolModal({ onDismiss }: { onDismiss: () => void }) {
required
control={control}
/>

<CheckboxField name="isDefault" control={control}>
Make default IP pool for silo
</CheckboxField>
</form>
</Modal.Section>
</Modal.Body>
Expand Down
12 changes: 9 additions & 3 deletions app/pages/system/silos/SiloSubnetPoolsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
import { Networking24Icon } from '@oxide/design-system/icons/react'
import { Badge } from '@oxide/design-system/ui'

import { CheckboxField } from '~/components/form/fields/CheckboxField'
import { ComboboxField } from '~/components/form/fields/ComboboxField'
import { HL } from '~/components/HL'
import { IpVersionBadge } from '~/components/IpVersionBadge'
Expand Down Expand Up @@ -252,9 +253,10 @@ export const handle = makeCrumb('Subnet Pools')

type LinkPoolFormValues = {
pool: string | undefined
isDefault: boolean
}

const defaultValues: LinkPoolFormValues = { pool: undefined }
const defaultValues: LinkPoolFormValues = { pool: undefined, isDefault: false }

function LinkPoolModal({ onDismiss }: { onDismiss: () => void }) {
const { silo } = useSiloSelector()
Expand All @@ -271,9 +273,9 @@ function LinkPoolModal({ onDismiss }: { onDismiss: () => void }) {
},
})

function onSubmit({ pool }: LinkPoolFormValues) {
function onSubmit({ pool, isDefault }: LinkPoolFormValues) {
if (!pool) return
linkPool.mutate({ path: { pool }, body: { silo, isDefault: false } })
linkPool.mutate({ path: { pool }, body: { silo, isDefault } })
}

const allLinkedPools = useQuery(allSiloPoolsQuery(silo).optionsFn())
Expand Down Expand Up @@ -320,6 +322,10 @@ function LinkPoolModal({ onDismiss }: { onDismiss: () => void }) {
required
control={control}
/>

<CheckboxField name="isDefault" control={control}>
Make default subnet pool for silo
</CheckboxField>
</form>
</Modal.Section>
</Modal.Body>
Expand Down
Loading