From 34fb65ecf049a6edcc7157ce651fe5037cc5b2e7 Mon Sep 17 00:00:00 2001 From: Matthew Russell Date: Wed, 3 May 2023 15:48:48 -0700 Subject: [PATCH] feat: updated closed table test --- apps/trading/client-pages/markets/closed.spec.tsx | 13 +++++++++---- apps/trading/client-pages/markets/closed.tsx | 10 ++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/apps/trading/client-pages/markets/closed.spec.tsx b/apps/trading/client-pages/markets/closed.spec.tsx index 9c196d20b..25c930a44 100644 --- a/apps/trading/client-pages/markets/closed.spec.tsx +++ b/apps/trading/client-pages/markets/closed.spec.tsx @@ -214,7 +214,7 @@ describe('Closed', () => { 'Settlement price', 'Realised PNL', 'Settlement asset', - 'Market ID', + '', // actions row ]; expect(headers).toHaveLength(expectedHeaders.length); expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders); @@ -236,7 +236,7 @@ describe('Closed', () => { addDecimalsFormatNumber(property.value, market.decimalPlaces), addDecimalsFormatNumber(position.realisedPNL, market.decimalPlaces), market.tradableInstrument.instrument.product.settlementAsset.symbol, - market.id, + '', // actions row ]; cells.forEach((cell, i) => { expect(cell).toHaveTextContent(expectedValues[i]); @@ -328,8 +328,13 @@ describe('Closed', () => { // check that only included ids are shown const cells = screen .getAllByRole('gridcell') - .filter((cell) => cell.getAttribute('col-id') === 'id') - .map((cell) => cell.textContent?.trim()); + .filter((cell) => cell.getAttribute('col-id') === 'code') + .map((cell) => { + const marketId = within(cell) + .getByTestId('market-code') + .getAttribute('data-market-id'); + return marketId; + }); expect(cells).toEqual(expectedRows.map((m) => m.node.id)); }); }); diff --git a/apps/trading/client-pages/markets/closed.tsx b/apps/trading/client-pages/markets/closed.tsx index 404bcbef0..7511a5c32 100644 --- a/apps/trading/client-pages/markets/closed.tsx +++ b/apps/trading/client-pages/markets/closed.tsx @@ -122,6 +122,16 @@ const ClosedMarketsDataGrid = ({ rowData }: { rowData: Row[] }) => { { headerName: t('Market'), field: 'code', + cellRenderer: ({ + value, + data, + }: VegaICellRendererParams) => { + return ( + + {value} + + ); + }, }, { headerName: t('Description'),