Skip to content

[Bug]: Refresh button does not work on list pages #3520

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
olgenn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Bug]: Refresh button does not work on list pages #3520

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
60 changes: 30 additions & 30 deletions frontend/src/hooks/useInfiniteScroll.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ export const useInfiniteScroll = <DataItem, Args extends InfinityListArgs>({
const [getItems, { isLoading, isFetching }] = useLazyQuery({ ...args } as Args);

const getDataRequest = (params: Args) => {
if (isEqual(params, lastRequestParams.current)) {
return Promise.reject();
}

const request = getItems({
limit,
...params,
Expand Down Expand Up @@ -90,36 +86,40 @@ export const useInfiniteScroll = <DataItem, Args extends InfinityListArgs>({
return;
}

try {
isLoadingRef.current = true;

const result = await getDataRequest({
...argsProp,
...getPaginationParams(data[data.length - 1]),
} as Args);

let listResponse: ListResponse<DataItem>;
const requestParams = {
...argsProp,
...getPaginationParams(data[data.length - 1]),
};

if ('data' in result) {
listResponse = result.data;
setTotalCount(result.total_count);
} else {
listResponse = result;
setTotalCount();
if (!isEqual(requestParams, lastRequestParams.current)) {
try {
isLoadingRef.current = true;

const result = await getDataRequest(requestParams as Args);

let listResponse: ListResponse<DataItem>;

if ('data' in result) {
listResponse = result.data;
setTotalCount(result.total_count);
} else {
listResponse = result;
setTotalCount();
}

if (listResponse.length > 0) {
setData((prev) => [...prev, ...listResponse]);
} else {
isDisabledMoreRef.current = true;
}
} catch (e) {
console.log(e);
}

if (listResponse.length > 0) {
setData((prev) => [...prev, ...listResponse]);
} else {
isDisabledMoreRef.current = true;
}
} catch (e) {
console.log(e);
setTimeout(() => {
isLoadingRef.current = false;
}, 50);
}

setTimeout(() => {
isLoadingRef.current = false;
}, 50);
};

useLayoutEffect(() => {
Expand Down