Skip to content

Fix link generator to use targetPath in urlpath construction #386

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
ntaback wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix link generator to use targetPath in urlpath construction #386

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions docs/_static/link_gen/link.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,18 @@ function generateCloneDirectoryName(gitCloneUrl) {
return lastPart.split(':').slice(-1)[0].replace(/(\.git|\.bundle)?/, '');
}

/**
* Return the effective clone directory to use in urlpath construction.
*
* If targetPath is provided (non-empty after trimming), use it as the directory
* where the repo will be cloned. Otherwise, fall back to the default name
* (typically derived from the repo URL).
*/
function getEffectiveCloneDirectory(targetPath, defaultName) {
var trimmedPath = targetPath ? targetPath.trim() : '';
return trimmedPath ? trimmedPath : defaultName;
}

function displayLink() {
var form = document.getElementById('linkgenerator');

Expand All @@ -186,12 +198,14 @@ function displayLink() {
var urlPath = document.getElementById('urlpath').value;
} else {
var repoName = generateCloneDirectoryName(repoUrl);
var cloneDirectory = getEffectiveCloneDirectory(targetPath, repoName);
var urlPath;
if (activeTab === "tab-auth-binder") {
var contentRepoName = new URL(contentRepoUrl).pathname.split('/').pop().replace(/\.git$/, '');
urlPath = apps[appName].generateUrlPath(contentRepoName + '/' + filePath);
var binderCloneDir = getEffectiveCloneDirectory(targetPath, contentRepoName);
urlPath = apps[appName].generateUrlPath(binderCloneDir + '/' + filePath);
} else {
urlPath = apps[appName].generateUrlPath(repoName + '/' + filePath);
urlPath = apps[appName].generateUrlPath(cloneDirectory + '/' + filePath);
}
}

Expand Down