Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 OMICRON_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a14e6bb877451f7307ced4b079c298855cb974dc
7e18e523687767bb8c75070945ac398a5b89d9fd
2 changes: 1 addition & 1 deletion app/api/__generated__/API_VERSION

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions app/api/__generated__/Api.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/api/__generated__/OMICRON_VERSION

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion app/api/__generated__/validate.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions app/forms/silo-create.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ export type SiloCreateFormValues = Omit<SiloCreate, 'mappedFleetRoles'> & {
const defaultValues: SiloCreateFormValues = {
name: '',
description: '',
discoverable: true,
identityMode: 'saml_jit',
adminGroupName: '',
tlsCertificates: [],
Expand Down Expand Up @@ -121,9 +120,6 @@ export default function CreateSiloSideModalForm() {
<Message variant="info" content={<HelpMessage />} />
<NameField name="name" control={form.control} />
<DescriptionField name="description" control={form.control} />
<CheckboxField name="discoverable" control={form.control}>
Discoverable
</CheckboxField>
<FormDivider />
<NumberField
control={form.control}
Expand Down
4 changes: 0 additions & 4 deletions app/pages/system/silos/SilosPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { makeCrumb } from '~/hooks/use-crumbs'
import { useQuickActions } from '~/hooks/use-quick-actions'
import { confirmDelete } from '~/stores/confirm-delete'
import { addToast } from '~/stores/toast'
import { BooleanCell } from '~/table/cells/BooleanCell'
import { makeLinkCell } from '~/table/cells/LinkCell'
import { useColsWithActions, type MenuAction } from '~/table/columns/action-col'
import { Columns } from '~/table/columns/common'
Expand Down Expand Up @@ -51,9 +50,6 @@ const staticCols = [
cell: (info) => makeLinkCell((name) => pb.silo({ silo: name }))(info),
}),
colHelper.accessor('description', Columns.description),
colHelper.accessor('discoverable', {
cell: (info) => <BooleanCell isTrue={info.getValue()} />,
}),
colHelper.accessor((silo) => silo.identityMode, {
header: 'Identity mode',
cell: (info) => <Badge>{info.getValue().replace('_', ' ')}</Badge>,
Expand Down
24 changes: 0 additions & 24 deletions app/table/cells/BooleanCell.tsx

This file was deleted.

5 changes: 5 additions & 0 deletions mock-api/msw/handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1946,6 +1946,11 @@ export const handlers = makeHandlers({
id: uuid(),
...getTimestamps(),
...body,
// discoverable was removed from SiloCreate, but it's still on the Silo
// view. Silo creation through the API hardcodes discoverable: true in
// the DB model
// https://github.com/oxidecomputer/omicron/blob/71f52a3/nexus/db-queries/src/db/datastore/silo.rs#L164
discoverable: true,
mapped_fleet_roles: body.mapped_fleet_roles || {},
}
db.silos.push(newSilo)
Expand Down
6 changes: 3 additions & 3 deletions mock-api/silo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const silos: Json<Silo[]> = [
description: 'silo with v6-only default pool',
time_created: new Date(2024, 0, 1).toISOString(),
time_modified: new Date(2024, 0, 2).toISOString(),
discoverable: false,
discoverable: true,
identity_mode: 'saml_jit',
mapped_fleet_roles: {},
},
Expand All @@ -62,7 +62,7 @@ export const silos: Json<Silo[]> = [
description: 'silo with no default pools',
time_created: new Date(2024, 0, 3).toISOString(),
time_modified: new Date(2024, 0, 4).toISOString(),
discoverable: false,
discoverable: true,
identity_mode: 'saml_jit',
mapped_fleet_roles: {},
},
Expand All @@ -72,7 +72,7 @@ export const silos: Json<Silo[]> = [
description: 'silo with no IP pools',
time_created: new Date(2024, 0, 11).toISOString(),
time_modified: new Date(2024, 0, 12).toISOString(),
discoverable: false,
discoverable: true,
identity_mode: 'saml_jit',
mapped_fleet_roles: {},
},
Expand Down
6 changes: 0 additions & 6 deletions test/e2e/silos.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ test('Create silo', async ({ page }) => {
await expectRowVisible(table, {
name: 'maze-war',
'Identity mode': 'saml jit',
// not easy to assert this until we can calculate accessible name instead of text content
// discoverable: 'true',
})
await expect(page.getByText('Feb 28, 202312:00 AM')).toBeVisible()

Expand All @@ -84,9 +82,6 @@ test('Create silo', async ({ page }) => {
// fill out form
await page.getByRole('textbox', { name: 'Name', exact: true }).fill('other-silo')
await page.getByRole('textbox', { name: 'Description' }).fill('definitely a silo')
const discoverable = page.getByRole('checkbox', { name: 'Discoverable' })
await expect(discoverable).toBeChecked()
await discoverable.click()
await expect(page.getByRole('textbox', { name: 'Admin group name' })).toBeVisible()
await page.getByRole('textbox', { name: 'Admin group name' }).fill('admins')
await page.getByRole('checkbox', { name: 'Grant fleet admin' }).click()
Expand Down Expand Up @@ -213,7 +208,6 @@ test('Create silo', async ({ page }) => {
name: 'other-silo',
description: 'definitely a silo',
'Identity mode': 'saml jit',
// discoverable: 'false',
})
const otherSiloCell = page.getByRole('cell', { name: 'other-silo' })
await expect(otherSiloCell).toBeVisible()
Expand Down
Loading