Skip to content

Style polish on update release cards #2922

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 6 commits into from
Oct 15, 2025
+74 −50
Merged

Style polish on update release cards #2922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b6ffac
min width on update release list cardblock
david-crespo Oct 15, 2025
e98012a
let's just wrap instead. this is why I'm not a designer
david-crespo Oct 15, 2025
9b8cd0c
Fix card block child border
benjaminleonard Oct 15, 2025
21b42cf
Add divider
benjaminleonard Oct 15, 2025
3be3b9a
Tweak tuf repo list rows
benjaminleonard Oct 15, 2025
508a37e
Responsive tweaks
benjaminleonard Oct 15, 2025
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
20 changes: 15 additions & 5 deletions app/components/MoreActionsMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,33 @@ import * as DropdownMenu from '~/ui/lib/DropdownMenu'
interface MoreActionsMenuProps {
/** The accessible name for the menu button */
label: string
isSmall?: boolean
variant?: 'default' | 'small' | 'filled'
/** Dropdown items only */
children?: ReactNode
}

export const MoreActionsMenu = ({
label,
isSmall = false,
variant = 'default',
children,
}: MoreActionsMenuProps) => {
return (
<DropdownMenu.Root>
<DropdownMenu.Trigger aria-label={label} className="rounded">
<DropdownMenu.Trigger
aria-label={label}
className={cn(
'headless-hide-focus rounded',
variant === 'filled' && 'h-full w-full'
)}
>
<div
className={cn(
'active-clicked border-default hover:bg-tertiary flex items-center justify-center rounded border',
isSmall ? 'h-6 w-6' : 'h-8 w-8'
'active-clicked hover:bg-tertiary flex items-center justify-center',
variant === 'small' && 'h-6 w-6',
variant === 'default' && 'h-8 w-8',
(variant === 'default' || variant === 'small') &&
'border-default rounded border',
variant === 'filled' && 'h-full w-full px-3'
)}
>
<More12Icon />
Expand Down
2 changes: 1 addition & 1 deletion app/components/oxql-metrics/OxqlMetric.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export function OxqlMetric({ title, description, unit, ...queryObj }: OxqlMetric
return (
<ChartContainer>
<ChartHeader title={title} label={label} description={description}>
<MoreActionsMenu label="Instance actions" isSmall>
<MoreActionsMenu label="Instance actions" variant="small">
<Dropdown.LinkItem to={links.oxqlSchemaDocs(queryObj.metricName)}>
About this metric
</Dropdown.LinkItem>
Expand Down
100 changes: 57 additions & 43 deletions app/pages/system/UpdatePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ import * as R from 'remeda'

import {
Images24Icon,
SizeOutline12Icon,
SoftwareUpdate16Icon,
SoftwareUpdate24Icon,
Time16Icon,
TimeOutline12Icon,
} from '@oxide/design-system/icons/react'
import { Badge } from '@oxide/design-system/ui'

Expand All @@ -34,6 +35,7 @@ import { addToast } from '~/stores/toast'
import { EmptyCell } from '~/table/cells/EmptyCell'
import { CardBlock } from '~/ui/lib/CardBlock'
import { DateTime } from '~/ui/lib/DateTime'
import { Divider } from '~/ui/lib/Divider'
import * as DropdownMenu from '~/ui/lib/DropdownMenu'
import { PageHeader, PageTitle } from '~/ui/lib/PageHeader'
import { PropertiesTable } from '~/ui/lib/PropertiesTable'
Expand Down Expand Up @@ -106,7 +108,7 @@ export default function UpdatePage() {
/>
</div>
</PageHeader>
<PropertiesTable className="-mt-8 mb-8">
<PropertiesTable className="-mt-8">
{/* targetRelease will never be null on a customer system after the
first time it is set. */}
<PropertiesTable.Row label="Target release">
Expand All @@ -132,7 +134,7 @@ export default function UpdatePage() {
{componentProgress ? (
<>
<div className="mr-1.5">{componentProgress.percentage}%</div>
<div className="text-secondary">
<div className="text-tertiary">
({componentProgress.current} of {componentProgress.total})
</div>
</>
Expand Down Expand Up @@ -166,6 +168,8 @@ export default function UpdatePage() {
</PropertiesTable.Row>
</PropertiesTable>

<Divider className="my-8" />

<CardBlock>
<CardBlock.Header title="Releases" />
<CardBlock.Body>
Expand All @@ -175,50 +179,60 @@ export default function UpdatePage() {
return (
<li
key={repo.hash}
className="border-secondary flex items-center gap-4 rounded border p-4"
className="border-default @container flex items-center gap-3 rounded border pl-4"
>
<Images24Icon className="text-secondary shrink-0" aria-hidden />
<div className="flex-1">
<div className="flex items-center gap-2">
<span className="text-sans-semi-lg text-raise">
{repo.systemVersion}
</span>
{isTarget && <Badge color="default">Target</Badge>}
<Images24Icon className="text-tertiary shrink-0" aria-hidden />
<div className="flex min-w-0 flex-1 flex-col flex-wrap items-start gap-x-4 gap-y-1 py-3 @md:flex-row @md:items-center">
<div className="flex-1">
<div className="flex items-center gap-1.5">
<span className="text-sans-semi-lg text-raise">
{repo.systemVersion}
</span>
{isTarget && <Badge color="default">Target</Badge>}
</div>
</div>
<div className="text-secondary">{repo.fileName}</div>
</div>
<div className="flex items-center gap-4">
<div className="flex items-center gap-1">
<Time16Icon aria-hidden />
<DateTime date={repo.timeCreated} />
<div className="flex flex-col items-start gap-0.5 @md:items-end">
<div className="flex items-center gap-1.5">
<DateTime date={repo.timeCreated} />
<TimeOutline12Icon className="text-quaternary" aria-hidden />
</div>
<div className="flex items-center gap-1.5">
<div>{repo.fileName}</div>
<SizeOutline12Icon className="text-quaternary" aria-hidden />
</div>
</div>
</div>
<MoreActionsMenu label={`${repo.systemVersion} actions`} isSmall>
<DropdownMenu.Item
label="Set as target release"
onSelect={() => {
confirmAction({
actionType: 'primary',
doAction: () =>
setTargetRelease({
body: { systemVersion: repo.systemVersion },
}),
modalTitle: 'Confirm set target release',
modalContent: (
<p>
Are you sure you want to set <HL>{repo.systemVersion}</HL> as
the target release?
</p>
),
errorTitle: `Error setting target release to ${repo.systemVersion}`,
})
}}
// TODO: follow API logic, disabling for older releases.
// Or maybe just have the API tell us by adding a field to
// the TufRepo response type.
disabled={isTarget && 'Already set as target'}
/>
</MoreActionsMenu>
<div className="border-secondary flex items-center justify-center self-stretch border-l">
<MoreActionsMenu
label={`${repo.systemVersion} actions`}
variant="filled"
>
<DropdownMenu.Item
label="Set as target release"
onSelect={() => {
confirmAction({
actionType: 'primary',
doAction: () =>
setTargetRelease({
body: { systemVersion: repo.systemVersion },
}),
modalTitle: 'Confirm set target release',
modalContent: (
<p>
Are you sure you want to set <HL>{repo.systemVersion}</HL>{' '}
as the target release?
</p>
),
errorTitle: `Error setting target release to ${repo.systemVersion}`,
})
}}
// TODO: follow API logic, disabling for older releases.
// Or maybe just have the API tell us by adding a field to
// the TufRepo response type.
disabled={isTarget && 'Already set as target'}
/>
</MoreActionsMenu>
</div>
</li>
)
})}
Expand Down
2 changes: 1 addition & 1 deletion app/ui/lib/CardBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function CardBlock({ children, width = 'full' }: CardBlockProps) {
return (
<div
className={cn(
'text-sans-md border-default *:border-b-secondary flex flex-col rounded-lg border py-5 *:border-b last:*:border-0 last:*:pb-0',
'text-sans-md border-default *:border-b-secondary flex flex-col rounded-lg border py-5 *:border-b *:last:border-0 *:last:pb-0',
widthClass[width]
)}
>
Expand Down
Loading