#2 added link to relaunch server on process error page

cellxgene_gateway/templates/cache_status.html

@@ -31,7 +31,7 @@
                <th>dataset</th>
                <th>port</th>
                <th>launchtime</th>
-               <th>timestamp</th>
+               <th>last access</th>
                <th>status</th>
                <th>message</th>
                <th>http_status</th>
@@ -43,8 +43,8 @@
                <td>{{ entry.pid }}</td>
                <td>{{ entry.dataset }}</td>
                <td>{{ entry.port }}</td>
-               <td>{{ entry.launchtime }}</td>
-               <td>{{ entry.timestamp }}</td>
+               <td class="timestamp">{{ entry.launchtime }}</td>
+               <td class="timestamp">{{ entry.timestamp }}</td>
                <td>{{ entry.status }}</td>
                <td>{{ entry.message }}</td>
                <td>{{ entry.http_status }}</td>
@@ -52,5 +52,15 @@
      {% endfor %}
      </tbody>
      </table>
+     <script>
+          $(() => {
+               $(".timestamp").each(function(){
+                    const el = $(this);
+                    const ts = el.text();
+                    const dt = new Date(parseInt(ts * 1000));
+                    el.html(`${dt.toISOString()}<br>(${ts})`);
+               });
+          })
+     </script>
 </body>
 </html>

cellxgene_gateway/templates/index.html

@@ -39,6 +39,11 @@
 		  <u>File Crawler: Allows you to view all uploaded data.</u></a>
 		  
 	</div>
+	<div class="list-group" style="width:50%;padding-left:65px">
+		<a href="/cache_status" class="list-group-item list-group-item-action">
+			<u>Cache Status: view status of launched cellxgene servers.</u></a>
+	</div>
+	
 	<br>
 
 	<h1 style="padding-left:35px">
@@ -103,9 +108,5 @@ scp -r pbmc3k.h5ad ec2-user@{{ ip }}:{{ cellxgene_data }}/USER/DATA/</pre>
 		<li>Take a look at your data using the file crawler link above</li>
 	</ol>	
 
-	<ul>
-		<li><a href="/cache_status.html">Cache Status<</a>  - view status of currently loaded datasets</li>
-	</ul>
-
 </body>
 </html>

cellxgene_gateway/templates/process_error.html

@@ -25,19 +25,27 @@
      </header>
      <br>
      <div style="margin-left:20px">
-          
-     <h4>{{ message[0] }}</h4>
-     <h4>{{ message[1] }}</h4>
-     <h4>{{ message[2] }}</h4>
-     <h4>{{ message[3] }}</h4>
-
-     <a href="/filecrawl.html">
-          Please click here to be redirected to the file directory.
-     </a>
-     <br>
-     <a href="/">
-          Please click here to return to the homepage.
-     </a>
-     </div>
+     <h4>Error Details</h4>
+     <table>
+          <tr><th>Message</th><td>{{ message }}</td></tr>
+          <tr><th>Status</th><td>{{ http_status }}</td></tr>
+          <tr><th>Stdout</th><td>{{ stdout }}</td></tr>
+          <tr><th>Stderr</th><td>{{ stderr }}</td></tr>
+     </table>
+<br>
+<h4>Options</h4>
+     Please choose one of the following, or use the back button:
+     <ul>
+          <li><a href="{{url_for('do_relaunch', path=dataset)}}">
+                    Attempt to relaunch the cellxgene server.
+               </a></li>
+          <li><a href="/filecrawl.html">
+               Return to the file directory.
+          </a></li>
+          <li><a href="/">
+               Return to the homepage.
+          </a></li>
+     </ul>
+     
 </body>
 </html>