Merge branch 'TeselaGen:master' into master

.github/workflows/cypress.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - name: Checkout
         uses: actions/checkout@v3
         with:

CHANGELOG.md

@@ -6,6 +6,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### 0.2.0
 
+- Use a custom tippy theme called 'teselagen' to avoid overriding styles defined by themes in tippy instances outisde of ove [`#64`](https://github.com/TeselaGen/tg-oss/pull/64)
 - Added fix for clipboard commands when there are multiple editors [`#57`](https://github.com/TeselaGen/tg-oss/pull/57)
 - Fixed condition for removing \* [`#52`](https://github.com/TeselaGen/tg-oss/pull/52)
 - Removed \* aa from dna translation at the end of sequence [`#50`](https://github.com/TeselaGen/tg-oss/pull/50)
@@ -30,6 +31,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Added menu item to allow user to export DNA as FASTA when looking at a protein sequence to resolve https://github.com/TeselaGen/tg-oss/issues/61 [`#61`](https://github.com/TeselaGen/tg-oss/issues/61)
 - Added fix for clipboard commands when there are multiple editors on a page to resolve https://github.com/TeselaGen/tg-oss/issues/24 [`#24`](https://github.com/TeselaGen/tg-oss/issues/24)
 - closes #35 [`#35`](https://github.com/TeselaGen/tg-oss/issues/35)
-- making upload accept handle async values [`5c8dfd8`](https://github.com/TeselaGen/tg-oss/commit/5c8dfd8a91defd00773329d9dbfc2e15beb01bbb)
-- fixing issue with annotationsToSupport and adding test [`2f885dc`](https://github.com/TeselaGen/tg-oss/commit/2f885dc53fd4441a4473eb0b3194dc82d1922a30)
-- adding download table as csv button to editable tables, more csv wizard fixing [`9f4989e`](https://github.com/TeselaGen/tg-oss/commit/9f4989e2fda4f7542b96cb2f1ec3d3c97c386245)
+- formatting all files in repo [`87f52d8`](https://github.com/TeselaGen/tg-oss/commit/87f52d888fb22613139ee4fe32a702c1ed2adfda)
+- unifying the ui and ove demos [`f23237d`](https://github.com/TeselaGen/tg-oss/commit/f23237d4185830d94f362cbd1dae527ab59ad623)
+- bumping cypress and vite [`c85445a`](https://github.com/TeselaGen/tg-oss/commit/c85445a93a6978bc951f9f5e8dff1a366858a045)

output.json

@@ -779,7 +779,13 @@
         }
       ],
       "range-utils": [],
-      "shared-demo": [],
+      "shared-demo": [
+        {
+          "source": "shared-demo",
+          "target": "ui",
+          "type": "static"
+        }
+      ],
       "file-utils": [],
       "uploader": [],
       "ove": [

package.json

@@ -120,7 +120,7 @@
     "chance": "^1.1.11",
     "classnames": "^2.3.2",
     "concurrently": "^8.2.2",
-    "cypress": "13.5.1",
+    "cypress": "13.6.6",
     "cypress-vite": "^1.4.0",
     "esbuild": "^0.19.5",
     "eslint": "~8.53.0",
@@ -150,7 +150,7 @@
     "tslib": "^2.6.2",
     "typescript": "~5.2.2",
     "validate.io-nonnegative-integer-array": "^1.0.1",
-    "vite": "^4.3.9",
+    "vite": "^5.1.5",
     "vite-plugin-dts": "~3.5.4",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-libcss": "^1.1.1",

packages/ove/cypress/e2e/dialogs.spec.js

@@ -22,7 +22,8 @@ describe("dialogs", function () {
     cy.get(`[data-test="cutsiteHideShowTool"]`).click();
     cy.contains(".veLabelText", "araD").rightclick({ force: true });
     cy.contains(".bp3-menu-item", "Create").click();
-    cy.contains(".bp3-menu-item", "New Feature").click({ force: true });
+    cy.contains(".bp3-menu-item", "New Feature").click();
+    cy.contains(".bp3-menu-item", "New Feature").should("not.exist");
     cy.focused().type("new feat");
     cy.screenshot();
 

packages/ove/cypress/e2e/rnaMode.spec.js

@@ -20,11 +20,8 @@ describe("rna editing in OVE", function () {
     cy.contains("uuaugacaacuugacggcuacaucauucacuuuuucuuca").should("not.exist");
     cy.contains("uuuugacgt");
     cy.selectRange(10, 11);
+    cy.replaceSelection("      tguugttuuuuuuuuuuuuuuuaa{enter}");
     cy.get(".veRowViewSelectionLayer.notCaret").first().rightclick();
-    cy.contains(".bp3-menu-item", "Replace").click();
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(200);
-    cy.focused().type("      tguugttuuuuuuuuuuuuuuuaa{enter}", { delay: 20 });
     cy.contains("Selecting 24 bps from 10 to 33"); //the t's should not be filtered out and neither should the u's
     cy.contains("tguugttuuuuuuuuuuuuuuuaa");
   });

packages/ove/cypress/e2e/zoomCircularView.spec.js

@@ -60,7 +60,8 @@ describe("zoomCircularView.spec", function () {
       ".veRotateCircularSlider .bp3-slider-handle",
       ".ve-tool-container-downloadTool"
     );
-    cy.get(`.circularViewSvg g[style="transform: rotate(150deg);"]`);
+    cy.get(`.circularViewSvg g[style="transform: rotate(0deg);"]`);
+    cy.get(`.veCircularViewLabelText:contains(Example Primer 1)`);
     cy.dragBetween(
       ".veZoomCircularSlider .bp3-slider-handle",
       ".veZoomCircularSlider .bp3-icon-plus"

packages/ove/cypress/support/index.js

@@ -314,6 +314,7 @@ Cypress.Commands.add("replaceSelection", sequenceString => {
   cy.contains(".bp3-menu-item", "Replace").click();
   // eslint-disable-next-line cypress/no-unnecessary-waiting
   cy.wait(200);
+  cy.contains(".bp3-menu-item", "Replace").should("not.exist");
   cy.get(".sequenceInputBubble input").type(
     (Cypress.config("isInteractive") ? "" : "            ") +
       `${sequenceString}{enter}`