Refactor both export wins unconfirmed and confirmed tabs and URL paths (

#6547)
uktrade · Feb 22, 2024 · 8835ab5 · 8835ab5
1 parent 59ea8f6
commit 8835ab5
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 218 deletions.
diff --git a/src/apps/routers.js b/src/apps/routers.js
@@ -28,8 +28,8 @@ const reactRoutes = [
   '/exportwins',
   '/exportwins/create',
   '/exportwins/:winId/edit',
-  '/exportwins/confirmed',
-  '/exportwins/unconfirmed',
+  '/exportwins/won',
+  '/exportwins/sent',
   '/exportwins/:winId/details',
   '/companies/:companyId/dnb-hierarchy',
   '/companies/:companyId/company-tree',

diff --git a/src/client/modules/ExportWins/Form/ExportWinForm.jsx b/src/client/modules/ExportWins/Form/ExportWinForm.jsx
@@ -55,8 +55,8 @@ const ExportWinForm = ({
         <Form
           id="export-win-form"
           showStepInUrl={true}
-          cancelRedirectTo={() => urls.companies.exportWins.unconfirmed()}
-          redirectTo={() => urls.companies.exportWins.unconfirmed()}
+          cancelRedirectTo={() => urls.companies.exportWins.sent()}
+          redirectTo={() => urls.companies.exportWins.sent()}
           analyticsFormName="exportWinForm"
           submissionTaskName={TASK_GET_EXPORT_WINS_SAVE_FORM}
           initialValuesTaskName={initialValuesTaskName}

diff --git a/src/client/modules/ExportWins/Redirect.jsx b/src/client/modules/ExportWins/Redirect.jsx
@@ -3,9 +3,9 @@ import { Redirect } from 'react-router-dom'
 
 import urls from '../../../lib/urls'
 
-// Redirect from /exportwins to /exportwins/unconfirmed
+// Redirect from /exportwins to /exportwins/sent
 const ExportsWinsRedirect = () => (
-  <Redirect to={urls.companies.exportWins.unconfirmed()} />
+  <Redirect to={urls.companies.exportWins.sent()} />
 )
 
 export default ExportsWinsRedirect
diff --git a/src/client/modules/ExportWins/Unconfirmed/unconfirmed.json b/src/client/modules/ExportWins/Unconfirmed/unconfirmed.json
diff --git a/...tWins/Unconfirmed/UnconfirmedWinsList.jsx → ...lient/modules/ExportWins/WinsSentList.jsx b/...tWins/Unconfirmed/UnconfirmedWinsList.jsx → ...lient/modules/ExportWins/WinsSentList.jsx
@@ -1,25 +1,26 @@
 import React from 'react'
+import { Link as ReactRouterLink } from 'react-router-dom'
 import { Button } from 'govuk-react'
 
-import { CollectionItem } from '../../../components'
-import { formatMediumDate } from '../../../utils/date'
-import { currencyGBP } from '../../../utils/number-utils'
-import ExportWinsResource from '../../../components/Resource/ExportWins'
-
-import urls from '../../../../lib/urls'
+import ExportWinsResource from '../../components/Resource/ExportWins'
+import { currencyGBP } from '../../utils/number-utils'
+import { formatMediumDate } from '../../utils/date'
+import { CollectionItem } from '../../components'
+import { WIN_FILTERS } from './constants'
+import urls from '../../../lib/urls'
 
 export default () => (
   <ExportWinsResource.Paginated
-    id="unconfirmed-export-wins"
-    payload={{ filter: 'unconfirmed' }}
+    id="export-wins-sent"
+    payload={{ confirmed: WIN_FILTERS.SENT }}
   >
     {(page) => (
       <ul>
         {page.map((item) => (
           <li key={item.id}>
             <CollectionItem
               headingText={item.company.name}
-              headingUrl={`${urls.companies.detail(item.company.id)}`}
+              headingUrl={urls.companies.overview.index(item.company.id)}
               metadata={[
                 { label: 'Destination', value: item.country.name },
                 { label: 'Contact name', value: item.customer_name },
@@ -31,11 +32,12 @@ export default () => (
                 { label: 'Date modified', value: '???' },
               ]}
               buttons={
-                <div style={{ display: 'flex', gap: 10 }}>
-                  <Button as="a" href={`review/${item.id}`}>
-                    Review export win
-                  </Button>
-                </div>
+                <Button
+                  as={ReactRouterLink}
+                  to={urls.companies.exportWins.details(item.id)}
+                >
+                  Review export win
+                </Button>
               }
             />
           </li>

diff --git a/...portWins/Confirmed/ConfirmedWinsTable.jsx → ...lient/modules/ExportWins/WinsWonTable.jsx b/...portWins/Confirmed/ConfirmedWinsTable.jsx → ...lient/modules/ExportWins/WinsWonTable.jsx
@@ -1,18 +1,19 @@
 import React from 'react'
+import { Link as ReactRouterLink } from 'react-router-dom'
 import { Table, Link } from 'govuk-react'
 import styled from 'styled-components'
-import { Link as ReactRouterLink } from 'react-router-dom/cjs/react-router-dom'
 
-import { currencyGBP } from '../../../utils/number-utils'
-import { formatMediumDate } from '../../../utils/date'
-import ExportWinsResource from '../../../components/Resource/ExportWins'
-import urls from '../../../../lib/urls'
+import ExportWinsResource from '../../components/Resource/ExportWins'
+import { currencyGBP } from '../../utils/number-utils'
+import { formatMediumDate } from '../../utils/date'
+import { WIN_FILTERS } from './constants'
+import urls from '../../../lib/urls'
 
 const NoWrapCell = styled(Table.Cell)`
   white-space: nowrap;
 `
 
-export const ExportWinsTable = ({ exportWins }) => (
+export const WinsWonTable = ({ exportWins }) => (
   <Table
     head={
       <Table.Row>
@@ -36,7 +37,10 @@ export const ExportWinsTable = ({ exportWins }) => (
       }) => (
         <Table.Row key={id}>
           <Table.Cell>
-            <Link as={ReactRouterLink} to={urls.companies.detail(company.id)}>
+            <Link
+              as={ReactRouterLink}
+              to={urls.companies.overview.index(company.id)}
+            >
               {company.name}
             </Link>
           </Table.Cell>
@@ -47,8 +51,12 @@ export const ExportWinsTable = ({ exportWins }) => (
             {formatMediumDate(customer_response?.created_on)}
           </NoWrapCell>
           <NoWrapCell>
-            {/* TODO: Add target to the link once the path is decided */}
-            <Link as={ReactRouterLink}>View details</Link>
+            <Link
+              as={ReactRouterLink}
+              to={urls.companies.exportWins.details(id)}
+            >
+              View details
+            </Link>
           </NoWrapCell>
         </Table.Row>
       )
@@ -58,9 +66,9 @@ export const ExportWinsTable = ({ exportWins }) => (
 
 export default () => (
   <ExportWinsResource.Paginated
-    id="unconfirmed-export-wins"
-    payload={{ filter: 'confirmed' }}
+    id="export-wins-won"
+    payload={{ confirmed: WIN_FILTERS.WON }}
   >
-    {(page) => <ExportWinsTable exportWins={page} />}
+    {(page) => <WinsWonTable exportWins={page} />}
   </ExportWinsResource.Paginated>
 )
diff --git a/src/client/modules/ExportWins/constants.js b/src/client/modules/ExportWins/constants.js
@@ -0,0 +1,5 @@
+export const WIN_FILTERS = {
+  SENT: 'null',
+  REJECTED: false,
+  WON: true,
+}
diff --git a/src/client/modules/ExportWins/index.jsx b/src/client/modules/ExportWins/index.jsx
@@ -3,8 +3,8 @@ import { capitalize } from 'lodash'
 
 import { DefaultLayout } from '../../components'
 import TabNav from '../../components/TabNav'
-import UnconfirmedWinsList from './Unconfirmed/UnconfirmedWinsList'
-import ConfirmedWinsTable from './Confirmed/ConfirmedWinsTable'
+import WinsSentList from './WinsSentList'
+import WinsWonTable from './WinsWonTable'
 import urls from '../../../lib/urls'
 
 const TITLE = /([^\/]+$)/
@@ -25,13 +25,13 @@ const ExportWins = ({ location }) => {
         label="Export wins tab nav"
         routed={true}
         tabs={{
-          [urls.companies.exportWins.unconfirmed()]: {
-            label: 'Unconfirmed',
-            content: <UnconfirmedWinsList />,
+          [urls.companies.exportWins.sent()]: {
+            label: 'Sent',
+            content: <WinsSentList />,
           },
-          [urls.companies.exportWins.confirmed()]: {
-            label: 'Confirmed',
-            content: <ConfirmedWinsTable />,
+          [urls.companies.exportWins.won()]: {
+            label: 'Won',
+            content: <WinsWonTable />,
           },
         }}
       />

diff --git a/src/client/routes.js b/src/client/routes.js
@@ -465,12 +465,12 @@ const routes = {
   ],
   exportWins: [
     {
-      path: '/exportwins/unconfirmed',
+      path: '/exportwins/sent',
       module: 'datahub:companies',
       component: ExportWins,
     },
     {
-      path: '/exportwins/confirmed',
+      path: '/exportwins/won',
       module: 'datahub:companies',
       component: ExportWins,
     },

diff --git a/src/lib/urls.js b/src/lib/urls.js
@@ -221,9 +221,9 @@ module.exports = {
     exportWins: {
       index: url('/exportwins'),
       create: url('/exportwins/create'),
-      details: url('/exportwins/:winId/details'),
-      confirmed: url('/exportwins/confirmed'),
-      unconfirmed: url('/exportwins/unconfirmed'),
+      details: url('/exportwins', '/:winId/details'),
+      won: url('/exportwins/won'),
+      sent: url('/exportwins/sent'),
     },
     overview: {
       index: url('/companies', '/:companyId/overview'),

diff --git a/test/a11y/cypress/config/urlTestExclusions.js b/test/a11y/cypress/config/urlTestExclusions.js
@@ -7,7 +7,7 @@ export const urlTestExclusions = [
   { url: '/companies/:companyId/edit-history' },
   { url: '/companies/:companyId/exports' },
   { url: '/exportwins/' },
-  { url: '/exportwins/unconfirmed/' },
+  { url: '/exportwins/sent/' },
   { url: '/companies/:companyId/investments/large-capital-profile' },
   { url: '/companies/:companyId/account-management' },
   { url: '/company-lists/' },
@@ -142,7 +142,7 @@ export const urlTestExclusions = [
   { url: '/oauth/callback/' },
   { url: '/oauth/sign-out/' },
   { url: '/exportwins/1/details' },
-  { url: '/exportwins/unconfirmed/' },
+  { url: '/exportwins/sent/' },
   { url: '/companies/e59a2b0f-7d84-4de7-bc1e-f70339f4255f/overview' },
   // Exclude all metadata
   { url: '/api-proxy/v4/metadata/likelihood-to-land' },