Skip to content
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.

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

Fix issues 6836 6837 #6850

Merged
merged 8 commits into from
Sep 15, 2023
Merged

Fix issues 6836 6837 #6850

merged 8 commits into from
Sep 15, 2023

Conversation

Marishka17
Copy link
Contributor

@Marishka17 Marishka17 commented Sep 12, 2023

Motivation and context

Resolve #6837
Resolve #6836

How has this been tested?

Checklist

  • I submit my changes into the develop branch
  • I have added a description of my changes into the CHANGELOG file
    - [ ] I have updated the documentation accordingly
  • I have added tests to cover my changes
  • I have linked related issues (see GitHub docs)
  • I have increased versions of npm packages if it is necessary
    (cvat-canvas,
    cvat-core,
    cvat-data and
    cvat-ui)

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.

@Marishka17 Marishka17 requested a review from mdacoca as a code owner September 12, 2023 09:07
@@ -171,6 +171,18 @@ function RemoteBrowser(props: Props): JSX.Element {
}
};
collectNodes(content);

if (manifestPath) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this manifest file labeled in screenshot going to be added to the files being uploaded and is it going to affect to predefined sorting method #6836? @Marishka17
image_2023-09-12_13-07-53

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bedilbek, Yes, such manifest will be added to the list of files and the sequence of frames will be determined based on manifest content (in case of using predefined sorting).

@codecov
Copy link

codecov bot commented Sep 12, 2023

Codecov Report

Merging #6850 (6cd9c8a) into develop (8962c12) will increase coverage by 0.01%.
The diff coverage is 85.71%.

@@             Coverage Diff             @@
##           develop    #6850      +/-   ##
===========================================
+ Coverage    82.49%   82.51%   +0.01%     
===========================================
  Files          370      370              
  Lines        39831    39836       +5     
  Branches      3549     3549              
===========================================
+ Hits         32860    32871      +11     
+ Misses        6971     6965       -6     
Components Coverage Δ
cvat-ui 77.55% <ø> (+0.03%) ⬆️
cvat-server 86.86% <85.71%> (+<0.01%) ⬆️

cvat-ui/src/components/file-manager/remote-browser.tsx Outdated Show resolved Hide resolved
key: manifestPath,
children: [],
type: 'REG',
mimeType: 'unknown',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why mimeType is unknown? application/jsonl?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was sure that mimeType in such a structure generally is defined from the server content and it can be only image/video/archive/pdf/DIR /unknown.

Co-authored-by: Boris Sekachev <boris.sekachev@yandex.ru>
@nmanovic nmanovic merged commit 97c7f1d into develop Sep 15, 2023
@azhavoro azhavoro mentioned this pull request Sep 15, 2023
@bsekachev bsekachev deleted the mk/fix_issues_6836_6837 branch September 15, 2023 12:18
mikhail-treskin pushed a commit to retailnext/cvat that referenced this pull request Oct 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants