migration bugfixes (#301)

Computational-Plant-Science · May 16, 2022 · c93a51c · c93a51c
1 parent 4c580d1
commit c93a51c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/plantit/front_end/src/components/navigation.vue b/plantit/front_end/src/components/navigation.vue
@@ -764,10 +764,7 @@
                     <p v-if="profile.dirtMigrationStarted === null">
                         You haven't migrated your datasets from DIRT yet.
                     </p>
-                    <b-alert
-                        :show="migrationData.duplicate"
-                        variant="danger"
-                    >
+                    <b-alert :show="migrationData.duplicate" variant="danger">
                         You already have a collection with path
                         <code
                             >/iplant/home/{{
@@ -780,7 +777,9 @@
                         :disabled="
                             migrationSubmitting ||
                             (migrationData !== null &&
-                                migrationData.started !== null)
+                                migrationData.started !== null) ||
+                            (profile.dirtMigrationStarted !== null &&
+                                profile.dirtMigrationCompleted === null)
                         "
                         @click="startDirtMigration"
                         :variant="
@@ -792,15 +791,19 @@
                             small
                             v-if="
                                 migrationSubmitting ||
-                                migrationData.started !== null
+                                (migrationData !== null &&
+                                    migrationData.started !== null) ||
+                                (profile.dirtMigrationStarted !== null &&
+                                    profile.dirtMigrationCompleted === null)
                             "
                             label="Running..."
                             variant="dark"
                             class="mr-2"
                         ></b-spinner
                         ><i v-else class="fas fa-chevron-right fa-fw mr-1"></i>
                         {{
-                        (migrationSubmitting || migrationData.started !== null)
+                            migrationSubmitting ||
+                            migrationData.started !== null
                                 ? 'Running migration'
                                 : 'Start Migration'
                         }}</b-button

diff --git a/plantit/plantit/users/views.py b/plantit/plantit/users/views.py
@@ -272,7 +272,8 @@ def get_current(self, request):
                 'hints': user.profile.hints,
                 'first': user.profile.first_login,
                 'dirt_migration_started': user.profile.dirt_migration_started,
-                'dirt_migration_completed': user.profile.dirt_migration_completed
+                'dirt_migration_completed': user.profile.dirt_migration_completed,
+                'dirt_migration_path': user.profile.dirt_migration_path
             },
             'stats': async_to_sync(q.get_user_statistics)(user),
             'users': q.list_users(),