Fix a11y and test issue.

DataBiosphere · Sep 27, 2024 · b8af9dc · b8af9dc
1 parent 6d0f7aa
commit b8af9dc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/integration-tests/tests/run-analysis-azure.ts b/integration-tests/tests/run-analysis-azure.ts
@@ -54,7 +54,7 @@ const testRunAnalysisAzure = _.flowRight(
   await waitForNoModal(page);
 
   // Navigate to analysis launcher
-  await click(page, `//*[@title="${notebookName}.ipynb"]`);
+  await click(page, clickable({ textContains: `${notebookName}.ipynb` }));
   await dismissInfoNotifications(page);
   await findText(page, 'PREVIEW (READ-ONLY)');
   await waitForNoSpinners(page);

diff --git a/integration-tests/tests/run-analysis.js b/integration-tests/tests/run-analysis.js
@@ -50,7 +50,7 @@ const testRunAnalysisFn = _.flowRight(
   await waitForNoModal(page);
 
   // Navigate to analysis launcher
-  await click(page, `//*[@title="${notebookName}.ipynb"]`);
+  await click(page, clickable({ textContains: `${notebookName}.ipynb` }));
   await dismissInfoNotifications(page);
   await findText(page, 'PREVIEW (READ-ONLY)');
   await waitForNoSpinners(page);

diff --git a/integration-tests/tests/run-rstudio.js b/integration-tests/tests/run-rstudio.js
@@ -53,7 +53,7 @@ const testRunRStudioFn = _.flowRight(
   await waitForNoModal(page);
 
   // Navigate to analysis launcher
-  await click(page, `//*[@title="${rFileName}.Rmd"]`);
+  await click(page, clickable({ textContains: `${rFileName}.Rmd` }));
   await dismissInfoNotifications(page);
   await findText(page, 'PREVIEW (READ-ONLY)');
   await waitForNoSpinners(page);

diff --git a/integration-tests/utils/integration-utils.js b/integration-tests/utils/integration-utils.js
@@ -226,11 +226,11 @@ const waitForNoSpinners = (page, { timeout = 30000 } = {}) => {
 };
 
 const waitForNoModal = (page, { timeout = 30000 } = {}) => {
-  return page.waitForSelector('xpath///*[contains(@class, "ReactModal__Overlay")]', { hidden: true, timeout });
+  return page.waitForSelector('.ReactModal__Overlay', { hidden: true, timeout });
 };
 
 const waitForModal = (page, { timeout = 30000 } = {}) => {
-  return page.waitForSelector('xpath///*[contains(@class, "ReactModal__Overlay")]', { hidden: false, timeout });
+  return page.waitForSelector('.ReactModal__Overlay', { hidden: false, timeout });
 };
 
 // Puppeteer works by internally using MutationObserver. We are setting up the listener before

diff --git a/src/analysis/Analyses.ts b/src/analysis/Analyses.ts
@@ -317,10 +317,10 @@ const AnalysisCard = ({
     ]
   );
 
+  const launchAnalysis = () => Nav.goToPath(analysisLauncherTabName, { namespace, name: workspaceName, analysisName });
   // the flex values for columns here correspond to the flex values in the header
   const artifactName = div(
     {
-      onClick: () => Nav.goToPath(analysisLauncherTabName, { namespace, name: workspaceName, analysisName }),
       title: getFileName(name),
       role: 'cell',
       style: {
@@ -331,7 +331,7 @@ const AnalysisCard = ({
         ...centerColumnFlex,
       },
     },
-    [getFileName(name)]
+    [h(Clickable, { onClick: launchAnalysis }, [getFileName(name)])]
   );
 
   const toolLogos: Record<RuntimeToolLabel, string> = {