From 45817c699f70bc6cb9dd06548563b2d65245f494 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 11 Sep 2025 10:34:28 -0500
Subject: [PATCH] Sort combined VODs alphabetically by name/title and update
 fetch logic for 'all' type

---
 frontend/src/pages/VODs.jsx | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/VODs.jsx b/frontend/src/pages/VODs.jsx
index 5e5f8508..05cca9e5 100644
--- a/frontend/src/pages/VODs.jsx
+++ b/frontend/src/pages/VODs.jsx
@@ -304,8 +304,8 @@ const VODsPage = () => {
         _vodType: 'movie',
       }));
     } else {
-      // 'all' - combine movies and series, tagging each with its type
-      return [
+      // 'all' - combine movies and series, tagging each with its type, then sort alphabetically by name/title
+      const combined = [
         ...Object.values(movies).map((item) => ({
           ...item,
           _vodType: 'movie',
@@ -315,6 +315,13 @@ const VODsPage = () => {
           _vodType: 'series',
         })),
       ];
+      return combined.sort((a, b) => {
+        const nameA = (a.name || a.title || '').toLowerCase();
+        const nameB = (b.name || b.title || '').toLowerCase();
+        if (nameA < nameB) return -1;
+        if (nameA > nameB) return 1;
+        return 0;
+      });
     }
   };
 
@@ -341,8 +348,13 @@ const VODsPage = () => {
   useEffect(() => {
     if (filters.type === 'series') {
       fetchSeries().finally(() => setInitialLoad(false));
-    } else {
+    } else if (filters.type === 'movies') {
       fetchMovies().finally(() => setInitialLoad(false));
+    } else {
+      // 'all': fetch both movies and series
+      Promise.all([fetchMovies(), fetchSeries()]).finally(() =>
+        setInitialLoad(false)
+      );
     }
   }, [filters, currentPage, pageSize, fetchMovies, fetchSeries]);