Skip to content

Link generator handles non-git sources #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: gh-pages
Choose a base branch
from
+245 −66
Open

Link generator handles non-git sources #195

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eefdbfd
Link generator handles non-git sources
sean-morris Jul 21, 2021
734641a
fixed conflicts
sean-morris Sep 20, 2021
4616f6b
Changed value for Web choice to generic_web
sean-morris Nov 8, 2021
8c99a9d
Changed query parameter provider to content_provider
sean-morris Nov 24, 2021
381cf40
Fix indentation and remove all spaces on otherwise empty lines
consideRatio Nov 26, 2021
89f6b57
Fix additional formatting details
consideRatio Nov 26, 2021
ead0dc7
Implemented changes from PR review
sean-morris Nov 27, 2021
02d49b3
fixed conflicts
sean-morris Nov 27, 2021
dc30fe8
Apply suggestions from code review
sean-morris Nov 28, 2021
84fdfc6
Update link.html
sean-morris Nov 29, 2021
2a85e76
Cleaned up HTML errors
sean-morris Nov 29, 2021
64b39a3
Merge branch 'gh-pages-non-git' of https://github.com/sean-morris/nbg…
sean-morris Nov 29, 2021
4aafa3f
Query param content_provider now contentProvider
sean-morris Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .circleci/config.yml
View file
Open in desktop

This file was deleted.

178 changes: 100 additions & 78 deletions _static/link_gen/link.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
// Pure function that generates an nbgitpuller URL
function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source) {
function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, contentProvider) {

// assume hubUrl is a valid URL
var url = new URL(hubUrl);

url.searchParams.set('repo', repoUrl);
if(compressed) {
url.searchParams.set('content_provider', source);
url.searchParams.set('content_provider', contentProvider);
}
if (urlPath) {
url.searchParams.set('urlpath', urlPath);
}

if (branch) {
url.searchParams.set('branch', branch);
} else if(source == "git"){
} else if(contentProvider == "git"){
url.searchParams.set('branch', "main");
}

Expand All @@ -26,23 +26,23 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source
return url.toString();
}

function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, source) {
function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, contentProvider) {
// assume hubUrl is a valid URL
var url = new URL(hubUrl);

var nextUrlParams = new URLSearchParams();

nextUrlParams.append('repo', repoUrl);
if(compressed) {
nextUrlParams.append('content_provider', source);
nextUrlParams.append('content_provider', contentProvider);
}
if (urlPath) {
nextUrlParams.append('urlpath', urlPath);
}

if (branch) {
nextUrlParams.append('branch', branch);
} else if(source == "git"){
} else if(contentProvider == "git"){
nextUrlParams.append('branch', "main");
}

Expand All @@ -57,32 +57,35 @@ function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, source)
return url.toString();
}

function generateBinderUrl(hubUrl, userName, repoName, branch, urlPath,
contentRepoUrl, contentRepoBranch, compressed, source) {
function generateBinderUrl(hubUrl, userName, envRepoName, envGitBranch, urlPath,
contentGitRepoUrl, contentGitRepoBranch, compressed, contentProvider) {

var url = new URL(hubUrl);

var nextUrlParams = new URLSearchParams();

nextUrlParams.append('repo', contentRepoUrl);
nextUrlParams.append('repo', contentGitRepoUrl);

if(compressed) {
nextUrlParams.append('content_provider', source);
nextUrlParams.append('content_provider', contentProvider);
}
if (urlPath) {
nextUrlParams.append('urlpath', urlPath);
}

if (contentRepoBranch) {
nextUrlParams.append('branch', contentRepoBranch);
} else if(source == "git"){
if (contentGitRepoBranch) {
nextUrlParams.append('branch', contentGitRepoBranch);
} else if(contentProvider == "git"){
nextUrlParams.append('branch', "main");
}

if(envGitBranch == ""){
envGitBranch = "main"
}
var nextUrl = 'git-pull?' + nextUrlParams.toString();

var path = '/v2/gh/';
url.pathname = path.concat(userName, "/", repoName, "/", branch);
url.pathname = path.concat(userName, "/", envRepoName, "/", envGitBranch);
url.searchParams.append('urlpath', nextUrl);

return url.toString();
Expand Down Expand Up @@ -143,7 +146,7 @@ function changeTab(div) {
env_repo_group.style.display = 'none';
env_repo.disabled = true;
}
displaySource();
displayContentProvider();
}

/**
Expand All @@ -152,6 +155,12 @@ function changeTab(div) {
* nbgitpuller needs to redirect users to *inside* the directory it
* just cloned. We copy the logic git itself uses to determine that.
* See https://github.com/git/git/blob/1c52ecf4ba0f4f7af72775695fee653f50737c71/builtin/clone.c#L276
*
* The condition on the first line of this function ensures the user has not included a forward slash at the end of
* the URL. If they do, it is removed so that the rest of the function can split by forward slash and parse the name
* of directory from the URL.
*
* @param {string} gitCloneUrl This is the url to the git repo
*/
function generateCloneDirectoryName(gitCloneUrl) {
if(gitCloneUrl.slice(-1) == "/")
Expand All @@ -160,27 +169,40 @@ function generateCloneDirectoryName(gitCloneUrl) {
return lastPart.split(':').slice(-1)[0].replace(/(\.git|\.bundle)?/, '');
}

function handleSource(args){
source = args["source"];
branch = "";
compressed = true;
sourceUrl ="";
if(source == "git"){
sourceUrl = args["contentRepoUrl"];
branch = args["contentRepoBranch"];
compressed = false;
} else if(source == "googledrive"){
sourceUrl = args["driveUrl"];
} else if(source == "dropbox"){
sourceUrl = args["dropUrl"];
} else if(source == "generic_web"){
sourceUrl = args["webUrl"];
}
return {
"branch": branch,
"sourceUrl": sourceUrl,
"compressed": compressed
}
/**
* This takes the values from the UI for content providers and sets three values in a
* json object(contentProviderUrl, branch, and compressed) based on what contentProvider is selected in the UI.
*
* The args contains the contentProvider selected in the UI as well as whatever text(if any)
* is in each of the content provider URL(e.g. driveURL, dropURL) text boxes, as well as the contentGitBranch.
*
* The return value is a a json object containing the branch, which may be an empty string if git is not the content
* provider, the contentProviderURL, and a boolean key, compressed, that indicates if you our notebooks are in a
* compressed archive.
*
* @param {json} args - contains UI element values for content providers(url, git branch,
*/
function configureContentProviderAttrs(args){
contentProvider = args["contentProvider"];
branch = "";
compressed = true;
contentProviderURL ="";
if(contentProvider == "git"){
contentProviderURL = args["contentGitRepoUrl"];
branch = args["contentGitRepoBranch"];
compressed = false;
} else if(contentProvider == "googledrive"){
contentProviderURL = args["driveUrl"];
} else if(contentProvider == "dropbox"){
contentProviderURL = args["dropUrl"];
} else if(contentProvider == "generic_web"){
contentProviderURL = args["webUrl"];
}
return {
"branch": branch,
"contentProviderURL": contentProviderURL,
"compressed": compressed
}
}

function displayLink() {
Expand All @@ -191,53 +213,51 @@ function displayLink() {
var driveUrl = document.getElementById('drive-url').value;
var dropUrl = document.getElementById('drop-url').value;
var webUrl = document.getElementById('generic-web-url').value;
var envRepoUrl = document.getElementById('env-repo').value;
var envGitRepoUrl = 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 contentGitRepoUrl = document.getElementById('content-repo').value;
var contentGitRepoBranch = document.getElementById('content-branch').value;
var filePath = document.getElementById('filepath').value;
var appName = form.querySelector('input[name="app"]:checked').value;
var activeTab = document.querySelector(".nav-link.active").id;
var source = form.querySelector('input[name="source"]:checked').value;
var contentProvider = form.querySelector('input[name="content-provider"]:checked').value;

if (appName === 'custom') {
var urlPath = document.getElementById('urlpath').value;
} else {
var repoName = generateCloneDirectoryName(contentRepoUrl);
if(source !== "git"){
repoName = ""
}
var urlPath;
if (activeTab === "tab-auth-binder") {
var contentRepoName = new URL(contentRepoUrl).pathname.split('/').pop().replace(/\.git$/, '');
urlPath = apps[appName].generateUrlPath(contentRepoName + '/' + filePath);
} else {
urlPath = apps[appName].generateUrlPath(repoName + '/' + filePath);
var envGitRepoName = generateCloneDirectoryName(envGitRepoUrl);
var contentGitRepoName = generateCloneDirectoryName(contentGitRepoUrl);
var partialUrlPath = contentGitRepoName + '/' + filePath;
if(contentProvider !== "git"){
contentGitRepoName = "";
partialUrlPath = filePath;
}
var urlPath = apps[appName].generateUrlPath(partialUrlPath);
}
args = {
"source": source,
"contentRepoUrl": contentRepoUrl,
"contentRepoBranch": contentRepoBranch,
"driveUrl": driveUrl,
"dropUrl": dropUrl,
"webUrl": webUrl
"contentProvider": contentProvider,
"contentGitRepoUrl": contentGitRepoUrl,
"contentGitRepoBranch": contentGitRepoBranch,
"driveUrl": driveUrl,
"dropUrl": dropUrl,
"webUrl": webUrl
}
config = handleSource(args)
config = configureContentProviderAttrs(args)
if (activeTab === "tab-auth-default") {
document.getElementById('default-link').value = generateRegularUrl(
hubUrl, urlPath, config["sourceUrl"], config["branch"], config["compressed"], source
hubUrl, urlPath, config["contentProviderURL"], config["branch"], config["compressed"], contentProvider
);
} else if (activeTab === "tab-auth-canvas"){
document.getElementById('canvas-link').value = generateCanvasUrl(
hubUrl, urlPath, config["sourceUrl"], config["branch"], config["compressed"], source
hubUrl, urlPath, config["contentProviderURL"], config["branch"], config["compressed"], contentProvider
);
} 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(envRepoUrl).pathname.split('/')[1];
var userName = new URL(envGitRepoUrl).pathname.split('/')[1];
document.getElementById('binder-link').value = generateBinderUrl(
hubUrl, userName, repoName, envGitBranch, urlPath, config["sourceUrl"], config["branch"], config["compressed"], source
hubUrl, userName, envGitRepoName, envGitBranch, urlPath, config["contentProviderURL"], config["branch"], config["compressed"], contentProvider
);
}
} else {
Expand Down Expand Up @@ -276,21 +296,23 @@ function hideShowByClassName(cls, hideShow){
});
});
}


function displaySource(){
/**
* Depending on the content provider selected this hides and shows the appropriate divs
*
*/
function displayContentProvider(){
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 =="generic_web"){
hideShowByClassName(".source-generic-web", '');
var contentProvider = form.querySelector('input[name="content-provider"]:checked').value;
hideShowByClassName(".content-provider", 'none');

if(contentProvider == 'git'){
hideShowByClassName(".content-provider-git", '');
} else if(contentProvider == 'googledrive'){
hideShowByClassName(".content-provider-googledrive", '');
} else if(contentProvider == 'dropbox'){
hideShowByClassName(".content-provider-dropbox", '');
} else if(contentProvider =="generic_web"){
hideShowByClassName(".content-provider-generic-web", '');
}
}

Expand Down Expand Up @@ -332,10 +354,10 @@ function main() {
element.addEventListener('change', render);
}
)
document.querySelectorAll('#linkgenerator input[name="source"]').forEach(
document.querySelectorAll('#linkgenerator input[name="content-provider"]').forEach(
function (element) {
element.addEventListener('change', function(){
displaySource();
displayContentProvider();
render();
});
}
Expand All @@ -359,7 +381,7 @@ function main() {
}

// Do an initial render, to make sure our disabled / enabled properties are correctly set
displaySource();
displayContentProvider();
render();
}

Expand Down
Loading