Merge remote-tracking branch 'origin/master' into geometry-update

bgoldowsky · bgoldowsky · commit ddbd839fad8d · 2024-07-09T06:45:09.000-04:00
diff --git a/.github/workflows/ci-regression.yml b/.github/workflows/ci-regression.yml
@@ -45,7 +45,10 @@ jobs:
     # If we run out cypress test runs then we temporarily expand the timeout to 4hrs until cypress cloud is available
     # again
     # timeout-minutes: 240
-    container: cypress/browsers:node-20.11.0-chrome-121.0.6167.184-1-ff-123.0-edge-121.0.2277.128-1
+    container:
+      image: cypress/browsers:node-20.11.0-chrome-121.0.6167.184-1-ff-123.0-edge-121.0.2277.128-1
+      # This is needed so the commit info can be recorded by cypress
+      options: --user 1001
     strategy:
       # when one test fails, DO NOT cancel the other
       # containers, because this will kill Cypress processes
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -72,7 +72,10 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
   cypress:
     runs-on: ubuntu-latest
-    container: cypress/browsers:node-20.11.0-chrome-121.0.6167.184-1-ff-123.0-edge-121.0.2277.128-1
+    container:
+      image: cypress/browsers:node-20.11.0-chrome-121.0.6167.184-1-ff-123.0-edge-121.0.2277.128-1
+      # This is needed so the commit info can be recorded by cypress
+      options: --user 1001
     strategy:
       # when one test fails, DO NOT cancel the other
       # containers, because this will kill Cypress processes
diff --git a/.github/workflows/manual-regression.yml b/.github/workflows/manual-regression.yml
@@ -62,7 +62,10 @@ on:
 jobs:
   all-tests:
     runs-on: ubuntu-latest
-    container: cypress/browsers:node-20.11.0-chrome-121.0.6167.184-1-ff-123.0-edge-121.0.2277.128-1
+    container:
+      image: cypress/browsers:node-20.11.0-chrome-121.0.6167.184-1-ff-123.0-edge-121.0.2277.128-1
+      # This is needed so the commit info can be recorded by cypress
+      options: --user 1001
     if: ${{ github.event.inputs.test == 'all' }}
     strategy:
       # when one test fails, DO NOT cancel the other
diff --git a/.github/workflows/regression-daily.yml b/.github/workflows/regression-daily.yml
@@ -6,7 +6,10 @@ on:
 jobs:
   all-tests:
     runs-on: ubuntu-latest
-    container: cypress/browsers:node-20.11.0-chrome-121.0.6167.184-1-ff-123.0-edge-121.0.2277.128-1
+    container:
+      image: cypress/browsers:node-20.11.0-chrome-121.0.6167.184-1-ff-123.0-edge-121.0.2277.128-1
+      # This is needed so the commit info can be recorded by cypress
+      options: --user 1001
     strategy:
       # when one test fails, DO NOT cancel the other
       # containers, because this will kill Cypress processes
diff --git a/cypress/e2e/functional/document_tests/tiles_copy_test_spec.js b/cypress/e2e/functional/document_tests/tiles_copy_test_spec.js
@@ -9,6 +9,7 @@ import DataCardToolTile from '../../../support/elements/tile/DataCardToolTile';
 import DataflowToolTile from '../../../support/elements/tile/DataflowToolTile';
 import SimulatorTile from '../../../support/elements/tile/SimulatorTile';
 import DiagramToolTile from '../../../support/elements/tile/DiagramToolTile';
+import XYPlotToolTile from "../../../support/elements/tile/XYPlotToolTile";
 
 const student5 = `${Cypress.config("qaUnitStudent5")}`;
 const student6 = `${Cypress.config("qaUnitStudent6")}`;
@@ -22,22 +23,28 @@ let clueCanvas = new ClueCanvas,
   dc = new DataCardToolTile,
   dataflowToolTile = new DataflowToolTile,
   simulatorTile = new SimulatorTile,
-  diagramTile = new DiagramToolTile;
+  diagramTile = new DiagramToolTile,
+  graphTile = new XYPlotToolTile;
 let canvas = new Canvas;
 
 const imageName = "Image Tile";
 const simName = "Test Simulation";
 const diagramName = "Test Diagram";
+const categoricalGraphName = "Categorical Graph Test";
+const categoricalGraphCopyName = "Categorical Graph Test 1";
+
 const studentWorkspace = 'QA 1.1 Solving a Mystery with Proportional Reasoning';
 const studentWorkspaceCopyTiles = 'Test Workspace Copy Tiles';
 const studentClassWorkCopyTiles = 'Test Class Work Copy Tiles';
 
-const tiles1 = [{ "name": "table" },
-{ "name": "geometry" },
-{ "name": "drawing" },
-{ "name": "expression" },
-{ "name": "numberline" },
-{ "name": "image" }];
+const tiles1 = [
+  { "name": "table" },
+  { "name": "geometry" },
+  { "name": "drawing" },
+  { "name": "expression" },
+  { "name": "numberline" },
+  { "name": "image" }
+];
 const tiles2 = [
   { "name": "data-card" },
   { "name": "dataflow" },
@@ -300,3 +307,46 @@ context('Test copy tiles from one document to other document', function () {
 
   });
 });
+
+context("Test copy tile within a document", function () {
+  it("Copies a graph tile within a document", function () {
+    beforeTest(student5);
+
+    // Add table tile and populate it with categorical data.
+    cy.log("Add table tile with categorical data");
+    clueCanvas.addTile("table");
+    cy.get(".primary-workspace").within((workspace) => {
+      tableToolTile.typeInTableCellXY(0, 0, "small");
+      tableToolTile.getTableCellXY(0, 0).should("contain", "small");
+      tableToolTile.typeInTableCellXY(1, 0, "medium");
+      tableToolTile.getTableCellXY(1, 0).should("contain", "medium");
+      tableToolTile.typeInTableCellXY(0, 1, "red");
+      tableToolTile.getTableCellXY(0, 1).should("contain", "red");
+      tableToolTile.typeInTableCellXY(1, 1, "green");
+      tableToolTile.getTableCellXY(1, 1).should("contain", "green");
+    });
+
+    // Graph the table data in a new graph tile
+    cy.get("[data-original-title='Graph It!']").click();
+    cy.get("[data-test=link-tile-select]").select("New Graph");
+    cy.get(".modal-button").contains("Graph It").click();
+    graphTile.getTile().should("have.length", 1);
+    graphTile.getXYPlotTitle().first().should("contain", "Graph 1");
+    graphTile.getXYPlotTitle().first().click();
+    cy.get(".primary-workspace .graph-wrapper .editable-tile-title").first().type(categoricalGraphName + "{enter}");
+    graphTile.getXYPlotTitle().first().should("contain", categoricalGraphName);
+    graphTile.getGraphDot().should("have.length", 2).each(($g) => {
+      cy.wrap($g).should("have.attr", "transform").should("not.be.empty");
+    });
+
+    // Click on new graph tile to select it, then copy it
+    graphTile.getTile().first().click();
+    cy.get("[data-testid=tool-duplicate]").click();
+    graphTile.getTile().should("have.length", 2);
+    graphTile.getXYPlotTitle().eq(1).should("contain", categoricalGraphCopyName);
+    graphTile.getTile().eq(1).find("g.graph-dot").should("have.length", 2).each(($g) => {
+      cy.wrap($g).should("have.attr", "transform").should("not.be.empty");
+    });
+
+  });
+});
diff --git a/cypress/e2e/functional/teacher_tests/teacher_sort_work_view_spec.js b/cypress/e2e/functional/teacher_tests/teacher_sort_work_view_spec.js
@@ -66,6 +66,9 @@ describe('SortWorkView Tests', () => {
 
 
   it("should open Sort Work tab and test sorting by group", () => {
+    // Clear data before the test so it can be retried and will start with a clean slate
+    cy.clearQAData('all');
+
     const students = ["student:1", "student:2", "student:3", "student:4"];
     const studentProblemDocs = [
       `Student 1: ${title}`,
diff --git a/cypress/e2e/functional/tile_tests/datacard_merge_spec.js b/cypress/e2e/functional/tile_tests/datacard_merge_spec.js
@@ -1,12 +1,8 @@
 import ClueCanvas from '../../../support/elements/common/cCanvas';
-import Canvas from '../../../support/elements/common/Canvas';
 import DataCardToolTile from '../../../support/elements/tile/DataCardToolTile';
 
 let clueCanvas = new ClueCanvas;
 let dc = new DataCardToolTile;
-let canvas = new Canvas;
-let studentWorkspace = 'SAS 1.1 Solving a Mystery with Proportional Reasoning';
-const dataTransfer = new DataTransfer;
 
 function beforeTest() {
   const queryParams = `${Cypress.config("qaUnitStudent5")}`;
@@ -15,14 +11,6 @@ function beforeTest() {
   cy.waitForLoad();
 }
 
-function openMyWork() {
-  cy.wait(2000);
-  clueCanvas.getInvestigationCanvasTitle().text().then((investigationTitle) => {
-    cy.openTopTab('my-work');
-    cy.openDocumentThumbnail('my-work', 'workspaces', investigationTitle);
-  });
-}
-
 context('Merge Data Card Tool Tile', function () {
   it("Merge Data Card Tool Tile", () => {
     beforeTest();
@@ -64,12 +52,9 @@ context('Merge Data Card Tool Tile', function () {
     dc.getTile(1).should("exist");
     dc.getTileTitle(1).should("have.text", "Card Deck Data 2");
 
-    dc.getTile(0).find(".data-card-tool")
-      .trigger('dragstart', { dataTransfer }).then(() => {
-        dc.getTile(1).find(".data-card-tool .data-card-header-row")
-          .trigger('drop', { dataTransfer, force: true })
-          .trigger('dragend', { dataTransfer, force: true });
-      });
+    dc.getMergeDataButton(1).click();
+    dc.getMergeDataModalSelect().select("Card Deck Data 1");
+    dc.getMergeDataModalAddDataButton().click();
 
     dc.getAttrs(0).should("have.length", 1);
     dc.getCardNofTotalListing(0).should("have.text", "Card 1 of 1");
@@ -98,12 +83,9 @@ context('Merge Data Card Tool Tile', function () {
     dc.getTile(1).should("exist");
     dc.getTileTitle(1).should("have.text", "Card Deck Data 2");
 
-    dc.getTile(0).find(".data-card-tool")
-      .trigger('dragstart', { dataTransfer }).then(() => {
-        dc.getTile(1).find(".data-card-tool .data-card-header-row")
-          .trigger('drop', { dataTransfer, force: true })
-          .trigger('dragend', { dataTransfer, force: true });
-      });
+    dc.getMergeDataButton(1).click();
+    dc.getMergeDataModalSelect().select("Card Deck Data 1");
+    dc.getMergeDataModalAddDataButton().click();
 
     dc.getAttrs(0).should("have.length", 1);
     dc.getCardNofTotalListing(0).should("have.text", "Card 1 of 1");
@@ -140,12 +122,9 @@ context('Merge Data Card Tool Tile', function () {
     dc.getAttrName(1).contains("Attr1 Name");
     dc.getAttrValue(1).click().type("Attr1 Value{enter}");
 
-    dc.getTile(0).find(".data-card-tool")
-      .trigger('dragstart', { dataTransfer }).then(() => {
-        dc.getTile(1).find(".data-card-tool .data-card-header-row")
-          .trigger('drop', { dataTransfer, force: true })
-          .trigger('dragend', { dataTransfer, force: true });
-      });
+    dc.getMergeDataButton(1).click();
+    dc.getMergeDataModalSelect().select("Card Deck Data 1");
+    dc.getMergeDataModalAddDataButton().click();
 
     dc.getAttrs(0).should("have.length", 1);
     dc.getCardNofTotalListing(0).should("have.text", "Card 1 of 1");
@@ -186,12 +165,9 @@ context('Merge Data Card Tool Tile', function () {
     dc.getAttrName(1).contains("Attr2 Name");
     dc.getAttrValue(1).click().type("Attr2 Value{enter}");
 
-    dc.getTile(0).find(".data-card-tool")
-      .trigger('dragstart', { dataTransfer }).then(() => {
-        dc.getTile(1).find(".data-card-tool .data-card-header-row")
-          .trigger('drop', { dataTransfer, force: true })
-          .trigger('dragend', { dataTransfer, force: true });
-      });
+    dc.getMergeDataButton(1).click();
+    dc.getMergeDataModalSelect().select("Card Deck Data 1");
+    dc.getMergeDataModalAddDataButton().click();
 
     dc.getAttrs(0).should("have.length", 1);
     dc.getCardNofTotalListing(0).should("have.text", "Card 1 of 1");
@@ -232,12 +208,9 @@ context('Merge Data Card Tool Tile', function () {
     dc.getAttrName(1).contains("Attr1 Name");
     dc.getAttrValue(1).click().type("Attr2 Value{enter}");
 
-    dc.getTile(0).find(".data-card-tool")
-      .trigger('dragstart', { dataTransfer }).then(() => {
-        dc.getTile(1).find(".data-card-tool .data-card-header-row")
-          .trigger('drop', { dataTransfer, force: true })
-          .trigger('dragend', { dataTransfer, force: true });
-      });
+    dc.getMergeDataButton(1).click();
+    dc.getMergeDataModalSelect().select("Card Deck Data 1");
+    dc.getMergeDataModalAddDataButton().click();
 
     dc.getAttrs(1).should("have.length", 1);
     dc.getCardNofTotalListing(1).should("have.text", "Card 1 of 2");
@@ -275,12 +248,9 @@ context('Merge Data Card Tool Tile', function () {
     dc.getSortSelect(1).select("Attr2 Name");
     dc.getSortView(1).should('exist');
 
-    dc.getTile(0).find(".data-card-tool")
-      .trigger('dragstart', { dataTransfer }).then(() => {
-        dc.getTile(1).find(".data-card-tool .data-card-header-row")
-          .trigger('drop', { dataTransfer, force: true })
-          .trigger('dragend', { dataTransfer, force: true });
-      });
+    dc.getMergeDataButton(1).click();
+    dc.getMergeDataModalSelect().select("Card Deck Data 1");
+    dc.getMergeDataModalAddDataButton().click();
 
     dc.getSortSelect(1).select("None");
     dc.getSingleCardView(1).should('exist');
@@ -301,52 +271,4 @@ context('Merge Data Card Tool Tile', function () {
     dc.getPreviousCardButton(1).click();
     dc.getCardNofTotalListing(1).should("have.text", "Card 1 of 2");
   });
-
-  it("merge Data card tool tile across documents", () => {
-    beforeTest();
-    openMyWork();
-    clueCanvas.addTile("datacard");
-    dc.getTile(0).should("exist");
-    dc.getTileTitle(0).should("have.text", "Card Deck Data 1");
-
-    dc.getAttrName(0).dblclick().type("Attr1 Name{enter}");
-    dc.getAttrName(0).contains("Attr1 Name");
-    dc.getAttrValue(0).click().type("Attr1 Value{enter}");
-
-    cy.log("opens document in main doc on the left");
-    canvas.createNewExtraDocumentFromFileMenu(studentWorkspace, "my-work");
-
-    cy.log("creates a Data Card tool tile in new personal workspace");
-    clueCanvas.addTile("datacard");
-    dc.getTile(0).should("exist");
-    dc.getTileTitle(0).should("have.text", "Card Deck Data 1");
-
-    dc.getAttrName(0).dblclick().type("Attr2 Name{enter}");
-    dc.getAttrName(0).contains("Attr2 Name");
-    dc.getAttrValue(0).click().type("Attr2 Value{enter}");
-
-    cy.log("merge Data card tool tile from left to right");
-    dc.getTile(0, "[data-test=\"subtab-workspaces\"] .editable-document-content").find(".data-card-tool")
-      .trigger('dragstart', { dataTransfer }).then(() => {
-        dc.getTile(0).find(".data-card-tool .data-card-header-row")
-          .trigger('drop', { dataTransfer, force: true })
-          .trigger('dragend', { dataTransfer, force: true });
-      });
-
-    dc.getAttrs(0).should("have.length", 2);
-    dc.getCardNofTotalListing(0).should("have.text", "Card 1 of 2");
-    dc.getAttrName(0).eq(0).should("have.text", "Attr2 Name");
-    dc.getAttrValue(0).eq(0).invoke("val").should("contain", "Attr2 Value");
-    dc.getAttrName(0).eq(1).should("have.text", "Attr1 Name");
-    dc.getAttrValue(0).eq(1).invoke("val").should("be.empty");
-    dc.getNextCardButton(0).click();
-    dc.getCardNofTotalListing(0).should("have.text", "Card 2 of 2");
-    dc.getAttrs(0).should("have.length", 2);
-    dc.getAttrName(0).eq(0).should("have.text", "Attr2 Name");
-    dc.getAttrValue(0).eq(0).invoke("val").should("be.empty");
-    dc.getAttrName(0).eq(1).should("have.text", "Attr1 Name");
-    dc.getAttrValue(0).eq(1).invoke("val").should("contain", "Attr1 Value");
-    dc.getPreviousCardButton(0).click();
-    dc.getCardNofTotalListing(0).should("have.text", "Card 1 of 2");
-  });
 });
diff --git a/cypress/support/elements/common/cHeader.js b/cypress/support/elements/common/cHeader.js
@@ -10,11 +10,14 @@ class ClueHeader{
     getGroupMembers(){
         return cy.get('[data-test=group-members]');
     }
-    
+
     leaveGroup(){
         this.getGroupName().click();
         dialog.getDialogTitle().should('contain', 'Leave Group');
         dialog.getDialogOKButton().click();
+
+        // Wait a little bit to make sure this group change makes it to the database
+        cy.wait(500);
     }
 
     cancelLeaveGroup(){
diff --git a/dependencies-notes.md b/dependencies-notes.md
@@ -12,9 +12,6 @@ Notes on dependencies, particularly reasons for not updating to their latest ver
 |@types/react-dom            |17.0.17        |18.0.6        |React 18                                                                     |
 |@types/react-tabs           |2.3.4          |5.0.5         |Versions 3 and 4 were never published(?); Version 5 requires React 18        |
 |@types/slate-react          |0.22.9         |0.50.1        |Requires slate-editor library update to latest slate                         |
-|cypress                     |9.7.0          |10.6.0        |Cypress 10 requires non-trivial migration.                                   |
-|cypress-commands            |2.0.1          |3.0.0         |Cypress 10                                                                   |
-|cypress-terminal-report     |3.5.2          |4.1.2         |Cypress 10                                                                   |
 
 ## Runtime Dependencies
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -169,7 +169,7 @@
     "cross-env": "^7.0.3",
     "css-loader": "^6.7.1",
     "cypress": "^13.5.0",
-    "cypress-commands": "2.0.1",
+    "cypress-commands": "3.0.0",
     "cypress-file-upload": "^5.0.8",
     "cypress-terminal-report": "^4.1.2",
     "enquirer": "^2.3.6",
diff --git a/src/plugins/data-card/data-card-tile.tsx b/src/plugins/data-card/data-card-tile.tsx
diff --git a/src/plugins/graph/models/graph-model.ts b/src/plugins/graph/models/graph-model.ts
