Skip to content

CCM-8962: aggregate related channel routes together #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bhansell1 wants to merge 1 commit into from
Closed

CCM-8962: aggregate related channel routes together #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 ...template/__snapshots__/page.test.tsx.snap → ...template/__snapshots__/page.test.tsx.snap
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ..._/app/create-email-template/page.test.tsx → ...mail)/create-email-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import CreateEmailTemplatePage from '@app/create-email-template/page';
import CreateEmailTemplatePage from '@app/(email)/create-email-template/page';

jest.mock('@forms/EmailTemplateForm/EmailTemplateForm');

Expand Down
2 changes: 1 addition & 1 deletion ...s__/app/edit-email-template/page.test.tsx → ...(email)/edit-email-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import EditEmailTemplatePage from '@app/edit-email-template/[templateId]/page';
import EditEmailTemplatePage from '@app/(email)/edit-email-template/[templateId]/page';
import { getTemplate } from '@utils/form-actions';
import { redirect } from 'next/navigation';
import { EmailTemplateForm } from '@forms/EmailTemplateForm/EmailTemplateForm';
Expand Down
2 changes: 1 addition & 1 deletion ...pp/email-template-submitted/page.test.tsx → ...l)/email-template-submitted/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import EmailTemplateSubmittedPage from '@app/email-template-submitted/[templateId]/page';
import EmailTemplateSubmittedPage from '@app/(email)/email-template-submitted/[templateId]/page';
import { TemplateSubmitted } from '@molecules/TemplateSubmitted/TemplateSubmitted';
import { getTemplate } from '@utils/form-actions';
import { redirect } from 'next/navigation';
Expand Down
4 changes: 2 additions & 2 deletions .../app/preview-email-template/page.test.tsx → ...ail)/preview-email-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import PreviewEmailTemplatePage from '@app/preview-email-template/[templateId]/page';
import PreviewEmailTemplatePage from '@app/(email)/preview-email-template/[templateId]/page';
import { PreviewEmailTemplate } from '@forms/PreviewEmailTemplate';
import { EmailTemplate } from 'nhs-notify-web-template-management-utils';
import { redirect } from 'next/navigation';
Expand All @@ -12,7 +12,7 @@ import {
LETTER_TEMPLATE,
NHS_APP_TEMPLATE,
SMS_TEMPLATE,
} from '../../helpers';
} from '../../../helpers';

jest.mock('@utils/form-actions');
jest.mock('next/navigation');
Expand Down
8 changes: 6 additions & 2 deletions ..._/app/submit-email-template/page.test.tsx → ...mail)/submit-email-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
/**
* @jest-environment node
*/
import SubmitEmailTemplatePage from '@app/submit-email-template/[templateId]/page';
import SubmitEmailTemplatePage from '@app/(email)/submit-email-template/[templateId]/page';
import { SubmitTemplate } from '@forms/SubmitTemplate/SubmitTemplate';
import { redirect } from 'next/navigation';
import { getTemplate } from '@utils/form-actions';
import { TemplateDto } from 'nhs-notify-backend-client';
import { EMAIL_TEMPLATE, NHS_APP_TEMPLATE, SMS_TEMPLATE } from '../../helpers';
import {
EMAIL_TEMPLATE,
NHS_APP_TEMPLATE,
SMS_TEMPLATE,
} from '../../../helpers';

jest.mock('@utils/form-actions');
jest.mock('next/navigation');
Expand Down
8 changes: 6 additions & 2 deletions ...ew-submitted-email-template/page.test.tsx → ...ew-submitted-email-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
/**
* @jest-environment node
*/
import ViewSubmittedEmailTemplatePage from '@app/view-submitted-email-template/[templateId]/page';
import ViewSubmittedEmailTemplatePage from '@app/(email)/view-submitted-email-template/[templateId]/page';
import { ViewEmailTemplate } from '@molecules/ViewEmailTemplate/ViewEmailTemplate';
import { EmailTemplate } from 'nhs-notify-web-template-management-utils';
import { getTemplate } from '@utils/form-actions';
import { redirect } from 'next/navigation';
import { TemplateDto } from 'nhs-notify-backend-client';
import { EMAIL_TEMPLATE, NHS_APP_TEMPLATE, SMS_TEMPLATE } from '../../helpers';
import {
EMAIL_TEMPLATE,
NHS_APP_TEMPLATE,
SMS_TEMPLATE,
} from '../../../helpers';

jest.mock('@utils/form-actions');
jest.mock('next/navigation');
Expand Down
0 ...template/__snapshots__/page.test.tsx.snap → ...template/__snapshots__/page.test.tsx.snap
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../app/create-letter-template/page.test.tsx → ...ter)/create-letter-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import CreateLetterTemplatePage from '@app/create-letter-template/page';
import CreateLetterTemplatePage from '@app/(letter)/create-letter-template/page';

const OLD_ENV = { ...process.env };

Expand Down
8 changes: 6 additions & 2 deletions ...app/preview-letter-template/page.test.tsx → ...er)/preview-letter-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
/**
* @jest-environment node
*/
import PreviewLetterTemplatePage from '@app/preview-letter-template/[templateId]/page';
import PreviewLetterTemplatePage from '@app/(letter)/preview-letter-template/[templateId]/page';
import { PreviewLetterTemplate } from '@forms/PreviewLetterTemplate/PreviewLetterTemplate';
import { type LetterTemplate } from 'nhs-notify-web-template-management-utils';
import { redirect } from 'next/navigation';
import { getTemplate } from '@utils/form-actions';
import { Language, LetterType, TemplateDto } from 'nhs-notify-backend-client';
import { EMAIL_TEMPLATE, NHS_APP_TEMPLATE, SMS_TEMPLATE } from '../../helpers';
import {
EMAIL_TEMPLATE,
NHS_APP_TEMPLATE,
SMS_TEMPLATE,
} from '../../../helpers';

jest.mock('@utils/form-actions');
jest.mock('next/navigation');
Expand Down
0 ...template/__snapshots__/page.test.tsx.snap → ...template/__snapshots__/page.test.tsx.snap
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...app/create-nhs-app-template/page.test.tsx → ...pp)/create-nhs-app-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import CreateNHSAppTemplatePage from '@app/create-nhs-app-template/page';
import CreateNHSAppTemplatePage from '@app/(nhs-app)/create-nhs-app-template/page';

jest.mock('@forms/NhsAppTemplateForm/NhsAppTemplateForm');

Expand Down
8 changes: 6 additions & 2 deletions ..._/app/edit-nhs-app-template/page.test.tsx → ...-app)/edit-nhs-app-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ import { redirect } from 'next/navigation';
import { NHSAppTemplate } from 'nhs-notify-web-template-management-utils';
import { getTemplate } from '@utils/form-actions';
import { NhsAppTemplateForm } from '@forms/NhsAppTemplateForm/NhsAppTemplateForm';
import EditNhsAppTemplatePage from '@app/edit-nhs-app-template/[templateId]/page';
import EditNhsAppTemplatePage from '@app/(nhs-app)/edit-nhs-app-template/[templateId]/page';
import { TemplateDto } from 'nhs-notify-backend-client';
import { EMAIL_TEMPLATE, LETTER_TEMPLATE, SMS_TEMPLATE } from '../../helpers';
import {
EMAIL_TEMPLATE,
LETTER_TEMPLATE,
SMS_TEMPLATE,
} from '../../../helpers';

jest.mock('@forms/NhsAppTemplateForm/NhsAppTemplateForm');
jest.mock('@utils/form-actions');
Expand Down
2 changes: 1 addition & 1 deletion .../nhs-app-template-submitted/page.test.tsx → .../nhs-app-template-submitted/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import NhsAppTemplateSubmittedPage from '@app/nhs-app-template-submitted/[templateId]/page';
import NhsAppTemplateSubmittedPage from '@app/(nhs-app)/nhs-app-template-submitted/[templateId]/page';
import { TemplateSubmitted } from '@molecules/TemplateSubmitted/TemplateSubmitted';
import { getTemplate } from '@utils/form-actions';
import { redirect } from 'next/navigation';
Expand Down
4 changes: 2 additions & 2 deletions ...pp/preview-nhs-app-template/page.test.tsx → ...p)/preview-nhs-app-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import PreviewNhsAppTemplatePage from '@app/preview-nhs-app-template/[templateId]/page';
import PreviewNhsAppTemplatePage from '@app/(nhs-app)/preview-nhs-app-template/[templateId]/page';
import { PreviewNHSAppTemplate } from '@forms/PreviewNHSAppTemplate/PreviewNHSAppTemplate';
import { NHSAppTemplate } from 'nhs-notify-web-template-management-utils';
import { redirect } from 'next/navigation';
Expand All @@ -12,7 +12,7 @@ import {
LETTER_TEMPLATE,
NHS_APP_TEMPLATE,
SMS_TEMPLATE,
} from '../../helpers';
} from '../../../helpers';

jest.mock('@utils/form-actions');
jest.mock('next/navigation');
Expand Down
4 changes: 2 additions & 2 deletions ...app/submit-nhs-app-template/page.test.tsx → ...pp)/submit-nhs-app-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import SubmitNhsAppTemplatePage from '@app/submit-nhs-app-template/[templateId]/page';
import SubmitNhsAppTemplatePage from '@app/(nhs-app)/submit-nhs-app-template/[templateId]/page';
import { SubmitTemplate } from '@forms/SubmitTemplate/SubmitTemplate';
import { redirect } from 'next/navigation';
import { getTemplate } from '@utils/form-actions';
Expand All @@ -11,7 +11,7 @@ import {
LETTER_TEMPLATE,
NHS_APP_TEMPLATE,
SMS_TEMPLATE,
} from '../../helpers';
} from '../../../helpers';

jest.mock('@utils/form-actions');
jest.mock('next/navigation');
Expand Down
8 changes: 6 additions & 2 deletions ...-submitted-nhs-app-template/page.test.tsx → ...-submitted-nhs-app-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
/**
* @jest-environment node
*/
import ViewSubmittedNHSAppTemplatePage from '@app/view-submitted-nhs-app-template/[templateId]/page';
import ViewSubmittedNHSAppTemplatePage from '@app/(nhs-app)/view-submitted-nhs-app-template/[templateId]/page';
import { ViewNHSAppTemplate } from '@molecules/ViewNHSAppTemplate/ViewNHSAppTemplate';
import { NHSAppTemplate } from 'nhs-notify-web-template-management-utils';
import { getTemplate } from '@utils/form-actions';
import { redirect } from 'next/navigation';
import { TemplateDto } from 'nhs-notify-backend-client';
import { EMAIL_TEMPLATE, NHS_APP_TEMPLATE, SMS_TEMPLATE } from '../../helpers';
import {
EMAIL_TEMPLATE,
NHS_APP_TEMPLATE,
SMS_TEMPLATE,
} from '../../../helpers';

jest.mock('@utils/form-actions');
jest.mock('next/navigation');
Expand Down
0 ...template/__snapshots__/page.test.tsx.snap → ...template/__snapshots__/page.test.tsx.snap
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...reate-text-message-template/page.test.tsx → ...reate-text-message-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import CreateSMSTemplatePage from '@app/create-text-message-template/page';
import CreateSMSTemplatePage from '@app/(text-message)/create-text-message-template/page';

jest.mock('@forms/SmsTemplateForm/SmsTemplateForm');

Expand Down
2 changes: 1 addition & 1 deletion .../edit-text-message-template/page.test.tsx → .../edit-text-message-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import EditSmsTemplatePage from '@app/edit-text-message-template/[templateId]/page';
import EditSmsTemplatePage from '@app/(text-message)/edit-text-message-template/[templateId]/page';
import { getTemplate } from '@utils/form-actions';
import { redirect } from 'next/navigation';
import { SmsTemplateForm } from '@forms/SmsTemplateForm/SmsTemplateForm';
Expand Down
4 changes: 2 additions & 2 deletions ...eview-text-message-template/page.test.tsx → ...eview-text-message-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import PreviewSMSTemplatePage from '@app/preview-text-message-template/[templateId]/page';
import PreviewSMSTemplatePage from '@app/(text-message)/preview-text-message-template/[templateId]/page';
import { PreviewSMSTemplate } from '@forms/PreviewSMSTemplate';
import { SMSTemplate } from 'nhs-notify-web-template-management-utils';
import { redirect } from 'next/navigation';
Expand All @@ -12,7 +12,7 @@ import {
LETTER_TEMPLATE,
NHS_APP_TEMPLATE,
SMS_TEMPLATE,
} from '../../helpers';
} from '../../../helpers';

jest.mock('@utils/form-actions');
jest.mock('next/navigation');
Expand Down
4 changes: 2 additions & 2 deletions ...ubmit-text-message-template/page.test.tsx → ...ubmit-text-message-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import SubmitSmsTemplatePage from '@app/submit-text-message-template/[templateId]/page';
import SubmitSmsTemplatePage from '@app/(text-message)/submit-text-message-template/[templateId]/page';
import { SubmitTemplate } from '@forms/SubmitTemplate/SubmitTemplate';
import { redirect } from 'next/navigation';
import { getTemplate } from '@utils/form-actions';
Expand All @@ -11,7 +11,7 @@ import {
LETTER_TEMPLATE,
NHS_APP_TEMPLATE,
SMS_TEMPLATE,
} from '../../helpers';
} from '../../../helpers';

jest.mock('@utils/form-actions');
jest.mock('next/navigation');
Expand Down
2 changes: 1 addition & 1 deletion ...-message-template-submitted/page.test.tsx → ...-message-template-submitted/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment node
*/
import SmsTemplateSubmittedPage from '@app/text-message-template-submitted/[templateId]/page';
import SmsTemplateSubmittedPage from '@app/(text-message)/text-message-template-submitted/[templateId]/page';
import { TemplateSubmitted } from '@molecules/TemplateSubmitted/TemplateSubmitted';
import { getTemplate } from '@utils/form-actions';
import { redirect } from 'next/navigation';
Expand Down
8 changes: 6 additions & 2 deletions ...itted-text-message-template/page.test.tsx → ...itted-text-message-template/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
/**
* @jest-environment node
*/
import ViewSubmittedSMSTemplatePage from '@app/view-submitted-text-message-template/[templateId]/page';
import ViewSubmittedSMSTemplatePage from '@app/(text-message)/view-submitted-text-message-template/[templateId]/page';
import { ViewSMSTemplate } from '@molecules/ViewSMSTemplate/ViewSMSTemplate';
import { SMSTemplate } from 'nhs-notify-web-template-management-utils';
import { getTemplate } from '@utils/form-actions';
import { redirect } from 'next/navigation';
import { TemplateDto } from 'nhs-notify-backend-client';
import { EMAIL_TEMPLATE, NHS_APP_TEMPLATE, SMS_TEMPLATE } from '../../helpers';
import {
EMAIL_TEMPLATE,
NHS_APP_TEMPLATE,
SMS_TEMPLATE,
} from '../../../helpers';

jest.mock('@utils/form-actions');
jest.mock('next/navigation');
Expand Down
0 ...nd/src/app/create-email-template/page.tsx → ...pp/(email)/create-email-template/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...edit-email-template/[templateId]/page.tsx → ...edit-email-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...-template-submitted/[templateId]/page.tsx → ...-template-submitted/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...view-email-template/[templateId]/page.tsx → ...view-email-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...bmit-email-template/[templateId]/page.tsx → ...bmit-email-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...tted-email-template/[templateId]/page.tsx → ...tted-email-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...d/src/app/create-letter-template/page.tsx → .../(letter)/create-letter-template/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...iew-letter-template/[templateId]/page.tsx → ...iew-letter-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 .../src/app/create-nhs-app-template/page.tsx → ...nhs-app)/create-nhs-app-template/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...it-nhs-app-template/[templateId]/page.tsx → ...it-nhs-app-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...-template-submitted/[templateId]/page.tsx → ...-template-submitted/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...ew-nhs-app-template/[templateId]/page.tsx → ...ew-nhs-app-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...it-nhs-app-template/[templateId]/page.tsx → ...it-nhs-app-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...ed-nhs-app-template/[templateId]/page.tsx → ...ed-nhs-app-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...app/create-text-message-template/page.tsx → ...ge)/create-text-message-template/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...xt-message-template/[templateId]/page.tsx → ...xt-message-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...xt-message-template/[templateId]/page.tsx → ...xt-message-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...xt-message-template/[templateId]/page.tsx → ...xt-message-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...-template-submitted/[templateId]/page.tsx → ...-template-submitted/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...xt-message-template/[templateId]/page.tsx → ...xt-message-template/[templateId]/page.tsx
View file
Open in desktop
File renamed without changes.
Loading