Skip to content

Commit 4c00bc2

Browse files
authored
Merge branch 'main' into cal/dev-276
2 parents 7746188 + 0b8762c commit 4c00bc2

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
<span class="version-info">
174174
for
175175
<Categories
176-
:categories="loaderCategories"
176+
:categories="getLoaderCategories(notif.extra_data.version)"
177177
:type="notif.extra_data.project.project_type"
178178
class="categories"
179179
/>
@@ -391,12 +391,6 @@ const user = computed(() => props.notification.extra_data.user)
391391
const organization = computed(() => props.notification.extra_data.organization)
392392
const invitedBy = computed(() => props.notification.extra_data.invited_by)
393393
394-
const loaderCategories = computed(() => {
395-
return tags.value.loaders.filter((loader) => {
396-
return version.value?.loaders?.includes(loader.name)
397-
})
398-
})
399-
400394
const threadLink = computed(() => {
401395
if (report.value) {
402396
return `/dashboard/report/${report.value.id}`
@@ -462,6 +456,12 @@ function getMessages() {
462456
}
463457
return messages
464458
}
459+
460+
function getLoaderCategories(ver) {
461+
return tags.value.loaders.filter((loader) => {
462+
return ver?.loaders?.includes(loader.name)
463+
})
464+
}
465465
</script>
466466
467467
<style lang="scss" scoped>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,6 +1664,12 @@ if (!route.name.startsWith('type-id-settings')) {
16641664
const onUserCollectProject = useClientTry(userCollectProject)
16651665
16661666
const { version, loader } = route.query
1667+
if (
1668+
project.value.game_versions.length > 0 &&
1669+
project.value.game_versions.every((v) => v.includes('w') || v.includes('-'))
1670+
) {
1671+
showAllVersions.value = true
1672+
}
16671673
if (version !== undefined && project.value.game_versions.includes(version)) {
16681674
userSelectedGameVersion.value = version
16691675
}

0 commit comments

Comments
 (0)