Skip to content

Dim plus sign on disabled button #2256

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 3 commits into from
May 22, 2024
Merged

Dim plus sign on disabled button #2256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d3cb0e
Add logic to dim button when in a disabled state
charliepark May 22, 2024
5752e51
small test improvement
charliepark May 22, 2024
076f5f7
refactor CreateButton, tests
charliepark May 22, 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
7 changes: 6 additions & 1 deletion app/ui/lib/CreateButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Copyright Oxide Computer Company
*/

import cn from 'classnames'
import { Link, type LinkProps } from 'react-router-dom'

import { AddRoundel12Icon } from '@oxide/design-system/icons/react'
Expand All @@ -14,7 +15,11 @@ import { Button, buttonStyle, type ButtonProps } from '~/ui/lib/Button'

export const CreateButton = ({ children, ...props }: ButtonProps) => (
<Button size="sm" className="shrink-0" {...props}>
<AddRoundel12Icon className="mr-2 text-accent-secondary" />
<AddRoundel12Icon
// dim the icon color from the default (text accent) because it looks a
// lot brighter than text, but default disabled color is fine
className={cn('mr-2', { 'text-accent-secondary': !props.disabled })}
/>
{children}
</Button>
)
Expand Down
8 changes: 7 additions & 1 deletion test/e2e/instance-networking.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,16 @@ test('Instance networking tab — NIC table', async ({ page }) => {
'/projects/mock-project/vpcs/mock-vpc'
)

const addNicButton = page.getByRole('button', { name: 'Add network interface' })

// Ensure that the 'Add network interface' button is disabled when the instance is running
await expect(addNicButton).toBeDisabled()

// Have to stop instance to edit NICs
await stopInstance(page)

await page.click('role=button[name="Add network interface"]')
await expect(addNicButton).toBeEnabled()
await addNicButton.click()

// Add network interface
// TODO: modal title is not getting hooked up, IDs are wrong
Expand Down