debug #301

Computational-Plant-Science · Jun 5, 2022 · 06110c1 · 06110c1
1 parent d59865e
commit 06110c1
Show file tree

Hide file tree

Showing 4 changed files with 204 additions and 286 deletions.
diff --git a/plantit/front_end/src/components/datasets/data-tree.vue b/plantit/front_end/src/components/datasets/data-tree.vue
@@ -1095,17 +1095,6 @@
               </b-col>
                 </b-row>
               </b-card>
-            <!--<b-row class="p-2" v-if="uploadingFiles.length > 0">
-              <b-col>
-                Uploading...
-                <br/>
-                <b-list-group>
-                  <b-list-group-item v-for="file in uploadingFiles" v-bind:key="file.name">
-                    {{ file.name }}
-                  </b-list-group-item>
-                </b-list-group>
-              </b-col>
-            </b-row>-->
             </b-col>
         </b-row>
         <b-row

diff --git a/plantit/front_end/src/components/navigation.vue b/plantit/front_end/src/components/navigation.vue
@@ -816,22 +816,15 @@
                     >
                     <p v-if="profile.migration.started !== null">
                         <br />
-                        <span v-if="profile.migration.num_folders !== null"
+                        <span v-if="profile.migration.num_files !== null"
                             >You have
-                            {{ profile.migration.num_folders }} dataset(s) to
-                            migrate,
-                            {{
-                                profile.migration.num_folders === null
-                                    ? '?'
-                                    : profile.migration.num_folders -
-                                      uploadedFolders.length + 1
-                            }}
-                            remaining.</span
+                            {{ profile.migration.num_files - uploadedFiles.length }} remaining files to
+                            migrate.</span
                         >
                         <b-progress
-                            v-if="profile.migration.num_folders !== null"
-                            :value="uploadedFolders.length"
-                            :max="profile.migration.num_folders"
+                            v-if="profile.migration.num_files !== null"
+                            :value="uploadedFiles.length"
+                            :max="profile.migration.num_files"
                             animated
                             variant="success"
                         ></b-progress>
@@ -1011,17 +1004,7 @@ export default {
             'notificationsRead',
             'notificationsUnread',
         ]),
-        storageFolders() {
-            if (this.profileLoading || this.profile === null || this.profile.migration.storage.length === 0) return [];
-            let grouped = this.groupBy(
-                this.profile.migration.storage,
-                'folder'
-            );
-            return Object.entries(grouped).map((pair) => {
-                return { name: pair[0], files: pair[1] };
-            });
-        },
-        uploadedFolders() {
+        uploadedFiles() {
             if (this.profileLoading || this.profile === null || this.profile.migration.uploads.length === 0) return [];
             let grouped = this.groupBy(
                 this.profile.migration.uploads,