Skip to content

Fix link generation to include path #468

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

Merged
adamnovak merged 2 commits into from
Jan 28, 2025
Merged

Fix link generation to include path #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
418f30c
Add path to generated link URLs and use URL class for building/parsing
adamnovak Jan 28, 2025
177da35
Merge remote-tracking branch 'origin/master' into fix-link
adamnovak Jan 28, 2025
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
21 changes: 12 additions & 9 deletions src/components/CopyLink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,21 @@ export function CopyLink(props) {
// https://github.com/ljharb/qs#stringifying
const params = qs.stringify(viewTarget, { encodeValuesOnly: true });
console.log("params ", params);
// complete url
const full = window.location.origin + "?" + params;
console.log(full);

// Make a new URL based off the current one
let url = new URL(window.location.toString());
url.search = "?" + params;
url.hash = "";
console.log(url);

try {
// copy full to clipboard
copyCallback(full);
copyCallback(url.toString());
// change text
setText(CLICKED_TEXT);
} catch (err) {
setText(UNCLICKED_TEXT);
setDialogLink(full);
setDialogLink(url.toString());
console.log("copy error");
}
};
Expand Down Expand Up @@ -79,11 +82,11 @@ export const urlParamsToViewTarget = (url) => {
// and turn to object to populate in HeaderForm state and viewTarget
// Returns: Object (viewTarget) - see App.js

var result = null;
const s = url.href.split("?");
let parsed = new URL(url);
let result = null;
// If url contains information on viewObject
if (s[1]) {
result = qs.parse(s[1]);
if (parsed.search) {
result = qs.parse(parsed.search.substr(1));
}


Expand Down
4 changes: 2 additions & 2 deletions src/end-to-end.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ describe("When we wait for it to load", () => {
it("produces correct link for view before & after go is pressed", async () => {
// First test that after pressing go, the link reflects the dat form
const expectedLinkBRCA1 =
"http://localhost?name=snp1kg-BRCA1&tracks[0][trackFile]=exampleData%2Finternal%2Fsnp1kg-BRCA1.vg.xg&tracks[0][trackType]=graph&tracks[0][trackColorSettings][mainPalette]=greys&tracks[0][trackColorSettings][auxPalette]=ygreys&tracks[1][trackFile]=exampleData%2Finternal%2FNA12878-BRCA1.sorted.gam&tracks[1][trackType]=read&region=17%3A1-100&bedFile=exampleData%2Finternal%2Fsnp1kg-BRCA1.bed&dataType=built-in&simplify=false&removeSequences=false";
"http://localhost/?name=snp1kg-BRCA1&tracks[0][trackFile]=exampleData%2Finternal%2Fsnp1kg-BRCA1.vg.xg&tracks[0][trackType]=graph&tracks[0][trackColorSettings][mainPalette]=greys&tracks[0][trackColorSettings][auxPalette]=ygreys&tracks[1][trackFile]=exampleData%2Finternal%2FNA12878-BRCA1.sorted.gam&tracks[1][trackType]=read&region=17%3A1-100&bedFile=exampleData%2Finternal%2Fsnp1kg-BRCA1.bed&dataType=built-in&simplify=false&removeSequences=false";
// Set up dropdown
await act(async () => {
let dropdown = document.getElementById("dataSourceSelect");
Expand Down Expand Up @@ -373,7 +373,7 @@ it("produces correct link for view before & after go is pressed", async () => {
await clickCopyLink();

const expectedLinkCactus =
"http://localhost?tracks[0][trackFile]=exampleData%2Fcactus.vg.xg&tracks[0][trackType]=graph&tracks[1][trackFile]=exampleData%2Fcactus-NA12879.sorted.gam&tracks[1][trackType]=read&bedFile=exampleData%2Fcactus.bed&name=cactus&region=ref%3A1-100&dataType=built-in&simplify=false&removeSequences=false";
"http://localhost/?tracks[0][trackFile]=exampleData%2Fcactus.vg.xg&tracks[0][trackType]=graph&tracks[1][trackFile]=exampleData%2Fcactus-NA12879.sorted.gam&tracks[1][trackType]=read&bedFile=exampleData%2Fcactus.bed&name=cactus&region=ref%3A1-100&dataType=built-in&simplify=false&removeSequences=false";
// Make sure link has changed after pressing go
expect(fakeClipboard).toEqual(expectedLinkCactus);
}, 20000);
Expand Down