Merge branch 'develop' into bs/minor_style_fix

cvat-ai · Jun 25, 2024 · 935b156 · 935b156
2 parents 75070c9 + 25fc37b
commit 935b156
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/changelog.d/20240624_145717_boris.md b/changelog.d/20240624_145717_boris.md
@@ -0,0 +1,4 @@
+### Fixed
+
+- Slightly broken layout when running attributed face detection model
+  (<https://github.com/cvat-ai/cvat/pull/8072>)
diff --git a/...-ui/src/components/annotation-page/standard-workspace/controls-side-bar/tools-control.tsx b/...-ui/src/components/annotation-page/standard-workspace/controls-side-bar/tools-control.tsx
@@ -1231,8 +1231,12 @@ export class ToolsControlComponent extends React.PureComponent<Props, State> {
 
                     try {
                         this.setState({ mode: 'detection', fetching: true });
+
+                        // The function call endpoint doesn't support the cleanup and convMaskToPoly parameters.
+                        const { cleanup, convMaskToPoly, ...restOfBody } = body;
+
                         const result = await core.lambda.call(jobInstance.taskId, model, {
-                            ...body, frame, job: jobInstance.id,
+                            ...restOfBody, frame, job: jobInstance.id,
                         }) as DetectedShapes;
 
                         const states = result.map(
@@ -1307,7 +1311,7 @@ export class ToolsControlComponent extends React.PureComponent<Props, State> {
                                     });
                                 }
 
-                                if (data.type === 'mask' && data.points && body.convMaskToPoly) {
+                                if (data.type === 'mask' && data.points && convMaskToPoly) {
                                     return new core.classes.ObjectState({
                                         ...objectData,
                                         shapeType: ShapeType.POLYGON,

diff --git a/cvat-ui/src/components/model-runner-modal/object-mapper.tsx b/cvat-ui/src/components/model-runner-modal/object-mapper.tsx
@@ -78,13 +78,13 @@ function ObjectMapperComponent(props: Props): JSX.Element {
                 return (
                     <React.Fragment key={`${leftName}:${rightName}`}>
                         <Row className={rowClassName} key={`${leftName}:${rightName}`}>
-                            <Col span={10}>
+                            <Col span={9}>
                                 <Tag style={{ color: textColor }} color={color} key={leftName}>{leftName}</Tag>
                             </Col>
-                            <Col span={10} offset={1}>
+                            <Col span={9} offset={1}>
                                 <Tag style={{ color: textColor }} color={color} key={rightName}>{rightName}</Tag>
                             </Col>
-                            <Col span={1} offset={1}>
+                            <Col span={2} offset={1}>
                                 <CVATTooltip title={deleteMappingLabel}>
                                     <DeleteOutlined
                                         className='cvat-danger-circle-icon'
@@ -103,7 +103,7 @@ function ObjectMapperComponent(props: Props): JSX.Element {
 
             { (leftValue === null || rightValue === null) && !!notMappedLeft.length && (
                 <Row className={rowClassName}>
-                    <Col span={10}>
+                    <Col span={9}>
                         <Select
                             virtual
                             showSearch
@@ -124,7 +124,7 @@ function ObjectMapperComponent(props: Props): JSX.Element {
                             ))}
                         </Select>
                     </Col>
-                    <Col span={10} offset={1}>
+                    <Col span={9} offset={1}>
                         <Select
                             virtual
                             showSearch
@@ -145,7 +145,7 @@ function ObjectMapperComponent(props: Props): JSX.Element {
                             ))}
                         </Select>
                     </Col>
-                    <Col span={1} offset={1}>
+                    <Col span={2} offset={1}>
                         { (leftValue === null && rightValue === null) ? (
                             <Col span={1} offset={1}>
                                 <CVATTooltip title={infoMappingLabel}>

diff --git a/cvat-ui/src/components/model-runner-modal/styles.scss b/cvat-ui/src/components/model-runner-modal/styles.scss
@@ -19,14 +19,13 @@
 
     &:has(.cvat-runner-label-mapper) {
         max-height: $grid-unit-size * 64;
-        overflow-y: auto;
+        overflow: hidden auto;
     }
 
     > .cvat-runner-label-mapper {
         margin-top: $grid-unit-size * 2;
         margin-bottom: $grid-unit-size * 2;
-        padding-left: $grid-unit-size * 4;
-        padding-right: $grid-unit-size * 4;
+        margin-left: $grid-unit-size * 2;
     }
 
     .cvat-runner-attribute-mapper {
@@ -42,8 +41,7 @@
         width: 100%;
         margin-top: $grid-unit-size * 2;
         margin-bottom: $grid-unit-size * 2;
-        padding-left: $grid-unit-size * 4;
-        padding-right: $grid-unit-size * 4;
+        margin-left: $grid-unit-size * 2;
     }
 }