From ad7a4d7d769f5b32a5266c0b2bc6f9f52dcc509e Mon Sep 17 00:00:00 2001 From: "Calum H. (IMB11)" Date: Wed, 10 Jun 2026 16:27:54 +0100 Subject: [PATCH] fix: qa + lint + i18n --- .../composables/use-server-install-content.ts | 4 +- .../servers/ServerSettingsModal.vue | 2 - .../admonitions/ServerPanelAdmonitions.vue | 68 +++++++- .../server-header/ServerManageHeader.vue | 15 +- .../components/ContentModpackCard.vue | 6 +- .../shared/server-settings/pages/advanced.vue | 158 ------------------ .../shared/server-settings/pages/index.ts | 1 - .../shared/server-settings/pages/network.vue | 142 +++++++++++++++- .../layouts/shared/server-settings/tabs.ts | 7 +- .../hosting/manage/[id]/instances/index.vue | 47 ------ packages/ui/src/locales/en-US/index.json | 3 - .../servers/ServerPanelAdmonitions.stories.ts | 30 +++- 12 files changed, 245 insertions(+), 238 deletions(-) delete mode 100644 packages/ui/src/layouts/shared/server-settings/pages/advanced.vue diff --git a/apps/frontend/src/composables/use-server-install-content.ts b/apps/frontend/src/composables/use-server-install-content.ts index 6bd11ac7da..0dff3a74b1 100644 --- a/apps/frontend/src/composables/use-server-install-content.ts +++ b/apps/frontend/src/composables/use-server-install-content.ts @@ -211,7 +211,9 @@ export function useServerInstallContent({ const { data: serverContentData, error: serverContentError } = useQuery({ queryKey: contentQueryKey, queryFn: () => - client.archon.content_v1.getAddons(currentServerId.value!, currentWorldId.value!), + client.archon.content_v1.getAddons(currentServerId.value!, currentWorldId.value!, { + from_modpack: false, + }), enabled: computed(() => !!currentServerId.value && !!currentWorldId.value), }) diff --git a/packages/ui/src/components/servers/ServerSettingsModal.vue b/packages/ui/src/components/servers/ServerSettingsModal.vue index 4d05adee1f..dba81b20b9 100644 --- a/packages/ui/src/components/servers/ServerSettingsModal.vue +++ b/packages/ui/src/components/servers/ServerSettingsModal.vue @@ -8,7 +8,6 @@ import type { TabbedModalTab } from '#ui/components' import { TabbedModal } from '#ui/components' import { defineMessage, defineMessages, useVIntl } from '#ui/composables/i18n' import { - ServerSettingsAdvancedPage, ServerSettingsGeneralPage, ServerSettingsNetworkPage, serverSettingsTabDefinitions, @@ -71,7 +70,6 @@ useQuery({ const serverSettingsTabComponentMap = { general: ServerSettingsGeneralPage, network: ServerSettingsNetworkPage, - advanced: ServerSettingsAdvancedPage, } as const provideServerSettings({ diff --git a/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue b/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue index de7e6c210d..7bdcbe425b 100644 --- a/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue +++ b/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue @@ -1,5 +1,5 @@ -
-
-
-
-
- SFTP - - - - Launch SFTP - - -
- -
- Server Address -
- - {{ server?.sftp_host }} - -
- -
-
-
-
- Username -
-
- {{ server?.sftp_username }} -
-
- -
-
-
-
- Password -
-
-
-
- {{ - showPassword - ? server?.sftp_password - : '*'.repeat(server?.sftp_password?.length ?? 0) - }} -
- -
- - - - -
-
-
-
-
-
-
-
-
- - - - - diff --git a/packages/ui/src/layouts/shared/server-settings/pages/index.ts b/packages/ui/src/layouts/shared/server-settings/pages/index.ts index 6e79b6f819..2ae6b3645b 100644 --- a/packages/ui/src/layouts/shared/server-settings/pages/index.ts +++ b/packages/ui/src/layouts/shared/server-settings/pages/index.ts @@ -1,4 +1,3 @@ -export { default as ServerSettingsAdvancedPage } from './advanced.vue' export { default as ServerSettingsGeneralPage } from './general.vue' export { default as ServerSettingsInstallationPage } from './installation.vue' export { default as ServerInstanceSettingsAdvancedPage } from './instance-advanced.vue' diff --git a/packages/ui/src/layouts/shared/server-settings/pages/network.vue b/packages/ui/src/layouts/shared/server-settings/pages/network.vue index dd8091b289..9fb0f13087 100644 --- a/packages/ui/src/layouts/shared/server-settings/pages/network.vue +++ b/packages/ui/src/layouts/shared/server-settings/pages/network.vue @@ -204,6 +204,103 @@ Set up your personal domain to connect to your server via custom DNS records. + +
+
+ SFTP + + + + Launch SFTP + + +
+ +
+ Server Address +
+ + {{ server?.sftp_host }} + +
+ +
+
+
+
+ Username +
+
+ {{ server?.sftp_username }} +
+
+ +
+
+
+
+ Password +
+
+
+
+ {{ + showPassword + ? server?.sftp_password + : '*'.repeat(server?.sftp_password?.length ?? 0) + }} +
+ +
+ + + + +
+
+
+
+
+
@@ -213,6 +310,9 @@ + + diff --git a/packages/ui/src/layouts/shared/server-settings/tabs.ts b/packages/ui/src/layouts/shared/server-settings/tabs.ts index 5b76899f28..02400792e4 100644 --- a/packages/ui/src/layouts/shared/server-settings/tabs.ts +++ b/packages/ui/src/layouts/shared/server-settings/tabs.ts @@ -10,7 +10,7 @@ import { } from '@modrinth/assets' import type { Component } from 'vue' -export type ServerSettingsTabId = 'general' | 'network' | 'advanced' | 'billing' | 'admin-billing' +export type ServerSettingsTabId = 'general' | 'network' | 'billing' | 'admin-billing' export type ServerInstanceSettingsTabId = 'general' | 'installation' | 'properties' | 'advanced' @@ -51,11 +51,6 @@ export const serverSettingsTabDefinitions: ServerSettingsTabDefinition[] = [ label: 'Network', icon: VersionIcon, }, - { - id: 'advanced', - label: 'Advanced', - icon: TextQuoteIcon, - }, { id: 'billing', label: 'Billing', diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/instances/index.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/instances/index.vue index 28a63e8751..7a431c7657 100644 --- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/instances/index.vue +++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/instances/index.vue @@ -1,30 +1,5 @@