From 3fd36192430554d3e28fcee28d23d534881dae7a Mon Sep 17 00:00:00 2001
From: Stephen Smith <stephen@curii.com>
Date: Fri, 7 Jun 2024 09:29:26 -0400
Subject: [PATCH] 21225: Fix cypress tests

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>
---
 services/workbench2/cypress/e2e/process.cy.js |  7 ++++---
 services/workbench2/cypress/e2e/project.cy.js | 20 +++++++++----------
 .../multi-panel-view/multi-panel-view.tsx     |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/services/workbench2/cypress/e2e/process.cy.js b/services/workbench2/cypress/e2e/process.cy.js
index 6a3a894e8a..412576c05e 100644
--- a/services/workbench2/cypress/e2e/process.cy.js
+++ b/services/workbench2/cypress/e2e/process.cy.js
@@ -114,9 +114,10 @@ describe("Process tests", function () {
                 cy.get("[data-cy=process-details-attributes-modifiedby-user]").contains(`Active User (${activeUser.user.uuid})`);
                 cy.get("[data-cy=process-details-attributes-runtime-user]").should("not.exist");
                 cy.get("[data-cy=side-panel-tree]").contains("Home Projects").click();
-                cy.waitForDom()
-                cy.get('[data-cy=data-table-row]').contains(containerRequest.name).should('exist').parent().parent().parent().parent().click()
-                cy.waitForDom()
+                cy.waitForDom();
+                cy.get('[data-cy=mpv-tabs]').contains("Workflow Runs").click();
+                cy.get('[data-cy=data-table-row]').contains(containerRequest.name).should('exist').parents('[data-cy=data-table-row]').click()
+                cy.waitForDom();
                 cy.get('[data-cy=multiselect-button]').should('have.length', msButtonTooltips.length)
                 for (let i = 0; i < msButtonTooltips.length; i++) {
                     cy.get('[data-cy=multiselect-button]').eq(i).trigger('mouseover');
diff --git a/services/workbench2/cypress/e2e/project.cy.js b/services/workbench2/cypress/e2e/project.cy.js
index 43215741f5..3b2237bbce 100644
--- a/services/workbench2/cypress/e2e/project.cy.js
+++ b/services/workbench2/cypress/e2e/project.cy.js
@@ -657,28 +657,28 @@ describe("Project tests", function () {
         [
             {
                 name: "Name",
-                asc: "collections.name asc,container_requests.name asc,groups.name asc,container_requests.created_at desc",
-                desc: "collections.name desc,container_requests.name desc,groups.name desc,container_requests.created_at desc",
+                asc: "collections.name asc,groups.name asc,workflows.name asc,created_at desc",
+                desc: "collections.name desc,groups.name desc,workflows.name desc,created_at desc",
             },
             {
                 name: "Last Modified",
-                asc: "collections.modified_at asc,container_requests.modified_at asc,groups.modified_at asc,container_requests.created_at desc",
-                desc: "collections.modified_at desc,container_requests.modified_at desc,groups.modified_at desc,container_requests.created_at desc",
+                asc: "collections.modified_at asc,groups.modified_at asc,workflows.modified_at asc,created_at desc",
+                desc: "collections.modified_at desc,groups.modified_at desc,workflows.modified_at desc,created_at desc",
             },
             {
                 name: "Date Created",
-                asc: "collections.created_at asc,container_requests.created_at asc,groups.created_at asc,container_requests.created_at desc",
-                desc: "collections.created_at desc,container_requests.created_at desc,groups.created_at desc,container_requests.created_at desc",
+                asc: "collections.created_at asc,groups.created_at asc,workflows.created_at asc,created_at desc",
+                desc: "collections.created_at desc,groups.created_at desc,workflows.created_at desc,created_at desc",
             },
             {
                 name: "Trash at",
-                asc: "collections.trash_at asc,container_requests.trash_at asc,groups.trash_at asc,container_requests.created_at desc",
-                desc: "collections.trash_at desc,container_requests.trash_at desc,groups.trash_at desc,container_requests.created_at desc",
+                asc: "collections.trash_at asc,groups.trash_at asc,workflows.trash_at asc,created_at desc",
+                desc: "collections.trash_at desc,groups.trash_at desc,workflows.trash_at desc,created_at desc",
             },
             {
                 name: "Delete at",
-                asc: "collections.delete_at asc,container_requests.delete_at asc,groups.delete_at asc,container_requests.created_at desc",
-                desc: "collections.delete_at desc,container_requests.delete_at desc,groups.delete_at desc,container_requests.created_at desc",
+                asc: "collections.delete_at asc,groups.delete_at asc,workflows.delete_at asc,created_at desc",
+                desc: "collections.delete_at desc,groups.delete_at desc,workflows.delete_at desc,created_at desc",
             },
         ].forEach(test => {
             cy.get("[data-cy=project-panel] table thead th").contains(test.name).click();
diff --git a/services/workbench2/src/components/multi-panel-view/multi-panel-view.tsx b/services/workbench2/src/components/multi-panel-view/multi-panel-view.tsx
index 59d7b14c5d..6146151996 100644
--- a/services/workbench2/src/components/multi-panel-view/multi-panel-view.tsx
+++ b/services/workbench2/src/components/multi-panel-view/multi-panel-view.tsx
@@ -273,7 +273,7 @@ const MPVContainerComponent = ({ children, panelStates, classes, ...props }: MPV
         };
 
         buttonBar = props.mutuallyExclusive ?
-            <Tabs value={currentSelectedPanel} onChange={(e, val) => showFn(val)()}>
+            <Tabs value={currentSelectedPanel} onChange={(e, val) => showFn(val)()} data-cy={"mpv-tabs"}>
                 {tabs.map((tgl, idx) => <Tab className={classes.tabs} key={idx} label={tgl} />)}
             </Tabs> :
             <Grid container item direction="row">
-- 
2.30.2