diff --git a/src/client/components/Resource/Paginated.js b/src/client/components/Resource/Paginated.js index da30b5fc449..526e03fded6 100644 --- a/src/client/components/Resource/Paginated.js +++ b/src/client/components/Resource/Paginated.js @@ -88,12 +88,14 @@ const PaginatedResource = multiInstance({ onPageClick, currentPage, result, + noResults = "You don't have any results", }) => ( {({ location }) => { const qsParams = qs.parse(location.search.slice(1)) const routePage = parseInt(qsParams.page, 10) || 1 const totalPages = result ? Math.ceil(result.count / pageSize) : 0 + const hasZeroResults = result?.count === 0 return ( @@ -122,6 +124,7 @@ const PaginatedResource = multiInstance({ }} /> )} + {result ? ( )} + {hasZeroResults &&

{noResults}

} ) }} diff --git a/src/client/modules/ExportWins/Status/WinsRejectedList.jsx b/src/client/modules/ExportWins/Status/WinsRejectedList.jsx index ec3fe969340..02a3c6be920 100644 --- a/src/client/modules/ExportWins/Status/WinsRejectedList.jsx +++ b/src/client/modules/ExportWins/Status/WinsRejectedList.jsx @@ -10,6 +10,7 @@ import urls from '../../../../lib/urls' export default () => ( {(page) => ( diff --git a/src/client/modules/ExportWins/Status/WinsSentList.jsx b/src/client/modules/ExportWins/Status/WinsSentList.jsx index 2c991904167..229e33e69fd 100644 --- a/src/client/modules/ExportWins/Status/WinsSentList.jsx +++ b/src/client/modules/ExportWins/Status/WinsSentList.jsx @@ -10,6 +10,7 @@ import urls from '../../../../lib/urls' export default () => ( {(page) => ( diff --git a/src/client/modules/ExportWins/Status/WinsWonTable.jsx b/src/client/modules/ExportWins/Status/WinsWonTable.jsx index 83b1005082e..3aa8c9f98b3 100644 --- a/src/client/modules/ExportWins/Status/WinsWonTable.jsx +++ b/src/client/modules/ExportWins/Status/WinsWonTable.jsx @@ -13,60 +13,63 @@ const NoWrapCell = styled(Table.Cell)` white-space: nowrap; ` -export const WinsWonTable = ({ exportWins }) => ( - - UK Company - Destination - Export amount - Date won - Date responded - Details - - } - > - {exportWins.map( - ({ - id, - company, - country, - date, - total_expected_export_value, - customer_response, - }) => ( - - - - {company.name} - - - {country.name} - {currencyGBP(total_expected_export_value)} - {formatMediumDate(date)} - - {formatMediumDate(customer_response.responded_on)} - - - - View details - - +export const WinsWonTable = ({ exportWins }) => { + return exportWins.length === 0 ? null : ( +
+ UK Company + Destination + Export amount + Date won + Date responded + Details - ) - )} -
-) + } + > + {exportWins.map( + ({ + id, + company, + country, + date, + total_expected_export_value, + customer_response, + }) => ( + + + + {company.name} + + + {country.name} + {currencyGBP(total_expected_export_value)} + {formatMediumDate(date)} + + {formatMediumDate(customer_response.responded_on)} + + + + View details + + + + ) + )} + + ) +} export default () => ( {(page) => } diff --git a/test/component/cypress/specs/Resource/Paginated.cy.jsx b/test/component/cypress/specs/Resource/Paginated.cy.jsx index 34093c74db0..31543b3ebef 100644 --- a/test/component/cypress/specs/Resource/Paginated.cy.jsx +++ b/test/component/cypress/specs/Resource/Paginated.cy.jsx @@ -28,6 +28,8 @@ describe('Resource/Paginated', () => { ) + cy.get('[data-test="no-results"]').should('not.exist') + cy.get('pre').as('page').should('have.text', JSON.stringify(PAGES[0])) cy.get('[data-test="pagination-summary"]') @@ -108,4 +110,55 @@ describe('Resource/Paginated', () => { cy.contains('Loading') cy.get('pre').as('page').should('have.text', JSON.stringify(PAGES[0])) }) + + it('Should render the default no results message', () => { + cy.mount( + ({ + count: 0, + results: [], + }), + }} + > + + {(page) =>
{JSON.stringify(page)}
} +
+
+ ) + cy.get('[data-test="pagination-summary"]').should('not.exist') + cy.get('[data-test="pagination"]').should('not.exist') + cy.get('[data-test="no-results"]').should( + 'have.text', + "You don't have any results" + ) + }) + + it('Should override the default results message"', () => { + cy.mount( + ({ + count: 0, + results: [], + }), + }} + > + + {(page) =>
{JSON.stringify(page)}
} +
+
+ ) + cy.get('[data-test="no-results"]').should( + 'have.text', + "You don't have any sent export wins." + ) + }) })