Update datatable tests

visdesignlab · Mar 5, 2024 · 80c38b2 · 80c38b2
1 parent 8c3e0da
commit 80c38b2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/e2e-tests/datatable.spec.ts b/e2e-tests/datatable.spec.ts
@@ -72,13 +72,7 @@ test('Datatable', async ({ page }) => {
   // //////////////////
   // Test that the tables exist
   // //////////////////
-  // const datatable = await page1.getByText('IntersectionSizeSchool Male3Unincluded3Just Male3Duff_Fan Male Power_Plant3Evil Male2Evil Male Power_Plant2Duff_Fan Male2Just Blue_Hair2Just School1School Evil Male1Rows per page:101–10 of');
-  // await expect(datatable).toBeVisible();
-  // const visibleSets = await page1.getByText('SetSizeSchool6Blue_Hair3Duff_Fan6Evil6Male18Power_Plant5Rows per page:101–6 of');
-  // await expect(visibleSets).toBeVisible();
-  // const hiddenSets = await page1.getByText('No rowsSetSizeRows per page:100–0 of');
-  // await expect(hiddenSets).toBeVisible();
-  const datatable = await page1.getByText('IntersectionSizeSchool-Male3Unincluded3Male3Duff Fan-Male-Power Plant3Evil-Male2Evil-Male-Power Plant2Duff Fan-Male2Blue Hair2School1School-Evil-Male1Rows per page:101–10 of');
+  const datatable = await page1.getByText('IntersectionSizeSchool & Male3Unincluded3Male3Duff Fan & Male & Power Plant3Evil & Male2Evil & Male & Power Plant2Duff Fan & Male2Blue Hair2School1School & Evil & Male1Rows per page:101–10 of');
   await expect(datatable).toBeVisible();
   const visibleSets = await page1.getByText('SetSizeSchool6Blue_Hair3Duff_Fan6Evil6Male18Power_Plant5Rows per page:101–6 of');
   await expect(visibleSets).toBeVisible();

diff --git a/packages/app/src/components/DataTable.tsx b/packages/app/src/components/DataTable.tsx
@@ -6,7 +6,7 @@ import { getAccessibleData } from "@visdesignlab/upset2-react";
 import DownloadIcon from '@mui/icons-material/Download';
 
 const getRowData = (row: AccessibleDataEntry) => {
-    return {id: row.id, elementName: `${(row.type === "Aggregate") ? "Aggregate: " : ""}${row.elementName}`, size: row.size}
+    return {id: row.id, elementName: `${(row.type === "Aggregate") ? "Aggregate: " : ""}${row.elementName.replaceAll("~&~", " & ")}`, size: row.size}
 }
 
 const getAggRows = (row: AccessibleDataEntry) => {

diff --git a/packages/upset/src/utils/exports.ts b/packages/upset/src/utils/exports.ts
@@ -77,8 +77,6 @@ const generateElementName = (rows: Rows, vSetNames: string[]): Rows => {
 export const getAltTextConfig = (state: UpsetConfig, data: CoreUpsetData, rows: Rows): AltTextConfig => {
   let dataObj = state as AltTextConfig;
 
-  console.log(rows.order);
-
   const updatedRows = generateElementName(rows, dataObj.visibleSets);
 
   dataObj = {