Skip to content

PWA-3613: RI-Wishlist pagination fix #4562

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

Merged
merged 2 commits into from
Oct 13, 2025
Merged

PWA-3613: RI-Wishlist pagination fix #4562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37d55fa
PWA-3613: RI-Wishlist pagination fix
del22123 Oct 10, 2025
6e12b3a
PWA-3613:Fixed lint and prettier issues
del22123 Oct 13, 2025
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
2 changes: 1 addition & 1 deletion packages/peregrine/lib/hooks/useCustomerWishlistSkus/customerWishlist.gql.ce.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const GET_WISHLIST_ITEMS = gql`
customer {
wishlists {
id
items_v2(currentPage: $currentPage, pageSize: 10) {
items_v2(currentPage: $currentPage, pageSize: 20) {
items {
id
# eslint-disable-next-line @graphql-eslint/require-id-when-available
Expand Down
18 changes: 2 additions & 16 deletions packages/peregrine/lib/hooks/useCustomerWishlistSkus/useCustomerWishlistSkus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { useState } from 'react';
import { useQuery } from '@apollo/client';
import { useUserContext } from '../../context/user';
import mergeOperations from '../../util/shallowMerge';
Expand All @@ -16,19 +15,16 @@ export const useCustomerWishlistSkus = (props = {}) => {
const operations = mergeOperations(defaultOperations, props.operations);
const [{ isSignedIn }] = useUserContext();

const [currentPage, setCurrentPage] = useState(1);

const {
client,
data: { customerWishlistProducts }
} = useQuery(operations.getProductsInWishlistsQuery);

useQuery(operations.getWishlistItemsQuery, {
fetchPolicy: 'cache-and-network',
fetchPolicy: 'cache-first',
onCompleted: data => {
const itemsToAdd = new Set();
const wishlists = data.customer.wishlists;
let shouldFetchMore = false;
wishlists.map(wishlist => {
const items = wishlist.items_v2.items;
items.map(item => {
Expand All @@ -37,12 +33,6 @@ export const useCustomerWishlistSkus = (props = {}) => {
itemsToAdd.add(sku);
}
});

const pageInfo = wishlist.items_v2.page_info;

if (pageInfo.total_pages > pageInfo.current_page) {
shouldFetchMore = true;
}
});

if (itemsToAdd.size) {
Expand All @@ -56,14 +46,10 @@ export const useCustomerWishlistSkus = (props = {}) => {
}
});
}

if (shouldFetchMore) {
setCurrentPage(current => ++current);
}
},
skip: !isSignedIn,
variables: {
currentPage
currentPage: 1
}
});
};
3 changes: 0 additions & 3 deletions packages/peregrine/lib/talons/WishlistPage/__tests__/__snapshots__/useWishlist.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ Object {
Object {
"name": "item1",
},
Object {
"name": "item2",
},
],
}
`;
93 changes: 76 additions & 17 deletions packages/peregrine/lib/talons/WishlistPage/useWishlist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useCallback, useEffect, useState } from 'react';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useLazyQuery } from '@apollo/client';
import mergeOperations from '../../util/shallowMerge';
import defaultOperations from './wishlist.gql';
Expand All @@ -17,15 +17,17 @@ export const useWishlist = (props = {}) => {
const [page, setPage] = useState(1);
const [isOpen, setIsOpen] = useState(!isCollapsed);
const [isFetchingMore, setIsFetchingMore] = useState(false);
const hasFetchedRef = useRef(false);

const [fetchWishlistItems, queryResult] = useLazyQuery(
operations.getCustomerWishlistItems,
{
fetchPolicy: 'cache-and-network',
fetchPolicy: 'cache-first',
nextFetchPolicy: 'cache-first',
variables: {
id,
currentPage: 1
currentPage: 1,
pageSize: 20
}
}
);
Expand All @@ -38,27 +40,84 @@ export const useWishlist = (props = {}) => {
const handleLoadMore = useCallback(async () => {
setIsFetchingMore(true);
const currentPage = page + 1;
await fetchMore({
variables: {
id,
currentPage
}
});

setPage(currentPage);
setIsFetchingMore(false);
try {
await fetchMore({
variables: {
id,
currentPage,
pageSize: 20
},
updateQuery: (prevResult, { fetchMoreResult }) => {
if (!fetchMoreResult) {
return prevResult;
}

const prevWishlist = prevResult.customer.wishlist_v2;
const newWishlist = fetchMoreResult.customer.wishlist_v2;

if (prevWishlist.id !== newWishlist.id) {
return prevResult;
}

const prevItems = prevWishlist.items_v2.items || [];
const newItems = newWishlist.items_v2.items || [];

const existingIds = new Set(prevItems.map(item => item.id));
const uniqueNewItems = newItems.filter(
item => !existingIds.has(item.id)
);

return {
...prevResult,
customer: {
...prevResult.customer,
wishlist_v2: {
...prevWishlist,
items_v2: {
...prevWishlist.items_v2,
items: [...prevItems, ...uniqueNewItems]
}
}
}
};
}
});

setPage(currentPage);
} catch (error) {
console.error('Error loading more wishlist items:', error);
} finally {
setIsFetchingMore(false);
}
}, [id, fetchMore, page]);

useEffect(() => {
if (itemsCount >= 1 && isOpen === true && !data) {
if (itemsCount >= 1 && isOpen === true && !hasFetchedRef.current) {
hasFetchedRef.current = true;
fetchWishlistItems();
}
}, [itemsCount, isOpen, fetchWishlistItems, data]);
}, [itemsCount, isOpen, fetchWishlistItems]);

const items = useMemo(() => {
if (!data || !data.customer || !data.customer.wishlist_v2) {
return [];
}

const allItems = data.customer.wishlist_v2.items_v2?.items || [];

const uniqueItems = [];
const seenIds = new Set();

for (const item of allItems) {
if (!seenIds.has(item.id)) {
seenIds.add(item.id);
uniqueItems.push(item);
}
}

const items =
data && data.customer.wishlist_v2.items_v2.items
? data.customer.wishlist_v2.items_v2.items
: [];
return uniqueItems;
}, [data]);

return {
handleContentToggle,
Expand Down
4 changes: 2 additions & 2 deletions packages/peregrine/lib/talons/WishlistPage/wishlist.gql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ export const GET_CUSTOMER_WISHLIST = gql`
`;

export const GET_CUSTOMER_WISHLIST_ITEMS = gql`
query getCustomerWishlist($id: ID!, $currentPage: Int) {
query getCustomerWishlist($id: ID!, $currentPage: Int, $pageSize: Int) {
# eslint-disable-next-line @graphql-eslint/require-id-when-available
customer {
wishlist_v2(id: $id) {
id
items_v2(currentPage: $currentPage) {
items_v2(currentPage: $currentPage, pageSize: $pageSize) {
items {
id
...WishlistItemFragment
Expand Down