Remove tours for recent tapes

Author: switz

src/components/ArtistsColumn.tsx

@@ -4,6 +4,7 @@ import { Artist } from '../types';
 import Column from './Column';
 import Row from './Row';
 import RowHeader from './RowHeader';
+import { DEFAULT_ARTIST_SLUG } from '@/lib/defaultArtist';
 
 const byObject = {
   phish: 'Phish.in',
@@ -24,6 +25,7 @@ const ArtistsColumn = async () => {
                 key={[idx, artist.id].join(':')}
                 href={`/${artist.slug}`}
                 activeSegments={{ artistSlug: artist.slug }}
+                fallbackParams={{ artistSlug: DEFAULT_ARTIST_SLUG }}
               >
                 <div>
                   <div>{artist.name}</div>

src/components/RecentTapesColumn.tsx

@@ -11,40 +11,24 @@ import RowHeader from './RowHeader';
 import Tag from './Tag';
 import { notFound } from 'next/navigation';
 
-const RecentTapesColumn = async ({
-  artistSlug,
-  year,
-}: Pick<RawParams, 'artistSlug' | 'year'>) => {
+const RecentTapesColumn = async ({ artistSlug, year }: Pick<RawParams, 'artistSlug' | 'year'>) => {
   const shows = await RelistenAPI.fetchRecentlyAdded(artistSlug).catch(() => {
     notFound();
   });
   const tours = {};
   return (
     <Column heading={year ? year : 'Recently Added'} key={year}>
       {(!shows || shows.length === 0) && (
-        <div className="text-center text-gray-700 text-sm py-2">
-          No recently added shows!
-        </div>
+        <div className="text-center text-gray-700 text-sm py-2">No recently added shows!</div>
       )}
       {shows &&
         artistSlug &&
         sortActiveBands(artistSlug, shows).map((show) => {
           const { year, month, day } = splitShowDate(show.display_date);
-          const { venue, avg_duration, tour } = show;
-          let tourName = '';
-
-          // keep track of which tours we've displayed
-          if (tour) {
-            if (!tours[tour.id]) tourName = tour.name ?? '';
-
-            tours[tour.id] = true;
-          }
+          const { venue, avg_duration } = show;
 
           return (
             <div key={show.id}>
-              {tourName && (
-                <RowHeader>{tourName === 'Not Part of a Tour' ? '' : tourName}</RowHeader>
-              )}
               <Row
                 href={`/${artistSlug}/${year}/${month}/${day}`}
                 activeSegments={{
@@ -76,4 +60,4 @@ const RecentTapesColumn = async ({
   );
 };
 
-export default React.memo(RecentTapesColumn);
+export default React.memo(RecentTapesColumn);

src/components/Row.tsx

@@ -14,10 +14,19 @@ type RowProps = {
   active?: boolean;
   loading?: boolean;
   activeSegments?: Record<string, string | undefined>;
+  fallbackParams?: Record<string, string>;
   isActiveOverride?: boolean;
 };
 
-const Row = ({ children, href, activeSegments, isActiveOverride, loading, ...props }: RowProps) => {
+const Row = ({
+  children,
+  href,
+  activeSegments,
+  isActiveOverride,
+  loading,
+  fallbackParams,
+  ...props
+}: RowProps) => {
   const [isPending, startTransition] = useTransition();
   const params = useParams();
   const pathname = usePathname();
@@ -27,7 +36,9 @@ const Row = ({ children, href, activeSegments, isActiveOverride, loading, ...pro
 
   // if every segment is true, then we're active
   if (isActiveOverride === undefined && activeSegments) {
-    isActive = Object.entries(activeSegments).every(([key, value]) => params[key] === value);
+    isActive = Object.entries(activeSegments).every(
+      ([key, value]) => (params[key] ?? fallbackParams?.[key]) === value
+    );
   }
 
   if (!href) {