Skip to content

Add quota inputs to silo create form #1858

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 4 commits into from
Dec 14, 2023
Merged

Add quota inputs to silo create form #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a8d12a
Add inputs to silo create form
charliepark Dec 14, 2023
bef285a
Remove errant prop
charliepark Dec 14, 2023
06e5047
fill fields in e2e test and change disk to storage
david-crespo Dec 14, 2023
c81955e
add validation against negative quotas
david-crespo Dec 14, 2023
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
34 changes: 34 additions & 0 deletions app/forms/silo-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
TextField,
TlsCertsField,
} from 'app/components/form'
import { NumberField } from 'app/components/form/fields/NumberField'
import { useForm, useToast } from 'app/hooks'
import { pb } from 'app/util/path-builder'

Expand All @@ -43,6 +44,10 @@ const defaultValues: SiloCreateFormValues = {
},
}

function validateQuota(value: number) {
if (value < 0) return 'Must be at least 0'
}

export function CreateSiloSideModalForm() {
const navigate = useNavigate()
const queryClient = useApiQueryClient()
Expand Down Expand Up @@ -97,6 +102,35 @@ export function CreateSiloSideModalForm() {
<CheckboxField name="discoverable" control={form.control}>
Discoverable
</CheckboxField>
<FormDivider />
<NumberField
control={form.control}
label="CPU quota"
name="quotas.cpus"
required
type="number"
units="nCPUs"
validate={validateQuota}
/>
<NumberField
control={form.control}
label="Memory quota"
name="quotas.memory"
required
type="number"
units="GiB"
validate={validateQuota}
/>
<NumberField
control={form.control}
label="Storage quota"
name="quotas.storage"
required
type="number"
units="GiB"
validate={validateQuota}
/>
<FormDivider />
<RadioField
name="identityMode"
label="Identity mode"
Expand Down
5 changes: 4 additions & 1 deletion app/test/e2e/silos.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,17 @@ test('Create silo', async ({ page }) => {

await page.click('role=link[name="New silo"]')

// fill out form and submit
// fill out form
await page.fill('role=textbox[name="Name"]', 'other-silo')
await page.fill('role=textbox[name="Description"]', 'definitely a silo')
await expect(page.locator('role=checkbox[name="Discoverable"]')).toBeChecked()
await page.click('role=checkbox[name="Discoverable"]')
await page.click('role=radio[name="Local only"]')
await page.fill('role=textbox[name="Admin group name"]', 'admins')
await page.click('role=checkbox[name="Grant fleet admin role to silo admins"]')
await page.getByRole('textbox', { name: 'CPU quota (nCPUs)' }).fill('3')
await page.getByRole('textbox', { name: 'Memory quota (GiB)' }).fill('5')
await page.getByRole('textbox', { name: 'Storage quota (GiB)' }).fill('7')

// Add a TLS cert
const openCertModalButton = page.getByRole('button', { name: 'Add TLS certificate' })
Expand Down