fix: preserve hosting header updates after merge

This commit is contained in:
Calum H. (IMB11)
2026-08-03 18:41:57 +01:00
parent 32517df4a4
commit 4129be1831
@@ -427,10 +427,12 @@ import {
TransferIcon, TransferIcon,
TriangleAlertIcon, TriangleAlertIcon,
UsersIcon, UsersIcon,
XIcon,
} from '@modrinth/assets' } from '@modrinth/assets'
import { useQuery, useQueryClient } from '@tanstack/vue-query' import { useQuery, useQueryClient } from '@tanstack/vue-query'
import { useStorage, useTimeoutFn } from '@vueuse/core' import { useStorage, useTimeoutFn } from '@vueuse/core'
import DOMPurify from 'dompurify' import DOMPurify from 'dompurify'
import { Tooltip } from 'floating-vue'
import { computed, nextTick, onBeforeUnmount, onMounted, onUnmounted, ref, watch } from 'vue' import { computed, nextTick, onBeforeUnmount, onMounted, onUnmounted, ref, watch } from 'vue'
import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router' import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router'
@@ -450,8 +452,8 @@ import ServerPanelAdmonitions from '#ui/components/servers/admonitions/ServerPan
import LoaderIcon from '#ui/components/servers/icons/LoaderIcon.vue' import LoaderIcon from '#ui/components/servers/icons/LoaderIcon.vue'
import ServerIcon from '#ui/components/servers/icons/ServerIcon.vue' import ServerIcon from '#ui/components/servers/icons/ServerIcon.vue'
import MedalServerCountdown from '#ui/components/servers/marketing/MedalServerCountdown.vue' import MedalServerCountdown from '#ui/components/servers/marketing/MedalServerCountdown.vue'
import ServerInstanceSettingsModal from '#ui/components/servers/ServerInstanceSettingsModal.vue'
import { PanelServerActionButton } from '#ui/components/servers/server-header' import { PanelServerActionButton } from '#ui/components/servers/server-header'
import ServerInstanceSettingsModal from '#ui/components/servers/ServerInstanceSettingsModal.vue'
import ServerSettingsModal from '#ui/components/servers/ServerSettingsModal.vue' import ServerSettingsModal from '#ui/components/servers/ServerSettingsModal.vue'
import { import {
hasServerPermission, hasServerPermission,
@@ -507,6 +509,7 @@ const props = withDefaults(
serverId: string serverId: string
reloadPage: () => void reloadPage: () => void
resolveViewer: () => Promise<{ userId: string | null; userRole: string | null }> resolveViewer: () => Promise<{ userId: string | null; userRole: string | null }>
showCopyIdAction?: boolean
showAdvancedDebugInfo?: boolean showAdvancedDebugInfo?: boolean
showUptime?: boolean showUptime?: boolean
additionalTabs?: Tab[] additionalTabs?: Tab[]
@@ -530,6 +533,7 @@ const props = withDefaults(
layoutMode?: 'page' | 'contained' layoutMode?: 'page' | 'contained'
}>(), }>(),
{ {
showCopyIdAction: false,
showAdvancedDebugInfo: false, showAdvancedDebugInfo: false,
showUptime: true, showUptime: true,
additionalTabs: () => [], additionalTabs: () => [],
@@ -559,6 +563,21 @@ const leaveMessages = defineMessages({
}, },
}) })
const settingsHintMessages = defineMessages({
title: {
id: 'servers.manage.settings-hint.title',
defaultMessage: 'Your server settings have moved',
},
description: {
id: 'servers.manage.settings-hint.description',
defaultMessage: 'They can now be found here!',
},
dismiss: {
id: 'servers.manage.settings-hint.dismiss',
defaultMessage: "Don't show again",
},
})
const instancesHintMessages = defineMessages({ const instancesHintMessages = defineMessages({
title: { title: {
id: 'servers.manage.instances-hint.title', id: 'servers.manage.instances-hint.title',