Skip to content

Upgrade blueprintjs 5 #1

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
ryan-stackwave merged 5 commits into from
May 22, 2025
Merged

Upgrade blueprintjs 5 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e635e2e
Upgraded to blueprintjs 5
ryan-stackwave May 22, 2025
bf1bbc0
Merge branch 'master' of https://github.com/ryan-stackwave/tg-oss
ryan-stackwave May 22, 2025
6b73f50
Move Popover/Tooltip target properties out of properties and into the…
ryan-stackwave May 22, 2025
a394a3a
Replace all bp3 css classes with bp5
ryan-stackwave May 22, 2025
1938872
Remove @blueprintjs/popover2 import
ryan-stackwave May 22, 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
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@jscutlery/semver": "^5.2.2",
"@nx/cypress": "20.4.6",
"@nx/esbuild": "20.4.6",
"@nx/eslint": "^20.4.6",
"@nx/eslint-plugin": "^20.4.6",
"@nx/eslint": "20.4.6",
"@nx/eslint-plugin": "20.4.6",
"@nx/jest": "20.4.6",
"@nx/js": "20.4.6",
"@nx/react": "20.4.6",
Expand Down Expand Up @@ -92,5 +92,6 @@
"volta": {
"node": "18.18.0",
"yarn": "1.22.21"
}
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
2 changes: 1 addition & 1 deletion packages/ove/cypress/e2e/addYourOwnEnzyme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe("addAdditionalEnzymes", function () {
cy.get(`[data-test="cutsiteToolDropdown"]`).click();
cy.get(`.veToolbarCutsiteFilterHolder .tg-select`).click();
cy.contains(".tg-select-option", "AatII").click();
cy.get(".tg-select .bp3-icon-caret-up").click();
cy.get(".tg-select .bp5-icon-caret-up").click();
cy.contains("(2 cuts)").should("not.exist");
cy.contains("(1 cut)");
cy.get(`[data-test="cutsiteToolDropdown"]`).click();
Expand Down
20 changes: 10 additions & 10 deletions packages/ove/cypress/e2e/alignment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ describe("alignment", function () {
cy.visit("#/Alignment");
cy.get(".tg-alignment-visibility-toggle").click();
cy.contains("cds feature").should("not.exist");
cy.get(".bp3-popover .bp3-menu-item:contains(Features)").click();
cy.get(".bp5-popover .bp5-menu-item:contains(Features)").click();
cy.contains("cds feature");
cy.get(".tg-alignment-visibility-toggle").click();
cy.contains("text", "long feat whose label should still appear").should(
Expand All @@ -12,7 +12,7 @@ describe("alignment", function () {
});
it("it should show an unmapped warning", function () {
cy.visit("#/Alignment");
cy.get(".bp3-icon-warning-sign");
cy.get(".bp5-icon-warning-sign");
});

it("allowTrimming should work properly", function () {
Expand Down Expand Up @@ -52,24 +52,24 @@ describe("alignment", function () {
cy.tgToggle("addSelectionRightClickOptions");
cy.selectAlignmentRange(10, 20);
cy.get(".veAlignmentSelectionLayer:first").rightclick({ force: true });
cy.contains(".bp3-menu-item", "I'm an additional option").click();
cy.contains(".bp3-toast", "You did it");
cy.contains(".bp5-menu-item", "I'm an additional option").click();
cy.contains(".bp5-toast", "You did it");
});
it("overriding right click options should work", function () {
cy.visit("#/Alignment");
cy.tgToggle("overrideSelectionRightClick");
cy.selectAlignmentRange(10, 20);
cy.get(".veAlignmentSelectionLayer:first").rightclick({ force: true });
cy.contains(".bp3-toast", "lezzz goooo!");
cy.contains(".bp5-toast", "lezzz goooo!");
});
it("selection right click options should work and the additionalTopEl should be visible", function () {
cy.visit("#/Alignment");
cy.contains("Additional Top El");
cy.selectAlignmentRange(10, 20);
cy.get(".veAlignmentSelectionLayer:first").rightclick({ force: true });
cy.contains(".bp3-menu-item", "Copy Selection of F05224 as Fasta");
cy.contains(".bp3-menu-item", "Copy Selection of All Alignments ").click();
cy.contains(".bp3-toast", "Selection Copied");
cy.contains(".bp5-menu-item", "Copy Selection of F05224 as Fasta");
cy.contains(".bp5-menu-item", "Copy Selection of All Alignments ").click();
cy.contains(".bp5-toast", "Selection Copied");
});

it("dragging in the alignment should only allow non-origin wrapping selections", function () {
Expand Down Expand Up @@ -135,9 +135,9 @@ describe("alignment", function () {
it("can turn on/off the axis with one click", function () {
cy.visit("#/Alignment");
cy.contains(".alignmentHolder .veRowViewAxis", 1);
cy.get("button .bp3-icon-eye-open").click();
cy.get("button .bp5-icon-eye-open").click();

cy.contains(".bp3-menu-item", "Axis").click();
cy.contains(".bp5-menu-item", "Axis").click();
cy.contains(".alignmentHolder .veRowViewAxis", 1).should("not.exist");
});

Expand Down
20 changes: 10 additions & 10 deletions packages/ove/cypress/e2e/autoAnnotate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe("autoAnnotate", function () {

cy.triggerFileCmd("Auto Annotate Features");
cy.contains("My Features").click();
cy.contains(".bp3-dialog button", "Annotate").click();
cy.contains(".bp5-dialog button", "Annotate").click();
cy.contains(
`Detected that Row 1 (I cover the full Seq) has a non-standard type of`
);
Expand All @@ -44,8 +44,8 @@ describe("autoAnnotate", function () {
cy.removeFeatures();
cy.triggerFileCmd("Auto Annotate Features");
cy.contains("ApE File").click();
cy.uploadFile(`.bp3-dialog .tg-dropzone`, "Default_Features.txt");
cy.contains(".bp3-dialog button", "Annotate").click();
cy.uploadFile(`.bp5-dialog .tg-dropzone`, "Default_Features.txt");
cy.contains(".bp5-dialog button", "Annotate").click();
cy.contains(
`Detected that Row 5 (SP6) has a non-standard type of primer_zoink. We will assign it and all subsequent non-standard types to use the misc_feature type instead`
);
Expand All @@ -61,12 +61,12 @@ describe("autoAnnotate", function () {
cy.removeFeatures();
cy.triggerFileCmd("Auto Annotate Parts");
cy.uploadFile(
`.bp3-dialog .tg-dropzone`,
`.bp5-dialog .tg-dropzone`,
"csvAnnotationList.csv",
"text/csv"
);
cy.contains(`csvAnnotationList.csv`);
cy.contains(".bp3-dialog button", "Annotate").click();
cy.contains(".bp5-dialog button", "Annotate").click();
cy.contains("11 Selected");
cy.contains("button", "Add").click();
cy.contains(`Part - Example Feature 1 - Start: 74 End: 102`);
Expand All @@ -78,12 +78,12 @@ describe("autoAnnotate", function () {
cy.removeFeatures();
cy.triggerFileCmd("Auto Annotate Parts");
cy.uploadFile(
`.bp3-dialog .tg-dropzone`,
`.bp5-dialog .tg-dropzone`,
"csvAnnotationList_no_type.csv",
"text/csv"
);

cy.contains(".bp3-dialog button", "Annotate").click();
cy.contains(".bp5-dialog button", "Annotate").click();
cy.contains("10 Selected");

cy.contains("button", "Add").click();
Expand All @@ -97,12 +97,12 @@ describe("autoAnnotate", function () {
cy.triggerFileCmd("Auto Annotate Features");

cy.uploadFile(
`.bp3-dialog .tg-dropzone`,
`.bp5-dialog .tg-dropzone`,
"csvAnnotationList.csv",
"text/csv"
);
cy.contains(`csvAnnotationList.csv`);
cy.contains(".bp3-dialog button", "Annotate").click();
cy.contains(".bp5-dialog button", "Annotate").click();
cy.contains("11 Selected");
cy.get(`.rt-tr:contains(Example Feature 1)`).click();
cy.get(`.rt-tr:contains(Example Feature 2)`);
Expand All @@ -122,7 +122,7 @@ describe("autoAnnotate", function () {
// `.veFeature:contains(Reverse Feature - Start: 1577 End: 2801) path[fill="#EF6500"]`
// ); //it should be orange
cy.contains(".veCircularViewLabelText", "Example Feature 3").dblclick();
cy.get(`.bp3-radio input[name="forward"][value="true"]`);
cy.get(`.bp5-radio input[name="forward"][value="true"]`);
cy.get(`.tg-select-value:contains(primer_bind)`);
});
});
32 changes: 16 additions & 16 deletions packages/ove/cypress/e2e/copyPaste.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ describe("copyPaste", function () {
cy.contains(".veRowViewFeature", "araC")
.first()
.trigger("contextmenu", { force: true });
cy.contains(".bp3-menu-item", "Copy").trigger("mouseover");
cy.contains(".bp3-menu-item", "Copy Genbank").click();
cy.contains(".bp5-menu-item", "Copy").trigger("mouseover");
cy.contains(".bp5-menu-item", "Copy Genbank").click();
// cy.contains(".openVeCopy2", "Copy AA Sequence").click();
// cy.contains(".bp3-menu-item", "Copy Reverse Complement").click();
// cy.contains(".bp5-menu-item", "Copy Reverse Complement").click();
cy.window().then(() => {
assert(window.Cypress.textToCopy.includes("879 aa"));
assert(window.Cypress.textToCopy.includes("fcillaavsg"));
Expand All @@ -27,10 +27,10 @@ describe("copyPaste", function () {
cy.contains(".veRowViewFeature", "araC")
.first()
.trigger("contextmenu", { force: true });
cy.contains(".bp3-menu-item", "Copy").trigger("mouseover");
cy.contains(".bp3-menu-item", "Copy AA Sequence").click();
cy.contains(".bp5-menu-item", "Copy").trigger("mouseover");
cy.contains(".bp5-menu-item", "Copy AA Sequence").click();
// cy.contains(".openVeCopy2", "Copy AA Sequence").click();
// cy.contains(".bp3-menu-item", "Copy Reverse Complement").click();
// cy.contains(".bp5-menu-item", "Copy Reverse Complement").click();
cy.window().then(() => {
assert(
window.Cypress.textToCopy ===
Expand All @@ -48,8 +48,8 @@ describe("copyPaste", function () {
cy.contains(".veRowViewFeature", "araC")
.first()
.trigger("contextmenu", { force: true });
cy.contains(".bp3-menu-item", "Copy").trigger("mouseover");
cy.contains(".bp3-menu-item", "Copy Reverse Complement").click();
cy.contains(".bp5-menu-item", "Copy").trigger("mouseover");
cy.contains(".bp5-menu-item", "Copy Reverse Complement").click();
cy.window().then(() => {
assert(
window.Cypress.seqDataToCopy.sequence ===
Expand All @@ -63,8 +63,8 @@ describe("copyPaste", function () {
cy.contains(".veRowViewFeature", "araC")
.first()
.trigger("contextmenu", { force: true });
// cy.contains(".bp3-menu-item", "Copy").trigger("mouseover")
cy.contains(".bp3-menu-item", "Copy").click();
// cy.contains(".bp5-menu-item", "Copy").trigger("mouseover")
cy.contains(".bp5-menu-item", "Copy").click();
cy.contains(".openVeCopy2", "Copy").click();
cy.window().then(() => {
assert(
Expand All @@ -78,17 +78,17 @@ describe("copyPaste", function () {
cy.contains(".veRowViewFeature", "araC")
.first()
.trigger("contextmenu", { force: true });
// cy.contains(".bp3-menu-item", "Copy").trigger("mouseover")
cy.contains(".bp3-menu-item", "Copy").trigger("mouseover", { force: true });
cy.contains(".bp3-menu-item", "Copy Options").trigger("mouseover", {
// cy.contains(".bp5-menu-item", "Copy").trigger("mouseover")
cy.contains(".bp5-menu-item", "Copy").trigger("mouseover", { force: true });
cy.contains(".bp5-menu-item", "Copy Options").trigger("mouseover", {
force: true
});
cy.get(
`.bp3-menu-item:contains("Include Features") .bp3-icon-small-tick`
`.bp5-menu-item:contains("Include Features") .bp5-icon-small-tick`
).should("exist");
cy.contains(".bp3-menu-item", "Include Features").click({ force: true });
cy.contains(".bp5-menu-item", "Include Features").click({ force: true });
cy.get(
`.bp3-menu-item:contains("Include Features") .bp3-icon-small-tick`
`.bp5-menu-item:contains("Include Features") .bp5-icon-small-tick`
).should("not.exist");
});
});
20 changes: 10 additions & 10 deletions packages/ove/cypress/e2e/cutsiteInfoView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ describe("cutsiteInfoView", function () {
});
it(`enzyme preview should be rendering cutsites correctly`, () => {
cy.contains(".veLabelText", "AatII").dblclick();
cy.get(`.bp3-dialog .snipPosition-12`);
cy.get(`.bp5-dialog .snipPosition-12`);
});

it(`filtering for a hidden enzyme should bring up a 'These Hidden enzymes match' message`, () => {
Expand All @@ -21,9 +21,9 @@ describe("cutsiteInfoView", function () {
cy.get(`.veToolbarCutsiteFilterHolder input`).should("not.exist"); //clicking the hidden enzyme should close the filter
cy.contains("Esp3I (2 cuts) hidden");
cy.get(
`.bp3-dialog:contains(Aliases:):contains(BstGZ53I):contains(BstGZ53I)`
`.bp5-dialog:contains(Aliases:):contains(BstGZ53I):contains(BstGZ53I)`
);
cy.get(`.bp3-dialog:contains(Aliases:) .bp3-tag:contains(BsmBI)`).click();
cy.get(`.bp5-dialog:contains(Aliases:) .bp5-tag:contains(BsmBI)`).click();
cy.contains("BsmBI (2 cuts) inactive");
});
it(`filtering for an enzyme with 0 cuts should bring up a No Active Results.. These inactive enzymes match: message`, () => {
Expand All @@ -38,14 +38,14 @@ describe("cutsiteInfoView", function () {
cy.get(`.veToolbarCutsiteFilterHolder input`).type("{selectAll}nocuts");
cy.contains("noCutsEnzyme (0 cuts)").click();
cy.contains(".ve-enzymeSubrow", "gggggggaaaaaaa");
cy.contains(".bp3-dialog", "someGroup");
cy.contains(".bp5-dialog", "someGroup");
});
it(`clicking a cutsite or cutsite group should provide more info`, () => {
cy.tgToggle("overrideManageEnzymes");
cy.get(`[data-test="cutsiteToolDropdown"]`).click();
cy.get(".tg-select-toggle").click();
cy.contains("someGroup").click();
cy.contains(".bp3-tag", "someGroup").click();
cy.contains(".bp5-tag", "someGroup").click();
cy.contains("Compare..").click();
cy.contains("vs Single cutters").click();
cy.contains(`[data-test="tg-column-3"]`, "specialEnzyme2");
Expand All @@ -59,16 +59,16 @@ describe("cutsiteInfoView", function () {
cy.get(`[data-test="cutsiteToolDropdown"]`).click();
cy.get(".tg-select-toggle").click();
cy.contains(".tg-select-option", "specialEnzyme1").click();
cy.contains(".bp3-tag", "specialEnzyme1").click();
cy.contains(".bp5-tag", "specialEnzyme1").click();

cy.contains(".rt-tr", "92").click();
cy.contains("Caret Between Bases 92 and 93");

cy.contains(".bp3-tag.bp3-intent-primary", "Single cutters");
cy.contains(".bp3-tag.bp3-intent-primary", "someGroup").should("not.exist");
cy.contains(".bp3-tag", "someGroup").click();
cy.contains(".bp5-tag.bp5-intent-primary", "Single cutters");
cy.contains(".bp5-tag.bp5-intent-primary", "someGroup").should("not.exist");
cy.contains(".bp5-tag", "someGroup").click();

cy.contains("someGroup (inactive)");
cy.contains(".bp3-tag.bp3-intent-primary", "specialEnzyme1 (1 cut)");
cy.contains(".bp5-tag.bp5-intent-primary", "specialEnzyme1 (1 cut)");
});
});
Loading
Loading