Skip to content

Fix: Duplicates when click spam loading elements in FT (2/3) #9409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shadorc wants to merge 1 commit into
base: development
Choose a base branch
from
+14 −6
Open

Fix: Duplicates when click spam loading elements in FT (2/3) #9409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/renderer/views/SearchPage/SearchPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
:data="shownResults"
/>
<FtAutoLoadNextPageWrapper
v-if="!isNextPageLoading"
@load-next-page="nextPage"
>
<div
Expand Down Expand Up @@ -66,6 +67,7 @@ const { t } = useI18n()
const route = useRoute()

const isLoading = ref(false)
const isNextPageLoading = ref(false)
const apiUsed = ref('local')
const searchSettings = ref({})
const searchPage = ref(1)
Expand Down Expand Up @@ -226,7 +228,7 @@ async function performSearchLocal(payload) {

if (backendPreference.value === 'local' && backendFallback.value) {
showToast(t('Falling back to Invidious API'))
performSearchInvidious(payload)
await performSearchInvidious(payload)
} else {
isLoading.value = false
}
Expand Down Expand Up @@ -267,7 +269,7 @@ async function getNextpageLocal(payload) {

if (backendPreference.value === 'local' && backendFallback.value) {
showToast(t('Falling back to Invidious API'))
performSearchInvidious(payload)
await performSearchInvidious(payload)
} else {
isLoading.value = false
}
Expand Down Expand Up @@ -322,15 +324,19 @@ async function performSearchInvidious(payload, options = { resetSearchPage: fals

if (process.env.SUPPORTS_LOCAL_API && backendPreference.value === 'invidious' && backendFallback.value) {
showToast(t('Falling back to Local API'))
performSearchLocal(payload)
await performSearchLocal(payload)
} else {
isLoading.value = false
// TODO: Show toast with error message
}
}
}

function nextPage() {
async function nextPage() {
if (isNextPageLoading.value) return

isNextPageLoading.value = true

const payload = {
query: processedQuery.value,
searchSettings: searchSettings.value,
Expand All @@ -342,14 +348,16 @@ function nextPage() {
if (apiUsed.value === 'local') {
if (nextPageRef.value !== null) {
showToast(t('Search Filters["Fetching results. Please wait"]'))
getNextpageLocal(payload)
await getNextpageLocal(payload)
} else {
showToast(t('Search Filters.There are no more results for this search'))
}
} else {
showToast(t('Search Filters["Fetching results. Please wait"]'))
performSearchInvidious(payload)
await performSearchInvidious(payload)
}

isNextPageLoading.value = false
}

function replaceShownResults(history) {
Expand Down