From 623c97c24867a5805294be02f52494b232d41c24 Mon Sep 17 00:00:00 2001
From: Olga Bulat <obulat@gmail.com>
Date: Tue, 10 Oct 2023 15:18:47 +0300
Subject: [PATCH] Add result kind to the `SELECT_SEARCH_RESULT` event

---
 .../VAudioDetails/VRelatedAudio.vue           |  2 +-
 .../src/components/VImageCell/VImageCell.vue  |  6 ++++
 .../VImageDetails/VRelatedImages.vue          |  4 +--
 .../VSearchResultsGrid/VAudioCollection.vue   |  9 +++---
 .../VSearchResultsGrid/VAudioList.vue         | 11 +++----
 .../VSearchResultsGrid/VAudioResult.vue       | 19 +++++++-----
 .../VSearchResultsGrid/VImageGrid.vue         | 30 ++++++++++---------
 frontend/src/pages/search/audio.vue           |  2 +-
 frontend/src/pages/search/image.vue           |  4 +--
 frontend/src/types/analytics.ts               |  3 ++
 frontend/src/types/external-source.ts         |  4 ---
 frontend/src/types/result.ts                  |  1 +
 .../e2e/all-results-analytics.spec.ts         |  2 ++
 .../specs/components/v-image-grid.spec.js     | 11 ++++---
 14 files changed, 61 insertions(+), 47 deletions(-)
 delete mode 100644 frontend/src/types/external-source.ts
 create mode 100644 frontend/src/types/result.ts

diff --git a/frontend/src/components/VAudioDetails/VRelatedAudio.vue b/frontend/src/components/VAudioDetails/VRelatedAudio.vue
index a5cacb356c7..2c22ce6afa0 100644
--- a/frontend/src/components/VAudioDetails/VRelatedAudio.vue
+++ b/frontend/src/components/VAudioDetails/VRelatedAudio.vue
@@ -6,7 +6,7 @@
     <VAudioCollection
       :results="media"
       :fetch-state="fetchState"
-      :is-related="true"
+      kind="related"
       :collection-label="$t('audioDetails.relatedAudios').toString()"
       class="mb-12"
     />
diff --git a/frontend/src/components/VImageCell/VImageCell.vue b/frontend/src/components/VImageCell/VImageCell.vue
index b041940ab9f..f36302d4306 100644
--- a/frontend/src/components/VImageCell/VImageCell.vue
+++ b/frontend/src/components/VImageCell/VImageCell.vue
@@ -64,6 +64,7 @@
 import { computed, defineComponent, PropType } from "vue"
 
 import type { AspectRatio, ImageDetail } from "~/types/media"
+import type { ResultKind } from "~/types/result"
 import { useImageCellSize } from "~/composables/use-image-cell-size"
 import { useI18n } from "~/composables/use-i18n"
 import { useAnalytics } from "~/composables/use-analytics"
@@ -107,6 +108,10 @@ export default defineComponent({
       type: String as PropType<AspectRatio>,
       default: "square",
     },
+    kind: {
+      type: String as PropType<ResultKind>,
+      default: "search",
+    },
     relatedTo: {
       type: [String, null] as PropType<string | null>,
       default: null,
@@ -175,6 +180,7 @@ export default defineComponent({
     const sendSelectSearchResultEvent = () => {
       sendCustomEvent("SELECT_SEARCH_RESULT", {
         id: props.image.id,
+        kind: props.kind,
         mediaType: IMAGE,
         provider: props.image.provider,
         query: props.searchTerm || "",
diff --git a/frontend/src/components/VImageDetails/VRelatedImages.vue b/frontend/src/components/VImageDetails/VRelatedImages.vue
index d61913b3446..954b620e0bb 100644
--- a/frontend/src/components/VImageDetails/VRelatedImages.vue
+++ b/frontend/src/components/VImageDetails/VRelatedImages.vue
@@ -4,8 +4,8 @@
       {{ $t("imageDetails.relatedImages") }}
     </h2>
     <VImageGrid
-      :images="media"
-      :is-single-page="true"
+      kind="related"
+      :results="media"
       :fetch-state="fetchState"
       :image-grid-label="$t('imageDetails.relatedImages').toString()"
     />
diff --git a/frontend/src/components/VSearchResultsGrid/VAudioCollection.vue b/frontend/src/components/VSearchResultsGrid/VAudioCollection.vue
index 55c365eb594..db3f04ab70a 100644
--- a/frontend/src/components/VSearchResultsGrid/VAudioCollection.vue
+++ b/frontend/src/components/VSearchResultsGrid/VAudioCollection.vue
@@ -18,10 +18,10 @@
     </VSnackbar>
     <VAudioList
       :collection-label="collectionLabel"
-      :is-related="isRelated"
+      :kind="kind"
       :results="results"
     />
-    <footer v-if="!isRelated" class="mt-4">
+    <footer v-if="kind !== 'related'" class="mt-4">
       <VLoadMore />
     </footer>
   </section>
@@ -32,6 +32,7 @@ import { defineComponent, PropType } from "vue"
 
 import type { AudioDetail } from "~/types/media"
 import type { FetchState } from "~/types/fetch-state"
+import type { ResultKind } from "~/types/result"
 import { useAudioSnackbar } from "~/composables/use-audio-snackbar"
 
 import VAudioList from "~/components/VSearchResultsGrid/VAudioList.vue"
@@ -59,8 +60,8 @@ export default defineComponent({
     /**
      * If used for Related audio, do not show the Load more button.
      */
-    isRelated: {
-      type: Boolean,
+    kind: {
+      type: String as PropType<ResultKind>,
       required: true,
     },
     fetchState: {
diff --git a/frontend/src/components/VSearchResultsGrid/VAudioList.vue b/frontend/src/components/VSearchResultsGrid/VAudioList.vue
index 5baa8e56898..cf208d1c245 100644
--- a/frontend/src/components/VSearchResultsGrid/VAudioList.vue
+++ b/frontend/src/components/VSearchResultsGrid/VAudioList.vue
@@ -3,7 +3,7 @@
   <ol
     :aria-label="collectionLabel"
     class="-mx-2 flex flex-col md:-mx-4"
-    :class="isRelated ? 'gap-4' : 'gap-2 md:gap-1'"
+    :class="kind === 'related' ? 'gap-4' : 'gap-2 md:gap-1'"
   >
     <VAudioResult
       v-for="audio in results"
@@ -12,7 +12,7 @@
       :audio="audio"
       layout="row"
       :size="audioTrackSize"
-      :is-related="isRelated"
+      :kind="kind"
     />
   </ol>
 </template>
@@ -21,6 +21,7 @@
 import { computed, defineComponent, PropType } from "vue"
 
 import type { AudioDetail } from "~/types/media"
+import type { ResultKind } from "~/types/result"
 import { useSearchStore } from "~/stores/search"
 import { useUiStore } from "~/stores/ui"
 
@@ -37,8 +38,8 @@ export default defineComponent({
       type: Array as PropType<AudioDetail[]>,
       default: () => [],
     },
-    isRelated: {
-      type: Boolean,
+    kind: {
+      type: String as PropType<ResultKind>,
       required: true,
     },
     /**
@@ -53,7 +54,7 @@ export default defineComponent({
     const uiStore = useUiStore()
 
     const audioTrackSize = computed(() => {
-      if (props.isRelated) {
+      if (props.kind === "related") {
         return uiStore.isBreakpoint("md") ? "l" : "s"
       } else {
         return !uiStore.isDesktopLayout
diff --git a/frontend/src/components/VSearchResultsGrid/VAudioResult.vue b/frontend/src/components/VSearchResultsGrid/VAudioResult.vue
index 367928afaed..90e32019686 100644
--- a/frontend/src/components/VSearchResultsGrid/VAudioResult.vue
+++ b/frontend/src/components/VSearchResultsGrid/VAudioResult.vue
@@ -25,6 +25,7 @@ import type { AudioInteractionData } from "~/types/analytics"
 import type { AudioLayout, AudioSize } from "~/constants/audio"
 import type { AudioTrackClickEvent } from "~/types/events"
 import type { AudioDetail } from "~/types/media"
+import type { ResultKind } from "~/types/result"
 
 import VAudioTrack from "~/components/VAudioTrack/VAudioTrack.vue"
 
@@ -48,9 +49,9 @@ export default defineComponent({
       type: String,
       required: true,
     },
-    isRelated: {
-      type: Boolean,
-      required: true,
+    kind: {
+      type: String as PropType<ResultKind>,
+      default: "search",
     },
   },
   setup(props) {
@@ -69,6 +70,7 @@ export default defineComponent({
       useAudioSnackbar().hide()
       sendCustomEvent("SELECT_SEARCH_RESULT", {
         id: audio.id,
+        kind: props.kind,
         mediaType: AUDIO,
         query: props.searchTerm,
         provider: audio.provider,
@@ -80,11 +82,12 @@ export default defineComponent({
     const sendInteractionEvent = (
       data: Omit<AudioInteractionData, "component">
     ) => {
-      const component = props.isRelated
-        ? "VRelatedAudio"
-        : props.layout === "box"
-        ? "VAllResultsGrid"
-        : "AudioSearch"
+      const component =
+        props.kind === "related"
+          ? "VRelatedAudio"
+          : props.layout === "box"
+          ? "VAllResultsGrid"
+          : "AudioSearch"
       sendCustomEvent("AUDIO_INTERACTION", { ...data, component })
     }
 
diff --git a/frontend/src/components/VSearchResultsGrid/VImageGrid.vue b/frontend/src/components/VSearchResultsGrid/VImageGrid.vue
index f2f90073fa5..3797040d769 100644
--- a/frontend/src/components/VSearchResultsGrid/VImageGrid.vue
+++ b/frontend/src/components/VSearchResultsGrid/VImageGrid.vue
@@ -1,20 +1,21 @@
 <template>
   <section class="pt-2 sm:pt-0">
     <VGridSkeleton
-      v-if="images && !images.length && !fetchState.isFinished"
+      v-if="results && !results.length && !fetchState.isFinished"
       is-for-tab="image"
     />
     <ol class="image-grid flex flex-wrap gap-4" :aria-label="imageGridLabel">
       <VImageCell
-        v-for="image in images"
+        v-for="image in results"
         :key="image.id"
         :image="image"
         :search-term="searchTerm"
         aspect-ratio="intrinsic"
+        :kind="kind"
         :related-to="relatedTo"
       />
     </ol>
-    <footer v-if="!isSinglePage" class="pt-4">
+    <footer v-if="kind !== 'related'" class="pt-4">
       <VLoadMore />
     </footer>
   </section>
@@ -24,8 +25,7 @@
 /**
  * This component receives an array of images as a prop, and
  * is responsible for displaying them as a grid.
- * It can also fetch more images when 'Load More' clicked,
- * or display 'No More Media'.
+ * It can also fetch more images when 'Load More' is clicked.
  * Used to display both image search results, and related images.
  */
 import { computed, defineComponent, PropType } from "vue"
@@ -35,6 +35,7 @@ import { useRelatedMediaStore } from "~/stores/media/related-media"
 
 import type { FetchState } from "~/types/fetch-state"
 import type { ImageDetail } from "~/types/media"
+import type { ResultKind } from "~/types/result"
 
 import VGridSkeleton from "~/components/VSkeleton/VGridSkeleton.vue"
 import VLoadMore from "~/components/VLoadMore.vue"
@@ -44,19 +45,18 @@ export default defineComponent({
   name: "ImageGrid",
   components: { VGridSkeleton, VLoadMore, VImageCell },
   props: {
-    images: {
+    results: {
       type: Array as PropType<ImageDetail[]>,
       default: () => [],
     },
     /**
-     * VImageGrid is used for the search grid and the related images.
-     * In the related images, it is just a single page of results without the
-     * "Load More" button, and in the search grid it is a grid that can load
-     * more images on the "Load More" button click.
+     * `VImageGrid` is used for the image search results, related images,
+     * and the image collection page.
+     * The load more button is not shown for related images.
      */
-    isSinglePage: {
-      type: Boolean,
-      required: true,
+    kind: {
+      type: String as PropType<ResultKind>,
+      default: "search",
     },
     fetchState: {
       type: Object as PropType<FetchState>,
@@ -73,7 +73,9 @@ export default defineComponent({
     const searchTerm = computed(() => searchStore.searchTerm)
 
     const relatedTo = computed(() => {
-      return props.isSinglePage ? useRelatedMediaStore().mainMediaId : null
+      return props.kind === "related"
+        ? useRelatedMediaStore().mainMediaId
+        : null
     })
 
     return { searchTerm, relatedTo }
diff --git a/frontend/src/pages/search/audio.vue b/frontend/src/pages/search/audio.vue
index 6dd9d23fc9d..c76494639c1 100644
--- a/frontend/src/pages/search/audio.vue
+++ b/frontend/src/pages/search/audio.vue
@@ -1,7 +1,7 @@
 <template>
   <VAudioCollection
     :results="results"
-    :is-related="false"
+    kind="search"
     :fetch-state="fetchState"
     :collection-label="collectionLabel"
   />
diff --git a/frontend/src/pages/search/image.vue b/frontend/src/pages/search/image.vue
index def15739398..68db3350917 100644
--- a/frontend/src/pages/search/image.vue
+++ b/frontend/src/pages/search/image.vue
@@ -1,8 +1,8 @@
 <template>
   <VImageGrid
-    :images="results"
-    :is-single-page="false"
+    :results="results"
     :fetch-state="fetchState"
+    kind="search"
     :image-grid-label="
       $t('browsePage.aria.results', { query: searchTerm }).toString()
     "
diff --git a/frontend/src/types/analytics.ts b/frontend/src/types/analytics.ts
index 70bac76bdad..f37f81c7026 100644
--- a/frontend/src/types/analytics.ts
+++ b/frontend/src/types/analytics.ts
@@ -5,6 +5,7 @@ import type {
 } from "~/constants/media"
 import type { ReportReason } from "~/constants/content-report"
 import type { FilterCategory } from "~/constants/filters"
+import { ResultKind } from "~/types/result"
 
 export type AudioInteraction = "play" | "pause" | "seek"
 export type AudioInteractionData = Exclude<
@@ -254,6 +255,8 @@ export type Events = {
     id: string
     /** If the result is a related result, provide the ID of the 'original' result */
     relatedTo: string | null
+    /** Kind of the result selected: search/related/collection */
+    kind: ResultKind
     /** The media type being searched */
     mediaType: SearchType
     /** The slug (not the prettified name) of the provider */
diff --git a/frontend/src/types/external-source.ts b/frontend/src/types/external-source.ts
deleted file mode 100644
index 0befacce1fa..00000000000
--- a/frontend/src/types/external-source.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface ExternalSource {
-  name: string
-  url: string
-}
diff --git a/frontend/src/types/result.ts b/frontend/src/types/result.ts
new file mode 100644
index 00000000000..39abaa161c7
--- /dev/null
+++ b/frontend/src/types/result.ts
@@ -0,0 +1 @@
+export type ResultKind = "search" | "related" | "collection"
diff --git a/frontend/test/playwright/e2e/all-results-analytics.spec.ts b/frontend/test/playwright/e2e/all-results-analytics.spec.ts
index c39393f4125..f9abc1a577e 100644
--- a/frontend/test/playwright/e2e/all-results-analytics.spec.ts
+++ b/frontend/test/playwright/e2e/all-results-analytics.spec.ts
@@ -25,6 +25,7 @@ test.describe("all results grid analytics test", () => {
     expectEventPayloadToMatch(selectSearchResultEvent, {
       mediaType: AUDIO,
       query: "birds",
+      kind: "search",
       relatedTo: null,
       id: "2e38ac1e-830c-4e9c-b13d-2c9a1ad53f95",
       provider: "jamendo",
@@ -45,6 +46,7 @@ test.describe("all results grid analytics test", () => {
 
     expectEventPayloadToMatch(selectSearchResultEvent, {
       id: "da5cb478-c093-4d62-b721-cda18797e3fb",
+      kind: "search",
       mediaType: IMAGE,
       query: "birds",
       provider: "flickr",
diff --git a/frontend/test/unit/specs/components/v-image-grid.spec.js b/frontend/test/unit/specs/components/v-image-grid.spec.js
index 708286b2589..fb2ad0d730d 100644
--- a/frontend/test/unit/specs/components/v-image-grid.spec.js
+++ b/frontend/test/unit/specs/components/v-image-grid.spec.js
@@ -5,7 +5,7 @@ import { render } from "~~/test/unit/test-utils/render"
 import VImageGrid from "~/components/VSearchResultsGrid/VImageGrid.vue"
 
 const propsData = {
-  images: [
+  results: [
     { id: "i1", url: "http://localhost:8080/i1.png", title: "image1" },
     { id: "i2", url: "http://localhost:8080/i2.jpg", title: "image2" },
     { id: "i3", url: "http://localhost:8080/i3.svg", title: "image3" },
@@ -15,7 +15,7 @@ const propsData = {
     isFetching: false,
     fetchingError: null,
   },
-  isSinglePage: true,
+  kind: "related",
   imageGridLabel: "Image Results",
 }
 
@@ -28,11 +28,10 @@ describe("VImageGrid", () => {
     }
   })
   it("renders images without load more button for related images", () => {
+    const imageCount = propsData.results.length
     render(VImageGrid, options)
-    expect(screen.queryAllByRole("img").length).toEqual(propsData.images.length)
-    expect(screen.queryAllByRole("figure").length).toEqual(
-      propsData.images.length
-    )
+    expect(screen.queryAllByRole("img").length).toEqual(imageCount)
+    expect(screen.queryAllByRole("figure").length).toEqual(imageCount)
     expect(screen.queryByTestId("load-more")).toBeNull()
   })
 })