From 5aa0988794ef7cc339342e046ad6446756a4d70a Mon Sep 17 00:00:00 2001 From: Paul Gain Date: Thu, 1 Feb 2024 16:03:13 +0000 Subject: [PATCH] Change the export win endpoint to use a hyphen instead of an underscore --- .../modules/ExportWins/Confirmed/ConfirmedWinsTable.jsx | 2 +- src/client/modules/ExportWins/Form/tasks.js | 8 +++++--- .../ExportWins/Unconfirmed/UnconfirmedWinsList.jsx | 9 ++++----- src/middleware/api-proxy.js | 1 - .../cypress/specs/export-win/add-export-win-spec.js | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/client/modules/ExportWins/Confirmed/ConfirmedWinsTable.jsx b/src/client/modules/ExportWins/Confirmed/ConfirmedWinsTable.jsx index cb435ee6b11..8bcfd901bd9 100644 --- a/src/client/modules/ExportWins/Confirmed/ConfirmedWinsTable.jsx +++ b/src/client/modules/ExportWins/Confirmed/ConfirmedWinsTable.jsx @@ -44,7 +44,7 @@ export const ExportWinsTable = ({ exportWins }) => ( {currencyGBP(total_expected_export_value)} {formatMediumDate(date)} - {formatMediumDate(customer_response.created_on)} + {formatMediumDate(customer_response?.created_on)} {/* TODO: Add target to the link once the path is decided */} diff --git a/src/client/modules/ExportWins/Form/tasks.js b/src/client/modules/ExportWins/Form/tasks.js index 6d8be815f65..49069f89b66 100644 --- a/src/client/modules/ExportWins/Form/tasks.js +++ b/src/client/modules/ExportWins/Form/tasks.js @@ -5,6 +5,8 @@ import { transformExportProjectForForm, } from './transformers' +const exportWinEndpoint = '/v4/export-win' + export const getExportProject = ({ id }) => apiProxyAxios .get(`/v4/export/${id}`) @@ -12,14 +14,14 @@ export const getExportProject = ({ id }) => export const getExportWin = ({ id }) => apiProxyAxios - .get(`/v4/export_win/${id}`) + .get(`${exportWinEndpoint}/${id}`) .then(({ data }) => transformExportWinForForm(data)) export const saveExportWin = ({ exportWinId, payload }) => { const request = exportWinId ? apiProxyAxios.patch : apiProxyAxios.post const endpoint = exportWinId - ? `/v4/export_win/${exportWinId}` - : '/v4/export_win' + ? `${exportWinEndpoint}/${exportWinId}` + : exportWinEndpoint return request(endpoint, payload) } diff --git a/src/client/modules/ExportWins/Unconfirmed/UnconfirmedWinsList.jsx b/src/client/modules/ExportWins/Unconfirmed/UnconfirmedWinsList.jsx index 9156bc2b5d9..37d823dfce6 100644 --- a/src/client/modules/ExportWins/Unconfirmed/UnconfirmedWinsList.jsx +++ b/src/client/modules/ExportWins/Unconfirmed/UnconfirmedWinsList.jsx @@ -1,11 +1,13 @@ import React from 'react' import { Button } from 'govuk-react' -import { SecondaryButton, CollectionItem } from '../../../components' +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' + export default () => ( (
  • ( - - Edit export win - } /> diff --git a/src/middleware/api-proxy.js b/src/middleware/api-proxy.js index be659a06ba0..9fc30d13dad 100644 --- a/src/middleware/api-proxy.js +++ b/src/middleware/api-proxy.js @@ -57,7 +57,6 @@ const ALLOWLIST = [ '/v3/event/', '/v4/event/', '/v4/export-win/', - '/v4/export_win', '/v4/event/:id', '/v3/omis/order/:id/assignee', '/v3/omis/order/:id/subscriber-list', diff --git a/test/functional/cypress/specs/export-win/add-export-win-spec.js b/test/functional/cypress/specs/export-win/add-export-win-spec.js index dfb579d803a..36cb49c71bb 100644 --- a/test/functional/cypress/specs/export-win/add-export-win-spec.js +++ b/test/functional/cypress/specs/export-win/add-export-win-spec.js @@ -1006,7 +1006,7 @@ describe('Adding an export win', () => { 'have.text', 'Confirm and send to customer' ) - cy.intercept('POST', '/api-proxy/v4/export_win', { + cy.intercept('POST', '/api-proxy/v4/export-win', { statusCode: 201, }).as('apiRequest') cy.get('[data-test="confirm-and-send-to-customer"]').click()