diff --git a/gef-ui/component-tests/partials/amendments/effective-from.component-test.ts b/gef-ui/component-tests/partials/amendments/effective-from.component-test.ts index c3f954c028..3e6293bbf3 100644 --- a/gef-ui/component-tests/partials/amendments/effective-from.component-test.ts +++ b/gef-ui/component-tests/partials/amendments/effective-from.component-test.ts @@ -1,7 +1,7 @@ import { FACILITY_TYPE } from '@ukef/dtfs2-common'; import { validationErrorHandler } from '../../../server/utils/helpers'; import pageRenderer from '../../pageRenderer'; -import { EffectiveFromViewModel } from '../../../server/types/view-models/amendments/effective-date-view-model'; +import { EffectiveFromViewModel } from '../../../server/types/view-models/amendments/effective-from-view-model'; const page = 'partials/amendments/effective-from.njk'; const render = pageRenderer(page); diff --git a/gef-ui/server/controllers/amendments/effective-date/get-effective-from.test.ts b/gef-ui/server/controllers/amendments/effective-date/get-effective-from.test.ts index 9576a82742..efe32068eb 100644 --- a/gef-ui/server/controllers/amendments/effective-date/get-effective-from.test.ts +++ b/gef-ui/server/controllers/amendments/effective-date/get-effective-from.test.ts @@ -10,7 +10,7 @@ import { HttpStatusCode } from 'axios'; import { createMocks } from 'node-mocks-http'; import { getEffectiveFrom, GetEffectiveDateRequest } from './get-effective-from'; import { MOCK_BASIC_DEAL } from '../../../utils/mocks/mock-applications'; -import { EffectiveFromViewModel } from '../../../types/view-models/amendments/effective-date-view-model'; +import { EffectiveFromViewModel } from '../../../types/view-models/amendments/effective-from-view-model'; import { MOCK_UNISSUED_FACILITY, MOCK_ISSUED_FACILITY } from '../../../utils/mocks/mock-facilities'; import { PortalFacilityAmendmentWithUkefIdMockBuilder } from '../../../../test-helpers/mock-amendment'; import { PORTAL_AMENDMENT_PAGES } from '../../../constants/amendments'; @@ -114,7 +114,7 @@ describe('getEffectiveFrom', () => { }; expect(res._getStatusCode()).toEqual(HttpStatusCode.Ok); - expect(res._getRenderView()).toEqual('partials/amendments/effective-date.njk'); + expect(res._getRenderView()).toEqual('partials/amendments/effective-from.njk'); expect(res._getRenderData()).toEqual(expectedRenderData); expect(console.error).toHaveBeenCalledTimes(0); }); @@ -151,7 +151,7 @@ describe('getEffectiveFrom', () => { }; expect(res._getStatusCode()).toEqual(HttpStatusCode.Ok); - expect(res._getRenderView()).toEqual('partials/amendments/effective-date.njk'); + expect(res._getRenderView()).toEqual('partials/amendments/effective-from.njk'); expect(res._getRenderData()).toEqual(expectedRenderData); expect(console.error).toHaveBeenCalledTimes(0); }); diff --git a/gef-ui/server/controllers/amendments/effective-date/get-effective-from.ts b/gef-ui/server/controllers/amendments/effective-date/get-effective-from.ts index a624de5cd4..3e691242ae 100644 --- a/gef-ui/server/controllers/amendments/effective-date/get-effective-from.ts +++ b/gef-ui/server/controllers/amendments/effective-date/get-effective-from.ts @@ -7,7 +7,7 @@ import { userCanAmendFacility } from '../../../utils/facility-amendments.helper. import { getAmendmentsUrl, getPreviousPage } from '../helpers/navigation.helper.ts'; import { PORTAL_AMENDMENT_PAGES } from '../../../constants/amendments.ts'; import { convertDateToDayMonthYearInput } from '../helpers/dates.helper.ts'; -import { EffectiveFromViewModel } from '../../../types/view-models/amendments/effective-date-view-model.ts'; +import { EffectiveFromViewModel } from '../../../types/view-models/amendments/effective-from-view-model.ts'; export type GetEffectiveDateRequest = CustomExpressRequest<{ params: { dealId: string; facilityId: string; amendmentId: string }; diff --git a/gef-ui/server/types/view-models/amendments/effective-date-view-model.ts b/gef-ui/server/types/view-models/amendments/effective-from-view-model.ts similarity index 100% rename from gef-ui/server/types/view-models/amendments/effective-date-view-model.ts rename to gef-ui/server/types/view-models/amendments/effective-from-view-model.ts