Skip to content

Commit f7022ec

Browse files
liangfungliangfung
committed
update: remove 'no data' condition
1 parent f0f7c14 commit f7022ec

File tree

2 files changed

+144
-165
lines changed

2 files changed

+144
-165
lines changed

‎ee/tabby-ui/app/(home)/components/thread-feeds/all-threads.tsx

+72-82
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ export function AllThreadFeeds() {
9797
resetThreadsPageNo()
9898
}, [])
9999

100-
const hasThreads = !!data?.threads?.edges?.length
101-
102100
return (
103101
<div className={cn('w-full')}>
104102
<motion.div
@@ -121,90 +119,82 @@ export function AllThreadFeeds() {
121119
}
122120
delay={600}
123121
>
124-
{hasThreads ? (
125-
<>
126-
<div className="relative flex flex-col gap-3 text-sm">
127-
{threads.map(t => {
128-
return (
129-
<ThreadItem
130-
data={t}
131-
key={t.node.id}
132-
onNavigateToThread={handleNavigateToThread}
122+
<div className="relative flex flex-col gap-3 text-sm">
123+
{threads.map(t => {
124+
return (
125+
<ThreadItem
126+
data={t}
127+
key={t.node.id}
128+
onNavigateToThread={handleNavigateToThread}
129+
/>
130+
)
131+
})}
132+
{fetching && (
133+
<div className="absolute inset-0 bottom-10 z-10 flex items-center justify-center backdrop-blur-sm" />
134+
)}
135+
{showPagination && (
136+
// FIXME abstract Pagination
137+
<Pagination className={cn('flex items-center justify-end')}>
138+
<PaginationContent>
139+
<PaginationItem>
140+
<PaginationPrevious
141+
disabled={page === 1}
142+
onClick={() => {
143+
if (page === 1) return
144+
145+
const _page = page - 1
146+
setPage(_page)
147+
}}
133148
/>
134-
)
135-
})}
136-
{fetching && (
137-
<div className="absolute inset-0 bottom-10 z-10 flex items-center justify-center backdrop-blur-sm" />
138-
)}
139-
{showPagination && (
140-
// FIXME abstract Pagination
141-
<Pagination className={cn('flex items-center justify-end')}>
142-
<PaginationContent>
143-
<PaginationItem>
144-
<PaginationPrevious
145-
disabled={page === 1}
146-
onClick={() => {
147-
if (page === 1) return
148-
149-
const _page = page - 1
150-
setPage(_page)
151-
}}
152-
/>
153-
</PaginationItem>
154-
{paginationPages.map((item, index) => {
155-
return (
156-
<PaginationItem
157-
key={`${item}-${index}`}
158-
onClick={() => {
159-
if (typeof item === 'number') {
160-
setPage(item)
161-
}
162-
}}
149+
</PaginationItem>
150+
{paginationPages.map((item, index) => {
151+
return (
152+
<PaginationItem
153+
key={`${item}-${index}`}
154+
onClick={() => {
155+
if (typeof item === 'number') {
156+
setPage(item)
157+
}
158+
}}
159+
>
160+
{typeof item === 'number' ? (
161+
<PaginationLink
162+
className="cursor-pointer"
163+
isActive={item === page}
163164
>
164-
{typeof item === 'number' ? (
165-
<PaginationLink
166-
className="cursor-pointer"
167-
isActive={item === page}
168-
>
169-
{item}
170-
</PaginationLink>
171-
) : (
172-
<PaginationEllipsis />
173-
)}
174-
</PaginationItem>
175-
)
176-
})}
177-
{hasNextPage && (
178-
<PaginationItem>
165+
{item}
166+
</PaginationLink>
167+
) : (
179168
<PaginationEllipsis />
180-
</PaginationItem>
181-
)}
182-
<PaginationItem>
183-
<PaginationNext
184-
disabled={isNextPageDisabled}
185-
onClick={() => {
186-
if (isNextPageDisabled) {
187-
return
188-
}
189-
190-
const _page = page + 1
191-
setPage(_page)
192-
if (_page > pageCount) {
193-
loadMore()
194-
}
195-
}}
196-
/>
169+
)}
197170
</PaginationItem>
198-
</PaginationContent>
199-
</Pagination>
200-
)}
201-
</div>
202-
</>
203-
) : (
204-
<div className="my-12 text-center text-lg font-medium text-muted-foreground">
205-
No data
206-
</div>
207-
)}
171+
)
172+
})}
173+
{hasNextPage && (
174+
<PaginationItem>
175+
<PaginationEllipsis />
176+
</PaginationItem>
177+
)}
178+
<PaginationItem>
179+
<PaginationNext
180+
disabled={isNextPageDisabled}
181+
onClick={() => {
182+
if (isNextPageDisabled) {
183+
return
184+
}
185+
186+
const _page = page + 1
187+
setPage(_page)
188+
if (_page > pageCount) {
189+
loadMore()
190+
}
191+
}}
192+
/>
193+
</PaginationItem>
194+
</PaginationContent>
195+
</Pagination>
196+
)}
197+
</div>
208198
</LoadingWrapper>
209199
</motion.div>
210200
</div>

‎ee/tabby-ui/app/(home)/components/thread-feeds/my-threads.tsx

+72-83
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@ export function MyThreadFeeds() {
9696
resetMyThreadsPageNo()
9797
}, [])
9898

99-
const hasThreads = !!data?.myThreads?.edges?.length
100-
// const hasThreads = false
101-
10299
return (
103100
<div className={cn('w-full')}>
104101
<motion.div
@@ -121,90 +118,82 @@ export function MyThreadFeeds() {
121118
}
122119
delay={600}
123120
>
124-
{hasThreads ? (
125-
<>
126-
<div className="relative flex flex-col gap-3 text-sm">
127-
{threads.map(t => {
128-
return (
129-
<ThreadItem
130-
data={t}
131-
key={t.node.id}
132-
onNavigateToThread={handleNavigateToThread}
121+
<div className="relative flex flex-col gap-3 text-sm">
122+
{threads.map(t => {
123+
return (
124+
<ThreadItem
125+
data={t}
126+
key={t.node.id}
127+
onNavigateToThread={handleNavigateToThread}
128+
/>
129+
)
130+
})}
131+
{fetching && (
132+
<div className="absolute inset-0 bottom-10 z-10 flex items-center justify-center backdrop-blur-sm" />
133+
)}
134+
{showPagination && (
135+
// FIXME abstract Pagination
136+
<Pagination className={cn('flex items-center justify-end')}>
137+
<PaginationContent>
138+
<PaginationItem>
139+
<PaginationPrevious
140+
disabled={page === 1}
141+
onClick={() => {
142+
if (page === 1) return
143+
144+
const _page = page - 1
145+
setPage(_page)
146+
}}
133147
/>
134-
)
135-
})}
136-
{fetching && (
137-
<div className="absolute inset-0 bottom-10 z-10 flex items-center justify-center backdrop-blur-sm" />
138-
)}
139-
{showPagination && (
140-
// FIXME abstract Pagination
141-
<Pagination className={cn('flex items-center justify-end')}>
142-
<PaginationContent>
143-
<PaginationItem>
144-
<PaginationPrevious
145-
disabled={page === 1}
146-
onClick={() => {
147-
if (page === 1) return
148-
149-
const _page = page - 1
150-
setPage(_page)
151-
}}
152-
/>
153-
</PaginationItem>
154-
{paginationPages.map((item, index) => {
155-
return (
156-
<PaginationItem
157-
key={`${item}-${index}`}
158-
onClick={() => {
159-
if (typeof item === 'number') {
160-
setPage(item)
161-
}
162-
}}
148+
</PaginationItem>
149+
{paginationPages.map((item, index) => {
150+
return (
151+
<PaginationItem
152+
key={`${item}-${index}`}
153+
onClick={() => {
154+
if (typeof item === 'number') {
155+
setPage(item)
156+
}
157+
}}
158+
>
159+
{typeof item === 'number' ? (
160+
<PaginationLink
161+
className="cursor-pointer"
162+
isActive={item === page}
163163
>
164-
{typeof item === 'number' ? (
165-
<PaginationLink
166-
className="cursor-pointer"
167-
isActive={item === page}
168-
>
169-
{item}
170-
</PaginationLink>
171-
) : (
172-
<PaginationEllipsis />
173-
)}
174-
</PaginationItem>
175-
)
176-
})}
177-
{hasNextPage && (
178-
<PaginationItem>
164+
{item}
165+
</PaginationLink>
166+
) : (
179167
<PaginationEllipsis />
180-
</PaginationItem>
181-
)}
182-
<PaginationItem>
183-
<PaginationNext
184-
disabled={isNextPageDisabled}
185-
onClick={() => {
186-
if (isNextPageDisabled) {
187-
return
188-
}
189-
190-
const _page = page + 1
191-
setPage(_page)
192-
if (_page > pageCount) {
193-
loadMore()
194-
}
195-
}}
196-
/>
168+
)}
197169
</PaginationItem>
198-
</PaginationContent>
199-
</Pagination>
200-
)}
201-
</div>
202-
</>
203-
) : (
204-
<div className="my-12 text-center text-lg font-medium text-muted-foreground">
205-
No data
206-
</div>
207-
)}
170+
)
171+
})}
172+
{hasNextPage && (
173+
<PaginationItem>
174+
<PaginationEllipsis />
175+
</PaginationItem>
176+
)}
177+
<PaginationItem>
178+
<PaginationNext
179+
disabled={isNextPageDisabled}
180+
onClick={() => {
181+
if (isNextPageDisabled) {
182+
return
183+
}
184+
185+
const _page = page + 1
186+
setPage(_page)
187+
if (_page > pageCount) {
188+
loadMore()
189+
}
190+
}}
191+
/>
192+
</PaginationItem>
193+
</PaginationContent>
194+
</Pagination>
195+
)}
196+
</div>
208197
</LoadingWrapper>
209198
</motion.div>
210199
</div>

0 commit comments

Comments
 (0)