Merge pull request #25 from Jamesllllllllll/codex/issue-3-version-sort

Jamesllllllllll · web-flow · commit 5bee9873bdcc · 2026-03-21T15:20:51.000-04:00
Sort search results by updated date
diff --git a/src/components/song-search-panel.tsx b/src/components/song-search-panel.tsx
@@ -54,16 +54,6 @@ import { formatPathLabel } from "~/lib/request-policy";
 import { cn, getErrorMessage } from "~/lib/utils";
 
 type SearchField = "any" | "title" | "artist" | "album" | "creator";
-type SearchSort =
-  | "relevance"
-  | "artist"
-  | "title"
-  | "album"
-  | "creator"
-  | "tuning"
-  | "duration"
-  | "downloads"
-  | "updated";
 
 export interface SearchSong {
   id: string;
@@ -129,8 +119,6 @@ export function SongSearchPanel(props: {
   const [debouncedQuery, setDebouncedQuery] = useState("");
   const [page, setPage] = useState(1);
   const [field, setField] = useState<SearchField>("any");
-  const [sortBy, setSortBy] = useState<SearchSort>("relevance");
-  const [sortDirection, setSortDirection] = useState<"asc" | "desc">("desc");
   const [showAdvanced, setShowAdvanced] = useState(false);
   const [copiedCommand, setCopiedCommand] = useState<{
     songId: string;
@@ -161,15 +149,13 @@ export function SongSearchPanel(props: {
 
   useEffect(() => {
     setPage(1);
-  }, [debouncedAdvancedFilters, debouncedQuery, field, sortBy, sortDirection]);
+  }, [debouncedAdvancedFilters, debouncedQuery, field]);
 
   const searchParams = useMemo(() => {
     const params = new URLSearchParams({
       page: String(page),
       pageSize: "25",
       field,
-      sortBy,
-      sortDirection,
     });
 
     if (debouncedQuery.trim()) {
@@ -190,14 +176,7 @@ export function SongSearchPanel(props: {
     }
 
     return params;
-  }, [
-    debouncedAdvancedFilters,
-    debouncedQuery,
-    field,
-    page,
-    sortBy,
-    sortDirection,
-  ]);
+  }, [debouncedAdvancedFilters, debouncedQuery, field, page]);
 
   const hasSearchInput = useMemo(
     () =>
@@ -266,9 +245,7 @@ export function SongSearchPanel(props: {
   const catalogTotalQuery = useQuery<Pick<SearchResponse, "total">>({
     queryKey: ["song-search-total-count"],
     queryFn: async () => {
-      const response = await fetch(
-        "/api/search?page=1&pageSize=1&field=any&sortBy=relevance&sortDirection=desc"
-      );
+      const response = await fetch("/api/search?page=1&pageSize=1&field=any");
       const body = (await response.json().catch(() => null)) as
         | SearchResponse
         | { message?: string }
@@ -542,39 +519,6 @@ export function SongSearchPanel(props: {
                   <SelectItem value="creator">Creator only</SelectItem>
                 </SelectContent>
               </Select>
-              <Select
-                value={sortBy}
-                onValueChange={(value) => setSortBy(value as SearchSort)}
-              >
-                <SelectTrigger>
-                  <SelectValue placeholder="Sort by" />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectItem value="relevance">Best match</SelectItem>
-                  <SelectItem value="artist">Artist</SelectItem>
-                  <SelectItem value="title">Title</SelectItem>
-                  <SelectItem value="album">Album</SelectItem>
-                  <SelectItem value="creator">Creator</SelectItem>
-                  <SelectItem value="tuning">Tuning</SelectItem>
-                  <SelectItem value="duration">Duration</SelectItem>
-                  <SelectItem value="downloads">Downloads</SelectItem>
-                  <SelectItem value="updated">Recently updated</SelectItem>
-                </SelectContent>
-              </Select>
-              <Select
-                value={sortDirection}
-                onValueChange={(value) =>
-                  setSortDirection(value as "asc" | "desc")
-                }
-              >
-                <SelectTrigger>
-                  <SelectValue placeholder="Direction" />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectItem value="desc">Descending</SelectItem>
-                  <SelectItem value="asc">Ascending</SelectItem>
-                </SelectContent>
-              </Select>
             </div>
 
             <div className="flex flex-wrap items-center justify-start gap-3">
diff --git a/src/lib/server/search.ts b/src/lib/server/search.ts
@@ -54,8 +54,8 @@ function normalizeSearchCacheInput(
     year: input.year ?? [],
     page: input.page,
     pageSize: input.pageSize,
-    sortBy: input.sortBy,
-    sortDirection: input.sortDirection,
+    sortBy: "updated",
+    sortDirection: "desc",
   };
 }
 
@@ -98,6 +98,11 @@ export const searchCatalogSongs = createServerFn({ method: "GET" })
   .inputValidator(searchInputSchema)
   .handler(async ({ data }) => {
     const runtimeEnv = env as AppEnv;
+    const normalizedInput = {
+      ...data,
+      sortBy: "updated" as const,
+      sortDirection: "desc" as const,
+    };
     const identity = await getSearchIdentity(runtimeEnv);
     const rateLimit = await consumeSearchRateLimit(runtimeEnv, {
       rateLimitKey: identity,
@@ -109,7 +114,7 @@ export const searchCatalogSongs = createServerFn({ method: "GET" })
       );
     }
 
-    const cacheInput = normalizeSearchCacheInput(data);
+    const cacheInput = normalizeSearchCacheInput(normalizedInput);
     const cacheKey = await sha256(JSON.stringify(cacheInput));
     const cached = await getCachedSearchResult<SearchResponse>(
       runtimeEnv,
@@ -121,7 +126,7 @@ export const searchCatalogSongs = createServerFn({ method: "GET" })
     }
 
     const results = normalizeSearchResponse(
-      await searchCatalogSongsInDb(runtimeEnv, data)
+      await searchCatalogSongsInDb(runtimeEnv, normalizedInput)
     );
     await upsertCachedSearchResult(runtimeEnv, {
       cacheKey,
diff --git a/src/routes/api/search/route.ts b/src/routes/api/search/route.ts
@@ -30,8 +30,8 @@ function normalizeSearchCacheInput(
     year: input.year ?? [],
     page: input.page,
     pageSize: input.pageSize,
-    sortBy: input.sortBy,
-    sortDirection: input.sortDirection,
+    sortBy: "updated",
+    sortDirection: "desc",
   };
 }
 
@@ -101,6 +101,12 @@ export const Route = createFileRoute("/api/search")({
           return json({ error: "invalid_search", message }, { status: 400 });
         }
 
+        const normalizedInput = {
+          ...parsed.data,
+          sortBy: "updated" as const,
+          sortDirection: "desc" as const,
+        };
+
         const identity = await getSearchIdentity(request, runtimeEnv);
         const rateLimit = await consumeSearchRateLimit(runtimeEnv, {
           rateLimitKey: identity,
@@ -118,7 +124,7 @@ export const Route = createFileRoute("/api/search")({
           );
         }
 
-        const cacheInput = normalizeSearchCacheInput(parsed.data);
+        const cacheInput = normalizeSearchCacheInput(normalizedInput);
         const cacheKey = await sha256(JSON.stringify(cacheInput));
         const cached = await getCachedSearchResult(runtimeEnv, cacheKey);
 
@@ -131,7 +137,10 @@ export const Route = createFileRoute("/api/search")({
         }
 
         try {
-          const results = await searchCatalogSongsInDb(runtimeEnv, parsed.data);
+          const results = await searchCatalogSongsInDb(
+            runtimeEnv,
+            normalizedInput
+          );
 
           await upsertCachedSearchResult(runtimeEnv, {
             cacheKey,
diff --git a/src/routes/dashboard/playlist.tsx b/src/routes/dashboard/playlist.tsx
@@ -200,8 +200,6 @@ function DashboardPlaylistPage() {
         page: "1",
         pageSize: "6",
         field: "any",
-        sortBy: "relevance",
-        sortDirection: "desc",
       });
       const response = await fetch(`/api/search?${params.toString()}`);
       const body = (await response.json().catch(() => null)) as
@@ -808,15 +806,21 @@ function getPlaylistCandidates(candidateMatchesJson?: string) {
 function getResolvedCandidates(item: PlaylistItem) {
   const candidates = getPlaylistCandidates(item.candidateMatchesJson);
   if (candidates.length > 0) {
-    return candidates.map((candidate) => ({
-      ...candidate,
-      album: candidate.album ?? item.songAlbum,
-      sourceUrl: normalizeSongSourceUrl({
-        source: "library",
-        sourceUrl: candidate.sourceUrl,
-        sourceId: candidate.sourceId,
-      }),
-    }));
+    return [...candidates]
+      .map((candidate) => ({
+        ...candidate,
+        album: candidate.album ?? item.songAlbum,
+        sourceUrl: normalizeSongSourceUrl({
+          source: "library",
+          sourceUrl: candidate.sourceUrl,
+          sourceId: candidate.sourceId,
+        }),
+      }))
+      .sort((left, right) => {
+        const leftUpdatedAt = left.sourceUpdatedAt ?? -1;
+        const rightUpdatedAt = right.sourceUpdatedAt ?? -1;
+        return rightUpdatedAt - leftUpdatedAt;
+      });
   }
 
   return [
