twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-11-24 06:48:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Avoid fetching more emails when first query loading (#3709)

Browse Source 
Co-authored-by: Thomas Trompette <thomast@twenty.com>
This commit is contained in:
Thomas Trompette 2024-01-31 10:25:22 +01:00 committed by GitHub
parent 06e35e5119
commit 9597b1ae41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx
View File

@ -75,12 +75,21 @@ export const EmailThreads = ({
pageSize: TIMELINE_THREADS_DEFAULT_PAGE_SIZE,
} as GetTimelineThreadsFromPersonIdQueryVariables;
const { data, loading, fetchMore, error } = useQuery(threadQuery, {
const {
data,
loading: firstQueryLoading,
fetchMore,
error,
} = useQuery(threadQuery, {
variables: threadQueryVariables,
});
const fetchMoreRecords = async () => {
if (emailThreadsPage.hasNextPage && !isFetchingMoreEmails) {
if (
emailThreadsPage.hasNextPage &&
!isFetchingMoreEmails &&
!firstQueryLoading
) {
setIsFetchingMoreEmails(true);
await fetchMore({
@ -144,7 +153,7 @@ export const EmailThreads = ({
}
fontColor={H1TitleFontColor.Primary}
/>
{!loading && (
{!firstQueryLoading && (
<Card>
{timelineThreads?.map((thread: TimelineThread, index: number) => (
<EmailThreadPreview
@ -157,7 +166,7 @@ export const EmailThreads = ({
</Card>
)}
<EmailThreadFetchMoreLoader
loading={isFetchingMoreEmails}
loading={isFetchingMoreEmails || firstQueryLoading}
onLastRowVisible={fetchMoreRecords}
/>
</Section>