Merge branch 'develop' into bs/3d

cvat-ai · Oct 6, 2023 · 86dd5ce · 86dd5ce
2 parents 63f413b + ae1dc1b
commit 86dd5ce
Show file tree

Hide file tree

Showing 26 changed files with 309 additions and 196 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- New , form-based Issue templates for Github repository
-- TDB
+- The latest comment displayed in issues sidebar (<https://github.com/opencv/cvat/pull/6937>)
 
 ### Changed
 
@@ -22,6 +21,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- TDB
+
+### Fixed
+
+- It was not possible to copy issue comment from issue dialog (<https://github.com/opencv/cvat/pull/6937>)
+
+### Security
+
+- Update Grafana from 9.3.6 to 10.1.2
+
+## \[2.7.3\] - 2023-10-02
+
+### Added
+
+- New , form-based Issue templates for Github repository
+
+### Removed
+
 - Functionality for synchronizing a task with a Git repository
   (<https://github.com/opencv/cvat/pull/6904>)
 
@@ -35,6 +52,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  (<https://github.com/opencv/cvat/pull/6862>)
 - Incorrectly determined video frame count when the video contains an MP4 edit list
   (<https://github.com/opencv/cvat/pull/6929>)
+- Internal server error when retrieving data from CS and cache=True
+  (<https://github.com/opencv/cvat/pull/6932>)
 
 ### Security
 
@@ -55,6 +74,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Downloading additional data from cloud storage if use_cache=true and job_file_mapping are specified
   (<https://github.com/opencv/cvat/pull/6879>)
 - Leaving an organization (<https://github.com/opencv/cvat/pull/6422>)
+- Order of images in annotation file when dumping project in CVAT format (<https://github.com/opencv/cvat/pull/6927>)
+- Validation on Cloud Storage form / error message on create task form (<https://github.com/opencv/cvat/pull/6890>)
 
 ## \[2.7.1\] - 2023-09-15
 

diff --git a/cvat-canvas/package.json b/cvat-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas",
-  "version": "2.17.5",
+  "version": "2.17.6",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas library",
   "main": "src/canvas.ts",
   "scripts": {

diff --git a/cvat-canvas/src/typescript/canvasView.ts b/cvat-canvas/src/typescript/canvasView.ts
@@ -1258,13 +1258,11 @@ export class CanvasViewImpl implements CanvasView, Listener {
         window.document.addEventListener('keydown', this.onShiftKeyDown);
         window.document.addEventListener('keyup', this.onShiftKeyUp);
 
-        this.attachmentBoard.addEventListener('wheel', (event) => {
-            event.stopPropagation();
-        });
-
-        this.attachmentBoard.addEventListener('mousemove', (event) => {
-            event.stopPropagation();
-        });
+        for (const eventName of ['wheel', 'mousedown', 'dblclick', 'contextmenu']) {
+            this.attachmentBoard.addEventListener(eventName, (event) => {
+                event.stopPropagation();
+            });
+        }
 
         this.canvas.addEventListener('wheel', (event): void => {
             if (event.ctrlKey) return;

diff --git a/cvat-ui/package.json b/cvat-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.57.0",
+  "version": "1.57.2",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {

diff --git a/cvat-ui/src/components/annotation-page/review/hidden-issue-label.tsx b/cvat-ui/src/components/annotation-page/review/hidden-issue-label.tsx
@@ -8,7 +8,7 @@ import React, {
 } from 'react';
 import ReactDOM from 'react-dom';
 import Tag from 'antd/lib/tag';
-import { CheckCircleOutlined, CloseCircleOutlined, WarningOutlined } from '@ant-design/icons';
+import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons';
 
 import { Issue } from 'cvat-core-wrapper';
 import CVATTooltip from 'components/common/cvat-tooltip';
@@ -63,7 +63,7 @@ export default function HiddenIssueLabel(props: Props): ReactPortal {
 
     const elementID = `cvat-hidden-issue-label-${id}`;
     return ReactDOM.createPortal(
-        <CVATTooltip title={comments[0]?.message || 'Messages not found'}>
+        <CVATTooltip title={comments[0]?.message || 'No comments found'}>
             <Tag
                 ref={ref}
                 id={elementID}
@@ -78,7 +78,7 @@ export default function HiddenIssueLabel(props: Props): ReactPortal {
                 ) : (
                     <CloseCircleOutlined className='cvat-hidden-issue-unsolved-indicator' />
                 )}
-                {comments[0]?.message || <WarningOutlined />}
+                {comments[0]?.message || null}
             </Tag>
         </CVATTooltip>,
         window.document.getElementById('cvat_canvas_attachment_board') as HTMLElement,

diff --git a/cvat-ui/src/components/annotation-page/review/issue-dialog.tsx b/cvat-ui/src/components/annotation-page/review/issue-dialog.tsx
@@ -15,7 +15,6 @@ import Comment from 'antd/lib/comment';
 import Text from 'antd/lib/typography/Text';
 import Title from 'antd/lib/typography/Title';
 import Button from 'antd/lib/button';
-import Spin from 'antd/lib/spin';
 import Input from 'antd/lib/input';
 import moment from 'moment';
 import CVATTooltip from 'components/common/cvat-tooltip';
@@ -148,7 +147,9 @@ export default function IssueDialog(props: Props): JSX.Element {
             </Row>
             <Row className='cvat-issue-dialog-chat' justify='start'>
                 {
-                    lines.length > 0 ? <Col style={{ display: 'block' }}>{lines}</Col> : <Spin />
+                    lines.length > 0 ? <Col style={{ display: 'block' }}>{lines}</Col> : (
+                        <Col>No comments found</Col>
+                    )
                 }
             </Row>
             <Row className='cvat-issue-dialog-input' justify='start'>

diff --git a/cvat-ui/src/components/annotation-page/review/styles.scss b/cvat-ui/src/components/annotation-page/review/styles.scss
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-@import 'base.scss';
+@import 'base';
 
 .cvat-create-issue-dialog {
     position: absolute;
@@ -72,7 +72,6 @@
     transform-origin: top left;
     box-shadow: $box-shadow-base;
     border-radius: 0.5 * $grid-unit-size;
-    opacity: 0.95;
 
     .cvat-issue-dialog-chat {
         > div {
@@ -93,7 +92,7 @@
             }
         }
 
-        border-radius: 0.5 * $grid-unit-size;
+        user-select: all;
         background: $background-color-1;
         padding: $grid-unit-size;
         max-height: $grid-unit-size * 45;

diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/issues-list.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/issues-list.tsx
@@ -18,29 +18,29 @@ import CVATTooltip from 'components/common/cvat-tooltip';
 import { ActiveControl, CombinedState, Workspace } from 'reducers';
 import moment from 'moment';
 import Paragraph from 'antd/lib/typography/Paragraph';
-import { ConflictSeverity, QualityConflict } from 'cvat-core-wrapper';
+import { ConflictSeverity, QualityConflict, Issue } from 'cvat-core-wrapper';
 import { changeShowGroundTruth } from 'actions/settings-actions';
 import { ShowGroundTruthIcon } from 'icons';
 
 export default function LabelsListComponent(): JSX.Element {
     const dispatch = useDispatch();
     const frame = useSelector((state: CombinedState): number => state.annotation.player.frame.number);
-    const frameIssues = useSelector((state: CombinedState): any[] => state.review.frameIssues);
+    const frameIssues = useSelector((state: CombinedState): Issue[] => state.review.frameIssues);
     const frameConflicts = useSelector((state: CombinedState) => state.review.frameConflicts);
     const showGroundTruth = useSelector((state: CombinedState) => state.settings.shapes.showGroundTruth);
-    const issues = useSelector((state: CombinedState): any[] => state.review.issues);
+    const issues = useSelector((state: CombinedState): Issue[] => state.review.issues);
     const conflicts = useSelector((state: CombinedState) => state.review.conflicts);
-    const issuesHidden = useSelector((state: CombinedState): any => state.review.issuesHidden);
-    const issuesResolvedHidden = useSelector((state: CombinedState): any => state.review.issuesResolvedHidden);
+    const issuesHidden = useSelector((state: CombinedState) => state.review.issuesHidden);
+    const issuesResolvedHidden = useSelector((state: CombinedState) => state.review.issuesResolvedHidden);
     const highlightedConflict = useSelector((state: CombinedState) => state.annotation.annotations.highlightedConflict);
     const workspace = useSelector((state: CombinedState) => state.annotation.workspace);
     const ready = useSelector((state: CombinedState) => state.annotation.canvas.ready);
     const activeControl = useSelector((state: CombinedState) => state.annotation.canvas.activeControl);
 
-    let frames = issues.map((issue: any): number => issue.frame).sort((a: number, b: number) => +a - +b);
+    let frames = issues.map((issue: Issue): number => issue.frame).sort((a: number, b: number) => +a - +b);
     if (showGroundTruth) {
         const conflictFrames = conflicts
-            .map((issue: any): number => issue.frame).sort((a: number, b: number) => +a - +b);
+            .map((conflict): number => conflict.frame).sort((a: number, b: number) => +a - +b);
         frames = [...new Set([...frames, ...conflictFrames])];
     }
     const nearestLeft = frames.filter((_frame: number): boolean => _frame < frame).reverse()[0];
@@ -131,45 +131,74 @@ export default function LabelsListComponent(): JSX.Element {
             </div>
             <div className='cvat-objects-sidebar-issues-list'>
                 {frameIssues.map(
-                    (frameIssue: any): JSX.Element => (
-                        <div
-                            key={frameIssue.id}
-                            id={`cvat-objects-sidebar-issue-item-${frameIssue.id}`}
-                            className={
-                                `cvat-objects-sidebar-issue-item ${frameIssue.resolved ? 'cvat-objects-sidebar-issue-resolved' : ''}`
-                            }
-                            onMouseEnter={() => {
-                                const element = window.document.getElementById(
-                                    `cvat_canvas_issue_region_${frameIssue.id}`,
-                                );
-                                if (element) {
-                                    element.setAttribute('fill', 'url(#cvat_issue_region_pattern_2)');
-                                }
-                                dispatch(activateObject(null, null, null));
-                            }}
-                            onMouseLeave={() => {
-                                const element = window.document.getElementById(
-                                    `cvat_canvas_issue_region_${frameIssue.id}`,
-                                );
-                                if (element) {
-                                    element.setAttribute('fill', 'url(#cvat_issue_region_pattern_1)');
+                    (frameIssue: Issue): JSX.Element => {
+                        const firstComment = frameIssue.comments[0];
+                        const lastComment = frameIssue.comments.slice(-1)[0];
+                        return (
+                            <div
+                                key={frameIssue.id}
+                                id={`cvat-objects-sidebar-issue-item-${frameIssue.id}`}
+                                className={
+                                    `cvat-objects-sidebar-issue-item ${frameIssue.resolved ? 'cvat-objects-sidebar-issue-resolved' : ''}`
                                 }
-                            }}
-                        >
-                            <Row>
-                                <Text strong>{`#${frameIssue.id} • Issue`}</Text>
-                            </Row>
-                            <Row>
-                                <Paragraph ellipsis={{ rows: 2 }}>
-                                    {frameIssue.comments[0]?.message ? frameIssue.comments[0]?.message : ''}
-                                </Paragraph>
-                                <Text />
-                            </Row>
-                            <Row>
-                                <Text>{moment(frameIssue.createdDate).fromNow()}</Text>
-                            </Row>
-                        </div>
-                    ),
+                                onMouseEnter={() => {
+                                    const element = window.document.getElementById(
+                                        `cvat_canvas_issue_region_${frameIssue.id}`,
+                                    );
+                                    if (element) {
+                                        element.setAttribute('fill', 'url(#cvat_issue_region_pattern_2)');
+                                    }
+                                    dispatch(activateObject(null, null, null));
+                                }}
+                                onMouseLeave={() => {
+                                    const element = window.document.getElementById(
+                                        `cvat_canvas_issue_region_${frameIssue.id}`,
+                                    );
+                                    if (element) {
+                                        element.setAttribute('fill', 'url(#cvat_issue_region_pattern_1)');
+                                    }
+                                }}
+                            >
+                                <Row justify='space-between'>
+                                    <Col>
+                                        <Text strong>
+                                            {`#${frameIssue.id} • Issue`}
+                                        </Text>
+                                    </Col>
+                                    <Col offset={1}>
+                                        <Text type='secondary'>
+                                            {`created ${moment(frameIssue.createdDate).fromNow()}`}
+                                        </Text>
+                                    </Col>
+                                </Row>
+                                <Row>
+                                    <Paragraph ellipsis={{ rows: 2 }}>
+                                        {!!firstComment?.owner?.username && (
+                                            <Text strong>{`${firstComment.owner.username}: `}</Text>
+                                        )}
+                                        <Text>{firstComment?.message || ''}</Text>
+                                    </Paragraph>
+                                </Row>
+                                { lastComment !== firstComment && (
+                                    <>
+                                        <Row justify='start'>
+                                            <Col>
+                                                <Text strong>&#8230;</Text>
+                                            </Col>
+                                        </Row>
+                                        <Row>
+                                            <Paragraph ellipsis={{ rows: 2 }}>
+                                                {!!lastComment?.owner?.username && (
+                                                    <Text strong>{`${lastComment.owner.username}: `}</Text>
+                                                )}
+                                                <Text>{lastComment?.message || ''}</Text>
+                                            </Paragraph>
+                                        </Row>
+                                    </>
+                                )}
+                            </div>
+                        );
+                    },
                 )}
                 {showGroundTruth && frameConflicts.map(
                     (frameConflict: QualityConflict): JSX.Element => (

diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/styles.scss b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/styles.scss
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-@import 'base.scss';
+@import 'base';
 
 .cvat-objects-appearance-collapse.ant-collapse {
     width: 100%;
@@ -123,6 +123,12 @@
         padding: $grid-unit-size $grid-unit-size $grid-unit-size $grid-unit-size * 8;
     }
 
+    > .ant-row {
+        .ant-typography {
+            margin-bottom: 0;
+        }
+    }
+
     p {
         margin-bottom: 0;
     }
@@ -217,7 +223,7 @@
 
 .cvat-objects-sidebar-state-item {
     width: 100%;
-    padding: 5px 3px 3px 3px;
+    padding: 5px 3px 3px;
     opacity: 1;
 
     > div:nth-child(1) {
@@ -297,7 +303,7 @@
 
 .cvat-object-item-radio-attribute {
     border: 1px double $border-color-hover;
-    border-radius: 7px 7px 7px 7px;
+    border-radius: 7px;
 
     > legend {
         text-align: center;
@@ -316,7 +322,7 @@
 
     > .ant-radio-group {
         display: grid;
-        padding: 1px 5px 1px 5px;
+        padding: 1px 5px;
     }
 }
 
@@ -337,7 +343,7 @@
 .cvat-objects-sidebar-label-item {
     height: 2.5em;
     border-bottom: 1px solid $border-color-1;
-    padding: 5px 3px 3px 3px;
+    padding: 5px 3px 3px;
 
     span {
         @extend .cvat-object-sidebar-icon;
@@ -469,10 +475,6 @@
     padding: $grid-unit-size * 0.5;
     border: 1px solid $object-item-border-color;
     border-bottom: 0;
-    padding-top: 1px;
-    padding-left: 1px;
-    padding-right: 1px;
-    padding-bottom: 2px;
 
     &:last-child {
         border-bottom: 1px solid $object-item-border-color;

diff --git a/cvat-ui/src/components/create-cloud-storage-page/manifests-manager.tsx b/cvat-ui/src/components/create-cloud-storage-page/manifests-manager.tsx
@@ -90,6 +90,11 @@ export default function ManifestsManager(props: Props): JSX.Element {
                                                         required: true,
                                                         message: 'Please specify a manifest name',
                                                     },
+                                                    {
+                                                        type: 'string',
+                                                        pattern: /^.*\.(jsonl)$/,
+                                                        message: 'Manifest file must have .jsonl extension',
+                                                    },
                                                 ]}
                                                 initialValue={field.name}
                                             >