From be618d96f42d630291b1f8fd038b36f3b0dfbcb9 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Sat, 2 May 2026 09:33:19 -0700
Subject: [PATCH] fix: 404 when returning to collections dashboard (#5963)

* fix 404 when returning to collections dashboard, fix a couple hydration
issues

* fix clippy

* fmt

* fix hydration issue on revenue page

* fix transfer history page error

---------

Co-authored-by: aecsocket <aecsocket@tutanota.com>
---
 apps/frontend/src/app.vue                     |  4 +-
 apps/frontend/src/pages/collection/[id].vue   | 10 +-
 .../src/pages/dashboard/revenue/index.vue     | 16 +++-
 .../src/pages/dashboard/revenue/transfers.vue | 94 +++++++++----------
 .../app-lib/src/api/pack/install_mrpack.rs    |  3 +-
 packages/app-lib/src/api/server_address.rs    |  4 +-
 packages/app-lib/src/api/worlds.rs            |  2 +-
 packages/app-lib/src/state/fs_watcher.rs      | 33 +++----
 .../app-lib/src/state/instances/content.rs    |  2 +-
 .../src/components/project/TagsOverflow.vue   |  5 +-
 10 files changed, 94 insertions(+), 79 deletions(-)

diff --git a/apps/frontend/src/app.vue b/apps/frontend/src/app.vue
index 396d7a035..9cdb763dc 100644
--- a/apps/frontend/src/app.vue
+++ b/apps/frontend/src/app.vue
@@ -1,7 +1,9 @@
 <template>
 	<NuxtLayout>
 		<NuxtRouteAnnouncer />
-		<LoadingBar />
+		<ClientOnly>
+			<LoadingBar />
+		</ClientOnly>
 		<NotificationPanel />
 		<I18nDebugPanel />
 		<NuxtPage />
diff --git a/apps/frontend/src/pages/collection/[id].vue b/apps/frontend/src/pages/collection/[id].vue
index b3e0f285f..5c8b8b2f8 100644
--- a/apps/frontend/src/pages/collection/[id].vue
+++ b/apps/frontend/src/pages/collection/[id].vue
@@ -186,7 +186,9 @@
 												getProjectTypeSentenceMessage(
 													projectTypes.length === 1 ? projectTypes[0] : 'project',
 												),
-												{ count: formatCompactNumberPlural(projects?.length || 0) },
+												{
+													count: formatCompactNumberPlural(projects?.length || 0),
+												},
 											),
 										}"
 									>
@@ -532,8 +534,8 @@ const returnLink = computed(() => {
 	return null
 })
 
-const isFollowingCollection = computed(() => route.params.id === 'following')
 const collectionId = computed(() => route.params.id)
+const isFollowingCollection = computed(() => collectionId.value === 'following')
 
 // Static collection for "following" page
 const followingCollection = computed(() =>
@@ -560,13 +562,13 @@ const {
 } = useQuery({
 	queryKey: computed(() => ['collection', collectionId.value]),
 	queryFn: () => api.labrinth.collections.get(collectionId.value),
-	enabled: computed(() => !isFollowingCollection.value),
+	enabled: computed(() => !!collectionId.value && !isFollowingCollection.value),
 })
 
 watch(
 	collectionError,
 	(error) => {
-		if (error && !isFollowingCollection.value) {
+		if (error && collectionId.value && !isFollowingCollection.value) {
 			const status = error.statusCode ?? error.status ?? 404
 			showError({
 				fatal: true,
diff --git a/apps/frontend/src/pages/dashboard/revenue/index.vue b/apps/frontend/src/pages/dashboard/revenue/index.vue
index bb5741b3a..18eeb4433 100644
--- a/apps/frontend/src/pages/dashboard/revenue/index.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/index.vue
@@ -70,7 +70,12 @@
 								date: date.date ? formatDate(date.date) : '',
 							})
 						}}
-						<Tooltip theme="dismissable-prompt" :triggers="['hover', 'focus']" no-auto-focus>
+						<Tooltip
+							theme="dismissable-prompt"
+							:triggers="['hover', 'focus']"
+							no-auto-focus
+							:aria-id="`${baseId}-date-segment-tooltip-${i}`"
+						>
 							<nuxt-link
 								class="inline-flex items-center justify-center text-link"
 								to="/legal/cmp-info#pending"
@@ -99,7 +104,12 @@
 							class="zone--striped-small zone--striped--gray my-auto block size-4 rounded-full bg-button-bg opacity-90 md:size-5"
 						></span>
 						{{ formatMessage(messages.processing) }}
-						<Tooltip theme="dismissable-prompt" :triggers="['hover', 'focus']" no-auto-focus>
+						<Tooltip
+							theme="dismissable-prompt"
+							:triggers="['hover', 'focus']"
+							no-auto-focus
+							:aria-id="`${baseId}-processing-tooltip`"
+						>
 							<InProgressIcon class="inline-block size-4 align-middle md:size-5" />
 							<template #popper>
 								<div class="w-[250px] font-semibold text-contrast">
@@ -292,6 +302,8 @@ type RevenueBarSegment = {
 
 const hoveredSeg = ref<string | null>(null)
 
+const baseId = useId()
+
 const withdrawModal = ref<InstanceType<typeof CreatorWithdrawModal>>()
 async function openWithdrawModal() {
 	withdrawModal.value?.show?.()
diff --git a/apps/frontend/src/pages/dashboard/revenue/transfers.vue b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
index d08407a49..2dadf9910 100644
--- a/apps/frontend/src/pages/dashboard/revenue/transfers.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
@@ -117,6 +117,53 @@ const formatMonth = useFormatDateTime({
 const client = injectModrinthClient()
 const generatedState = useGeneratedState()
 
+const messages = defineMessages({
+	transactionsHeader: {
+		id: 'dashboard.revenue.transactions.header',
+		defaultMessage: 'Transactions',
+	},
+	headTitle: {
+		id: 'dashboard.revenue.transactions.head-title',
+		defaultMessage: 'Transaction history',
+	},
+	received: {
+		id: 'dashboard.revenue.stats.received',
+		defaultMessage: 'Received',
+	},
+	withdrawn: {
+		id: 'dashboard.revenue.stats.withdrawn',
+		defaultMessage: 'Withdrawn',
+	},
+	transactions: {
+		id: 'dashboard.revenue.stats.transactions',
+		defaultMessage: 'Transactions',
+	},
+	noTransactions: {
+		id: 'dashboard.revenue.transactions.none',
+		defaultMessage: 'No transactions',
+	},
+	noTransactionsDesc: {
+		id: 'dashboard.revenue.transactions.none.desc',
+		defaultMessage: 'Your payouts and withdrawals will appear here.',
+	},
+	downloadCsv: {
+		id: 'dashboard.revenue.transactions.btn.download-csv',
+		defaultMessage: 'Download as CSV',
+	},
+	allYears: {
+		id: 'dashboard.revenue.transactions.year.all',
+		defaultMessage: 'All years',
+	},
+	thisMonth: {
+		id: 'dashboard.revenue.transactions.period.this-month',
+		defaultMessage: 'This month',
+	},
+	lastMonth: {
+		id: 'dashboard.revenue.transactions.period.last-month',
+		defaultMessage: 'Last month',
+	},
+})
+
 useHead({
 	title: () => `${formatMessage(messages.headTitle)} - Modrinth`,
 })
@@ -318,51 +365,4 @@ const downloadTransactionsCSV = () => {
 }
 
 const onDownloadCSV = useClientTry(async () => await downloadTransactionsCSV())
-
-const messages = defineMessages({
-	transactionsHeader: {
-		id: 'dashboard.revenue.transactions.header',
-		defaultMessage: 'Transactions',
-	},
-	headTitle: {
-		id: 'dashboard.revenue.transactions.head-title',
-		defaultMessage: 'Transaction history',
-	},
-	received: {
-		id: 'dashboard.revenue.stats.received',
-		defaultMessage: 'Received',
-	},
-	withdrawn: {
-		id: 'dashboard.revenue.stats.withdrawn',
-		defaultMessage: 'Withdrawn',
-	},
-	transactions: {
-		id: 'dashboard.revenue.stats.transactions',
-		defaultMessage: 'Transactions',
-	},
-	noTransactions: {
-		id: 'dashboard.revenue.transactions.none',
-		defaultMessage: 'No transactions',
-	},
-	noTransactionsDesc: {
-		id: 'dashboard.revenue.transactions.none.desc',
-		defaultMessage: 'Your payouts and withdrawals will appear here.',
-	},
-	downloadCsv: {
-		id: 'dashboard.revenue.transactions.btn.download-csv',
-		defaultMessage: 'Download as CSV',
-	},
-	allYears: {
-		id: 'dashboard.revenue.transactions.year.all',
-		defaultMessage: 'All years',
-	},
-	thisMonth: {
-		id: 'dashboard.revenue.transactions.period.this-month',
-		defaultMessage: 'This month',
-	},
-	lastMonth: {
-		id: 'dashboard.revenue.transactions.period.last-month',
-		defaultMessage: 'Last month',
-	},
-})
 </script>
diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs
index 2e4aeebb6..a00c45af7 100644
--- a/packages/app-lib/src/api/pack/install_mrpack.rs
+++ b/packages/app-lib/src/api/pack/install_mrpack.rs
@@ -228,8 +228,7 @@ pub async fn install_zipped_mrpack_files(
 
     let num_files = pack.files.len();
     loading_try_for_each_concurrent(
-        futures::stream::iter(pack.files.into_iter())
-            .map(Ok::<PackFile, crate::Error>),
+        futures::stream::iter(pack.files).map(Ok::<PackFile, crate::Error>),
         None,
         Some(&loading_bar),
         70.0,
diff --git a/packages/app-lib/src/api/server_address.rs b/packages/app-lib/src/api/server_address.rs
index e41a041df..12f88f278 100644
--- a/packages/app-lib/src/api/server_address.rs
+++ b/packages/app-lib/src/api/server_address.rs
@@ -150,8 +150,8 @@ pub async fn resolve_server_address(
         match resolver.srv_lookup(format!("_minecraft._tcp.{host}")).await {
             Err(e)
                 if e.proto()
-                    .filter(|x| x.kind().is_no_records_found())
-                    .is_some() =>
+                    .as_ref()
+                    .is_some_and(|x| x.kind().is_no_records_found()) =>
             {
                 None
             }
diff --git a/packages/app-lib/src/api/worlds.rs b/packages/app-lib/src/api/worlds.rs
index 33cba6ef5..380142464 100644
--- a/packages/app-lib/src/api/worlds.rs
+++ b/packages/app-lib/src/api/worlds.rs
@@ -791,7 +791,7 @@ pub async fn remove_server_from_profile(
     index: usize,
 ) -> Result<()> {
     let mut servers = servers_data::read(profile_path).await?;
-    if servers.get(index).filter(|x| !x.hidden).is_none() {
+    if servers.get(index).as_ref().is_none_or(|x| x.hidden) {
         return Err(ErrorKind::InputError(format!(
             "No removable server at index {index}"
         ))
diff --git a/packages/app-lib/src/state/fs_watcher.rs b/packages/app-lib/src/state/fs_watcher.rs
index 833f60178..75644ad07 100644
--- a/packages/app-lib/src/state/fs_watcher.rs
+++ b/packages/app-lib/src/state/fs_watcher.rs
@@ -59,31 +59,28 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                                 .nth(1)
                                 .map(|x| x.as_os_str());
                             if first_file_name
-                                .filter(|x| *x == "crash-reports")
-                                .is_some()
+                                .as_ref()
+                                .is_some_and(|x| *x == "crash-reports")
                                 && e.path
                                     .extension()
-                                    .filter(|x| *x == "txt")
-                                    .is_some()
+                                    .as_ref()
+                                    .is_some_and(|x| *x == "txt")
                             {
                                 crash_task(profile_path_str);
                             } else if !visited_profiles.contains(&profile_path)
                             {
                                 let event = if first_file_name
-                                    .filter(|x| *x == "servers.dat")
-                                    .is_some()
+                                    .as_ref()
+                                    .is_some_and(|x| *x == "servers.dat")
                                 {
                                     Some(ProfilePayloadType::ServersUpdated)
-                                } else if first_file_name
-                                    .filter(|x| {
-                                        *x == "saves"
-                                            && e.path
-                                                .file_name()
-                                                .filter(|x| *x == "level.dat")
-                                                .is_some()
-                                    })
-                                    .is_some()
-                                {
+                                } else if first_file_name.as_ref().is_some_and(|x| {
+                                    *x == "saves"
+                                        && e.path
+                                            .file_name()
+                                            .as_ref()
+                                            .is_some_and(|x| *x == "level.dat")
+                                }) {
                                     tracing::info!(
                                         "World updated: {}",
                                         e.path.display()
@@ -113,8 +110,8 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                                     }
                                     Some(ProfilePayloadType::WorldUpdated { world })
                                 } else if first_file_name
-                                    .filter(|x| *x == "saves")
-                                    .is_none()
+                                    .as_ref()
+                                    .is_none_or(|x| *x != "saves")
                                 {
                                     Some(ProfilePayloadType::Synced)
                                 } else {
diff --git a/packages/app-lib/src/state/instances/content.rs b/packages/app-lib/src/state/instances/content.rs
index e315184b1..e7c32e4e6 100644
--- a/packages/app-lib/src/state/instances/content.rs
+++ b/packages/app-lib/src/state/instances/content.rs
@@ -283,7 +283,7 @@ fn check_modpack_update(
         .collect();
 
     // Sort by date_published descending (newest first)
-    compatible_versions.sort_by(|a, b| b.date_published.cmp(&a.date_published));
+    compatible_versions.sort_by_key(|b| std::cmp::Reverse(b.date_published));
 
     // Find the newest compatible version
     if let Some(newest) = compatible_versions.first() {
diff --git a/packages/ui/src/components/project/TagsOverflow.vue b/packages/ui/src/components/project/TagsOverflow.vue
index 28d6103d1..c9de5d763 100644
--- a/packages/ui/src/components/project/TagsOverflow.vue
+++ b/packages/ui/src/components/project/TagsOverflow.vue
@@ -1,8 +1,11 @@
 <script setup lang="ts">
 import { Menu } from 'floating-vue'
+import { useId } from 'vue'
 
 import { TagItem, TagTagItem } from '../base'
 
+const id = useId()
+
 defineProps<{
 	tags: string[]
 }>()
@@ -13,7 +16,7 @@ defineOptions({
 </script>
 
 <template>
-	<Menu :delay="{ hide: 50, show: 0 }" no-auto-focus>
+	<Menu :delay="{ hide: 50, show: 0 }" no-auto-focus :aria-id="id">
 		<TagItem v-if="tags.length > 0" v-bind="$attrs" tabindex="0"> +{{ tags.length }} </TagItem>
 		<template #popper>
 			<div class="flex gap-1 flex-wrap max-w-[20rem]">