From 71dfd51be187ff23e66c716c439a86d2a3c1394e Mon Sep 17 00:00:00 2001
From: Boris Sekachev <boris.sekachev@intel.com>
Date: Wed, 2 Feb 2022 11:57:27 +0300
Subject: [PATCH] Added missed migration, fixed couple of minor issues with job
 state (#4274)

---
 cvat-ui/package-lock.json                     |  4 +--
 cvat-ui/package.json                          |  2 +-
 cvat-ui/src/actions/annotation-actions.ts     |  2 +-
 .../top-bar/annotation-menu.tsx               | 32 +++++++++----------
 .../migrations/0049_auto_20220202_0710.py     | 23 +++++++++++++
 5 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 cvat/apps/engine/migrations/0049_auto_20220202_0710.py

diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json
index 217c5fc6..90c57f9a 100644
--- a/cvat-ui/package-lock.json
+++ b/cvat-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "cvat-ui",
-  "version": "1.34.0",
+  "version": "1.34.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "cvat-ui",
-      "version": "1.34.0",
+      "version": "1.34.1",
       "license": "MIT",
       "dependencies": {
         "@ant-design/icons": "^4.6.3",
diff --git a/cvat-ui/package.json b/cvat-ui/package.json
index 21b7b1b9..d1d5dfa3 100644
--- a/cvat-ui/package.json
+++ b/cvat-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.34.0",
+  "version": "1.34.1",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {
diff --git a/cvat-ui/src/actions/annotation-actions.ts b/cvat-ui/src/actions/annotation-actions.ts
index 27b4e9df..f71851af 100644
--- a/cvat-ui/src/actions/annotation-actions.ts
+++ b/cvat-ui/src/actions/annotation-actions.ts
@@ -1132,7 +1132,7 @@ export function saveAnnotationsAsync(sessionInstance: any, afterSave?: () => voi
 
             if (sessionInstance instanceof cvat.classes.Job && sessionInstance.state === cvat.enums.JobState.NEW) {
                 sessionInstance.state = cvat.enums.JobState.IN_PROGRESS;
-                updateJobAsync(sessionInstance);
+                dispatch(updateJobAsync(sessionInstance));
             }
 
             dispatch({
diff --git a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx
index a46a8961..6093a76b 100644
--- a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx
+++ b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2021 Intel Corporation
+// Copyright (C) 2020-2022 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -229,22 +229,20 @@ function AnnotationMenuComponent(props: Props & RouteComponentProps): JSX.Elemen
                     Open the task
                 </a>
             </Menu.Item>
-            {jobStage !== JobStage.ACCEPTANCE ? (
-                <Menu.SubMenu popupClassName='cvat-annotation-menu-job-state-submenu' key='job-state-submenu' title='Change job state'>
-                    <Menu.Item key={`state:${JobState.NEW}`}>
-                        <Text className={computeClassName(JobState.NEW)}>{JobState.NEW}</Text>
-                    </Menu.Item>
-                    <Menu.Item key={`state:${JobState.IN_PROGRESS}`}>
-                        <Text className={computeClassName(JobState.IN_PROGRESS)}>{JobState.IN_PROGRESS}</Text>
-                    </Menu.Item>
-                    <Menu.Item key={`state:${JobState.REJECTED}`}>
-                        <Text className={computeClassName(JobState.REJECTED)}>{JobState.REJECTED}</Text>
-                    </Menu.Item>
-                    <Menu.Item key={`state:${JobState.COMPLETED}`}>
-                        <Text className={computeClassName(JobState.COMPLETED)}>{JobState.COMPLETED}</Text>
-                    </Menu.Item>
-                </Menu.SubMenu>
-            ) : null }
+            <Menu.SubMenu popupClassName='cvat-annotation-menu-job-state-submenu' key='job-state-submenu' title='Change job state'>
+                <Menu.Item key={`state:${JobState.NEW}`}>
+                    <Text className={computeClassName(JobState.NEW)}>{JobState.NEW}</Text>
+                </Menu.Item>
+                <Menu.Item key={`state:${JobState.IN_PROGRESS}`}>
+                    <Text className={computeClassName(JobState.IN_PROGRESS)}>{JobState.IN_PROGRESS}</Text>
+                </Menu.Item>
+                <Menu.Item key={`state:${JobState.REJECTED}`}>
+                    <Text className={computeClassName(JobState.REJECTED)}>{JobState.REJECTED}</Text>
+                </Menu.Item>
+                <Menu.Item key={`state:${JobState.COMPLETED}`}>
+                    <Text className={computeClassName(JobState.COMPLETED)}>{JobState.COMPLETED}</Text>
+                </Menu.Item>
+            </Menu.SubMenu>
             {[JobStage.ANNOTATION, JobStage.REVIEW].includes(jobStage) ?
                 <Menu.Item key={Actions.FINISH_JOB}>Finish the job</Menu.Item> : null}
             {jobStage === JobStage.ACCEPTANCE ?
diff --git a/cvat/apps/engine/migrations/0049_auto_20220202_0710.py b/cvat/apps/engine/migrations/0049_auto_20220202_0710.py
new file mode 100644
index 00000000..468fe667
--- /dev/null
+++ b/cvat/apps/engine/migrations/0049_auto_20220202_0710.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.11 on 2022-02-02 07:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('engine', '0048_auto_20211112_1918'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='labeledshape',
+            name='type',
+            field=models.CharField(choices=[('rectangle', 'RECTANGLE'), ('polygon', 'POLYGON'), ('polyline', 'POLYLINE'), ('points', 'POINTS'), ('ellipse', 'ELLIPSE'), ('cuboid', 'CUBOID')], max_length=16),
+        ),
+        migrations.AlterField(
+            model_name='trackedshape',
+            name='type',
+            field=models.CharField(choices=[('rectangle', 'RECTANGLE'), ('polygon', 'POLYGON'), ('polyline', 'POLYLINE'), ('points', 'POINTS'), ('ellipse', 'ELLIPSE'), ('cuboid', 'CUBOID')], max_length=16),
+        ),
+    ]