Skip to content

Add success toasts for create and delete SSH key #2188

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
Apr 23, 2024
Merged

Add success toasts for create and delete SSH key #2188

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
11 changes: 6 additions & 5 deletions app/forms/ssh-key-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { NameField } from '~/components/form/fields/NameField'
import { TextField } from '~/components/form/fields/TextField'
import { SideModalForm } from '~/components/form/SideModalForm'
import { useForm } from '~/hooks'
import { addToast } from '~/stores/toast'
import { pb } from '~/util/path-builder'

const defaultValues: SshKeyCreate = {
Expand All @@ -22,13 +23,12 @@ const defaultValues: SshKeyCreate = {
publicKey: '',
}

export function CreateSSHKeySideModalForm({
onDismiss,
message,
}: {
type Props = {
onDismiss?: () => void
message?: React.ReactNode
}) {
}

export function CreateSSHKeySideModalForm({ onDismiss, message }: Props) {
const queryClient = useApiQueryClient()
const navigate = useNavigate()

Expand All @@ -38,6 +38,7 @@ export function CreateSSHKeySideModalForm({
onSuccess() {
queryClient.invalidateQueries('currentUserSshKeyList')
handleDismiss()
addToast({ content: 'Your SSH key has been created' })
},
})
const form = useForm({ defaultValues })
Expand Down
2 changes: 2 additions & 0 deletions app/pages/settings/SSHKeysPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { apiQueryClient, useApiMutation, useApiQueryClient, type SshKey } from '
import { Key16Icon, Key24Icon } from '@oxide/design-system/icons/react'

import { confirmDelete } from '~/stores/confirm-delete'
import { addToast } from '~/stores/toast'
import { useColsWithActions, type MenuAction } from '~/table/columns/action-col'
import { Columns } from '~/table/columns/common'
import { PAGE_SIZE, useQueryTable } from '~/table/QueryTable'
Expand Down Expand Up @@ -45,6 +46,7 @@ export function SSHKeysPage() {
const deleteSshKey = useApiMutation('currentUserSshKeyDelete', {
onSuccess: () => {
queryClient.invalidateQueries('currentUserSshKeyList')
addToast({ content: 'Your SSH key has been deleted' })
},
})

Expand Down
8 changes: 3 additions & 5 deletions test/e2e/ssh-keys.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
import { test } from '@playwright/test'

import { expectNotVisible, expectRowVisible, expectVisible } from './utils'
import { clickRowAction, expectNotVisible, expectRowVisible, expectVisible } from './utils'

test('SSH keys', async ({ page }) => {
await page.goto('/settings/ssh-keys')
Expand All @@ -20,14 +20,12 @@ test('SSH keys', async ({ page }) => {
])

// delete the two ssh keys
await page.click('role=button[name="Row actions"]')
await page.click('role=menuitem[name="Delete"]')
await clickRowAction(page, 'm1-macbook-pro', 'Delete')
await page.getByRole('button', { name: 'Confirm' }).click()

await expectNotVisible(page, ['role=cell[name="m1-macbook-pro"]'])

await page.click('role=button[name="Row actions"]')
await page.click('role=menuitem[name="Delete"]')
await clickRowAction(page, 'mac-mini', 'Delete')
await page.getByRole('button', { name: 'Confirm' }).click()

// should show empty state
Expand Down