alt/zot-wo-auth
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: infinite loading bug

Browse Source 
Signed-off-by: Raul Kele <raulkeleblk@gmail.com>
This commit is contained in:
Raul Kele 2023-01-31 16:02:06 +02:00
parent 23416883c7
commit 514475a33f
5 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/__tests__/TagPage/DependsOn.test.js
View File

@ -101,4 +101,11 @@ describe('Dependencies tab', () => {
render(<RouterDependsWrapper />);
await waitFor(() => expect(error).toBeCalledTimes(1));
});
it('should stop loading if the api response contains an error', async () => {
jest.spyOn(api, 'get').mockResolvedValue({ status: 500, data: { errors: ['test error'] } });
jest.spyOn(console, 'error').mockImplementation(() => {});
render(<RouterDependsWrapper />);
expect(await screen.findByText(/Nothing found/i)).toBeInTheDocument();
});
});

7
src/__tests__/TagPage/IsDependentOn.test.js
View File

@ -101,4 +101,11 @@ describe('Dependents tab', () => {
render(<RouterDependsWrapper />);
await waitFor(() => expect(error).toBeCalledTimes(1));
});
it('should stop loading if the api response contains an error', async () => {
jest.spyOn(api, 'get').mockResolvedValue({ status: 500, data: { errors: ['test error'] } });
jest.spyOn(console, 'error').mockImplementation(() => {});
render(<RouterDependsWrapper />);
expect(await screen.findByText(/Nothing found/i)).toBeInTheDocument();
});
});

3
src/__tests__/TagPage/TagDetails.test.js
View File

@ -230,8 +230,9 @@ afterEach(() => {
describe('Tags details', () => {
it('should show tabs and allow nagivation between them', async () => {
jest.spyOn(api, 'get').mockResolvedValue({ status: 200, data: { data: mockImage } });
jest.spyOn(api, 'get').mockResolvedValueOnce({ status: 200, data: { data: mockImage } });
render(<TagDetailsThemeWrapper />);
jest.spyOn(api, 'get').mockResolvedValue({ status: 500, data: { data: { errors: ['test error'] } } });
const dependenciesTab = await screen.findByTestId('dependencies-tab');
fireEvent.click(dependenciesTab);
expect(await screen.findByTestId('depends-on-container')).toBeInTheDocument();

18
src/components/DependsOn.jsx
View File

@ -89,15 +89,15 @@ function DependsOn(props) {
)
.then((response) => {
if (response.data && response.data.data) {
if (!isEmpty(response.data.data.BaseImageList?.Results)) {
let imagesData = response.data.data.BaseImageList?.Results?.map((img) => mapToImage(img));
const newImageList = [...images, ...imagesData];
setImages(newImageList);
setIsEndOfList(
response.data.data.BaseImageList.Page?.ItemCount < EXPLORE_PAGE_SIZE ||
newImageList.length >= response.data.data.BaseImageList?.Page?.TotalCount
);
}
let imagesData = response.data.data.BaseImageList?.Results?.map((img) => mapToImage(img));
const newImageList = [...images, ...imagesData];
setImages(newImageList);
setIsEndOfList(
response.data.data.BaseImageList.Page?.ItemCount < EXPLORE_PAGE_SIZE ||
newImageList.length >= response.data.data.BaseImageList?.Page?.TotalCount
);
} else if (response.data.errors) {
setIsEndOfList(true);
}
setIsLoading(false);
})

2
src/components/IsDependentOn.jsx
View File

@ -96,6 +96,8 @@ function IsDependentOn(props) {
response.data.data.DerivedImageList?.Page?.ItemCount < EXPLORE_PAGE_SIZE ||
newImageList.length >= response.data.data.DerivedImageList?.Page?.TotalCount
);
} else if (response.data.errors) {
setIsEndOfList(true);
}
setIsLoading(false);
})