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

Migrate quality UI changes #7441

Merged
merged 31 commits into from
Feb 15, 2024
Merged

Migrate quality UI changes #7441

merged 31 commits into from
Feb 15, 2024

Conversation

klakhov
Copy link
Contributor

@klakhov klakhov commented Feb 5, 2024

Motivation and context

This PR moves some UI changes from #6367
Now it includes:

  • Fix for quality page: job reports are not displayed correctly on second and later pages
  • Quality pages code refactoring in cvat-ui

How has this been tested?

Checklist

  • I submit my changes into the develop branch
  • I have created a changelog fragment
  • [ ] 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.

@klakhov klakhov marked this pull request as ready for review February 6, 2024 10:09
@klakhov klakhov removed the request for review from nmanovic February 6, 2024 10:09
@klakhov klakhov added the ui/ux label Feb 6, 2024
@bsekachev
Copy link
Member

@klakhov Could you please merge with develop?

Copy link

codecov bot commented Feb 9, 2024

Codecov Report

Merging #7441 (8f608e2) into develop (e8384f8) will decrease coverage by 0.03%.
The diff coverage is 88.52%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #7441      +/-   ##
===========================================
- Coverage    83.55%   83.52%   -0.03%     
===========================================
  Files          375      373       -2     
  Lines        39752    39689      -63     
  Branches      3734     3718      -16     
===========================================
- Hits         33213    33151      -62     
+ Misses        6539     6538       -1     
Components Coverage Δ
cvat-ui 79.39% <88.52%> (-0.07%) ⬇️
cvat-server 87.32% <ø> (+<0.01%) ⬆️

changelog.d/20240206_125854_klakhov_quality_bugfixes.md Outdated Show resolved Hide resolved
cvat-core/src/server-proxy.ts Outdated Show resolved Hide resolved
cvat-core/src/common.ts Outdated Show resolved Hide resolved
cvat-core/src/api.ts Show resolved Hide resolved
Comment on lines 37 to 42
export function useStateIfMounted<T>(defaultValue: T): [T, (t: T) => void] {
const isMounted = useIsMounted();
const [state, setState] = useState<T>(defaultValue);
const wrappedSetState = useCallback((val: T) => isMounted() && setState(val), []);
return [state, wrappedSetState];
}
Copy link
Member

Choose a reason for hiding this comment

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

I suppose now it may be removed

Comment on lines 31 to 38
fetching: boolean,
taskReport: QualityReport | null,
jobsReports: QualityReport[],
qualitySettings: {
settings: QualitySettings | null,
fetching: boolean,
visible: boolean,
},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
fetching: boolean,
taskReport: QualityReport | null,
jobsReports: QualityReport[],
qualitySettings: {
settings: QualitySettings | null,
fetching: boolean,
visible: boolean,
},
fetching: boolean;
taskReport: QualityReport | null;
jobsReports: QualityReport[];
qualitySettings: {
settings: QualitySettings | null;
fetching: boolean;
visible: boolean;
};

Comment on lines 26 to 27
task: Task,
onJobUpdate: (job: Job) => void
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
task: Task,
onJobUpdate: (job: Job) => void
task: Task;
onJobUpdate: (job: Job) => void;

Comment on lines 300 to 316
frame_count: number,
frame_share: number,
conflict_count: number,
valid_count: number,
ds_count: number,
gt_count: number,
error_count: number,
warning_count: number,
conflicts_by_type: {
extra_annotation: number,
missing_annotation: number,
mismatching_label: number,
low_overlap: number,
mismatching_direction: number,
mismatching_attributes: number,
mismatching_groups: number,
covered_annotation: number,
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
frame_count: number,
frame_share: number,
conflict_count: number,
valid_count: number,
ds_count: number,
gt_count: number,
error_count: number,
warning_count: number,
conflicts_by_type: {
extra_annotation: number,
missing_annotation: number,
mismatching_label: number,
low_overlap: number,
mismatching_direction: number,
mismatching_attributes: number,
mismatching_groups: number,
covered_annotation: number,
frame_count: number;
frame_share: number;
conflict_count: number;
valid_count: number;
ds_count: number;
gt_count: number;
error_count: number;
warning_count: number;
conflicts_by_type: {
extra_annotation: number;
missing_annotation: number;
mismatching_label: number;
low_overlap: number;
mismatching_direction: number;
mismatching_attributes: number;
mismatching_groups: number;
covered_annotation: number;

@bsekachev bsekachev merged commit 11cec4c into develop Feb 15, 2024
34 checks passed
@klakhov klakhov mentioned this pull request Feb 19, 2024
3 tasks
@cvat-bot cvat-bot bot mentioned this pull request Feb 23, 2024
@bsekachev bsekachev deleted the kl/quality-bugfixes branch February 26, 2024 09:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants