changes to get provider in

Author: sean-morris

_static/link_gen/link.js

@@ -1,13 +1,13 @@
 // Pure function that generates an nbgitpuller URL
-function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed) {
+function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source) {
 
     // assume hubUrl is a valid URL
     var url = new URL(hubUrl);
 
     url.searchParams.set('repo', repoUrl);
 
     if(compressed) {
-      url.searchParams.set('compressed', "true");
+      url.searchParams.set('provider', source);
     }
 
     if (urlPath) {
@@ -16,6 +16,8 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed) {
 
     if (branch) {
         url.searchParams.set('branch', branch);
+    } else if(source == "git"){
+        url.searchParams.set('branch', "main");
     }
 
     if (!url.pathname.endsWith('/')) {
@@ -110,53 +112,42 @@ function clearLinks(){
     document.getElementById('canvas-link').value = "";
 }
 
-var stateSource = null;
+
 function changeTab(div) {
     var hub = document.getElementById("hub");
     var hub_help_text = document.getElementById("hub-help-text");
-    var env_repo = document.getElementById("repo");
-    var env_repo_branch = document.getElementById("branch");
+    var env_repo_group = document.getElementById("env-repo-group");
+    var env_repo = document.getElementById("env-repo");
+    var env_repo_branch = document.getElementById("env-branch");
     var env_repo_help_text = document.getElementById("env-repo-help-text");
-    var content_repo = document.getElementById("content-repo-group");
-    var content_branch = document.getElementById("content-branch-group");
     var id = div.id;
     var form = document.getElementById('linkgenerator');
 
     clearLinks();
     if (id.includes("binder")) {
-        document.getElementById("app-source").hidden = true;
         hub.placeholder = "https://mybinder.org";
         hub.value = "https://mybinder.org";
         hub_help_text.hidden = true;
         hub.labels[0].innerHTML = "BinderHub URL";
-        env_repo.labels[0].innerHTML = "Git Environment Repository URL";
-        env_repo_help_text.hidden = false;
-        env_repo_branch.required = true;
-        env_repo_branch.pattern = ".+";
-        content_repo.hidden = false;
-        content_branch.hidden = false;
-        // if binder but in correct state
-        stateSource = form.querySelector('input[name="source"]:checked');
-        document.getElementById("source-git").checked = true;
-        displaySource();
+        
+        env_repo_group.style.display = '';
+        // env_repo_group.hidden = false;
+        // env_repo.hidden = false;
+        // env_repo_help_text.hidden = false;
+        // env_repo_branch.required = true;
+        // env_repo_branch.pattern = ".+";
+
     } else {
-        document.getElementById("app-source").hidden = false;
         hub.placeholder = "https://hub.example.com";
         hub.value = "";
         hub_help_text.hidden = false;
         hub.labels[0].innerHTML = "JupyterHub URL";
-        env_repo.labels[0].innerHTML = "Git Repository URL";
-        env_repo_help_text.hidden = true;
-        env_repo_branch.required = false;
-        content_repo.hidden = true;
-        content_branch.hidden = true;
 
-        //if coming from binder tab restore state
-        if(stateSource)
-          stateSource.checked = true;
-          stateSource = null
-          displaySource();
+        env_repo_group.style.display = 'none';
+        env_repo.required = false;
+        
     }
+    displaySource();
 }
 
 /**
@@ -167,6 +158,8 @@ function changeTab(div) {
  * See https://github.com/git/git/blob/1c52ecf4ba0f4f7af72775695fee653f50737c71/builtin/clone.c#L276
  */
 function generateCloneDirectoryName(gitCloneUrl) {
+    if(gitCloneUrl.slice(-1) == "/")
+      gitCloneUrl = gitCloneUrl.slice(0,-1);
     var lastPart = gitCloneUrl.split('/').slice(-1)[0];
     return lastPart.split(':').slice(-1)[0].replace(/(\.git|\.bundle)?/, '');
 }
@@ -178,11 +171,11 @@ function displayLink() {
     form.classList.add('was-validated');
     if (form.checkValidity()) {
         var hubUrl = document.getElementById('hub').value;
-        var repoUrl = document.getElementById('repo').value;
         var driveUrl = document.getElementById('drive-url').value;
         var dropUrl = document.getElementById('drop-url').value;
-        var webUrl = document.getElementById('web-url').value;
-        var gitBranch = document.getElementById('branch').value;
+        var webUrl = document.getElementById('standard-url').value;
+        var envRepoUrl = document.getElementById('env-repo').value;
+        var envGitBranch = document.getElementById('env-branch').value;
         var contentRepoUrl = document.getElementById('content-repo').value;
         var contentRepoBranch = document.getElementById('content-branch').value;
         var filePath = document.getElementById('filepath').value;
@@ -193,7 +186,7 @@ function displayLink() {
         if (appName === 'custom') {
             var urlPath = document.getElementById('urlpath').value;
         } else {
-            var repoName = generateCloneDirectoryName(repoUrl);
+            var repoName = generateCloneDirectoryName(contentRepoUrl);
             if(source !== "git"){
               repoName = ""
             }
@@ -209,30 +202,30 @@ function displayLink() {
             branch = "";
             compressed = true;
             if(source == "git"){
-                sourceUrl = repoUrl;
-                branch = gitBranch;
+                sourceUrl = contentRepoUrl;
+                branch = contentRepoBranch;
                 compressed = false;
             } else if(source == "googledrive"){
                 sourceUrl = driveUrl;
             } else if(source == "dropbox"){
                 sourceUrl =  dropUrl;
-            } else if(source == "web"){
+            } else if(source == "standard"){
                 sourceUrl =  webUrl;
             }
             document.getElementById('default-link').value = generateRegularUrl(
-                hubUrl, urlPath, sourceUrl, branch, compressed
+                hubUrl, urlPath, sourceUrl, branch, compressed, source
             );
         } else if (activeTab === "tab-auth-canvas"){
             document.getElementById('canvas-link').value = generateCanvasUrl(
-                hubUrl, urlPath, repoUrl, gitBranch
+                hubUrl, urlPath, contentRepoUrl, contentRepoBranch
             );
         } else if (activeTab === "tab-auth-binder"){
             // FIXME: userName parsing using new URL(...) assumes a 
             // HTTP based repoUrl. Does it make sense to create a
             // BinderHub link for SSH URLs? Then let's fix this parsing.
             var userName = new URL(repoUrl).pathname.split('/')[1];
             document.getElementById('binder-link').value = generateBinderUrl(
-                hubUrl, userName, repoName, gitBranch, urlPath, contentRepoUrl, contentRepoBranch
+                hubUrl, userName, repoName, envGitBranch, urlPath, contentRepoUrl, contentRepoBranch
             );
         }
     } else {
@@ -272,18 +265,20 @@ function hideShowByClassName(cls, hideShow){
   });
 }
 
+
 function displaySource(){
     var form = document.getElementById('linkgenerator');
     var source = form.querySelector('input[name="source"]:checked').value;
     hideShowByClassName(".source", 'none');
+
     if(source == 'git'){
         hideShowByClassName(".source-git", '');
     } else if(source == 'googledrive'){
         hideShowByClassName(".source-googledrive", '');
     } else if(source == 'dropbox'){
         hideShowByClassName(".source-dropbox", '');
-    } else if(source == 'web'){
-        hideShowByClassName(".source-web", '');
+    } else if(source =="standard"){
+        hideShowByClassName(".source-standard", '');
     }
 }
 
@@ -298,7 +293,9 @@ function displaySource(){
 function render() {
     var form = document.getElementById('linkgenerator');
     var appName = form.querySelector('input[name="app"]:checked').value;
-  
+    document.getElementById("env-repo-group").style.display = 'none';
+    document.getElementById("env-repo").disabled = true;
+    
     if (appName == 'custom') {
         document.getElementById('urlpath').disabled = false;
         document.getElementById('filepath').disabled = true;
@@ -312,8 +309,7 @@ function render() {
             document.getElementById('filepath').disabled = false;
         }
     }
-    
-    
+
     displayLink();
 }
 

link.html

@@ -222,6 +222,34 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
           </div>
         </div>
 
+        <div class="form-group row source-env" id="env-repo-group" >
+          <label for="env-repo" class="col-sm-2 col-form-label">Git Environment Repository URL</label>
+          <div class="col-sm-6">
+            <input class="form-control" type="text" id="env-repo" placeholder="https://github.com/example/test"
+              oninput="displayLink()" required pattern="((git|https?)://.+|git@.+:.+)">
+            <div class="invalid-feedback">
+              Must be a valid git URL
+            </div>
+            <small class="form-text text-muted" id="env-repo-help-text" >
+              The environment repository must have
+              <a href="https://github.com/jupyterhub/nbgitpuller">nbgitpuller</a> installed.
+            </small>
+          </div>
+          <div class="col-sm-4">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="branch-prepend-label">branch</span>
+              </div>
+              <input name="branch" id="env-branch" type="text" aria-label="Branch Name" aria-describedby="branch-prepend-label">
+              <small id="default-repo-message" class="form-text text-muted">
+                 If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
+                 <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">
+                 new GitHub repositories</a>
+              </small>
+            </div>
+          </div>
+        </div>
+        
         <div class="form-group row" id="app-source">
           <div class="col-sm-2 col-form-label">
             <label for="app" class=>Notebook Source</label>
@@ -248,56 +276,31 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
               </label>
             </div>
             <div class="form-check">
-              <input class="form-check-input" type="radio" name="source" id="source-web" value="web">
-              <label class="form-check-label text-dark" for="source-web">
+              <input class="form-check-input" type="radio" name="source" id="source-standard" value="standard">
+              <label class="form-check-label text-dark" for="source-standard">
                 Web(Public URL to archive)
               </label>
             </div>
           </div>
         </div>
-        <div class="form-group row source source-git">
-          <label for="repo" class="col-sm-2 col-form-label">Git Repository URL</label>
-          <div class="col-sm-6">
-            <input class="form-control" type="text" id="repo" placeholder="https://github.com/example/test"
-              oninput="displayLink()" required pattern="((git|https?)://.+|git@.+:.+)">
-            <div class="invalid-feedback">
-              Must be a valid git URL
-            </div>
-            <small class="form-text text-muted" id="env-repo-help-text" hidden="true">
-              The environment repository must have
-              <a href="https://github.com/jupyterhub/nbgitpuller">nbgitpuller</a> installed.
-            </small>
-          </div>
-          <div class="col-sm-4">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text" id="branch-prepend-label">branch</span>
-              </div>
-              <input name="branch" id="branch" type="text" aria-label="Branch Name" aria-describedby="branch-prepend-label">
-              <small id="default-repo-message" class="form-text text-muted">
-                 If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
-                 <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">
-                 new GitHub repositories</a>
-              </small>
-            </div>
-          </div>
-        </div>
-
-        <div class="form-group row source source-git" id="content-repo-group" hidden="true">
+        
+        
+        
+        <div class="form-group row source source-git" id="content-repo-group">
           <label for="content-repo" class="col-sm-2 col-form-label">Git Content Repository URL</label>
           <div class="col-sm-6">
             <input class="form-control" type="text" id="content-repo" placeholder="https://github.com/example/test"
-              oninput="displayLink()" pattern="((git|https?)://.+|git@.+:.+)">
+              oninput="displayLink()" required pattern="((git|https?)://.+|git@.+:.+)">
             <div class="invalid-feedback">
               Must be a valid git URL
             </div>
           </div>
           <div class="col-sm-4">
-            <div class="input-group" id="content-branch-group" hidden="true">
+            <div class="input-group" id="content-branch-group" >
               <div class="input-group-prepend">
                 <span class="input-group-text" id="content-branch-prepend-label">branch</span>
               </div>
-              <input name="content-branch" id="content-branch" type="text" aria-label="Branch Name" aria-describedby="content-branch-prepend-label">
+              <input name="content-branch" id="content-branch" type="text" placeholder="main" aria-label="Branch Name" aria-describedby="content-branch-prepend-label">
               <small id="default-content-message" class="form-text text-muted">
                  If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
                  <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">
@@ -307,50 +310,50 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
           </div>
          </div>
 
-        <div class="form-group row source source-git" id="filepath-container">
-          <label for="filepath" class="col-sm-2 col-form-label">File to open</label>
-          <div class="col-sm-10">
-            <input class="form-control" type="text" id="filepath" placeholder="index.ipynb"
-              oninput="displayLink()">
-            <small class="form-text text-muted">
-              This file or directory from within the repo will open when user clicks the link.
-            </small>
-          </div>
-        </div>
-
         <div class="form-group row source source-googledrive">
-          <label for="repo" class="col-sm-2 col-form-label">Google Drive Shared Link</label>
+          <label for="drive-url" class="col-sm-2 col-form-label">Google Drive Shared Link</label>
           <div class="col-sm-10">
             <input class="form-control" type="text" id="drive-url" placeholder="https://drive.google.com/file/d/1p3m0h5UGWdLkVVP0S1HpG2yeDlU/view?usp=sharing"
-              oninput="displayLink()" required pattern="((https?)://.+|(drive.google).+:.+)">
+              oninput="displayLink()" required pattern="https?:\/\/drive.google.com+">
             <div class="invalid-feedback">
               Must be a valid Google Drive URL
             </div>
           </div>
         </div>
 
         <div class="form-group row source source-dropbox">
-          <label for="repo" class="col-sm-2 col-form-label">Dropbox Shared Link</label>
+          <label for="drop-url" class="col-sm-2 col-form-label">Dropbox Shared Link</label>
           <div class="col-sm-10">
-            <input class="form-control" type="text" id="drop-url" placeholder="https://www.dropbox.com/s/w0q4eirtuht/example.tgz?dl=0"
-              oninput="displayLink()" required pattern="((https?)://.+|(drive.google).+:.+)">
+            <input class="form-control"  type="text" id="drop-url" placeholder="https://www.dropbox.com/s/w0q4eirtuht/example.tgz?dl=0"
+              oninput="displayLink()" required pattern="https?:\/\/.+dropbox.com+">
             <div class="invalid-feedback">
               Must be a valid Dropbox URL (Note: all the common compression formats work(e.g. zip, tar, tgz, etc))
             </div>
           </div>
         </div>
 
-        <div class="form-group row source source-web">
-          <label for="repo" class="col-sm-2 col-form-label">Public URL to archive</label>
+        <div class="form-group row source source-standard">
+          <label for="standard-url" class="col-sm-2 col-form-label">Public URL to archive</label>
           <div class="col-sm-10">
-            <input class="form-control" type="text" id="web-url" placeholder="https://example.com/materials-sp20-external.zip"
-              oninput="displayLink()" required pattern="((https?)://.+|(drive.google).+:.+)">
+            <input class="form-control" type="text" id="standard-url" placeholder="https://example.com/materials-sp20-external.zip"
+              oninput="displayLink()" required pattern="https?://.+">
             <div class="invalid-feedback">
               Must be a valid public URL (Note: all the common compression formats work(e.g. zip, tar, tgz, etc))
             </div>
           </div>
         </div>
 
+        <div class="form-group row" id="filepath-container">
+          <label for="filepath" class="col-sm-2 col-form-label">File to open</label>
+          <div class="col-sm-10">
+            <input class="form-control" type="text" id="filepath" placeholder="index.ipynb"
+              oninput="displayLink()">
+            <small class="form-text text-muted">
+              This file or directory from within the repo will open when user clicks the link.
+            </small>
+          </div>
+        </div>
+        
         <div class="form-group row" id="app-container">
           <div class="col-sm-2 col-form-label">
             <label for="app" class=>Application to Open</label>