feat(collections): Add library-aware filtering to collection detail pages

- Add library_id parameter to BuildSections and getViewAllURL functions - Update dashboard handler to pass libraryID when building sections - Add library_id query param support to collection detail page handler - When library_id is provided, filter collection items by that library - When no library_id, show all books (backward compatible) - Reuses GetCollectionItemsForDashboard query for filtered results - Preserves context when navigating from dashboard to collection detail
2026-03-02 13:11:35 -05:00
parent 8f83403342
commit be4230266e
2 changed files with 66 additions and 21 deletions
@@ -191,8 +191,8 @@ func registerFrontendRoutes(cfg *Config) {
 			}
 		}

-		sectionData := handlers.BuildSections(visibleSections)
-		allSectionsData := handlers.BuildSections(allSections)
+		sectionData := handlers.BuildSections(visibleSections, libraryID)
+		allSectionsData := handlers.BuildSections(allSections, libraryID)

 		var buf bytes.Buffer
 		err = templates.Dashboard(user, sectionData, allSectionsData, libData, libraryID, prefs.HiddenCollections, limit, errorMsg).Render(c.Request().Context(), &buf)
@@ -358,24 +358,66 @@ func registerFrontendRoutes(cfg *Config) {
 				}
 			}
 		} else {
-			// User collection - fetch collection items
-			collItems, err := cfg.Queries.GetCollectionItems(c.Request().Context(), pgtype.UUID{Bytes: collUUID, Valid: true})
-			if err != nil {
-				books = []handlers.BookInfo{}
-			}
+			// User collection - check if library_id filter is present
+			libraryID := c.QueryParam("library_id")

-			// Convert to BookInfo format
-			bookCards := make([]handlers.BookInfo, len(collItems))
-			for i, item := range collItems {
-				itemUUID, _ := uuid.FromBytes(item.MediaItemID.Bytes[0:16])
-				bookCards[i] = handlers.BookInfo{
-					MediaItemID:    itemUUID.String(),
-					Title:          item.Title,
-					Author:         getText(item.Author),
-					CoverImagePath: utils.ResolveMediaURL(item.LibraryID, item.CoverImagePath),
+			if libraryID != "" {
+				// Filter by library - reuse dashboard query
+				libUUID, err := uuid.Parse(libraryID)
+				if err != nil {
+					return renderErrorPage(c, "Invalid library ID", "invalid_library_id")
 				}
+
+				// Use GetCollectionItemsForDashboard for library-filtered results
+				collItems, err := cfg.Queries.GetCollectionItemsForDashboard(c.Request().Context(),
+					database.GetCollectionItemsForDashboardParams{
+						CollectionID: pgtype.UUID{Bytes: collUUID, Valid: true},
+						LibraryID:    pgtype.UUID{Bytes: libUUID, Valid: true},
+						Limit:        1000,
+					})
+				if err != nil {
+					books = []handlers.BookInfo{}
+				} else {
+					// Convert to BookInfo format (non-excluded only)
+					var validItems []database.GetCollectionItemsForDashboardRow
+					for _, item := range collItems {
+						if !item.Excluded.Valid || !item.Excluded.Bool {
+							validItems = append(validItems, item)
+						}
+					}
+
+					bookCards := make([]handlers.BookInfo, len(validItems))
+					for i, item := range validItems {
+						itemUUID, _ := uuid.FromBytes(item.ID.Bytes[0:16])
+						bookCards[i] = handlers.BookInfo{
+							MediaItemID:    itemUUID.String(),
+							Title:          item.Title,
+							Author:         getText(item.Author),
+							CoverImagePath: utils.ResolveMediaURL(item.LibraryID, item.CoverImagePath),
+						}
+					}
+					books = bookCards
+				}
+			} else {
+				// No library filter - show all books in collection
+				collItems, err := cfg.Queries.GetCollectionItems(c.Request().Context(), pgtype.UUID{Bytes: collUUID, Valid: true})
+				if err != nil {
+					books = []handlers.BookInfo{}
+				}
+
+				// Convert to BookInfo format
+				bookCards := make([]handlers.BookInfo, len(collItems))
+				for i, item := range collItems {
+					itemUUID, _ := uuid.FromBytes(item.MediaItemID.Bytes[0:16])
+					bookCards[i] = handlers.BookInfo{
+						MediaItemID:    itemUUID.String(),
+						Title:          item.Title,
+						Author:         getText(item.Author),
+						CoverImagePath: utils.ResolveMediaURL(item.LibraryID, item.CoverImagePath),
+					}
+				}
+				books = bookCards
 			}
-			books = bookCards
 		}
 		// Build collection data
 		colData := templates.CollectionData{