Skip to content

Commit 81f19ee

Browse files
authored
fix: various content tab hosting bugs (#5662)
* fix: qa * fix: lint
1 parent 4b4282c commit 81f19ee

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,19 +398,25 @@ provideInstallationSettings({
398398
const currentPlatform = server.value?.loader?.toLowerCase() ?? 'vanilla'
399399
const platformChanged = platform !== currentPlatform
400400
401+
let resolvedLoaderVersion = loaderVersionId
402+
if (!resolvedLoaderVersion && platform !== 'vanilla') {
403+
const versions = getLoaderVersionsForGameVersion(platform, gameVersion)
404+
resolvedLoaderVersion = versions[0]?.id ?? null
405+
}
406+
401407
debug('save: emitting reinstall before API call')
402408
emit(
403409
'reinstall',
404410
platformChanged
405-
? { loader: platform, lVersion: loaderVersionId, mVersion: gameVersion }
411+
? { loader: platform, lVersion: resolvedLoaderVersion, mVersion: gameVersion }
406412
: { mVersion: gameVersion },
407413
)
408414
try {
409415
if (platformChanged) {
410416
const request: Archon.Content.v1.InstallWorldContent = {
411417
content_variant: 'bare',
412418
loader: toApiLoader(platform),
413-
version: loaderVersionId ?? '',
419+
version: resolvedLoaderVersion ?? '',
414420
game_version: gameVersion || undefined,
415421
soft_override: true,
416422
}

packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ const deleteHovered = ref(false)
212212
>
213213
<span ref="versionNumberRef" class="truncate">{{
214214
version.version_number.slice(0, Math.ceil(version.version_number.length / 2))
215-
}}</span>
216-
<span class="shrink-0">{{
215+
}}</span
216+
><span class="shrink-0">{{
217217
version.version_number.slice(Math.ceil(version.version_number.length / 2))
218218
}}</span>
219219
</AutoLink>
@@ -223,8 +223,8 @@ const deleteHovered = ref(false)
223223
>
224224
<span ref="fileNameRef" class="truncate">{{
225225
version.file_name.slice(0, Math.ceil(version.file_name.length / 2))
226-
}}</span>
227-
<span class="shrink-0">{{
226+
}}</span
227+
><span class="shrink-0">{{
228228
version.file_name.slice(Math.ceil(version.file_name.length / 2))
229229
}}</span>
230230
</span>

packages/ui/src/layouts/wrapped/hosting/manage/content.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ const contentQuery = useQuery({
115115
queryFn: () =>
116116
client.archon.content_v1.getAddons(serverId, worldId.value!, { from_modpack: false }),
117117
enabled: computed(() => worldId.value !== null),
118+
staleTime: 0,
118119
})
119120
120121
const modpackProjectId = computed(() => contentQuery.data.value?.modpack?.spec.project_id ?? null)
@@ -483,7 +484,7 @@ function addonToContentItem(addon: Archon.Content.v1.Addon): ContentItem {
483484
link: `/${addon.owner.type}/${addon.owner.id}`,
484485
}
485486
: undefined,
486-
id: addon.id,
487+
id: addon.id ?? addon.filename,
487488
enabled: !addon.disabled,
488489
file_name: addon.filename,
489490
project_type: addon.kind,

0 commit comments

Comments
 (0)