Fixed filter #1444

cvat-ai · Apr 21, 2020 · 7c5783a · 7c5783a
1 parent c41ff06
commit 7c5783a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cvat-core/src/annotations-filter.js b/cvat-core/src/annotations-filter.js
@@ -18,7 +18,7 @@ const { ArgumentError } = require('./exceptions');
 class AnnotationsFilter {
     constructor() {
         // eslint-disable-next-line security/detect-unsafe-regex
-        this.operatorRegex = /(==|!=|<=|>=|>|<|~=)(?=(?:[^"]*(["])[^"]*\2)*[^"]*$)/g;
+        this.operatorRegex = /(==|!=|<=|>=|>|<)(?=(?:[^"]*(["])[^"]*\2)*[^"]*$)/g;
     }
 
     // Method splits expression by operators that are outside of any brackets
@@ -204,7 +204,7 @@ class AnnotationsFilter {
                 serverID: state.serverID,
                 clientID: state.clientID,
                 type: state.objectType,
-                shape: state.objectShape,
+                shape: state.shapeType,
                 occluded: state.occluded,
             };
         });

diff --git a/cvat-ui/src/components/annotation-page/annotations-filters-input.tsx b/cvat-ui/src/components/annotation-page/annotations-filters-input.tsx
@@ -93,7 +93,7 @@ function filtersHelpModalContent(
                 width, height, label, serverID, clientID, type, shape, occluded
                 <br />
                 <Text strong>Supported operators: </Text>
-                    ==, !=, &gt;, &gt;=, &lt;, &lt;=, ~=, (), &amp; and |
+                    ==, !=, &gt;, &gt;=, &lt;, &lt;=, (), &amp; and |
                 <br />
                 <Text strong>
                     If you have double quotes in your query string,
@@ -107,6 +107,7 @@ function filtersHelpModalContent(
                 <Title level={3}>Examples</Title>
                 <ul>
                     <li>label==&quot;car&quot; | label==[&quot;road sign&quot;]</li>
+                    <li>shape == &quot;polygon&quot;</li>
                     <li>width &gt;= height</li>
                     <li>attr[&quot;Attribute 1&quot;] == attr[&quot;Attribute 2&quot;]</li>
                     <li>clientID == 50</li>