diffgram · anthony-chaudhary · Apr 19, 2022 · Apr 19, 2022 · Apr 19, 2022 · Apr 19, 2022
diff --git a/frontend/cypress/integration/diffgram/user/user_login_spec.js b/frontend/cypress/integration/diffgram/user/user_login_spec.js
@@ -1,6 +1,5 @@
 
 
-
 describe('Login Flow tests', function () {
 
   beforeEach(() => {
@@ -15,8 +14,6 @@ describe('Login Flow tests', function () {
       'ai',
       'alert',
       'public_project',
-      'annotation_assignment',
-      'annotation_project',
       'annotation_state',
       'attribute',
       'project_list',

diff --git a/frontend/src/components/annotation/annotation_core.vue b/frontend/src/components/annotation/annotation_core.vue
@@ -1488,8 +1488,6 @@ export default Vue.extend({
         label: {},
       },
 
-      Annotation_assignments: [],
-
       html_image: new Image(), // our canvas expects an image at init
 
       save_on_change: true,

diff --git a/frontend/src/components/annotation/labels_view.vue b/frontend/src/components/annotation/labels_view.vue
@@ -426,7 +426,6 @@
           default: false
         },
         'current_video_file_id': {},
-        'annotation_assignment_on': {},
         'render_mode': {
           default: 'own_page'
         },

diff --git a/frontend/src/components/main_menu/menu_project.vue b/frontend/src/components/main_menu/menu_project.vue
@@ -2,18 +2,36 @@
   <div>
 
 
-    <v-menu  v-model="project_menu"
+    <v-flex v-if="!$store.state.project.current.project_string_id
+                && $store.state.user.current.security_email_verified == true
+                && $store.state.project_list.user_projects_list
+                && $store.state.project_list.user_projects_list.length > 0">
+      <v-btn color="primary"
+              text
+              style="text-transform: none !important;"
+              @click="$router.push('/projects')">
+        <span>
+          <v-icon left>folder</v-icon>
+          Change Project
+        </span>
+      </v-btn>
+    </v-flex>
+
+    <v-menu v-model="project_menu"
             :nudge-width="150"
             offset-y
-            :disabled="false">
+            :disabled="false"
+            v-if="$store.state.project.current.project_string_id"
+            >
 
       <template v-slot:activator="{ on }">
         <v-btn  v-on="on"
                 color="primary"
                 id="open_main_menu"
                 data-cy="project_menu_dropdown_toggle"
                 text
-                :disabled="!$store.state.project.current.project_string_id || $store.state.user.current.security_email_verified != true">
+                v-if="$store.state.project.current.project_string_id"
+                :disabled="$store.state.user.current.security_email_verified != true">
           <v-icon left> mdi-lightbulb </v-icon>
           Project
           <v-icon right> mdi-chevron-down</v-icon>

diff --git a/frontend/src/components/main_menu/menu_tasks.vue b/frontend/src/components/main_menu/menu_tasks.vue
@@ -5,12 +5,13 @@
     <v-menu v-model="tasks_menu"
             :nudge-width="150"
             offset-y
-            :disabled="false">
+            :disabled="false"
+            v-if="$store.state.project.current.project_string_id"
+            >
 
       <template v-slot:activator="{ on }">
-        <v-btn v-if="$store.state.builder_or_trainer.mode == 'builder'"
+        <v-btn v-if="$store.state.project.current.project_string_id"
                v-on="on"
-               :disabled="!$store.state.project || !$store.state.project.current.project_string_id"
                text
         >
           <v-icon left>mdi-brush</v-icon>

diff --git a/frontend/src/components/report/report.vue b/frontend/src/components/report/report.vue
@@ -704,7 +704,7 @@ export default Vue.extend({
         ],
 
         date_period_unit_list: ['day', 'month', 'year'],
-        //group_by_list: ['user', 'project', 'job', 'label', 'date'],
+        group_by_list: ['user', 'project', 'job', 'label', 'date'],
 
         group_by_list_default: [
 

diff --git a/frontend/src/store.js b/frontend/src/store.js
@@ -116,15 +116,14 @@ export const user_module = {
       commit('clear_ai')
       commit('clear_annotation')
       commit('clear_labels')
-      commit('clear_annotation_assignment')
-      commit('clear_annotation_project')
       commit('clear_video_current')
       commit('builder_or_trainer_clear')
       commit('clear_alert')
       commit('clear_org')
       commit('clear_job')
       commit('clear_connection')
       commit('clear_ui_schema')
+      commit('clear_userProjects_list')
 
     },
 
@@ -167,6 +166,9 @@ export const project_list = {
   mutations: {
     set_userProjects_list(state, fetched_projects_list) {
       state.user_projects_list = fetched_projects_list
+    },
+    clear_userProjects_list(state) {
+      state.user_projects_list = undefined
     }
   }
 }
@@ -262,13 +264,7 @@ const org = {
 }
 
 
-/* Feb 14, 2020
- * Example context
- * of wanting to easily access values of counts from different
- * components and context that current media core is kind buried.
- *
- *
- */
+
 const job = {
 
   state: {
@@ -570,37 +566,7 @@ const auth = {
 }
 
 
-const annotation_assignment = {
-  state: {
-    assignment: {},
-    on: false,
-  },
-  mutations: {
-    annotation_assignment_on: state => state.on = true,
-    annotation_assignment_off: state => state.on = false,
-    set_annotation_assignment(state, assignment) {
-      state.assignment = assignment
-    },
-    clear_annotation_assignment(state) {
-      state.on = false,
-        state.assignment = {}
-    }
-  }
-}
 
-const annotation_project = {
-  state: {
-    current: {}
-  },
-  mutations: {
-    set_annotation_project(state, current) {
-      state.current = current
-    },
-    clear_annotation_project(state) {
-      state.current = {}
-    }
-  }
-}
 
 const builder_or_trainer = {
   state: {
@@ -803,8 +769,6 @@ const my_store = new Vuex.Store({
     project_list: project_list,
     ai: ai,
     labels: labels,
-    annotation_assignment: annotation_assignment,
-    annotation_project: annotation_project,
     video: video,
     job: job,
     connection: connection,

diff --git a/shared/settings/settings.py b/shared/settings/settings.py
@@ -112,7 +112,7 @@
 
 
 # Other Misc Settings
-SANDBOX_BYPASS_LOGIN = os.getenv('SANDBOX_BYPASS_LOGIN', False)  # True or False
+SANDBOX_BYPASS_LOGIN = env_adapter.bool(os.getenv('SANDBOX_BYPASS_LOGIN', False))  # True or False
 URL_SIGNED_REFRESH = int(os.getenv('URL_SIGNED_REFRESH', 1548450398))
 ML_JOB_DIR = "job/"