feat: fix infinite scroll (#325)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ocodista · Oct 4, 2024 · f422a7f · f422a7f
1 parent 7efccf0
commit f422a7f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/apps/web/app/(roles)/vagas/action.ts b/apps/web/app/(roles)/vagas/action.ts
@@ -91,7 +91,7 @@ export const fetchJobs = async (
         ascending: orderOption[0].option.value === 'ascending',
       })
     } else {
-      query = query.order('createdAt', { ascending: true })
+      query = query.order('salary', { nullsFirst: false })
     }
 
     if (type === 'refetch') {

diff --git a/apps/web/app/(roles)/vagas/page.tsx b/apps/web/app/(roles)/vagas/page.tsx
@@ -1,6 +1,7 @@
 import { RolesPage } from './RolesPage'
 import { createClient } from '@supabase/supabase-js'
 import { createClient as createClientRedis } from 'redis'
+import { fetchJobs } from './action'
 
 export const revalidate = 0
 
@@ -27,16 +28,17 @@ async function getJobs() {
     return JSON.parse(jobsFromCache)
   }
 
-  const { data: jobs } = await supabase
-    .from('Roles')
-    .select('*', { count: 'exact' })
-    .eq('ready', true)
-    .order('salary', { nullsFirst: false })
-    .limit(21)
+  const result = await fetchJobs('initial', [], [])
 
-  await client.set('web_jobs', JSON.stringify(jobs), { EX: ONE_DAY_IN_MINUTES })
-
-  return jobs
+  if (result.isSuccess && result.data) {
+    await client.set('web_jobs', JSON.stringify(result.data), {
+      EX: ONE_DAY_IN_MINUTES,
+    })
+    return result.data
+  } else {
+    console.error('Failed to fetch jobs:', result.message)
+    return []
+  }
 }
 
 async function getSkills() {
@@ -71,11 +73,10 @@ export default async function Page() {
   const skills = await getSkills()
   const jobs = await getJobs()
   const countries = await getCountries()
-  const jobsReady = jobs.filter((job) => job.ready === true)
 
   return (
     <RolesPage
-      jobsFromServer={jobsReady}
+      jobsFromServer={jobs}
       skillsFromServer={skills}
       countries={countries}
     />

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "private": true,
   "scripts": {
     "dev": "development=true next dev",

diff --git a/yarn.lock b/yarn.lock
@@ -10135,7 +10135,7 @@ web-streams-polyfill@^3.0.3:
   integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==
 
 "web@file:/home/runner/work/trampar-de-casa/trampar-de-casa/apps/web":
-  version "1.0.36"
+  version "1.0.37"
   resolved "file:apps/web"
   dependencies:
     "@headlessui/react" "^1.7.15"