From 56eeb242dedb24ad222d4dd5724fa59303c71058 Mon Sep 17 00:00:00 2001 From: "Calum H." Date: Wed, 22 Jul 2026 11:45:02 +0100 Subject: [PATCH] fix: page header merge conflict (#6816) --- .../src/layouts/shared/browse-tab/header.vue | 74 +++++++++++-------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/packages/ui/src/layouts/shared/browse-tab/header.vue b/packages/ui/src/layouts/shared/browse-tab/header.vue index 1ee98cea5c..cda1745fb1 100644 --- a/packages/ui/src/layouts/shared/browse-tab/header.vue +++ b/packages/ui/src/layouts/shared/browse-tab/header.vue @@ -4,7 +4,12 @@ import type { Component } from 'vue' import { computed, ref } from 'vue' import { useRouter } from 'vue-router' +import Admonition from '#ui/components/base/Admonition.vue' +import Avatar from '#ui/components/base/Avatar.vue' +import ButtonStyled from '#ui/components/base/ButtonStyled.vue' import PageHeader from '#ui/components/base/page-header/index.vue' +import PageHeaderMetadata from '#ui/components/base/page-header/metadata/index.vue' +import PageHeaderMetadataItem from '#ui/components/base/page-header/metadata/page-header-metadata-item.vue' import LoaderIcon from '#ui/components/servers/icons/LoaderIcon.vue' import { useServerImage } from '#ui/composables/use-server-image' import { formatLoaderLabel } from '#ui/utils/loaders' @@ -46,34 +51,6 @@ const iconSrc = computed(() => { return fetchedIcon.value ?? installContext.value?.iconSrc ?? null }) -const leadingItems = computed(() => { - const context = installContext.value - if (!context) return [] - - return [ - { - id: 'back', - type: 'button' as const, - icon: LeftArrowIcon, - ariaLabel: context.backLabel, - tooltip: context.backLabel, - onClick: handleBack, - }, - ...(iconSrc.value - ? [ - { - id: 'icon', - type: 'avatar' as const, - src: iconSrc.value, - alt: context.name, - avatarSize: '48px', - class: 'shrink-0', - }, - ] - : []), - ] -}) - const metadataItems = computed(() => { const context = installContext.value if (!context) return [] @@ -162,13 +139,48 @@ async function handleSelectedProjectsLeaveResult( /> + > + + + + + + {{ installContext.warning }} +