@playpilot/tpi 8.35.2 → 8.36.0

package/src/routes/components/Participants/Participant.svelte

@@ -1,9 +1,7 @@
 <script lang="ts">
-  import { onMount } from 'svelte'
   import { heading } from '$lib/actions/heading'
-  import { fetchTitlesForParticipant } from '$lib/api/participants'
-  import { openModal } from '$lib/modal'
-  import type { ParticipantData } from '$lib/types/participant'
+  import type { Job, ParticipantData } from '$lib/types/participant'
+  import type { ExploreFilter, ExploreTitleSorting } from '$lib/types/filter'
   import type { TitleData } from '$lib/types/title'
   import { Sorting } from '$lib/enums/Sorting'
   import { t } from '$lib/localization'
@@ -11,67 +9,42 @@
   import { trackViaPixel } from '@playpilot/retargeting-tracking'
   import { MetaEvent } from '$lib/enums/TrackingEvent'
   import ParticipantImage from './ParticipantImage.svelte'
-  import ListTitle from '../ListTitle.svelte'
-  import Dropdown from '../Explore/Filter/Dropdown.svelte'
+  import ExploreResults from '../Explore/Routes/ExploreResults.svelte'
+  import Filter from '../Explore/Filter/Filter.svelte'
   import Button from '../Button.svelte'
+  import { openModal } from '$lib/modal'
 
   interface Props {
     participant: ParticipantData
     small?: boolean
   }
 
-  type TitleSorting = { label: string; value: (typeof Sorting)[keyof typeof Sorting] }
-
   const { participant, small = false }: Props = $props()
 
-  const { name, birth_date, death_date } = $derived(participant)
+  const { name, description } = $derived(participant)
 
-  const sortings: TitleSorting[] = [
+  const filter: ExploreFilter = $state({})
+  const sortings: ExploreTitleSorting[] = [
     { label: 'Popularity', value: Sorting.Popular },
     { label: 'Top Rated', value: Sorting.Best },
     { label: 'IMDb Rating', value: Sorting.IMDb },
     { label: 'Year', value: Sorting.Chronological },
   ]
 
-  const pageSize = 30
-
-  let titles: TitleData[] = $state([])
-  let page = $state(1)
-  let hasMorePages = $state(true)
-  let loading = $state(true)
-  let currentSorting = $state(sortings[0])
+  let clientWidth = $state(0)
+  let currentJob: 'all' | Job = $state('all')
+  let descriptionExpanded: boolean = $state(false)
 
-  onMount(loadMore)
+  const filterWithParticipant: ExploreFilter = $derived({
+    ...filter,
+    participant_sid: { type: 'string', value: participant.sid },
+    participant_job: { type: 'string', value: currentJob === 'all' ? null : currentJob }
+  })
 
   if (isRetargetingAllowed()) trackViaPixel(MetaEvent.ParticipantView, { participant: participant.name })
 
-  function formatDate(dateString: string): string {
-    const date = new Date(dateString)
-    return date.toLocaleDateString(undefined, { year: 'numeric', month: 'long', day: 'numeric' })
-  }
-
-  async function loadMore(): Promise<void> {
-    loading = true
-
-    try {
-      const results = await fetchTitlesForParticipant(participant, { page, sorting: currentSorting.value })
-
-      titles = [...titles, ...results]
-      hasMorePages = results?.length >= pageSize
-    } catch {
-      hasMorePages = false
-    } finally {
-      loading = false
-      page += 1
-    }
-  }
-
-  function setSorting(sorting: TitleSorting): void {
-    currentSorting = sorting
-    titles = []
-    page = 1
-
-    loadMore()
+  function onTitleClick(event: MouseEvent, titles: TitleData[], index: number): void {
+    openModal({ event, type: 'titles-rail', data: titles, props: { initialIndex: index } })
   }
 </script>
 
@@ -81,60 +54,46 @@
   <div>
     <div class="heading" use:heading={2} id="heading">{name}</div>
 
-    {#if birth_date}
-      <p class="dates">
-        {t('Born On')} <strong>{formatDate(birth_date)}</strong>{#if death_date}, {t('Died On')} <strong>{formatDate(death_date)}</strong>{/if}
+    {#if description}
+      <p class="description" class:expanded={descriptionExpanded}>
+        {description}
       </p>
+
+      <div class="read-more">
+        <Button variant="link" onclick={() => descriptionExpanded = !descriptionExpanded}>
+          {descriptionExpanded ? t('Read Less') : t('Read More')}
+        </Button>
+      </div>
     {/if}
   </div>
 </div>
 
-<div class="content">
-  {#if !small && (titles.length && !loading)}
+<div class="content" class:small bind:clientWidth>
+  {#if !small}
     <div class="list-header">
       <div class="heading subheading" use:heading={3} id="credits">{t('Credits')}</div>
+    </div>
 
-      <div class="sort">
-        {t('Sort By')}:
-
-        <Dropdown>
-          {#snippet button({ toggle })}
-            <Button variant="border" onclick={toggle}>{t(currentSorting.label)}</Button>
-          {/snippet}
-
-          {#snippet content()}
-            <div class="sortings">
-              {#each sortings as sorting}
-                <Button variant="link" onclick={() => setSorting(sorting)}>{t(sorting.label)}</Button>
-              {/each}
-            </div>
-          {/snippet}
-        </Dropdown>
-      </div>
+    <div class="jobs">
+      {#each ['all', ...participant.jobs] as job}
+        <Button variant="border" size="large" active={currentJob === job} onclick={() => currentJob = job as 'all' | Job}>
+          {t('Job: ' + job)}
+        </Button>
+      {/each}
     </div>
-  {/if}
 
-  <div class="list">
-    {#each titles as title}
-      <ListTitle {title} compact={small} onclick={(event) => openModal({ event, data: title })} />
-    {/each}
+    <Filter {filter} {sortings} limit={clientWidth < 700} hideActive />
+  {/if}
 
-    {#if loading}
-      {#each { length: 6 }}
-        <div class="skeleton" data-testid="skeleton"></div>
-      {/each}
-    {:else if hasMorePages}
-      <button class="more" onclick={loadMore}>{t('Show More')}</button>
-    {/if}
-  </div>
+  <ExploreResults forceGrid hidePlaylinks filter={filterWithParticipant} {onTitleClick} />
 </div>
 
 <style lang="scss">
   .header {
-    --participant-image-size: #{margin(6)};
+    --participant-image-size: #{margin(5)};
     display: grid;
-    grid-template-columns: calc(var(--participant-image-size)) auto;
-    align-items: center;
+    grid-template-columns: var(--participant-image-size) calc(100% - var(--participant-image-size) - margin(1));
+    align-items: start;
     gap: margin(1);
     padding: margin(3) margin(1) margin(2);
     font-family: theme(detail-font-family, font-family);
@@ -145,11 +104,13 @@
 
     @include desktop {
       --participant-image-size: #{margin(8)};
+      padding: margin(3) margin(2) margin(2);
     }
 
     &.small {
       --participant-image-size: #{margin(6)};
-      padding: margin(1);
+      padding: margin(1) margin(1) 0;
+      align-items: center;
     }
   }
 
@@ -162,19 +123,14 @@
     font-style: theme(detail-title-font-style, normal);
 
     &.subheading {
-      margin: 0;
       font-size: theme(detail-title-small-font-size, margin(1.25));
     }
 
     .small & {
-      font-size: 1em;
+      font-size: 1.25em;
     }
   }
 
-  .dates {
-    margin: margin(0.5) 0 0;
-  }
-
   .content {
     padding: 0 margin(1) margin(1);
     color: theme(detail-text-color, text-color);
@@ -184,16 +140,38 @@
     line-height: normal;
     font-style: normal;
 
+    @include desktop {
+      padding: 0 margin(2) margin(2);
+
+      &.small {
+        padding: 0 margin(1) margin(1);
+      }
+    }
+
     ::view-transition-old(content),
     ::view-transition-new(content) {
       height: 100%;
     }
   }
 
-  .list {
-    display: flex;
-    flex-direction: column;
-    gap: margin(0.5);
+  .description {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    margin: margin(0.5) 0 0;
+    overflow: hidden;
+    -webkit-line-clamp: 3;
+    line-clamp: 3;
+    color: theme(text-color-alt);
+
+    &.expanded {
+      display: block;
+    }
+  }
+
+  .read-more {
+    :global(.button) {
+      font-weight: bold;
+    }
   }
 
   .list-header {
@@ -203,47 +181,10 @@
     margin-bottom: margin(0.5);
   }
 
-  .skeleton {
-    min-height: margin(7.25);
-    border-radius: theme(playlink-border-radius, border-radius);
-    background: theme(detail-background-light, lighter);
-  }
-
-  .more {
-    cursor: pointer;
-    appearance: none;
-    padding: margin(0.5) margin(1);
-    border: 0;
-    border-radius: theme(participants-load-more-border-radius, border-radius);
-    background: theme(participants-load-more-background, content);
-    color: inherit;
-    font-size: inherit;
-    font-family: inherit;
-
-    &:hover {
-      filter: brightness(1.2);
-    }
-  }
-
-  .sort {
+  .jobs {
     display: flex;
-    align-items: center;
-    gap: margin(0.25);
-    color: theme(text-color-alt);
-  }
-
-  .sortings {
-    :global(.button) {
-      display: block;
-      width: 100%;
-      padding: margin(0.5) margin(1);
-      text-align: left;
-      white-space: nowrap;
-    }
-
-    :global(.button:hover) {
-      background: theme(content-light);
-      border-radius: 0;
-    }
+    flex-wrap: wrap;
+    gap: margin(0.5);
+    margin-bottom: margin(0.5);
   }
 </style>

package/src/routes/components/Participants/ParticipantImage.svelte

@@ -98,7 +98,8 @@
     margin: 0;
     border: 0;
     background: transparent;
-    color: rgba(255, 255, 255, 0.75);
+    color: rgba(255, 255, 255, 0.65);
+    filter: drop-shadow(0 1px 1px rgba(0, 0, 0, 0.35));
 
     &:hover {
       color: white;

package/src/tests/lib/api/providers.test.js

@@ -3,6 +3,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { api } from '$lib/api/api'
 import { fetchProviders } from '$lib/api/providers'
 import { getApiToken } from '$lib/token'
+import { title } from '$lib/fakeData'
 
 vi.mock('$lib/token', () => ({
   getApiToken: vi.fn(),
@@ -33,5 +34,13 @@ describe('$lib/api/ads', () => {
 
       await expect(async () => await fetchProviders()).rejects.toThrow()
     })
+
+    it('Should remove duplicates', async () => {
+      vi.mocked(api).mockResolvedValueOnce([title.providers[0], title.providers[0]])
+
+      const response = await fetchProviders()
+
+      expect(response).toEqual([title.providers[0]])
+    })
   })
 })

package/src/tests/routes/components/Explore/Filter/Filter.test.js

@@ -25,8 +25,9 @@ describe('Filter.svelte', () => {
   it('Should not limit the number of filter items shown after pressing expand button', async () => {
     const { getByText, getAllByTestId } = render(Filter, { filter: {} })
 
-    await fireEvent.click(getByText('All filters'))
+    await fireEvent.click(getByText('Show more'))
 
+    expect(getByText('Show less')).toBeTruthy()
     expect(getAllByTestId('filter-item')).toHaveLength(7)
   })
 

package/src/tests/routes/components/Participants/Participant.test.js

@@ -3,15 +3,15 @@ import { describe, expect, it, vi, beforeEach } from 'vitest'
 
 import Participant from '../../../../routes/components/Participants/Participant.svelte'
 import { participants, title } from '$lib/fakeData'
-import { fetchTitlesForParticipant } from '$lib/api/participants'
+import { fetchTitles } from '$lib/api/titles'
 import { Sorting } from '$lib/enums/Sorting'
 
 vi.mock('$lib/tracking', () => ({
   track: vi.fn(),
 }))
 
-vi.mock('$lib/api/participants', () => ({
-  fetchTitlesForParticipant: vi.fn(),
+vi.mock('$lib/api/titles', () => ({
+  fetchTitles: vi.fn(),
 }))
 
 describe('Participant.svelte', () => {
@@ -19,18 +19,20 @@ describe('Participant.svelte', () => {
     vi.resetAllMocks()
   })
 
-  it('Should call fetchTitlesForParticipant on mount', () => {
+  it('Should call fetchTitles on mount', async () => {
     render(Participant, { participant: participants[0] })
 
-    expect(fetchTitlesForParticipant).toHaveBeenCalledWith(participants[0], { page: 1, sorting: Sorting.Popular })
+    await waitFor(() => {
+      expect(fetchTitles).toHaveBeenCalled()
+    })
   })
 
   it('Should render fetched titles after showing skeletons', async () => {
-    vi.mocked(fetchTitlesForParticipant).mockResolvedValueOnce([title, title])
+    vi.mocked(fetchTitles).mockResolvedValueOnce({ results: [title, title], next: 'next', previous: 'previous' })
 
     const { getAllByTestId } = render(Participant, { participant: participants[0] })
 
-    expect(getAllByTestId('skeleton')).toHaveLength(6)
+    expect(getAllByTestId('skeleton')).toHaveLength(24)
 
     await waitFor(() => {
       expect(getAllByTestId('title')).toHaveLength(2)
@@ -38,41 +40,68 @@ describe('Participant.svelte', () => {
   })
 
   it('Should not show load more button while loading and when fewer than page size of titles are fetched', async () => {
-    vi.mocked(fetchTitlesForParticipant).mockResolvedValueOnce([title, title])
+    vi.mocked(fetchTitles).mockResolvedValueOnce({ results: [title, title], next: null, previous: 'previous' })
 
-    const { queryByText, getAllByTestId } = render(Participant, { participant: participants[0] })
+    const { queryByLabelText, getAllByTestId } = render(Participant, { participant: participants[0] })
 
-    expect(queryByText('Show More')).not.toBeTruthy()
+    expect(queryByLabelText('Show more movies & shows')).not.toBeTruthy()
 
     await waitFor(() => {
       expect(getAllByTestId('title')).toHaveLength(2)
     })
 
-    expect(queryByText('Show More')).not.toBeTruthy()
+    expect(queryByLabelText('Show more movies & shows')).not.toBeTruthy()
   })
 
   it('Should show load more button after loading and if more than page size of titles are fetched', async () => {
-    const resolved = Array(30).fill(title)
-    vi.mocked(fetchTitlesForParticipant).mockResolvedValueOnce(resolved)
+    const resolved = ({ results: Array(30).fill(title), next: 'next', previous: 'previous' })
+    vi.mocked(fetchTitles).mockResolvedValueOnce(resolved)
 
-    const { getByText } = render(Participant, { participant: participants[0] })
+    const { getByLabelText } = render(Participant, { participant: participants[0] })
 
     await waitFor(() => {
-      expect(getByText('Show more')).toBeTruthy()
+      expect(getByLabelText('Show more movies & shows')).toBeTruthy()
     })
   })
 
   it('Should fetch more titles when load more button is clicked', async () => {
-    const resolved = Array(30).fill(title)
-    vi.mocked(fetchTitlesForParticipant).mockResolvedValueOnce(resolved)
+    const resolved = ({ results: Array(30).fill(title), next: 'next', previous: 'previous' })
+    vi.mocked(fetchTitles).mockResolvedValueOnce(resolved)
+
+    const { getByLabelText } = render(Participant, { participant: participants[0] })
+
+    await waitFor(() => getByLabelText('Show more movies & shows'))
+
+    await fireEvent.click(getByLabelText('Show more movies & shows'))
+
+    expect(fetchTitles).toHaveBeenCalledWith({ page: 2, page_size: expect.any(Number), participant_job: null, participant_sid: participants[0].sid })
+  })
+
+  it('Should include participant role in fetchTitles when selected and refetch', async () => {
+    const resolved = ({ results: Array(30).fill(title), next: 'next', previous: 'previous' })
+    vi.mocked(fetchTitles).mockResolvedValueOnce(resolved)
 
     const { getByText } = render(Participant, { participant: participants[0] })
 
-    await waitFor(() => getByText('Show more'))
+    await fireEvent.click(getByText('Actor'))
+
+    await waitFor(() => {
+      expect(fetchTitles).toHaveBeenCalledWith(expect.objectContaining({ participant_job: 'actor' }))
+    })
+  })
 
-    await fireEvent.click(getByText('Show more'))
+  it('Should include selected sorting specific to participants', async () => {
+    const resolved = ({ results: Array(30).fill(title), next: 'next', previous: 'previous' })
+    vi.mocked(fetchTitles).mockResolvedValueOnce(resolved)
 
-    expect(fetchTitlesForParticipant).toHaveBeenCalledWith(participants[0], { page: 2, sorting: Sorting.Popular })
+    const { getByText } = render(Participant, { participant: participants[0] })
+
+    await fireEvent.click(getByText('Sort by'))
+    await fireEvent.click(getByText('Year'))
+
+    await waitFor(() => {
+      expect(fetchTitles).toHaveBeenCalledWith(expect.objectContaining({ ordering: Sorting.Chronological }))
+    })
   })
 
   it('Should render as small variant when given', () => {
@@ -93,11 +122,20 @@ describe('Participant.svelte', () => {
   })
 
   it('Should not render image if not given', async () => {
-
     const { queryByRole } = render(Participant, { participant: participants[0] })
 
     await waitFor(() => {
       expect(queryByRole('presentation')).not.toBeTruthy()
     })
   })
+
+  it('Should render description and toggle more on click of Read more button', async () => {
+    const { getByText } = render(Participant, { participant: participants[0] })
+
+    expect(getByText(participants[0].description)).toBeTruthy()
+
+    await fireEvent.click(getByText('Read more'))
+
+    expect(getByText('Read less')).toBeTruthy()
+  })
 })