Merge pull request #380 from cmarmo/proceedtotarget

Add link to go back to root when an error is thrown

Author: yuvipanda

nbgitpuller/static/js/gitsyncview.js

@@ -4,7 +4,7 @@ import { FitAddon } from 'xterm-addon-fit';
 import { WebLinksAddon } from 'xterm-addon-web-links';
 
 export class GitSyncView{
-    constructor(termSelector, progressSelector, termToggleSelector) {
+    constructor(termSelector, progressSelector, termToggleSelector, recoverySelector) {
         // Class that encapsulates view rendering as much as possible
         this.term = new Terminal({
             convertEol: true
@@ -18,6 +18,7 @@ export class GitSyncView{
 
         this.termToggle = document.querySelector(termToggleSelector);
         this.termElement = document.querySelector(termSelector);
+        this.recovery = document.querySelector(recoverySelector);
 
         this.termToggle.onclick = () => this.setTerminalVisibility(!this.visible)
     }
@@ -62,4 +63,10 @@ export class GitSyncView{
             this.progress.classList.remove('progress-bar-danger');
         }
     }
+
+    setRecoveryLink(isError) {
+        if (isError) {
+            this.recovery.classList.toggle('hidden', !visible);
+        }
+    }
 }

nbgitpuller/static/js/index.js

@@ -28,7 +28,8 @@ const gs = new GitSync(
 const gsv = new GitSyncView(
     '#status-details',
     '#status-panel-title',
-    '#status-panel-toggle'
+    '#status-panel-toggle',
+    '#recovery-link'
 );
 
 gs.addHandler('syncing', function(data) {
@@ -45,6 +46,7 @@ gs.addHandler('error', function(data) {
     gsv.setProgressValue(100);
     gsv.setProgressText('Error: ' + data.message);
     gsv.setProgressError(true);
+    gsv.setRecoveryLink(true);
     gsv.setTerminalVisibility(true);
     if (data.output) {
         gsv.term.write(data.output);

nbgitpuller/templates/status.html

@@ -29,7 +29,10 @@
     <div class="panel-body hidden" id="status-details-container">
             <div id="status-details"></div>
     </div>
-    </div>
+</div>
+<div id="recovery-link" class="hidden">
+    <a class="btn btn-warning" href="{{ base_url }}" aria-label="Go to the Jupyter server without synchronizing content">Proceed to server without synchronizing</a>
+</div>
 </div>
 {% endblock %}