Skip to content

Remove footer when side modal is read-only #2621

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
david-crespo merged 4 commits into from
Dec 13, 2024
Merged

Remove footer when side modal is read-only #2621

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
a2d4377
Remove sidemodal footer when read-only
charliepark Dec 12, 2024
240fce0
Update test to use X to close modal
charliepark Dec 12, 2024
7fe3cfe
move close button back into SideModal
david-crespo Dec 13, 2024
0a36947
merge main
david-crespo Dec 13, 2024
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
15 changes: 8 additions & 7 deletions app/components/form/SideModalForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* Copyright Oxide Computer Company
*/

import { useEffect, useId, useState, type ReactNode } from 'react'
import type { FieldValues, UseFormReturn } from 'react-hook-form'
import { NavigationType, useNavigationType } from 'react-router-dom'
Expand Down Expand Up @@ -127,11 +128,11 @@ export function SideModalForm<TFieldValues extends FieldValues>({
{children}
</form>
</SideModal.Body>
<SideModal.Footer error={!!submitError}>
<Button variant="ghost" size="sm" onClick={onDismiss}>
Cancel
</Button>
{onSubmit && (
{onSubmit && (
<SideModal.Footer error={!!submitError}>
<Button variant="ghost" size="sm" onClick={onDismiss}>
Cancel
</Button>
<Button
type="submit"
size="sm"
Expand All @@ -142,8 +143,8 @@ export function SideModalForm<TFieldValues extends FieldValues>({
>
{label}
</Button>
)}
</SideModal.Footer>
</SideModal.Footer>
)}

{showNavGuard && (
<Modal
Expand Down
18 changes: 8 additions & 10 deletions app/ui/lib/SideModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ export function SideModal({
</div>
)}
{children}

{/* Close button is here at the end so we aren't automatically focusing on it when the side modal is opened. Positioned in the safe area at the top */}
<Dialog.Close
className="absolute right-[var(--content-gutter)] top-10 -m-2 flex rounded p-2 hover:bg-hover"
aria-label="Close"
>
<Close12Icon className="text-default" />
</Dialog.Close>
</AnimatedDialogContent>
</Dialog.Portal>
</Dialog.Root>
Expand Down Expand Up @@ -161,15 +169,5 @@ SideModal.Footer = ({ children, error }: { children: ReactNode; error?: boolean
</div>
)}
{children}
{/*
Close button is here at the end so we aren't automatically focusing on it
when the side modal is opened. Positioned in the safe area at the top
*/}
<Dialog.Close
className="absolute right-[var(--content-gutter)] top-10 -m-2 flex rounded p-2 hover:bg-hover"
aria-label="Close"
>
<Close12Icon className="text-default" />
</Dialog.Close>
</footer>
)
4 changes: 2 additions & 2 deletions test/e2e/silos.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ test('Identity providers', async ({ page }) => {
'groups'
)

await page.getByRole('button', { name: 'Cancel' }).click()
await page.getByRole('button', { name: 'Close' }).click()

await expect(dialog).toBeHidden()

Expand Down Expand Up @@ -320,7 +320,7 @@ test('Silo IP pools link pool', async ({ page }) => {
await expect(modal).toBeVisible()

// close modal works
await page.getByRole('button', { name: 'Cancel' }).click()
await page.getByRole('button', { name: 'Close' }).click()
await expect(modal).toBeHidden()

// reopen
Expand Down
Loading