exposing addEditableTableEntities on editable cell table, adding cypr…

…ess ci test retries
Revvity · Nov 8, 2023 · d3244ef · d3244ef
1 parent 2365c23
commit d3244ef
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 14 deletions.
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -14,6 +14,10 @@ export default ({
     video: false,
     pageLoadTimeout: 40000,
     e2e: {
+      retries: {
+        runMode: 3,
+        openMode: 0
+      },
       // setupNodeEvents(on, config) {
       //   on(
       //     "file:preprocessor",

diff --git a/packages/ove/cypress/e2e/editing.spec.js b/packages/ove/cypress/e2e/editing.spec.js
@@ -13,7 +13,6 @@ describe("editing", function () {
     cy.contains(`.bp3-menu-item`, "Edit Part").click();
     cy.contains(".bp3-dialog button", "Save").click();
 
-    cy.contains(`button`, "Help").click();
     cy.triggerFileCmd("New Part");
     cy.contains(`.bp3-dialog`, "New Part");
     cy.get(`[placeholder="Untitled Annotation"]`);

diff --git a/packages/ove/cypress/e2e/proteinEditor.spec.js b/packages/ove/cypress/e2e/proteinEditor.spec.js
@@ -90,11 +90,11 @@ describe("proteinEditor", function () {
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(0);
     cy.get(".sequenceInputBubble input").type("{enter}");
-    cy.contains("Selecting 9 AAs from 1 to 9");
-    cy.contains("Length: 1394 AAs");
-    cy.get(`[data-test="ve-find-tool-toggle"]`).click().focused().type(".*-ma");
+    cy.contains("Selecting 6 AAs from 1 to 6");
+    cy.contains("Length: 1391 AAs");
+    cy.get(`[data-test="ve-find-tool-toggle"]`).click().focused().type("ma");
 
-    cy.get(`[title="Selecting 5 AAs from 1 to 5"]`).should("exist");
+    cy.get(`[title="Selecting 2 AAs from 1 to 2"]`).should("exist");
   });
   it(`should be able to delete correctly when backspace/del pressed`, () => {
     cy.contains(".veRowViewPrimaryProteinSequenceContainer svg g", "M").click({

diff --git a/packages/ui/cypress/support/index.js b/packages/ui/cypress/support/index.js
@@ -23,6 +23,7 @@
 //
 // -- This is will overwrite an existing command --
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
+// cypress/support/index.js
 const { isString } = require("lodash");
 
 Cypress.Commands.add("tgToggle", (type, onOrOff = true) => {

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.3.43",
+  "version": "0.3.44",
   "main": "./src/index.js",
   "exports": {
     ".": {

diff --git a/packages/ui/src/DataTable/index.js b/packages/ui/src/DataTable/index.js
@@ -96,6 +96,10 @@ const IS_LINUX = window.navigator.platform.toLowerCase().search("linux") > -1;
 class DataTable extends React.Component {
   constructor(props) {
     super(props);
+    if (this.props.helperProp) {
+      this.props.helperProp.addEditableTableEntities =
+        this.addEditableTableEntities;
+    }
     this.hotkeyEnabler = withHotkeys({
       moveUpARow: {
         global: false,
@@ -1704,16 +1708,23 @@ class DataTable extends React.Component {
               additionalBodyEl={
                 isCellEditable &&
                 !onlyShowRowsWErrors && (
-                  <Button
-                    icon="add"
-                    style={{ marginTop: "auto" }}
-                    onClick={() => {
-                      this.insertRows({ numRows: 10, appendToBottom: true });
+                  <div
+                    style={{
+                      width: "100%",
+                      display: "flex",
+                      justifyContent: "center"
                     }}
-                    minimal
                   >
-                    Add 10 Rows
-                  </Button>
+                    <Button
+                      icon="add"
+                      onClick={() => {
+                        this.insertRows({ numRows: 10, appendToBottom: true });
+                      }}
+                      minimal
+                    >
+                      Add 10 Rows
+                    </Button>
+                  </div>
                 )
               }
               className={classNames({
@@ -2961,6 +2972,35 @@ class DataTable extends React.Component {
     return stringText;
   };
 
+  addEditableTableEntities = incomingEnts => {
+    const { entities = [], reduxFormCellValidation } = computePresets(
+      this.props
+    );
+
+    this.updateEntitiesHelper(entities, entities => {
+      const newEntities = incomingEnts.map(e => ({
+        ...e,
+        id: e.id || nanoid(),
+        _isClean: false
+      }));
+
+      const { newEnts, validationErrors } = this.formatAndValidateEntities(
+        newEntities,
+        {
+          useDefaultValues: true,
+          indexToStartAt: entities.length
+        }
+      );
+
+      entities.splice(entities.length, 0, ...newEnts);
+
+      this.updateValidation(entities, {
+        ...reduxFormCellValidation,
+        ...validationErrors
+      });
+    });
+  };
+
   insertRows = ({ above, numRows = 1, appendToBottom } = {}) => {
     const { entities = [], reduxFormCellValidation } = computePresets(
       this.props