From 622a99631bd51872774d67cddca1a52754717592 Mon Sep 17 00:00:00 2001
From: Ray <154766448+damontecres@users.noreply.github.com>
Date: Mon, 29 Dec 2025 15:35:42 -0500
Subject: [PATCH] Fix movie page library & collection tabs not updating (#594)

## Description
Ensures the tabs on movie page use separate view models so the data
isn't shared between them.

### Related issues
Fixes #591
---
 .../wholphin/ui/components/CollectionFolderGrid.kt           | 5 ++++-
 .../damontecres/wholphin/ui/detail/CollectionFolderMovie.kt  | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/components/CollectionFolderGrid.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/components/CollectionFolderGrid.kt
index a2e99ffe..eef5c9ae 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/components/CollectionFolderGrid.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/components/CollectionFolderGrid.kt
@@ -518,6 +518,7 @@ fun CollectionFolderGrid(
     playEnabled: Boolean,
     defaultViewOptions: ViewOptions,
     modifier: Modifier = Modifier,
+    viewModelKey: String? = itemId.toServerString(),
     initialSortAndDirection: SortAndDirection? = null,
     showTitle: Boolean = true,
     positionCallback: ((columns: Int, position: Int) -> Unit)? = null,
@@ -531,6 +532,7 @@ fun CollectionFolderGrid(
     onClickItem,
     sortOptions,
     playEnabled,
+    viewModelKey = viewModelKey,
     defaultViewOptions = defaultViewOptions,
     modifier = modifier,
     initialSortAndDirection = initialSortAndDirection,
@@ -551,6 +553,7 @@ fun CollectionFolderGrid(
     playEnabled: Boolean,
     defaultViewOptions: ViewOptions,
     modifier: Modifier = Modifier,
+    viewModelKey: String? = itemId,
     initialSortAndDirection: SortAndDirection? = null,
     showTitle: Boolean = true,
     positionCallback: ((columns: Int, position: Int) -> Unit)? = null,
@@ -559,7 +562,7 @@ fun CollectionFolderGrid(
     playlistViewModel: AddPlaylistViewModel = hiltViewModel(),
     viewModel: CollectionFolderViewModel =
         hiltViewModel<CollectionFolderViewModel, CollectionFolderViewModel.Factory>(
-            key = itemId,
+            key = viewModelKey,
         ) {
             it.create(
                 itemId = itemId,
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/CollectionFolderMovie.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/CollectionFolderMovie.kt
index f824a4b9..1292cd5c 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/CollectionFolderMovie.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/CollectionFolderMovie.kt
@@ -115,6 +115,7 @@ fun CollectionFolderMovie(
                         preferencesViewModel.navigationManager.navigateTo(item.destination())
                     },
                     itemId = destination.itemId,
+                    viewModelKey = "${destination.itemId}_library",
                     initialFilter =
                         CollectionFolderFilter(
                             filter =
@@ -146,6 +147,7 @@ fun CollectionFolderMovie(
                         preferencesViewModel.navigationManager.navigateTo(item.destination())
                     },
                     itemId = destination.itemId,
+                    viewModelKey = "${destination.itemId}_collection",
                     initialFilter =
                         CollectionFolderFilter(
                             filter =