Skip to content

Commit

Permalink
Fixed bug: some models are not shown (#5754)
Browse files Browse the repository at this point in the history
<!-- Raise an issue to propose your change
(https://github.com/opencv/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution
guide](https://opencv.github.io/cvat/docs/contributing/). -->

<!-- Provide a general summary of your changes in the Title above -->

### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
It seems after merging #5575 we need to get models in a new way. If we
are sending default request(without page params, only first page is
returned). This pr users fetchAll function to fetch models. Also fixes
bug with incorrect 0 in result.count if there is only one page. Model
page pagination should work fine when all models would be correctly
fetched

### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->

### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- ~~[ ] I have added a description of my changes into the
[CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md)
file~~
- ~~[ ] I have updated the documentation accordingly~~
- ~~[ ] I have added tests to cover my changes~~
- ~~[ ] I have linked related issues (see [GitHub docs](

https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))~~
- ~~[ ] I have increased versions of npm packages if it is necessary

([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))~~

### License

- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.
  • Loading branch information
klakhov authored Feb 23, 2023
1 parent 48a57c9 commit 4351d7a
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions cvat-core/src/server-proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ function fetchAll(url, filter = {}): Promise<any> {
}).then((initialData) => {
const { count, results } = initialData.data;
result.results = result.results.concat(results);
result.count = result.results.length;

if (count <= pageSize) {
resolve(result);
return;
Expand Down Expand Up @@ -1573,8 +1575,8 @@ async function getFunctions(): Promise<FunctionsResponseBody> {
const { backendAPI } = config;

try {
const response = await Axios.get(`${backendAPI}/functions`);
return response.data;
const response = await fetchAll(`${backendAPI}/functions`);
return response;
} catch (errorData) {
if (errorData.response.status === 404) {
return {
Expand Down

0 comments on commit 4351d7a

Please sign in to comment.