fix some issues with latest PRs (#5242)

apps/frontend/src/components/ui/NotificationItem.vue

@@ -458,9 +458,11 @@ function getMessages() {
 }
 
 function getLoaderCategories(ver) {
-	return tags.value.loaders.filter((loader) => {
+	return tags.value.loaders
-		return ver?.loaders?.includes(loader.name)
+		.filter((loader) => {
-	})
+			return ver?.loaders?.includes(loader.name)
+		})
+		.map((loader) => loader.name)
 }
 </script>
 

apps/frontend/src/pages/[type]/[id].vue

@@ -225,7 +225,7 @@
 													? formatMessage(messages.gameVersionUnsupportedTooltip, {
 															title: project.title,
 															gameVersion: gameVersion,
-															platform: formatCategory(currentPlatform),
+															platform: currentPlatformText,
 														})
 													: null
 											"
@@ -277,7 +277,7 @@
 									{{
 										currentPlatform
 											? formatMessage(messages.platformLabel, {
-													platform: formatCategory(currentPlatform),
+													platform: currentPlatformText,
 												})
 											: formatMessage(messages.platformError)
 									}}
@@ -285,7 +285,7 @@
 										v-tooltip="
 											formatMessage(messages.platformTooltip, {
 												title: project.title,
-												platform: formatCategory(currentPlatform),
+												platform: currentPlatformText,
 											})
 										"
 										class="ml-auto size-5"
@@ -309,7 +309,7 @@
 									{{
 										currentPlatform
 											? formatMessage(messages.platformLabel, {
-													platform: formatCategory(currentPlatform),
+													platform: currentPlatformText,
 												})
 											: formatMessage(messages.selectPlatform)
 									}}
@@ -325,7 +325,7 @@
 												!possiblePlatforms.includes(platform)
 													? formatMessage(messages.platformUnsupportedTooltip, {
 															title: project.title,
-															platform: formatCategory(platform),
+															platform: currentPlatformText,
 															gameVersion: currentGameVersion,
 														})
 													: null
@@ -357,7 +357,7 @@
 												}
 											"
 										>
-											{{ formatCategory(platform) }}
+											{{ formatMessage(getTagMessage(platform, 'loader')) }}
 											<CheckIcon v-if="userSelectedPlatform === platform" />
 										</button>
 									</ButtonStyled>
@@ -395,7 +395,7 @@
 								{{
 									formatMessage(messages.noVersionsAvailable, {
 										gameVersion: currentGameVersion,
-										platform: formatCategory(currentPlatform),
+										platform: currentPlatformText,
 									})
 								}}
 							</p>
@@ -956,6 +956,7 @@ import {
 	Checkbox,
 	commonMessages,
 	defineMessages,
+	getTagMessage,
 	injectModrinthClient,
 	injectNotificationManager,
 	IntlFormatted,
@@ -1061,6 +1062,10 @@ const currentPlatform = computed(() => {
 	)
 })
 
+const currentPlatformText = computed(() =>
+	formatMessage(getTagMessage(currentPlatform.value, 'loader')),
+)
+
 const releaseVersions = computed(() => {
 	const set = new Set()
 	for (const gv of tags.value.gameVersions || []) {

apps/frontend/src/pages/collection/[id].vue

@@ -213,7 +213,10 @@
 			</div>
 		</template>
 		<template #sidebar>
-			<SidebarCard v-if="collection.description" :title="formatMessage(messages.descriptionLabel)">
+			<SidebarCard
+				v-if="collection.description"
+				:title="formatMessage(commonMessages.descriptionLabel)"
+			>
 				<p class="m-0">{{ collection.description }}</p>
 			</SidebarCard>
 			<SidebarCard

packages/assets/generated-icons.ts

@@ -3,6 +3,8 @@
 
 import type { FunctionalComponent, SVGAttributes } from 'vue'
 
+export type IconComponent = FunctionalComponent<SVGAttributes>
+
 import _AffiliateIcon from './icons/affiliate.svg?component'
 import _AlignLeftIcon from './icons/align-left.svg?component'
 import _ArchiveIcon from './icons/archive.svg?component'
@@ -325,8 +327,6 @@ import _XCircleIcon from './icons/x-circle.svg?component'
 import _ZoomInIcon from './icons/zoom-in.svg?component'
 import _ZoomOutIcon from './icons/zoom-out.svg?component'
 
-export type IconComponent = FunctionalComponent<SVGAttributes>
-
 export const AffiliateIcon = _AffiliateIcon
 export const AlignLeftIcon = _AlignLeftIcon
 export const ArchiveIcon = _ArchiveIcon

packages/assets/index.ts

@@ -129,14 +129,23 @@ export { default as SlimPlayerModel } from './models/slim-player.gltf?url'
 export const EmptyIllustration = _EmptyIllustration
 
 export function getCategoryIcon(categoryName: string): IconComponent | undefined {
+	if (!categoryName) {
+		return undefined
+	}
 	return categoryIconMap[categoryName.toLowerCase()]
 }
 
 export function getLoaderIcon(loaderName: string): IconComponent | undefined {
+	if (!loaderName) {
+		return undefined
+	}
 	return loaderIconMap[loaderName.toLowerCase()]
 }
 
 // will try loader first, then category
 export function getTagIcon(tagName: string): IconComponent | undefined {
+	if (!tagName) {
+		return undefined
+	}
 	return getLoaderIcon(tagName) ?? getCategoryIcon(tagName)
 }