From 9b3b228d69eab96a34b1f21be4cdda10fa6c383e Mon Sep 17 00:00:00 2001 From: Pierre Bastianelli Date: Wed, 10 Aug 2022 16:45:30 -0700 Subject: [PATCH] feat: date sent to csnr field for teimp form --- .../projectEmissionIntensitySchema.ts | 8 ++++++ ...rojectEmissionIntensityReportForm.test.tsx | 28 +++++++++++++++---- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/app/data/jsonSchemaForm/projectEmissionIntensitySchema.ts b/app/data/jsonSchemaForm/projectEmissionIntensitySchema.ts index 89eb70c0ac..b8feae5ae7 100644 --- a/app/data/jsonSchemaForm/projectEmissionIntensitySchema.ts +++ b/app/data/jsonSchemaForm/projectEmissionIntensitySchema.ts @@ -54,6 +54,11 @@ export const emissionIntensityReportSchema = { title: "Holdback Payment Amount", type: "number", }, + dateSentToCsnr: { + type: "string", + title: "Date sent to CSNR", + default: undefined, + }, }, }; @@ -125,6 +130,9 @@ export const emissionIntensityReportUiSchema = { isMoney: true, hideOptional: true, }, + dateSentToCsnr: { + "ui:widget": "DateWidget", + }, }; export const emissionIntensityReportingRequirementUiSchema = { diff --git a/app/tests/unit/components/Form/ProjectEmissionIntensityReportForm.test.tsx b/app/tests/unit/components/Form/ProjectEmissionIntensityReportForm.test.tsx index 8949a8aa9f..ebece4b59f 100644 --- a/app/tests/unit/components/Form/ProjectEmissionIntensityReportForm.test.tsx +++ b/app/tests/unit/components/Form/ProjectEmissionIntensityReportForm.test.tsx @@ -21,6 +21,8 @@ const testQuery = graphql` const defaultMockResolver = { ProjectRevision(context, generateID) { return { + teimpPaymentPercentage: "60", + teimpPaymentAmount: "99", emissionIntensityReportingRequirementFormChange: { edges: [ { @@ -62,7 +64,9 @@ const defaultMockResolver = { targetEmissionIntensity: "3", postProjectEmissionIntensity: "4", totalLifetimeEmissionReduction: "5", - adjustedGHGEmissionIntensityPerformance: "6", + adjustedEmissionsIntensityPerformance: "6", + adjustedHoldbackPaymentAmount: "123456.45", + dateSentToCsnr: "2022-02-11", }, operation: "CREATE", changeStatus: "pending", @@ -177,13 +181,25 @@ describe("the emission intensity report form component", () => { // We can't query by label for text elements, // See 'note' field here https://testing-library.com/docs/queries/bylabeltext/#options expect( - screen.queryByText("GHG Emission Intensity Performance") - ).toBeInTheDocument(); - expect(screen.queryByText("200.00%")).toBeInTheDocument(); - + screen.getByLabelText("GHG Emission Intensity Performance") + ).toHaveTextContent("200.00%"); expect( - screen.getByLabelText(/GHG Emission Intensity Performance \(Adjusted\)/i) + screen.getByLabelText("GHG Emission Intensity Performance (Adjusted)") ).toHaveValue("6.00%"); + expect( + screen.getByLabelText( + "Payment percentage of performance milestone amount" + ) + ).toHaveTextContent("60.00%"); + expect(screen.getByLabelText("Holdback Payment Amount")).toHaveTextContent( + "$99.00" + ); + expect( + screen.getByLabelText("Holdback Payment Amount (Adjusted)") + ).toHaveValue("$123,456.45"); + expect(screen.getByLabelText(/Date sent to CSNR/i)).toHaveTextContent( + /Feb[.]? 11, 2022/ + ); }); it("renders 0% for the GHG emissions performance if the calculated value is null", () => {