Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions apps/frontend/src/pages/[type]/[project].vue
Original file line number Diff line number Diff line change
Expand Up @@ -1874,12 +1874,18 @@ const isSettings = computed(() => route.name.startsWith('type-project-settings')

// Transform versionsV3 to be same shape as versionsV2 for compatibility in project pages
const versionsRaw = computed(() => {
return (versionsV3.value ?? []).map((v) => {
const isModpack = v.project_types?.includes('modpack')
return (versionsV3.value ?? []).map((version) => {
const files = Array.isArray(version.files) ? version.files : []
const gameVersions = Array.isArray(version.game_versions) ? version.game_versions : []
const loaders = Array.isArray(version.loaders) ? version.loaders : []
const isModpack = version.project_types?.includes('modpack')
const mrpackLoaders = Array.isArray(version.mrpack_loaders) ? version.mrpack_loaders : []

return {
...v,
loaders: isModpack && v.mrpack_loaders ? v.mrpack_loaders : v.loaders,
...version,
files,
game_versions: gameVersions,
loaders: isModpack && mrpackLoaders.length ? mrpackLoaders : loaders,
}
})
})
Expand Down
23 changes: 17 additions & 6 deletions apps/frontend/src/pages/[type]/[project]/changelog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
{{ formatDate(version.date_published) }}</span
>
</div>
<ButtonStyled color="brand" type="transparent">
<ButtonStyled v-if="getPrimaryFile(version)" color="brand" type="transparent">
<a
class="ml-auto"
:href="createDownloadUrl(version)"
:download="getPrimaryFile(version).filename"
:download="getPrimaryFile(version)?.filename"
:title="`Download ${version.name}`"
>
<DownloadIcon aria-hidden="true" />
Expand Down Expand Up @@ -145,10 +145,10 @@ const filteredVersions = computed(() => {
(projectVersion) =>
(selectedGameVersions.length === 0 ||
selectedGameVersions.some((gameVersion) =>
projectVersion.game_versions.includes(gameVersion),
getVersionGameVersions(projectVersion).includes(gameVersion),
)) &&
(selectedLoaders.length === 0 ||
selectedLoaders.some((loader) => projectVersion.loaders.includes(loader))) &&
selectedLoaders.some((loader) => getVersionLoaders(projectVersion).includes(loader))) &&
(selectedVersionTypes.length === 0 ||
selectedVersionTypes.includes(projectVersion.version_type)),
)
Expand Down Expand Up @@ -233,14 +233,25 @@ watch(
)

function getPrimaryFile(version) {
return version.files.find((x) => x.primary) || version.files[0]
return version.files?.find((x) => x.primary) || version.files?.[0]
}

function createDownloadUrl(version) {
return createProjectDownloadUrl(getPrimaryFile(version).url, {
const file = getPrimaryFile(version)
if (!file?.url) return undefined

return createProjectDownloadUrl(file.url, {
reason: cdnDownloadReason.value,
})
}

function getVersionGameVersions(version) {
return Array.isArray(version.game_versions) ? version.game_versions : []
}

function getVersionLoaders(version) {
return Array.isArray(version.loaders) ? version.loaders : []
}
</script>

<style lang="scss">
Expand Down
10 changes: 7 additions & 3 deletions apps/frontend/src/pages/[type]/[project]/settings/versions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,11 @@
color: 'primary',
hoverFilled: true,
link: createDownloadUrl(version),
download: getPrimaryFile(version).filename,
download: getPrimaryFile(version)?.filename,
action: () => {
emit('onDownload')
},
shown: !!getPrimaryFile(version),
},
{
id: 'new-tab',
Expand Down Expand Up @@ -402,7 +403,7 @@ const emit = defineEmits(['onDownload'])
const baseDropdownId = useId()

function getPrimaryFile(version: Labrinth.Versions.v3.Version) {
return version.files.find((x) => x.primary) || version.files[0]
return version.files?.find((x) => x.primary) || version.files?.[0]
}

watch(
Expand All @@ -417,7 +418,10 @@ watch(
)

function createDownloadUrl(version: Labrinth.Versions.v3.Version) {
return createProjectDownloadUrl(getPrimaryFile(version).url, {
const file = getPrimaryFile(version)
if (!file?.url) return undefined

return createProjectDownloadUrl(file.url, {
reason: cdnDownloadReason.value,
})
}
Expand Down
14 changes: 9 additions & 5 deletions apps/frontend/src/pages/[type]/[project]/versions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
:open-modal="currentMember ? () => handleOpenCreateVersionModal() : undefined"
>
<template #actions="{ version }">
<ButtonStyled circular type="transparent">
<ButtonStyled v-if="getPrimaryFile(version)" circular type="transparent">
<a
v-tooltip="`Download`"
:href="createDownloadUrl(version)"
:download="getPrimaryFile(version).filename"
:download="getPrimaryFile(version)?.filename"
class="hover:!bg-button-bg [&>svg]:!text-green"
aria-label="Download"
@click="emit('onDownload')"
Expand Down Expand Up @@ -102,10 +102,11 @@
color: 'primary',
hoverFilled: true,
link: createDownloadUrl(version),
download: getPrimaryFile(version).filename,
download: getPrimaryFile(version)?.filename,
action: () => {
emit('onDownload')
},
shown: !!getPrimaryFile(version),
},
{
id: 'new-tab',
Expand Down Expand Up @@ -318,7 +319,7 @@ const emit = defineEmits(['onDownload', 'deleteVersion'])
const baseDropdownId = useId()

function getPrimaryFile(version) {
return version.files.find((x) => x.primary) || version.files[0]
return version.files?.find((x) => x.primary) || version.files?.[0]
}

watch(
Expand All @@ -333,7 +334,10 @@ watch(
)

function createDownloadUrl(version) {
return createProjectDownloadUrl(getPrimaryFile(version).url, {
const file = getPrimaryFile(version)
if (!file?.url) return undefined

return createProjectDownloadUrl(file.url, {
reason: cdnDownloadReason.value,
})
}
Expand Down
1 change: 0 additions & 1 deletion packages/ui/src/components/base/Pagination.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ const props = withDefaults(
{
page: 1,
count: 1,
linkFunction: (page: number) => void page,
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removing since its a no-op and not needed

},
)
Expand Down
17 changes: 13 additions & 4 deletions packages/ui/src/components/project/ProjectPageVersions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -327,15 +327,22 @@ const props = withDefaults(
)

function getModpackLoaders(version: VersionWithDisplayUrlEnding): string[] {
const loaders = Array.isArray(version.loaders) ? version.loaders : []

if (props.project.project_type !== 'modpack') {
return version.loaders
return loaders
}

if (version.mrpack_loaders?.length) {
return version.mrpack_loaders
const mrpackLoaders = Array.isArray(version.mrpack_loaders) ? version.mrpack_loaders : []
if (mrpackLoaders.length) {
return mrpackLoaders
}

return version.loaders.filter((loader) => loader !== 'mrpack')
return loaders.filter((loader) => loader !== 'mrpack')
}

function getGameVersions(version: VersionWithDisplayUrlEnding): string[] {
return Array.isArray(version.game_versions) ? version.game_versions : []
}

function hasNoModLoader(loaders: string[]): boolean {
Expand All @@ -350,10 +357,12 @@ function hasNoModLoader(loaders: string[]): boolean {
const normalizedVersions = computed<DisplayVersion[]>(() =>
props.versions.map((version) => {
const loaders = getModpackLoaders(version)
const gameVersions = getGameVersions(version)
const noModLoader = hasNoModLoader(loaders)

return {
...version,
game_versions: gameVersions,
loaders: noModLoader ? [] : loaders,
noModLoader,
}
Expand Down
10 changes: 5 additions & 5 deletions packages/ui/src/components/version/VersionFilterControl.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ const filterOptions = computed(() => {
platform: [],
}

const platformSet = new Set()
const gameVersionSet = new Set()
const channelSet = new Set()
const platformSet = new Set<Filter>()
const gameVersionSet = new Set<Filter>()
const channelSet = new Set<Filter>()

for (const version of props.versions) {
for (const loader of version.loaders) {
for (const loader of Array.isArray(version.loaders) ? version.loaders : []) {
platformSet.add(loader)
}
for (const gameVersion of version.game_versions) {
for (const gameVersion of Array.isArray(version.game_versions) ? version.game_versions : []) {
gameVersionSet.add(gameVersion)
}
channelSet.add(version.version_type)
Expand Down
Loading