From 89628fbac53cccb63206e3e86c0f519f3f7c851a Mon Sep 17 00:00:00 2001
From: Dmitry Kalinin <dmitry.kalinin@intel.com>
Date: Wed, 11 Mar 2020 14:52:45 +0300
Subject: [PATCH] Fixed filters with tags

---
 cvat-core/src/annotations-filter.js           | 25 +++++++++--------
 .../objects-side-bar/object-item.tsx          | 28 +++++++++++--------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/cvat-core/src/annotations-filter.js b/cvat-core/src/annotations-filter.js
index 62530167..903067bc 100644
--- a/cvat-core/src/annotations-filter.js
+++ b/cvat-core/src/annotations-filter.js
@@ -165,18 +165,21 @@ class AnnotationsFilter {
             let xbr = Number.MIN_SAFE_INTEGER;
             let ytl = Number.MAX_SAFE_INTEGER;
             let ybr = Number.MIN_SAFE_INTEGER;
+            let [width, height] = [null, null];
+
+            if (state.objectType !== 'tag') {
+                state.points.forEach((coord, idx) => {
+                    if (idx % 2) { // y
+                        ytl = Math.min(ytl, coord);
+                        ybr = Math.max(ybr, coord);
+                    } else { // x
+                        xtl = Math.min(xtl, coord);
+                        xbr = Math.max(xbr, coord);
+                    }
+                });
+                [width, height] = [xbr - xtl, ybr - ytl];
+            }
 
-            state.points.forEach((coord, idx) => {
-                if (idx % 2) { // y
-                    ytl = Math.min(ytl, coord);
-                    ybr = Math.max(ybr, coord);
-                } else { // x
-                    xtl = Math.min(xtl, coord);
-                    xbr = Math.max(xbr, coord);
-                }
-            });
-
-            const [width, height] = [xbr - xtl, ybr - ytl];
             const attributes = {};
             Object.keys(state.attributes).reduce((acc, key) => {
                 const attr = labelAttributes[key];
diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item.tsx
index 72e2d0e6..dc7952cf 100644
--- a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item.tsx
+++ b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item.tsx
@@ -68,18 +68,22 @@ function ItemMenu(
                     Propagate
                 </Button>
             </Menu.Item>
-            <Menu.Item>
-                <Button disabled={objectType === ObjectType.TAG} type='link' onClick={toBackground}>
-                    <Icon component={BackgroundIcon} />
-                    To background
-                </Button>
-            </Menu.Item>
-            <Menu.Item>
-                <Button disabled={objectType === ObjectType.TAG} type='link' onClick={toForeground}>
-                    <Icon component={ForegroundIcon} />
-                    To foreground
-                </Button>
-            </Menu.Item>
+            { objectType !== ObjectType.TAG && (
+                <>
+                    <Menu.Item>
+                        <Button type='link' onClick={toBackground}>
+                            <Icon component={BackgroundIcon} />
+                            To background
+                        </Button>
+                    </Menu.Item>
+                    <Menu.Item>
+                        <Button type='link' onClick={toForeground}>
+                            <Icon component={ForegroundIcon} />
+                            To foreground
+                        </Button>
+                    </Menu.Item>
+                </>
+            )}
             <Menu.Item>
                 <Button
                     type='link'