diff --git a/app/components/MoreActionsMenu.tsx b/app/components/MoreActionsMenu.tsx index a2e72179b..5bf0c0999 100644 --- a/app/components/MoreActionsMenu.tsx +++ b/app/components/MoreActionsMenu.tsx @@ -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 ( - +
diff --git a/app/components/oxql-metrics/OxqlMetric.tsx b/app/components/oxql-metrics/OxqlMetric.tsx index db8c09799..5eba37cfb 100644 --- a/app/components/oxql-metrics/OxqlMetric.tsx +++ b/app/components/oxql-metrics/OxqlMetric.tsx @@ -89,7 +89,7 @@ export function OxqlMetric({ title, description, unit, ...queryObj }: OxqlMetric return ( - + About this metric diff --git a/app/pages/system/UpdatePage.tsx b/app/pages/system/UpdatePage.tsx index 695038b55..42a7a0885 100644 --- a/app/pages/system/UpdatePage.tsx +++ b/app/pages/system/UpdatePage.tsx @@ -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' @@ -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' @@ -106,7 +108,7 @@ export default function UpdatePage() { />
- + {/* targetRelease will never be null on a customer system after the first time it is set. */} @@ -132,7 +134,7 @@ export default function UpdatePage() { {componentProgress ? ( <>
{componentProgress.percentage}%
-
+
({componentProgress.current} of {componentProgress.total})
@@ -166,6 +168,8 @@ export default function UpdatePage() { + + @@ -175,50 +179,60 @@ export default function UpdatePage() { return (
  • - -
    -
    - - {repo.systemVersion} - - {isTarget && Target} + +
    +
    +
    + + {repo.systemVersion} + + {isTarget && Target} +
    -
    {repo.fileName}
    -
    -
    -
    - - +
    +
    + + +
    +
    +
    {repo.fileName}
    + +
    - - { - confirmAction({ - actionType: 'primary', - doAction: () => - setTargetRelease({ - body: { systemVersion: repo.systemVersion }, - }), - modalTitle: 'Confirm set target release', - modalContent: ( -

    - Are you sure you want to set {repo.systemVersion} as - the target release? -

    - ), - 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'} - /> -
    +
    + + { + confirmAction({ + actionType: 'primary', + doAction: () => + setTargetRelease({ + body: { systemVersion: repo.systemVersion }, + }), + modalTitle: 'Confirm set target release', + modalContent: ( +

    + Are you sure you want to set {repo.systemVersion}{' '} + as the target release? +

    + ), + 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'} + /> +
    +
  • ) })} diff --git a/app/ui/lib/CardBlock.tsx b/app/ui/lib/CardBlock.tsx index bf584ee54..5fd890636 100644 --- a/app/ui/lib/CardBlock.tsx +++ b/app/ui/lib/CardBlock.tsx @@ -28,7 +28,7 @@ export function CardBlock({ children, width = 'full' }: CardBlockProps) { return (