init

Author: alexnuttall

frontend/jest.setup.ts

@@ -32,5 +32,4 @@ Object.assign(global, {
 createMocks();
 
 // set feature flag
-process.env.NEXT_PUBLIC_ENABLE_LETTERS = 'true';
 process.env.NEXT_PUBLIC_ENABLE_PROOFING = 'true';

frontend/src/__tests__/app/choose-a-template-type/page.test.tsx

@@ -41,13 +41,3 @@ test('ChooseATemplateTypePage', async () => {
   expect(await generateMetadata()).toEqual({ title: pageTitle });
   expect(container.asFragment()).toMatchSnapshot();
 });
-
-test('ChooseATemplateTypePage - LETTER option is hidden when feature flag is not enabled', async () => {
-  process.env.NEXT_PUBLIC_ENABLE_LETTERS = 'false';
-
-  const page = await ChooseATemplateTypePage();
-
-  const container = render(page);
-
-  expect(container.asFragment()).toMatchSnapshot();
-});

frontend/src/__tests__/app/create-and-submit-templates/page.test.tsx

@@ -1,25 +1,11 @@
 import { render } from '@testing-library/react';
 import HomePage from '@app/create-and-submit-templates/page';
 
-const OLD_ENV = { ...process.env };
-
 beforeEach(() => {
   jest.resetAllMocks();
-  process.env.NEXT_PUBLIC_ENABLE_LETTERS = 'true';
-});
-
-afterAll(() => {
-  process.env = OLD_ENV;
 });
 
 it('matches the snapshot', () => {
   const { container } = render(<HomePage />);
   expect(container).toMatchSnapshot();
 });
-
-it('matches the snapshot with letters feature flag disabled', () => {
-  process.env.NEXT_PUBLIC_ENABLE_LETTERS = 'false';
-
-  const { container } = render(<HomePage />);
-  expect(container).toMatchSnapshot();
-});

frontend/src/__tests__/app/create-letter-template/page.test.tsx

@@ -3,29 +3,14 @@
  */
 import CreateLetterTemplatePage from '@app/create-letter-template/page';
 
-const OLD_ENV = { ...process.env };
-
 describe('CreateLetterTemplatePage', () => {
   beforeEach(() => {
     jest.resetAllMocks();
-    process.env.NEXT_PUBLIC_ENABLE_LETTERS = 'true';
-  });
-
-  afterAll(() => {
-    process.env = OLD_ENV;
   });
 
   it('should render CreateLetterTemplatePage', async () => {
     const page = await CreateLetterTemplatePage();
 
     expect(page).toMatchSnapshot();
   });
-
-  it('returns 404 when letters feature flag is not enabled', async () => {
-    process.env.NEXT_PUBLIC_ENABLE_LETTERS = 'false';
-
-    await expect(CreateLetterTemplatePage()).rejects.toThrow(
-      'NEXT_HTTP_ERROR_FALLBACK;404'
-    );
-  });
 });

frontend/src/app/choose-a-template-type/page.tsx

@@ -14,11 +14,7 @@ export async function generateMetadata(): Promise<Metadata> {
 }
 
 const ChooseATemplateTypePage = async () => {
-  const templateTypes = TEMPLATE_TYPE_LIST.filter(
-    (t) => process.env.NEXT_PUBLIC_ENABLE_LETTERS === 'true' || t !== 'LETTER'
-  );
-
-  return <ChooseTemplate templateTypes={templateTypes} />;
+  return <ChooseTemplate templateTypes={TEMPLATE_TYPE_LIST} />;
 };
 
 export default ChooseATemplateTypePage;

frontend/src/app/create-and-submit-templates/page.tsx

@@ -10,11 +10,6 @@ export const metadata: Metadata = {
 };
 
 export default function HomePage() {
-  const channelList =
-    process.env.NEXT_PUBLIC_ENABLE_LETTERS === 'true'
-      ? [...homePageContent.list, 'letters']
-      : homePageContent.list;
-
   return (
     <NHSNotifyMain>
       <div className='nhsuk-grid-row' data-testid='page-content-wrapper'>
@@ -27,7 +22,7 @@ export default function HomePage() {
           <p>{homePageContent.text2}</p>
 
           <ul className='nhsuk-list nhsuk-list--bullet'>
-            {channelList.map((channel, i) => (
+            {homePageContent.channelList.map((channel, i) => (
               <li key={`template${i + 1}`}>{channel}</li>
             ))}
           </ul>

frontend/src/app/create-letter-template/page.tsx

@@ -1,10 +1,7 @@
-import { notFound } from 'next/navigation';
 import { CreateLetterTemplate } from 'nhs-notify-web-template-management-utils';
 import { LetterTemplateForm } from '@forms/LetterTemplateForm/LetterTemplateForm';
 
 const CreateLetterTemplatePage = async () => {
-  if (process.env.NEXT_PUBLIC_ENABLE_LETTERS !== 'true') notFound();
-
   const initialState: CreateLetterTemplate = {
     templateType: 'LETTER',
     name: '',

frontend/src/content/content.ts

@@ -170,7 +170,7 @@ const homePage = {
   text1:
     'Use this tool to create and submit templates you want to send as messages using NHS Notify.',
   text2: 'You can create templates for:',
-  list: ['NHS App messages', 'emails', 'text messages (SMS)'],
+  channelList: ['NHS App messages', 'emails', 'text messages (SMS)', 'letters'],
   text3:
     'When you submit a template, it will be used by NHS Notify to set up the messages you want to send.',
   pageSubHeading: 'Before you start',

infrastructure/terraform/components/app/amplify_app.tf

@@ -32,7 +32,6 @@ resource "aws_amplify_app" "main" {
     AMPLIFY_MONOREPO_APP_ROOT                = "frontend"
     API_BASE_URL                             = module.backend_api.api_base_url
     CSRF_SECRET                              = aws_ssm_parameter.csrf_secret.value
-    NEXT_PUBLIC_ENABLE_LETTERS               = var.enable_letters
     NEXT_PUBLIC_ENABLE_PROOFING              = var.enable_proofing
     NEXT_PUBLIC_PROMPT_SECONDS_BEFORE_LOGOUT = 120
     NEXT_PUBLIC_TIME_TILL_LOGOUT_SECONDS     = 900

infrastructure/terraform/components/app/module_backend_api.tf

@@ -21,7 +21,6 @@ module "backend_api" {
 
   enable_backup = var.destination_vault_arn != null ? true : false
 
-  enable_letters            = var.enable_letters
   enable_proofing           = var.enable_proofing
   letter_suppliers          = var.letter_suppliers
   log_destination_arn       = "arn:aws:logs:${var.region}:${var.observability_account_id}:destination:nhs-notify-main-acct-firehose-logs"