Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
act 0.2.64
gitleaks 8.24.0
jq 1.6
nodejs 22.22.0
nodejs 22.16.0
pre-commit 3.6.0
terraform 1.10.1
terraform-docs 0.19.0
trivy 0.61.0
vale 3.6.0
python 3.13.2

# ==============================================================================
# The section below is reserved for Docker image versions.

# TODO: Move this section - consider using a different file for the repository template dependencies.
# docker/ghcr.io/anchore/grype v0.104.3@sha256:d340f4f8b3b7e6e72a6c9c0152f25402ed8a2d7375dba1dfce4e53115242feb6 # SEE: https://github.com/anchore/grype/pkgs/container/grype
# docker/ghcr.io/anchore/syft v1.39.0@sha256:6f13bb010923c33fb197047c8f88888e77071bd32596b3f605d62a133e493ce4 # SEE: https://github.com/anchore/syft/pkgs/container/syft
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ import ChooseATemplateTypePage, {
} from '@app/choose-a-template-type/page';
import { TemplateFormState } from 'nhs-notify-web-template-management-utils';
import content from '@content/content';
import { useFeatureFlags } from '@providers/client-config-provider';

const { pageTitle } = content.components.chooseTemplateType;

jest.mocked(useFeatureFlags).mockReturnValue({ letterAuthoring: true });

jest.mock('next/navigation', () => ({
redirect: () => {
throw new Error('Simulated redirect');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,36 @@ exports[`ChooseMessageOrderPage 1`] = `
</div>
</fieldset>
</div>
<div
class="nhsuk-card nhsuk-card--warning nhsuk-u-reading-width"
>
<div
class="nhsuk-card__content"
>
<h4
class="nhsuk-card__heading"
>
To create a letter template
</h4>
<p
class="nhsuk-card__description nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-6"
>
You cannot upload a letter template using this service.
</p>
<p
class="nhsuk-card__description"
>
Follow our guidance to
<a
href="https://notify.nhs.uk/using-nhs-notify/upload-a-letter"
rel="noopener noreferrer"
target="_blank"
>
upload a letter template (opens in a new tab)
</a>
</p>
</div>
</div>
<button
aria-disabled="false"
class="nhsuk-button"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useActionState } from 'react';
import { render, screen, fireEvent } from '@testing-library/react';
import { ChooseMessageOrder } from '@forms/ChooseMessageOrder/ChooseMessageOrder';
import { TemplateFormState } from 'nhs-notify-web-template-management-utils';
import { useFeatureFlags } from '@providers/client-config-provider';

jest.mock('@utils/amplify-utils');

Expand All @@ -24,6 +25,8 @@ jest.mock('react', () => {
};
});

jest.mocked(useFeatureFlags).mockReturnValue({ letterAuthoring: true });

describe('Choose message order page', () => {
const errorLogger = console.error;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ beforeEach(() => {
describe('Preview email form renders', () => {
describe('Routing feature flag - Disabled', () => {
beforeEach(() => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing: false });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing: false, letterAuthoring: true });
});

it('matches error snapshot', () => {
Expand Down Expand Up @@ -114,7 +116,9 @@ describe('Preview email form renders', () => {

describe('Routing feature flag - Enabled', () => {
beforeEach(() => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing: true });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing: true, letterAuthoring: true });
});

it('renders component correctly', () => {
Expand All @@ -141,7 +145,9 @@ describe('Preview email form renders', () => {
it.each([true, false])(
'matches snapshot when navigating from manage templates screen, when routing is %p',
(routing) => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing, letterAuthoring: true });

const container = render(
<PreviewEmailTemplate
Expand All @@ -163,7 +169,9 @@ describe('Preview email form renders', () => {
it.each([true, false])(
'matches snapshot when navigating from edit screen when routing is %p',
(routing) => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing, letterAuthoring: true });

const mockSearchParams = new Map([['from', 'edit']]);
(useSearchParams as jest.Mock).mockImplementationOnce(() => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ beforeEach(() => {
describe('Preview nhs app form renders', () => {
describe('Routing feature flag - Disabled', () => {
beforeEach(() => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing: false });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing: false, letterAuthoring: true });
});

it('matches error snapshot', () => {
Expand Down Expand Up @@ -110,7 +112,9 @@ describe('Preview nhs app form renders', () => {

describe('Routing feature flag - Enabled', () => {
beforeEach(() => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing: true });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing: true, letterAuthoring: true });
});

it('renders component correctly', () => {
Expand All @@ -136,7 +140,9 @@ describe('Preview nhs app form renders', () => {
it.each([true, false])(
'matches snapshot when navigating from manage templates screen when routing is %p',
(routing) => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing, letterAuthoring: true });

const container = render(
<PreviewNHSAppTemplate
Expand All @@ -157,7 +163,9 @@ describe('Preview nhs app form renders', () => {
it.each([true, false])(
'matches snapshot when navigating from edit screen when routing is %p',
(routing) => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing, letterAuthoring: true });

const mockSearchParams = new Map([['from', 'edit']]);
(useSearchParams as jest.Mock).mockImplementationOnce(() => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ beforeEach(() => {
describe('Review sms form renders', () => {
describe('Routing feature flag - Disabled', () => {
beforeEach(() => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing: false });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing: false, letterAuthoring: true });
});

it('matches error snapshot', () => {
Expand Down Expand Up @@ -110,7 +112,9 @@ describe('Review sms form renders', () => {

describe('Routing feature flag - Enabled', () => {
beforeEach(() => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing: true });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing: true, letterAuthoring: true });
});

it('renders component correctly', () => {
Expand All @@ -136,7 +140,9 @@ describe('Review sms form renders', () => {
it.each([true, false])(
'matches snapshot when navigating from manage templates screen when routing is %p',
(routing) => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing, letterAuthoring: true });

const container = render(
<PreviewSMSTemplate
Expand All @@ -157,7 +163,9 @@ describe('Review sms form renders', () => {
it.each([true, false])(
'matches snapshot when navigating from edit screen when routing is %p',
(routing) => {
jest.mocked(useFeatureFlags).mockReturnValue({ routing });
jest
.mocked(useFeatureFlags)
.mockReturnValue({ routing, letterAuthoring: true });

const mockSearchParams = new Map([['from', 'edit']]);
(useSearchParams as jest.Mock).mockImplementationOnce(() => ({
Expand Down
Loading
Loading