Merge pull request #7275 from uktrade/fix/no-exports

Refine messaging for users with no export projects
uktrade · Nov 8, 2024 · 2d9f79b · 2d9f79b
2 parents 25c1389 + f4e82fd
commit 2d9f79b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 31 deletions.
diff --git a/src/client/components/DataHubFeed/index.jsx b/src/client/components/DataHubFeed/index.jsx
@@ -23,7 +23,7 @@ const Date = styled('div')({
 
 const DataHubFeed = ({ items, feedLimit = 5 }) => (
   <FeedContainer>
-    <H3>"What's new"</H3>
+    <H3>What's new?</H3>
     {!!items.length && (
       <>
         <UnorderedList listStyleType="none">

diff --git a/src/client/modules/ExportPipeline/ExportList/index.jsx b/src/client/modules/ExportPipeline/ExportList/index.jsx
@@ -1,13 +1,12 @@
 import React from 'react'
 import { useNavigate } from 'react-router-dom'
-import { HEADING_SIZES, FONT_SIZE, MEDIA_QUERIES } from '@govuk-react/constants'
+import { HEADING_SIZES, MEDIA_QUERIES } from '@govuk-react/constants'
 import { UnorderedList, ListItem, H2, Button } from 'govuk-react'
 import styled from 'styled-components'
 import { connect } from 'react-redux'
 import PropTypes from 'prop-types'
 import qs from 'qs'
 
-import ContentWithHeading from '../../../components/ContentWithHeading'
 import { ButtonLink, Pagination } from '../../../components'
 import { MID_GREY } from '../../../utils/colours'
 import { SHOW_ALL_OPTION } from '../constants.js'
@@ -37,10 +36,8 @@ const StyledResultCount = styled('span')({
   lineHeight: 1,
 })
 
-const StyledContent = styled.div({
-  display: 'flex',
-  flexDirection: 'column',
-  rowGap: FONT_SIZE.SIZE_20,
+const StyledParagraph = styled.p({
+  marginTop: 15,
 })
 
 const FiltersContainer = styled('div')({
@@ -213,26 +210,17 @@ const ExportList = ({
           <>
             {hasZeroExports ? (
               <div data-test="no-export-items">
-                <ContentWithHeading
-                  data-test="no-export-items"
-                  heading="You have no exports"
-                >
-                  <StyledContent>
-                    <div>
-                      Here you can create an export project to track a company's
-                      export progress. These will appear on your home page, so
-                      you keep track of your exports in one place.
-                    </div>
-                    <span>To add an export:</span>
-                    <div>
-                      <UnorderedList listStyleType="bullet">
-                        <ListItem>go to the company page</ListItem>
-                        <ListItem>select 'Add export project' button</ListItem>
-                      </UnorderedList>
-                    </div>
-                  </StyledContent>
-                  <ExportWinsLink />
-                </ContentWithHeading>
+                <StyledParagraph>
+                  Here you can create an export project to track a company's
+                  export progress. These will appear on your home page, so you
+                  keep track of your exports in one place.
+                </StyledParagraph>
+                <p>To add an export:</p>
+                <UnorderedList listStyleType="bullet">
+                  <ListItem>go to the company page</ListItem>
+                  <ListItem>select 'Add export project' button</ListItem>
+                </UnorderedList>
+                <ExportWinsLink />
               </div>
             ) : (
               <ListContainer>

diff --git a/test/functional/cypress/specs/dashboard/dashboard-spec.js b/test/functional/cypress/specs/dashboard/dashboard-spec.js
@@ -26,7 +26,7 @@ describe('Dashboard', () => {
     })
 
     it('should display the correct heading', () => {
-      cy.get('@dataHubFeed').find('h3').should('have.text', '"What\'s new"')
+      cy.get('@dataHubFeed').find('h3').should('have.text', "What's new?")
     })
 
     it('should display the info feed list', () => {

diff --git a/test/functional/cypress/specs/dashboard/data-hub-feed-spec.js b/test/functional/cypress/specs/dashboard/data-hub-feed-spec.js
@@ -14,7 +14,7 @@ describe('Dashboard - Data Hub feed', () => {
     })
 
     it('Should contain a header and no updates available text', () => {
-      cy.get('@dataHubFeed').find('h3').should('have.text', '"What\'s new"')
+      cy.get('@dataHubFeed').find('h3').should('have.text', "What's new?")
 
       cy.get('@dataHubFeed')
         .find('p')
@@ -45,7 +45,7 @@ describe('Dashboard - Data Hub feed', () => {
     })
 
     it('should display only one feed item', () => {
-      cy.get('@dataHubFeed').find('h3').should('have.text', '"What\'s new"')
+      cy.get('@dataHubFeed').find('h3').should('have.text', "What's new?")
 
       cy.get('@dataHubFeed')
         .find('[data-test="data-hub-feed-link-0"]')

diff --git a/test/functional/cypress/specs/export-pipeline/list-export-spec.js b/test/functional/cypress/specs/export-pipeline/list-export-spec.js
@@ -67,7 +67,6 @@ describe('Export pipeline list', () => {
     })
 
     it('should display the empty results message', () => {
-      cy.get('[data-test=no-export-items]').should('exist')
       cy.get('[data-test=export-export]').should('not.exist')
     })
   })