debug migration logic (upload paths)

Computational-Plant-Science · Feb 21, 2023 · 12b04e0 · 12b04e0
1 parent dc8d5d1
commit 12b04e0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/plantit/front_end/src/components/navigation.vue b/plantit/front_end/src/components/navigation.vue
@@ -802,10 +802,12 @@
                         <b>Collection:</b>
                         {{ profile.migration.target_path }}
                         <br />
+                        <div v-if="migrationLogs.count > 0">
                         <br />
                         <p style="max-height: 50%;overflow-y: scroll;">
                         <small v-for="line in migrationLogs" v-bind:key="line">{{ line }}<br/></small>
                         </p>
+                        </div>
                     </div>
                 </b-col>
             </b-row>

diff --git a/plantit/front_end/src/components/splash/about.vue b/plantit/front_end/src/components/splash/about.vue
@@ -265,12 +265,12 @@
         >
             <br />
             <b-container>
-                <b-row class="text-center">
+                <!--<b-row class="text-center">
                     <b-col>
                         <h5 class="text-light">About</h5>
                     </b-col></b-row
                 >
-                <br />
+                <br />-->
                 <b-row class="text-light lightlinks text-center"
                     ><b-col>
                         <p>
@@ -283,7 +283,7 @@
                                 :src="require('../../assets/logo.png')"
                                 class="m-0 p-0"
                             ></b-img>
-                            free service for parallelizable image-based plant phenotyping &mdash; deploy to a cluster with a click
+                            free web service for parallel image-based plant phenotyping &mdash; deploy to clusters with a click
                             </p>
                             <p>
                             <b-img
@@ -369,8 +369,7 @@
                             <b-link
                                 href="https://github.com/Computational-Plant-Science/plantit"
                                 >on GitHub</b-link
-                            > &mdash;
-                            <b-link
+                            > or <b-link
                                 href="https://github.com/Computational-Plant-Science/plantit/discussions"
                                 >get in touch</b-link
                             >
@@ -450,11 +449,11 @@
                 </b-row>
                 <b-row class="text-center">
                     <b-col>
-                        <h6
+                        <h5
                             class="text-light"
                         >
                             Former Contributors
-                        </h6>
+                        </h5>
                     </b-col></b-row
                 >
                 <br />
@@ -482,15 +481,6 @@
                     </b-col>
                 </b-row>
                 <br />
-                <b-row class="text-center">
-                    <b-col>
-                <p>
-                            <i
-                                ><small><small><b>note:</b> platform developers make no guarantees regarding workflow result </small></small></i
-                            >
-                        </p>
-</b-col>
-</b-row>
                 <br />
                 <b-row align-v="center" class="justify-content-md-center">
                     <b-col
@@ -507,6 +497,18 @@
                     ></b-col>
                 </b-row>
                 <br />
+                <br/>
+                <br/>
+                <b-row class="text-center">
+                    <b-col>
+                        <p>
+                            <i
+                                ><small><small><b>note:</b> platform developers can't guarantee correctness or validity of hosted workflows &mdash; <br/>
+                                questions should be raised with workflow authors and results double-checked for errors!</small></small></i
+                            >
+                        </p>
+                    </b-col>
+                </b-row>
                 <br />
             </b-container>
         </b-card>

diff --git a/plantit/plantit/celery_tasks.py b/plantit/plantit/celery_tasks.py
@@ -1204,7 +1204,7 @@ def start_dirt_migration(self, username: str):
             client.set_metadata(id, props, [])
 
         # persist collection information on managed file record
-        file = file._replace(collection=collection_name)
+        file = file._replace(collection=collection_path)
         file = file._replace(collection_entity_id=collection_entity_id)
 
         # create managed file record
@@ -1218,6 +1218,7 @@ def start_dirt_migration(self, username: str):
                                               missing=file.missing,
                                               uploaded=file.uploaded,
                                               entity_id=file.entity_id,
+                                              collection=file.collection,
                                               collection_entity_id=file.collection_entity_id,
                                               nfs_path=join(rootnfs_dir, 'root-images', file.folder, file.name),
                                               staging_path=join(staging_dir, file.name))
@@ -1246,6 +1247,7 @@ def start_dirt_migration(self, username: str):
                                               orphan=file.orphan,
                                               missing=file.missing,
                                               uploaded=file.uploaded,
+                                              collection=collection_path,
                                               nfs_path=join(rootnfs_dir, 'metadata-files', file.folder, file.name),
                                               staging_path=join(staging_dir, file.name))
 
@@ -1273,6 +1275,7 @@ def start_dirt_migration(self, username: str):
                                               orphan=file.orphan,
                                               missing=file.missing,
                                               uploaded=file.uploaded,
+                                              collection=collection_path,
                                               nfs_path=join(rootnfs_dir, 'output-files', file.folder, file.name),
                                               staging_path=join(staging_dir, file.name))
 
@@ -1300,6 +1303,7 @@ def start_dirt_migration(self, username: str):
                                               orphan=file.orphan,
                                               missing=file.missing,
                                               uploaded=file.uploaded,
+                                              collection=collection_path,
                                               nfs_path=join(rootnfs_dir, 'output-logs', file.folder, file.name),
                                               staging_path=join(staging_dir, file.name))