diff --git a/frontend/cypress/e2e/side_window/logbook_prior_notification_form/form.spec.ts b/frontend/cypress/e2e/side_window/logbook_prior_notification_form/form.spec.ts index 6cc80484ba..be04b34384 100644 --- a/frontend/cypress/e2e/side_window/logbook_prior_notification_form/form.spec.ts +++ b/frontend/cypress/e2e/side_window/logbook_prior_notification_form/form.spec.ts @@ -4,11 +4,11 @@ import { editSideWindowPriorNotification } from '../manual_prior_notification_fo context('Side Window > Logbook Prior Notification Form > Form', () => { it('Should not update the form with a PUT request on first render', () => { - cy.intercept('PUT', '/bff/v1/prior_notifications/logbook/FAKE_OPERATION_109*', cy.spy().as('updateForm')) + cy.intercept('PUT', '/bff/v1/prior_notifications/logbook/FAKE_OPERATION_114*', cy.spy().as('updateForm')) - editSideWindowPriorNotification(`L'ANCRE`, 'FAKE_OPERATION_109') + editSideWindowPriorNotification(`LA MER À BOIRE`, 'FAKE_OPERATION_114') - cy.contains(`L'ANCRE SÈCHE (CFR106)`).should('be.visible') + cy.contains(`LA MER À BOIRE (CFR110)`).should('be.visible') cy.get('@updateForm').should('not.have.been.called') @@ -17,7 +17,7 @@ context('Side Window > Logbook Prior Notification Form > Form', () => { cy.get('@updateForm').should('have.been.calledOnce') // Reset - cy.request('PUT', `/bff/v1/prior_notifications/logbook/FAKE_OPERATION_109?operationDate=${dayjs().toISOString()}`, { + cy.request('PUT', `/bff/v1/prior_notifications/logbook/FAKE_OPERATION_114?operationDate=${dayjs().toISOString()}`, { body: { authorTrigram: null, note: null diff --git a/frontend/src/features/Logbook/LogbookMessage.types.ts b/frontend/src/features/Logbook/LogbookMessage.types.ts index cedac3c2ed..7d10ae0c75 100644 --- a/frontend/src/features/Logbook/LogbookMessage.types.ts +++ b/frontend/src/features/Logbook/LogbookMessage.types.ts @@ -15,7 +15,6 @@ export namespace LogbookMessage { ircs: string | undefined isCorrectedByNewerMessage: boolean isDeleted: boolean - isManuallyCreated: boolean isSentByFailoverSoftware: boolean message: MessageBase | undefined messageType: MessageType diff --git a/frontend/src/features/PriorNotification/components/ManualPriorNotificationForm/Content.tsx b/frontend/src/features/PriorNotification/components/ManualPriorNotificationForm/Content.tsx index 111e696fda..86163db7de 100644 --- a/frontend/src/features/PriorNotification/components/ManualPriorNotificationForm/Content.tsx +++ b/frontend/src/features/PriorNotification/components/ManualPriorNotificationForm/Content.tsx @@ -193,6 +193,7 @@ export function Content({ detail, isValidatingOnChange, onClose, onSubmit, onVer {!!detail && ( diff --git a/frontend/src/features/PriorNotification/components/PriorNotificationCard/index.tsx b/frontend/src/features/PriorNotification/components/PriorNotificationCard/index.tsx index 9689e34ee7..31fefa3504 100644 --- a/frontend/src/features/PriorNotification/components/PriorNotificationCard/index.tsx +++ b/frontend/src/features/PriorNotification/components/PriorNotificationCard/index.tsx @@ -123,7 +123,11 @@ export function PriorNotificationCard({ Fermer - + {footerChildren} diff --git a/frontend/src/features/PriorNotification/components/shared/DownloadButton/__tests__/getHtmlContent.test.ts b/frontend/src/features/PriorNotification/components/shared/DownloadButton/__tests__/getHtmlContent.test.ts index 427cd3ac96..6aab21be07 100644 --- a/frontend/src/features/PriorNotification/components/shared/DownloadButton/__tests__/getHtmlContent.test.ts +++ b/frontend/src/features/PriorNotification/components/shared/DownloadButton/__tests__/getHtmlContent.test.ts @@ -22,7 +22,6 @@ describe('PriorNotificationCard/utils.getHtmlContent()', () => { ircs: undefined, isCorrectedByNewerMessage: false, isDeleted: false, - isManuallyCreated: true, isSentByFailoverSoftware: false, message: { authorTrigram: undefined, diff --git a/frontend/src/features/PriorNotification/components/shared/DownloadButton/index.tsx b/frontend/src/features/PriorNotification/components/shared/DownloadButton/index.tsx index 9e4ed40547..8b6933d915 100644 --- a/frontend/src/features/PriorNotification/components/shared/DownloadButton/index.tsx +++ b/frontend/src/features/PriorNotification/components/shared/DownloadButton/index.tsx @@ -14,10 +14,16 @@ import type { LogbookMessage } from '@features/Logbook/LogbookMessage.types' type DownloadButtonProps = Readonly<{ isDisabled?: boolean + isManuallyCreated: boolean pnoLogbookMessage: LogbookMessage.PnoLogbookMessage reportId: string }> -export function DownloadButton({ isDisabled = false, pnoLogbookMessage, reportId }: DownloadButtonProps) { +export function DownloadButton({ + isDisabled = false, + isManuallyCreated, + pnoLogbookMessage, + reportId +}: DownloadButtonProps) { const isSuperUser = useIsSuperUser() const getGearsApiQuery = useGetGearsQuery() const { isError } = useGetPriorNotificationPDFQuery(reportId, RTK_ONE_MINUTE_POLLING_QUERY_OPTIONS) @@ -28,7 +34,7 @@ export function DownloadButton({ isDisabled = false, pnoLogbookMessage, reportId getAlpha2CodeFromAlpha2or3Code(pnoLogbookMessage.flagState), pnoLogbookMessage.externalReferenceNumber ) && - pnoLogbookMessage.isManuallyCreated + isManuallyCreated const pdfUrl = `/api/v1/prior_notifications/pdf/${reportId}` const gearsWithName = useMemo(() => {