-
Notifications
You must be signed in to change notification settings - Fork 215
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use
VMediaCollection for all search results
Signed-off-by: Olga Bulat <[email protected]>
- Loading branch information
Showing
17 changed files
with
530 additions
and
343 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| <template> | ||
| <div ref="loadMoreSectionRef" class="w-full"> | ||
| <VButton | ||
| v-show="canLoadMore" | ||
| class="label-bold lg:description-bold h-16 w-full lg:h-18" | ||
| variant="filled-gray" | ||
| size="disabled" | ||
| :disabled="fetchState.isFetching" | ||
| data-testid="load-more" | ||
| @click="onLoadMore" | ||
| > | ||
| {{ buttonLabel }} | ||
| </VButton> | ||
| </div> | ||
| </template> | ||
| <script lang="ts"> | ||
| import { computed, defineComponent, onMounted, ref, watch } from "vue" | ||
| import { storeToRefs } from "pinia" | ||
| import { useElementVisibility } from "@vueuse/core" | ||
| import { useRoute } from "@nuxtjs/composition-api" | ||
| import { useAnalytics } from "~/composables/use-analytics" | ||
| import { useMediaStore } from "~/stores/media" | ||
| import { useSearchStore } from "~/stores/search" | ||
| import { useI18n } from "~/composables/use-i18n" | ||
| import VButton from "~/components/VButton.vue" | ||
| export default defineComponent({ | ||
| name: "VLoadMoreOld", | ||
| components: { | ||
| VButton, | ||
| }, | ||
| setup() { | ||
| const loadMoreSectionRef = ref(null) | ||
| const route = useRoute() | ||
| const i18n = useI18n() | ||
| const mediaStore = useMediaStore() | ||
| const searchStore = useSearchStore() | ||
| const { sendCustomEvent } = useAnalytics() | ||
| // Use the `_searchType` from mediaStore because it falls back to ALL_MEDIA | ||
| // for unsupported search types. | ||
| const { fetchState, resultCount, currentPage, _searchType } = | ||
| storeToRefs(mediaStore) | ||
| const { searchTerm } = storeToRefs(searchStore) | ||
| const searchStarted = computed(() => { | ||
| return searchStore.strategy === "default" | ||
| ? searchTerm.value !== "" | ||
| : searchStore.collectionParams !== null | ||
| }) | ||
| /** | ||
| * Whether we should show the "Load more" button. | ||
| * If the user has entered a search term, there is at least 1 page of results, | ||
| * there has been no fetching error, and there are more results to fetch, | ||
| * we show the button. | ||
| */ | ||
| const canLoadMore = computed(() => { | ||
| return Boolean( | ||
| searchStarted.value && | ||
| !fetchState.value.fetchingError && | ||
| !fetchState.value.isFinished && | ||
| resultCount.value > 0 | ||
| ) | ||
| }) | ||
| const reachResultEndEventSent = ref(false) | ||
| /** | ||
| * On button click, fetch media, persisting the existing results. | ||
| * The button is disabled when we are fetching, but we still check | ||
| * whether we are currently fetching to be sure we don't fetch multiple times. | ||
| * | ||
| */ | ||
| const onLoadMore = async () => { | ||
| if (fetchState.value.isFetching) { | ||
| return | ||
| } | ||
| reachResultEndEventSent.value = false | ||
| sendCustomEvent("LOAD_MORE_RESULTS", { | ||
| query: searchStore.searchTerm, | ||
| searchType: searchStore.searchType, | ||
| resultPage: currentPage.value || 1, | ||
| }) | ||
| await mediaStore.fetchMedia({ | ||
| shouldPersistMedia: true, | ||
| }) | ||
| } | ||
| const sendReachResultEnd = () => { | ||
| // This function can be called before the media is fetched and | ||
| // currentPage is updated from 0, so we use the value or 1. | ||
| // The currentPage can never be 0 here because then the loadMore | ||
| // button would not be visible. | ||
| sendCustomEvent("REACH_RESULT_END", { | ||
| searchType: _searchType.value, | ||
| query: searchTerm.value, | ||
| resultPage: currentPage.value || 1, | ||
| }) | ||
| } | ||
| const buttonLabel = computed(() => | ||
| fetchState.value.isFetching | ||
| ? i18n.t("browsePage.loading") | ||
| : i18n.t("browsePage.load") | ||
| ) | ||
| const mainPageElement = ref<HTMLElement | null>(null) | ||
| onMounted(() => { | ||
| mainPageElement.value = document.getElementById("main-page") | ||
| }) | ||
| const isLoadMoreButtonVisible = useElementVisibility(loadMoreSectionRef, { | ||
| scrollTarget: mainPageElement, | ||
| }) | ||
| // Reset the reachResultEndEvent whenever the route changes, | ||
| // to make sure the result end is tracked properly whenever | ||
| // the search query or content type changes | ||
| watch(route, () => { | ||
| reachResultEndEventSent.value = false | ||
| }) | ||
| watch(isLoadMoreButtonVisible, (isVisible) => { | ||
| if (isVisible) { | ||
| if (reachResultEndEventSent.value) { | ||
| return | ||
| } | ||
| sendReachResultEnd() | ||
| reachResultEndEventSent.value = true | ||
| } | ||
| }) | ||
| return { | ||
| buttonLabel, | ||
| fetchState, | ||
| onLoadMore, | ||
| canLoadMore, | ||
| loadMoreSectionRef, | ||
| } | ||
| }, | ||
| }) | ||
| </script> |
Oops, something went wrong.