From f02ce1fee878923165ae117aea6bdf400b19c203 Mon Sep 17 00:00:00 2001 From: Andie Swift Date: Thu, 21 Nov 2024 15:36:45 -0600 Subject: [PATCH 1/9] added missing preview emails --- lib/libs/email/content/email-components.tsx | 18 ++++-- .../new-submission/emailTemplates/AppKCMS.tsx | 2 +- .../email/preview/CMS/CHIP_RAI_Response.tsx | 59 ------------------- .../email/preview/CMS/Waiver_Contracting.tsx | 42 ------------- .../{ => Initial Submissions}/CMS/AppK.tsx | 6 +- .../CMS/CHIP_SPA.tsx | 0 .../CMS/Medicaid_SPA.tsx | 6 +- .../CMS/Temp_Extension.tsx | 4 +- .../CMS/Waiver_Capitated.tsx | 4 +- .../{ => Initial Submissions}/State/AppK.tsx | 6 +- .../State/CHIP_SPA.tsx | 0 .../State/Medicaid_SPA.tsx | 6 +- .../State/Temp_Extension.tsx | 4 +- .../State/Waiver_Capitated.tsx | 4 +- .../State/Waiver_Contracting.tsx | 4 +- .../State}/Waiver_RAI_Response.tsx | 31 +++++----- .../preview/Respond to Rai/CMS/CHIP_SPA.tsx | 6 ++ .../Respond to Rai/CMS/Medicaid_SPA.tsx | 6 ++ .../Respond to Rai/CMS/Waiver_Capitated.tsx | 6 ++ .../preview/Respond to Rai/State/CHIP_SPA.tsx | 6 ++ .../Respond to Rai/State/Medicaid_SPA.tsx | 5 ++ .../Respond to Rai/State/Waiver_Capitated.tsx | 5 ++ .../preview/State/Medicaid_RAI_Response.tsx | 26 -------- .../preview/Withdraw Package/CMS/CHIP_SPA.tsx | 6 ++ .../Withdraw Package/CMS/Medicaid_SPA.tsx | 6 ++ .../Withdraw Package/CMS/Waiver_Capitated.tsx | 6 ++ .../Withdraw Package/State/CHIP_SPA.tsx | 6 ++ .../Withdraw Package/State/Medicaid_SPA.tsx | 6 ++ .../State/Waiver_Capitated.tsx | 6 ++ .../email/preview/Withdraw Rai/CMS/AppK.tsx | 9 +++ .../preview/Withdraw Rai/CMS/CHIP_SPA.tsx | 7 +++ .../preview/Withdraw Rai/CMS/Medicaid_SPA.tsx | 7 +++ .../Withdraw Rai/CMS/Waiver_Contracting.tsx | 7 +++ .../email/preview/Withdraw Rai/State/AppK.tsx | 9 +++ .../preview/Withdraw Rai/State/CHIP_SPA.tsx | 7 +++ .../Withdraw Rai/State/Medicaid_SPA.tsx | 7 +++ .../Withdraw Rai/State/Waiver_Contracting.tsx | 7 +++ .../State/Waiver_RAI_Response.tsx | 0 38 files changed, 180 insertions(+), 172 deletions(-) delete mode 100644 lib/libs/email/preview/CMS/CHIP_RAI_Response.tsx delete mode 100644 lib/libs/email/preview/CMS/Waiver_Contracting.tsx rename lib/libs/email/preview/{ => Initial Submissions}/CMS/AppK.tsx (70%) rename lib/libs/email/preview/{ => Initial Submissions}/CMS/CHIP_SPA.tsx (100%) rename lib/libs/email/preview/{ => Initial Submissions}/CMS/Medicaid_SPA.tsx (77%) rename lib/libs/email/preview/{ => Initial Submissions}/CMS/Temp_Extension.tsx (51%) rename lib/libs/email/preview/{ => Initial Submissions}/CMS/Waiver_Capitated.tsx (87%) rename lib/libs/email/preview/{ => Initial Submissions}/State/AppK.tsx (69%) rename lib/libs/email/preview/{ => Initial Submissions}/State/CHIP_SPA.tsx (100%) rename lib/libs/email/preview/{ => Initial Submissions}/State/Medicaid_SPA.tsx (78%) rename lib/libs/email/preview/{ => Initial Submissions}/State/Temp_Extension.tsx (52%) rename lib/libs/email/preview/{ => Initial Submissions}/State/Waiver_Capitated.tsx (89%) rename lib/libs/email/preview/{ => Initial Submissions}/State/Waiver_Contracting.tsx (86%) rename lib/libs/email/preview/{CMS => Initial Submissions/State}/Waiver_RAI_Response.tsx (62%) create mode 100644 lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx create mode 100644 lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx create mode 100644 lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx create mode 100644 lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx create mode 100644 lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx create mode 100644 lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx delete mode 100644 lib/libs/email/preview/State/Medicaid_RAI_Response.tsx create mode 100644 lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx create mode 100644 lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx create mode 100644 lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx create mode 100644 lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx create mode 100644 lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx create mode 100644 lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx create mode 100644 lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx create mode 100644 lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx create mode 100644 lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx create mode 100644 lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx create mode 100644 lib/libs/email/preview/Withdraw Rai/State/AppK.tsx create mode 100644 lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx create mode 100644 lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx create mode 100644 lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx rename lib/libs/email/preview/{ => Withdraw Rai}/State/Waiver_RAI_Response.tsx (100%) diff --git a/lib/libs/email/content/email-components.tsx b/lib/libs/email/content/email-components.tsx index 2672c53d3..a3bb35627 100644 --- a/lib/libs/email/content/email-components.tsx +++ b/lib/libs/email/content/email-components.tsx @@ -63,24 +63,30 @@ const EmailNav = ({ appEndpointUrl }: { appEndpointUrl: string }) => ( ); -const LoginInstructions = ({ appEndpointURL }: { appEndpointURL: string }) => ( +const LoginInstructions = ({ + appEndpointURL, + useThisLink, +}: { + appEndpointURL: string; + useThisLink?: boolean; +}) => ( diff --git a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx index 8d9ca8717..77bd96e6a 100644 --- a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx +++ b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx @@ -22,7 +22,7 @@ export const AppKCMSEmail = ({ variables }: { variables: AppKEmailProps }) => { footerContent={} > - + { - return ( - - ); -}; - -export default ChipSpaCMSEmailPreview; diff --git a/lib/libs/email/preview/CMS/Waiver_Contracting.tsx b/lib/libs/email/preview/CMS/Waiver_Contracting.tsx deleted file mode 100644 index d66066b9f..000000000 --- a/lib/libs/email/preview/CMS/Waiver_Contracting.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import { Waiver1915bStateEmail } from "../../content/new-submission/emailTemplates/Waiver1915bState"; -import { emailTemplateValue } from "../../mock-data/new-submission"; - -const Waiver1915bStateEmailPreview = () => { - return ( - - ); -}; - -export default Waiver1915bStateEmailPreview; diff --git a/lib/libs/email/preview/CMS/AppK.tsx b/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx similarity index 70% rename from lib/libs/email/preview/CMS/AppK.tsx rename to lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx index dfe470a99..498163f57 100644 --- a/lib/libs/email/preview/CMS/AppK.tsx +++ b/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx @@ -1,6 +1,6 @@ -import { AppKCMSEmail } from "../../content/new-submission/emailTemplates"; -import { emailTemplateValue } from "../../mock-data/new-submission"; -import * as attachments from "../../mock-data/attachments"; +import { AppKCMSEmail } from "../../../content/new-submission/emailTemplates"; +import { emailTemplateValue } from "../../../mock-data/new-submission"; +import * as attachments from "../../../mock-data/attachments"; const AppKCMSEmailPreview = () => { return ( { return ( diff --git a/lib/libs/email/preview/CMS/Temp_Extension.tsx b/lib/libs/email/preview/Initial Submissions/CMS/Temp_Extension.tsx similarity index 51% rename from lib/libs/email/preview/CMS/Temp_Extension.tsx rename to lib/libs/email/preview/Initial Submissions/CMS/Temp_Extension.tsx index decc99d30..3cafcc4b2 100644 --- a/lib/libs/email/preview/CMS/Temp_Extension.tsx +++ b/lib/libs/email/preview/Initial Submissions/CMS/Temp_Extension.tsx @@ -1,5 +1,5 @@ -import { TempExtCMSEmail } from "../../content/tempExtension/emailTemplates/TempExtCMS"; -import { emailTemplateValue } from "../../mock-data/temp-extension"; +import { TempExtCMSEmail } from "../../../content/tempExtension/emailTemplates/TempExtCMS"; +import { emailTemplateValue } from "../../../mock-data/temp-extension"; const TempExtCMSPreview = () => { return ( diff --git a/lib/libs/email/preview/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Initial Submissions/CMS/Waiver_Capitated.tsx similarity index 87% rename from lib/libs/email/preview/CMS/Waiver_Capitated.tsx rename to lib/libs/email/preview/Initial Submissions/CMS/Waiver_Capitated.tsx index 91d454627..cf6af4936 100644 --- a/lib/libs/email/preview/CMS/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Initial Submissions/CMS/Waiver_Capitated.tsx @@ -1,5 +1,5 @@ -import { Waiver1915bCMSEmail } from "../../content/new-submission/emailTemplates/Waiver1915bCMS"; -import { emailTemplateValue } from "../../mock-data/new-submission"; +import { Waiver1915bCMSEmail } from "lib/libs/email/content/new-submission/emailTemplates/Waiver1915bCMS"; +import { emailTemplateValue } from "../../../mock-data/new-submission"; const Waiver1915bCMSEmailPreview = () => { return ( diff --git a/lib/libs/email/preview/State/AppK.tsx b/lib/libs/email/preview/Initial Submissions/State/AppK.tsx similarity index 69% rename from lib/libs/email/preview/State/AppK.tsx rename to lib/libs/email/preview/Initial Submissions/State/AppK.tsx index 98a1e1fc3..5c779ad74 100644 --- a/lib/libs/email/preview/State/AppK.tsx +++ b/lib/libs/email/preview/Initial Submissions/State/AppK.tsx @@ -1,6 +1,6 @@ -import { AppKStateEmail } from "../../content/new-submission/emailTemplates"; -import * as attachments from "../../mock-data/attachments"; -import { emailTemplateValue } from "../../mock-data/new-submission"; +import { AppKStateEmail } from "../../../content/new-submission/emailTemplates"; +import * as attachments from "../../../mock-data/attachments"; +import { emailTemplateValue } from "../../../mock-data/new-submission"; const AppKStateEmailPreview = () => { return ( diff --git a/lib/libs/email/preview/State/CHIP_SPA.tsx b/lib/libs/email/preview/Initial Submissions/State/CHIP_SPA.tsx similarity index 100% rename from lib/libs/email/preview/State/CHIP_SPA.tsx rename to lib/libs/email/preview/Initial Submissions/State/CHIP_SPA.tsx diff --git a/lib/libs/email/preview/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Initial Submissions/State/Medicaid_SPA.tsx similarity index 78% rename from lib/libs/email/preview/State/Medicaid_SPA.tsx rename to lib/libs/email/preview/Initial Submissions/State/Medicaid_SPA.tsx index 3e0a11568..1f3a2e213 100644 --- a/lib/libs/email/preview/State/Medicaid_SPA.tsx +++ b/lib/libs/email/preview/Initial Submissions/State/Medicaid_SPA.tsx @@ -1,6 +1,6 @@ -import { MedSpaStateEmail } from "../../content/new-submission/emailTemplates"; -import { emailTemplateValue } from "../../mock-data/new-submission"; -import * as attachments from "../../mock-data/attachments"; +import { MedSpaStateEmail } from "../../../content/new-submission/emailTemplates"; +import { emailTemplateValue } from "../../../mock-data/new-submission"; +import * as attachments from "../../../mock-data/attachments"; const MedSpaStateEmailPreview = () => { return ( diff --git a/lib/libs/email/preview/State/Temp_Extension.tsx b/lib/libs/email/preview/Initial Submissions/State/Temp_Extension.tsx similarity index 52% rename from lib/libs/email/preview/State/Temp_Extension.tsx rename to lib/libs/email/preview/Initial Submissions/State/Temp_Extension.tsx index f81a5555b..3a56000dc 100644 --- a/lib/libs/email/preview/State/Temp_Extension.tsx +++ b/lib/libs/email/preview/Initial Submissions/State/Temp_Extension.tsx @@ -1,6 +1,6 @@ -import { emailTemplateValue } from "../../mock-data/temp-extension"; +import { emailTemplateValue } from "../../../mock-data/temp-extension"; -import { TempExtStateEmail } from "../../content/tempExtension/emailTemplates/TempExtState"; +import { TempExtStateEmail } from "../../../content/tempExtension/emailTemplates/TempExtState"; const TempExtStatePreview = () => { return ( diff --git a/lib/libs/email/preview/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Initial Submissions/State/Waiver_Capitated.tsx similarity index 89% rename from lib/libs/email/preview/State/Waiver_Capitated.tsx rename to lib/libs/email/preview/Initial Submissions/State/Waiver_Capitated.tsx index a283e3974..8d2c3e387 100644 --- a/lib/libs/email/preview/State/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Initial Submissions/State/Waiver_Capitated.tsx @@ -1,5 +1,5 @@ -import { Waiver1915bStateEmail } from "../../content/new-submission/emailTemplates/Waiver1915bState"; -import { emailTemplateValue } from "../../mock-data/new-submission"; +import { Waiver1915bStateEmail } from "../../../content/new-submission/emailTemplates/Waiver1915bState"; +import { emailTemplateValue } from "../../../mock-data/new-submission"; const Waiver1915bStateEmailPreview = () => { return ( diff --git a/lib/libs/email/preview/State/Waiver_Contracting.tsx b/lib/libs/email/preview/Initial Submissions/State/Waiver_Contracting.tsx similarity index 86% rename from lib/libs/email/preview/State/Waiver_Contracting.tsx rename to lib/libs/email/preview/Initial Submissions/State/Waiver_Contracting.tsx index 7286168c5..e31c141bf 100644 --- a/lib/libs/email/preview/State/Waiver_Contracting.tsx +++ b/lib/libs/email/preview/Initial Submissions/State/Waiver_Contracting.tsx @@ -1,5 +1,5 @@ -import { Waiver1915bStateEmail } from "../../content/new-submission/emailTemplates/Waiver1915bState"; -import { emailTemplateValue } from "../../mock-data/new-submission"; +import { Waiver1915bStateEmail } from "../../../content/new-submission/emailTemplates/Waiver1915bState"; +import { emailTemplateValue } from "../../../mock-data/new-submission"; const Waiver1915bStateEmailPreview = () => { return ( diff --git a/lib/libs/email/preview/CMS/Waiver_RAI_Response.tsx b/lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx similarity index 62% rename from lib/libs/email/preview/CMS/Waiver_RAI_Response.tsx rename to lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx index f306a7a54..02c26d57b 100644 --- a/lib/libs/email/preview/CMS/Waiver_RAI_Response.tsx +++ b/lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx @@ -1,9 +1,9 @@ -import { Waiver1915bCMSEmail } from "../../content/respondToRai/emailTemplates"; -import { emailTemplateValue } from "../../mock-data/respond-to-rai"; +import { Waiver1915bStateEmail } from "../../../content/respondToRai/emailTemplates"; +import { emailTemplateValue } from "../../../mock-data/respond-to-rai"; -const Waiver1915bCMSEmailPreview = () => { +const Waiver1915bStateEmailPreview = () => { return ( - { revisedAmendedStatePlanLanguage: { files: [ { - filename: "revised-amended-state-plan-language.pdf", - title: "Revised Amended State Plan Language", + filename: "waiver-rai-response.pdf", + title: "Waiver RAI Response", bucket: "test-bucket", - key: "revised-amended-state-plan-language.pdf", + key: "waiver-rai-response.pdf", uploadDate: Date.now(), }, - ], - label: "Revised Amended State Plan Language", - }, - officialRAIResponse: { - files: [ { - filename: "official-rai-response.pdf", - title: "Official RAI Response", + filename: "spa-pages.pdf", + title: "SPA Pages", bucket: "test-bucket", - key: "official-rai-response.pdf", + key: "spa-pages.pdf", uploadDate: Date.now(), }, ], + label: "Revised Amended State Plan Language", + }, + officialRAIResponse: { + files: [], label: "Official RAI Response", }, budgetDocuments: { @@ -56,4 +55,4 @@ const Waiver1915bCMSEmailPreview = () => { ); }; -export default Waiver1915bCMSEmailPreview; +export default Waiver1915bStateEmailPreview; diff --git a/lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx new file mode 100644 index 000000000..ef45e737a --- /dev/null +++ b/lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx @@ -0,0 +1,6 @@ +import { ChipSpaCMSEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx new file mode 100644 index 000000000..c10eb3b14 --- /dev/null +++ b/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx @@ -0,0 +1,6 @@ +import { MedSpaCMSEmail } from "../../../content/respondToRai/emailTemplates/MedSpaCMS"; +import { emailTemplateValue } from "../../../mock-data/respond-to-rai"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx new file mode 100644 index 000000000..448694b19 --- /dev/null +++ b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx @@ -0,0 +1,6 @@ +import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx b/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx new file mode 100644 index 000000000..e1b948f30 --- /dev/null +++ b/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx @@ -0,0 +1,6 @@ +import { ChipSpaStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx new file mode 100644 index 000000000..74b2bd7f2 --- /dev/null +++ b/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx @@ -0,0 +1,5 @@ +import { MedSpaStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx new file mode 100644 index 000000000..8390c7507 --- /dev/null +++ b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx @@ -0,0 +1,5 @@ +import { Waiver1915bStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/State/Medicaid_RAI_Response.tsx b/lib/libs/email/preview/State/Medicaid_RAI_Response.tsx deleted file mode 100644 index a860e31db..000000000 --- a/lib/libs/email/preview/State/Medicaid_RAI_Response.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import * as RAIResponse from "../../mock-data/respond-to-rai"; -import { MedSpaStateEmail } from "../../content/respondToRai/emailTemplates/MedSpaState"; -import * as attachments from "../../mock-data/attachments"; - -export const MedSpaStateEmailPreview = () => { - return ( - - ); -}; - -export default MedSpaStateEmailPreview; diff --git a/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx new file mode 100644 index 000000000..80d5aeca4 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx @@ -0,0 +1,6 @@ +import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx new file mode 100644 index 000000000..80d5aeca4 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx @@ -0,0 +1,6 @@ +import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx new file mode 100644 index 000000000..d0fad31f2 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx @@ -0,0 +1,6 @@ +import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx new file mode 100644 index 000000000..cfb36ab8d --- /dev/null +++ b/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx @@ -0,0 +1,6 @@ +import { ChipSpaStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx new file mode 100644 index 000000000..6b9453d67 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx @@ -0,0 +1,6 @@ +import { MedSpaStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx new file mode 100644 index 000000000..e5740c5bd --- /dev/null +++ b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx @@ -0,0 +1,6 @@ +import { Waiver1915bStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx new file mode 100644 index 000000000..8730c8cd7 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx @@ -0,0 +1,9 @@ +import { AppKCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; + +export const relatedEvent = { + submitterName: "George", + submitterEmail: "test@email.com", +}; + +export default () => ; diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx new file mode 100644 index 000000000..01c1dfa41 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx @@ -0,0 +1,7 @@ +import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; +import { relatedEvent } from "./AppK"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx new file mode 100644 index 000000000..30098cb7d --- /dev/null +++ b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx @@ -0,0 +1,7 @@ +import { MedSpaCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; +import { relatedEvent } from "./AppK"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx new file mode 100644 index 000000000..fde3ba4c3 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx @@ -0,0 +1,7 @@ +import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; +import { relatedEvent } from "./AppK"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx new file mode 100644 index 000000000..8730c8cd7 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx @@ -0,0 +1,9 @@ +import { AppKCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; + +export const relatedEvent = { + submitterName: "George", + submitterEmail: "test@email.com", +}; + +export default () => ; diff --git a/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx new file mode 100644 index 000000000..cf16a2742 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx @@ -0,0 +1,7 @@ +import { ChipSpaStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; +import { relatedEvent } from "../CMS/AppK"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx new file mode 100644 index 000000000..50c7997d3 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx @@ -0,0 +1,7 @@ +import { MedSpaStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; +import { relatedEvent } from "../CMS/AppK"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx new file mode 100644 index 000000000..2b4823511 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx @@ -0,0 +1,7 @@ +import { Waiver1915bStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; +import { relatedEvent } from "../CMS/AppK"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/State/Waiver_RAI_Response.tsx b/lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx similarity index 100% rename from lib/libs/email/preview/State/Waiver_RAI_Response.tsx rename to lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx From c30b37283da8329dae32147a71e7080a4fb1c252 Mon Sep 17 00:00:00 2001 From: Andie Swift Date: Mon, 25 Nov 2024 13:13:18 -0600 Subject: [PATCH 2/9] in the middle of updating the text for these email templates --- lib/libs/email/content/email-components.tsx | 28 ++++++++++++++++++- .../new-submission/emailTemplates/AppKCMS.tsx | 11 ++++---- .../emailTemplates/AppKState.tsx | 16 ++++------- .../{Waiver1915bCMS.tsx => WaiverCMS.tsx} | 7 ++--- .../{Waiver1915bState.tsx => WaiverState.tsx} | 7 +++-- .../respondToRai/emailTemplates/index.tsx | 4 +-- lib/libs/email/content/respondToRai/index.tsx | 8 +++--- .../preview/Initial Submissions/CMS/AppK.tsx | 6 ++-- .../Initial Submissions/State/AppK.tsx | 18 ++++++------ .../email/preview/Respond to Rai/CMS/AppK.tsx | 17 +++++++++++ .../Respond to Rai/CMS/Waiver_Capitated.tsx | 4 +-- .../preview/Respond to Rai/State/AppK.tsx | 19 +++++++++++++ .../Respond to Rai/State/Waiver_Capitated.tsx | 4 +-- 13 files changed, 101 insertions(+), 48 deletions(-) rename lib/libs/email/content/respondToRai/emailTemplates/{Waiver1915bCMS.tsx => WaiverCMS.tsx} (91%) rename lib/libs/email/content/respondToRai/emailTemplates/{Waiver1915bState.tsx => WaiverState.tsx} (84%) create mode 100644 lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx create mode 100644 lib/libs/email/preview/Respond to Rai/State/AppK.tsx diff --git a/lib/libs/email/content/email-components.tsx b/lib/libs/email/content/email-components.tsx index a3bb35627..ad309e653 100644 --- a/lib/libs/email/content/email-components.tsx +++ b/lib/libs/email/content/email-components.tsx @@ -92,6 +92,8 @@ const LoginInstructions = ({ ); +const Divider = () =>
; + const DetailsHeading = () => (
@@ -160,7 +162,7 @@ const PackageDetails = ({ details }: { details: Record }) => Summary: - + {value ?? "No additional information submitted"} ); } @@ -224,6 +226,29 @@ const ContactStateLead = ({ isChip }: { isChip?: boolean }) => ( ); +export const SpamWarning = () => { + return ( +
+
+

+ If the contents of this email seem suspicious, do not open them, and instead forward this + email to{" "} + + SPAM@cms.hhs.gov + + . +

+

Thank you!

+
+ ); +}; + const EmailFooter = ({ children }: { children: React.ReactNode }) => (
{children}
); @@ -284,6 +309,7 @@ export { EmailNav, LoginInstructions, DetailsHeading, + Divider, Attachments, PackageDetails, MailboxNotice, diff --git a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx index 77bd96e6a..9d8df5004 100644 --- a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx +++ b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx @@ -1,11 +1,10 @@ import { Events, CommonEmailVariables } from "shared-types"; - import { LoginInstructions, PackageDetails, - BasicFooter, - DetailsHeading, Attachments, + SpamWarning, + Divider, } from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; import { formatDate } from "shared-utils"; @@ -19,9 +18,9 @@ export const AppKCMSEmail = ({ variables }: { variables: AppKEmailProps }) => { previewText="Appendix K Amendment Submitted" heading="The OneMAC Submission Portal received a 1915(c) Appendix K Amendment Submission:" applicationEndpointUrl={variables.applicationEndpointUrl} - footerContent={} + footerContent={} > - + { "Email Address": variables.submitterEmail, "Amendment Title": variables.title ?? null, "Waiver Amendment Number": variables.id, - "Waiver Authority": variables.seaActionType, + "Waiver Authority": variables.actionType, "Proposed Effective Date": formatDate(variables.proposedEffectiveDate), Summary: variables.additionalInformation, }} diff --git a/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx b/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx index aef0cdfc5..bd3f21d02 100644 --- a/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx +++ b/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx @@ -1,13 +1,7 @@ import { Text } from "@react-email/components"; import { CommonEmailVariables, Events } from "shared-types"; import { formatNinetyDaysDate, formatDate } from "shared-utils"; -import { - PackageDetails, - ContactStateLead, - DetailsHeading, - Attachments, - MailboxNotice, -} from "../../email-components"; +import { PackageDetails, ContactStateLead, Divider, MailboxNotice } from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; import { styles } from "../../email-styles"; @@ -24,20 +18,20 @@ export const AppKStateEmail = (props: { applicationEndpointUrl={variables.applicationEndpointUrl} footerContent={} > - + - + {`This response confirms the receipt of your Waiver request or your response to a Waiver Request for Additional Information (RAI). You can diff --git a/lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bCMS.tsx b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx similarity index 91% rename from lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bCMS.tsx rename to lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx index 1c1cdb587..114b270bf 100644 --- a/lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bCMS.tsx +++ b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx @@ -2,15 +2,12 @@ import { CommonEmailVariables, Events } from "shared-types"; import { Html, Container } from "@react-email/components"; import { PackageDetails, LoginInstructions, BasicFooter } from "../../email-components"; -export const Waiver1915bCMSEmail = (props: { +export const WaiverCMSEmail = (props: { variables: Events["RespondToRai"] & CommonEmailVariables; }) => { const variables = props.variables; return ( - +

The OneMAC Submission Portal received a {variables.authority} Waiver RAI Response diff --git a/lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bState.tsx b/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx similarity index 84% rename from lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bState.tsx rename to lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx index f7146100b..7819f635f 100644 --- a/lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bState.tsx +++ b/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx @@ -1,16 +1,16 @@ import { formatNinetyDaysDate } from "shared-utils"; import { CommonEmailVariables, Events } from "shared-types"; import { Text } from "@react-email/components"; -import { PackageDetails, MailboxNotice, ContactStateLead } from "../../email-components"; +import { PackageDetails, MailboxNotice, ContactStateLead, Divider } from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; import { styles } from "../../email-styles"; -export const Waiver1915bStateEmail = (props: { +export const WaiverStateEmail = (props: { variables: Events["RespondToRai"] & CommonEmailVariables; }) => { const variables = props.variables; const previewText = `Appendix K Amendment Submitted`; - const heading = "This response confirms the submission of your 1915(c) Waiver to CMS for review"; + const heading = `This response confirms the submission of your ${variables.authority} RAI Response to CMS for review:`; return ( + {`This response confirms the receipt of your Waiver request or your response to a Waiver Request for Additional Information (RAI). You can expect a formal response to your submittal diff --git a/lib/libs/email/content/respondToRai/emailTemplates/index.tsx b/lib/libs/email/content/respondToRai/emailTemplates/index.tsx index 9b6842c3c..4b093e1dd 100644 --- a/lib/libs/email/content/respondToRai/emailTemplates/index.tsx +++ b/lib/libs/email/content/respondToRai/emailTemplates/index.tsx @@ -2,5 +2,5 @@ export { MedSpaCMSEmail } from "./MedSpaCMS"; export { MedSpaStateEmail } from "./MedSpaState"; export { ChipSpaCMSEmail } from "./ChipSpaCMS"; export { ChipSpaStateEmail } from "./ChipSpaState"; -export { Waiver1915bCMSEmail } from "./Waiver1915bCMS"; -export { Waiver1915bStateEmail } from "./Waiver1915bState"; +export { WaiverCMSEmail } from "./WaiverCMS"; +export { WaiverStateEmail } from "./WaiverState"; diff --git a/lib/libs/email/content/respondToRai/index.tsx b/lib/libs/email/content/respondToRai/index.tsx index d140bc627..133c1d2e0 100644 --- a/lib/libs/email/content/respondToRai/index.tsx +++ b/lib/libs/email/content/respondToRai/index.tsx @@ -5,8 +5,8 @@ import { MedSpaStateEmail, ChipSpaCMSEmail, ChipSpaStateEmail, - Waiver1915bCMSEmail, - Waiver1915bStateEmail, + WaiverCMSEmail, + WaiverStateEmail, } from "./emailTemplates"; import { render } from "@react-email/render"; @@ -72,7 +72,7 @@ export const respondToRai: AuthoritiesWithUserTypesTemplate = { ...variables.emails.srtEmails, ], subject: `Waiver RAI Response for ${variables.id} Submitted`, - body: await render(), + body: await render(), }; }, state: async ( @@ -82,7 +82,7 @@ export const respondToRai: AuthoritiesWithUserTypesTemplate = { to: [`${variables.submitterName} <${variables.submitterEmail}>`], cc: variables.allStateUsersEmails, subject: `Your Waiver Response for ${variables.id} has been submitted to CMS`, - body: await render(), + body: await render(), }; }, }, diff --git a/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx b/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx index 498163f57..2b25f8f68 100644 --- a/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx +++ b/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx @@ -6,11 +6,11 @@ const AppKCMSEmailPreview = () => { { +const AppKCMSEmailPreview = () => { return ( - { ); }; -export default AppKStateEmailPreview; +export default AppKCMSEmailPreview; diff --git a/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx new file mode 100644 index 000000000..43007918a --- /dev/null +++ b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx @@ -0,0 +1,17 @@ +import { WaiverCMSEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; + +export default () => { + return ( + + ); +}; diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx index 448694b19..6c7bbe3fd 100644 --- a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx @@ -1,6 +1,6 @@ -import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; export default () => { - return ; + return ; }; diff --git a/lib/libs/email/preview/Respond to Rai/State/AppK.tsx b/lib/libs/email/preview/Respond to Rai/State/AppK.tsx new file mode 100644 index 000000000..fd9f2f3b2 --- /dev/null +++ b/lib/libs/email/preview/Respond to Rai/State/AppK.tsx @@ -0,0 +1,19 @@ +import { WaiverStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; + +const AppKStateEmailPreview = () => { + return ( + + ); +}; + +export default AppKStateEmailPreview; diff --git a/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx index 8390c7507..e9b77f299 100644 --- a/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx @@ -1,5 +1,5 @@ -import { Waiver1915bStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; +import { WaiverStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; export default () => { - return ; + return ; }; From 626b6c33577f742204de023b5237887431424e42 Mon Sep 17 00:00:00 2001 From: Andie Swift Date: Tue, 26 Nov 2024 10:44:18 -0600 Subject: [PATCH 3/9] verified all app k template lang --- lib/libs/email/content/email-components.tsx | 33 ++++-------- .../new-submission/emailTemplates/AppKCMS.tsx | 4 +- .../emailTemplates/AppKState.tsx | 11 +++- .../respondToRai/emailTemplates/WaiverCMS.tsx | 54 +++++++++++-------- .../emailTemplates/WaiverState.tsx | 11 +++- .../emailTemplates/WaiverState.tsx} | 12 +++-- .../emailTemplates/index.tsx | 1 + .../content/withdrawConfirmation/index.tsx | 2 + .../{Waiver1915bCMS.tsx => WaiverCMS.tsx} | 8 +-- .../emailTemplates/WaiverState.tsx | 32 +++++++++++ .../withdrawPackage/emailTemplates/index.tsx | 4 +- .../withdrawRai/emailTemplates/AppKCMS.tsx | 37 +++++++------ .../withdrawRai/emailTemplates/AppKState.tsx | 38 +++++++++++++ .../withdrawRai/emailTemplates/index.tsx | 1 + lib/libs/email/mock-data/withdraw-rai.ts | 2 +- .../email/preview/Respond to Rai/CMS/AppK.tsx | 4 ++ .../preview/Withdraw Package/CMS/AppK.tsx | 6 +++ .../Withdraw Package/CMS/Waiver_Capitated.tsx | 4 +- .../preview/Withdraw Package/State/AppK.tsx | 6 +++ .../State/Waiver_Capitated.tsx | 4 +- .../email/preview/Withdraw Rai/State/AppK.tsx | 4 +- .../WithdrawConfirmation/State/AppK.tsx | 6 +++ 22 files changed, 200 insertions(+), 84 deletions(-) rename lib/libs/email/content/{withdrawPackage/emailTemplates/Waiver1915bState.tsx => withdrawConfirmation/emailTemplates/WaiverState.tsx} (56%) create mode 100644 lib/libs/email/content/withdrawConfirmation/emailTemplates/index.tsx create mode 100644 lib/libs/email/content/withdrawConfirmation/index.tsx rename lib/libs/email/content/withdrawPackage/emailTemplates/{Waiver1915bCMS.tsx => WaiverCMS.tsx} (81%) create mode 100644 lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx create mode 100644 lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx create mode 100644 lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx create mode 100644 lib/libs/email/preview/Withdraw Package/State/AppK.tsx create mode 100644 lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx diff --git a/lib/libs/email/content/email-components.tsx b/lib/libs/email/content/email-components.tsx index ad309e653..a8edfdc3f 100644 --- a/lib/libs/email/content/email-components.tsx +++ b/lib/libs/email/content/email-components.tsx @@ -170,7 +170,7 @@ const PackageDetails = ({ details }: { details: Record }) => return ( - {label} + {label}: {value ?? "Not provided"} @@ -205,46 +205,35 @@ const SpamNotice = () => ( ); const ContactStateLead = ({ isChip }: { isChip?: boolean }) => ( -
+
+ If you have questions or did not expect this email, please contact{" "} {isChip ? EMAIL_CONFIG.CHIP_EMAIL : EMAIL_CONFIG.SPA_EMAIL} {" "} or your state lead. - Thank you! + Thank you.
); export const SpamWarning = () => { return ( -
-
-

+

+ + If the contents of this email seem suspicious, do not open them, and instead forward this email to{" "} - + SPAM@cms.hhs.gov . -

-

Thank you!

+ + Thank you.
); }; diff --git a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx index 9d8df5004..a502e6198 100644 --- a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx +++ b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx @@ -3,6 +3,7 @@ import { LoginInstructions, PackageDetails, Attachments, + BasicFooter, SpamWarning, Divider, } from "../../email-components"; @@ -18,7 +19,7 @@ export const AppKCMSEmail = ({ variables }: { variables: AppKEmailProps }) => { previewText="Appendix K Amendment Submitted" heading="The OneMAC Submission Portal received a 1915(c) Appendix K Amendment Submission:" applicationEndpointUrl={variables.applicationEndpointUrl} - footerContent={} + footerContent={} > @@ -35,6 +36,7 @@ export const AppKCMSEmail = ({ variables }: { variables: AppKEmailProps }) => { }} /> + ); }; diff --git a/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx b/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx index bd3f21d02..e280cdccb 100644 --- a/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx +++ b/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx @@ -1,7 +1,13 @@ import { Text } from "@react-email/components"; import { CommonEmailVariables, Events } from "shared-types"; import { formatNinetyDaysDate, formatDate } from "shared-utils"; -import { PackageDetails, ContactStateLead, Divider, MailboxNotice } from "../../email-components"; +import { + PackageDetails, + BasicFooter, + ContactStateLead, + Divider, + MailboxNotice, +} from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; import { styles } from "../../email-styles"; @@ -16,7 +22,7 @@ export const AppKStateEmail = (props: { previewText={previewText} heading={heading} applicationEndpointUrl={variables.applicationEndpointUrl} - footerContent={} + footerContent={} > + ); diff --git a/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx index 114b270bf..3c86581a5 100644 --- a/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx +++ b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx @@ -1,30 +1,40 @@ -import { CommonEmailVariables, Events } from "shared-types"; -import { Html, Container } from "@react-email/components"; -import { PackageDetails, LoginInstructions, BasicFooter } from "../../email-components"; +import { Events, CommonEmailVariables } from "shared-types"; +import { + LoginInstructions, + PackageDetails, + Attachments, + BasicFooter, + SpamWarning, + Divider, +} from "../../email-components"; +import { BaseEmailTemplate } from "../../email-templates"; +import { formatDate } from "shared-utils"; export const WaiverCMSEmail = (props: { variables: Events["RespondToRai"] & CommonEmailVariables; }) => { const variables = props.variables; return ( - - -

- The OneMAC Submission Portal received a {variables.authority} Waiver RAI Response - Submission: -

- - - - - + } + > +

+ + + + + ); }; diff --git a/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx b/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx index 7819f635f..c3cedc016 100644 --- a/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx +++ b/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx @@ -1,7 +1,13 @@ import { formatNinetyDaysDate } from "shared-utils"; import { CommonEmailVariables, Events } from "shared-types"; import { Text } from "@react-email/components"; -import { PackageDetails, MailboxNotice, ContactStateLead, Divider } from "../../email-components"; +import { + PackageDetails, + MailboxNotice, + BasicFooter, + ContactStateLead, + Divider, +} from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; import { styles } from "../../email-styles"; @@ -16,7 +22,7 @@ export const WaiverStateEmail = (props: { previewText={previewText} heading={heading} applicationEndpointUrl={variables.applicationEndpointUrl} - footerContent={} + footerContent={} > + ); }; diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bState.tsx b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx similarity index 56% rename from lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bState.tsx rename to lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx index 627c028c8..458b58293 100644 --- a/lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bState.tsx +++ b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx @@ -1,21 +1,23 @@ import { CommonEmailVariables, Events } from "shared-types"; -import { ContactStateLead } from "../../email-components"; +import { ContactStateLead, BasicFooter } from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; -export const Waiver1915bStateEmail = (props: { +export const WaiverStateEmail = (props: { variables: | (Events["CapitatedInitial"] & CommonEmailVariables) | (Events["ContractingInitial"] & CommonEmailVariables); }) => { const variables = props.variables; const previewText = `Withdrawal of ${variables.authority} ${variables.id}`; - const heading = `This email is to confirm $ {variables.authority} Waiver ${variables.id} was withdrawn by ${variables.submitterName}. The review of ${variables.authority} Waiver ${variables.id} has concluded`; + const heading = `This email is to confirm ${variables.authority} Waiver ${variables.id} was withdrawn by ${variables.submitterName}. The review of ${variables.authority} Waiver ${variables.id} has concluded.`; return ( } - /> + footerContent={} + > + + ); }; diff --git a/lib/libs/email/content/withdrawConfirmation/emailTemplates/index.tsx b/lib/libs/email/content/withdrawConfirmation/emailTemplates/index.tsx new file mode 100644 index 000000000..ee6d7fd21 --- /dev/null +++ b/lib/libs/email/content/withdrawConfirmation/emailTemplates/index.tsx @@ -0,0 +1 @@ +export { WaiverStateEmail } from "./WaiverState"; diff --git a/lib/libs/email/content/withdrawConfirmation/index.tsx b/lib/libs/email/content/withdrawConfirmation/index.tsx new file mode 100644 index 000000000..b88cfc436 --- /dev/null +++ b/lib/libs/email/content/withdrawConfirmation/index.tsx @@ -0,0 +1,2 @@ +// TODO: Implement Logic for sending Package Withdraw confirmation emails after +// they are aproved in seatool diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bCMS.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx similarity index 81% rename from lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bCMS.tsx rename to lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx index 91a156a9d..b1a62ca98 100644 --- a/lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bCMS.tsx +++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx @@ -1,8 +1,8 @@ import { CommonEmailVariables, Events } from "shared-types"; -import { Attachments, PackageDetails, BasicFooter } from "../../email-components"; +import { SpamWarning, PackageDetails, BasicFooter } from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; -export const Waiver1915bCMSEmail = (props: { +export const WaiverCMSEmail = (props: { variables: | (Events["CapitatedInitial"] & CommonEmailVariables) | (Events["ContractingInitial"] & CommonEmailVariables); @@ -23,11 +23,11 @@ export const Waiver1915bCMSEmail = (props: { "State or territory": variables.territory, Name: variables.submitterName, Email: variables.submitterEmail, - [`${variables.authority} Package ID`]: variables.id, + "Waiver Number": variables.id, Summary: variables.additionalInformation, }} /> - + ); }; diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx new file mode 100644 index 000000000..95690f86a --- /dev/null +++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx @@ -0,0 +1,32 @@ +import { CommonEmailVariables, Events } from "shared-types"; +import { ContactStateLead, BasicFooter, PackageDetails } from "../../email-components"; +import { BaseEmailTemplate } from "../../email-templates"; + +export const WaiverStateEmail = (props: { + variables: + | (Events["CapitatedInitial"] & CommonEmailVariables) + | (Events["ContractingInitial"] & CommonEmailVariables); +}) => { + const variables = props.variables; + const previewText = `Withdrawal of ${variables.authority} ${variables.id}`; + const heading = `This is confirmation that you have requested to withdraw the package below. The package will no longer be considered for CMS review:`; + return ( + } + > + + + + ); +}; diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/index.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/index.tsx index 9b6842c3c..4b093e1dd 100644 --- a/lib/libs/email/content/withdrawPackage/emailTemplates/index.tsx +++ b/lib/libs/email/content/withdrawPackage/emailTemplates/index.tsx @@ -2,5 +2,5 @@ export { MedSpaCMSEmail } from "./MedSpaCMS"; export { MedSpaStateEmail } from "./MedSpaState"; export { ChipSpaCMSEmail } from "./ChipSpaCMS"; export { ChipSpaStateEmail } from "./ChipSpaState"; -export { Waiver1915bCMSEmail } from "./Waiver1915bCMS"; -export { Waiver1915bStateEmail } from "./Waiver1915bState"; +export { WaiverCMSEmail } from "./WaiverCMS"; +export { WaiverStateEmail } from "./WaiverState"; diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx index 6020b9862..6cc64eaac 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx @@ -1,7 +1,7 @@ import { CommonEmailVariables } from "shared-types"; import { RaiWithdraw } from "shared-types"; -import { Html, Container } from "@react-email/components"; -import { WithdrawRAI, PackageDetails, BasicFooter } from "../../email-components"; +import { Attachments, PackageDetails, BasicFooter, SpamWarning } from "../../email-components"; +import { BaseEmailTemplate } from "../../email-templates"; export const AppKCMSEmail = (props: { variables: RaiWithdraw & CommonEmailVariables; @@ -9,20 +9,23 @@ export const AppKCMSEmail = (props: { }) => { const { variables, relatedEvent } = { ...props }; return ( - - - - - - - + } + > + + + + ); }; diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx new file mode 100644 index 000000000..dd4e11771 --- /dev/null +++ b/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx @@ -0,0 +1,38 @@ +import { CommonEmailVariables } from "shared-types"; +import { RaiWithdraw } from "shared-types"; +import { + PackageDetails, + BasicFooter, + MailboxNotice, + Divider, + ContactStateLead, +} from "../../email-components"; +import { BaseEmailTemplate } from "../../email-templates"; + +export const AppKStateEmail = (props: { + variables: RaiWithdraw & CommonEmailVariables; + relatedEvent: any; +}) => { + const { variables, relatedEvent } = { ...props }; + return ( + } + > + + + + + + ); +}; diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/index.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/index.tsx index c597a4a4e..c414f4aa2 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/index.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/index.tsx @@ -5,3 +5,4 @@ export { ChipSpaStateEmail } from "./ChipSpaState"; export { Waiver1915bCMSEmail } from "./Waiver1915bCMS"; export { Waiver1915bStateEmail } from "./Waiver1915bState"; export { AppKCMSEmail } from "./AppKCMS"; +export { AppKStateEmail } from "./AppKState"; diff --git a/lib/libs/email/mock-data/withdraw-rai.ts b/lib/libs/email/mock-data/withdraw-rai.ts index c8916a2d1..986b56136 100644 --- a/lib/libs/email/mock-data/withdraw-rai.ts +++ b/lib/libs/email/mock-data/withdraw-rai.ts @@ -32,7 +32,7 @@ export const emailTemplateValue = { }, }, additionalInformation: - "This some additional infornormaiton about the request to withdraw and what makes it important.", + "This some additional information about the request to withdraw and what makes it important.", submitterName: "George Harrison", submitterEmail: "george@example.com", timestamp: 1723390633663, diff --git a/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx index 43007918a..4f4a9c4f1 100644 --- a/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx +++ b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx @@ -1,5 +1,6 @@ import { WaiverCMSEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; +import * as attachments from "../../../mock-data/attachments"; export default () => { return ( @@ -11,6 +12,9 @@ export default () => { actionType: "Amend", territory: "CO", title: "A Perfect Appendix K Amendment Title", + attachments: { + other: attachments.other, + }, }} /> ); diff --git a/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx new file mode 100644 index 000000000..c84958cf8 --- /dev/null +++ b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx @@ -0,0 +1,6 @@ +import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx index d0fad31f2..142775a74 100644 --- a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx @@ -1,6 +1,6 @@ -import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; export default () => { - return ; + return ; }; diff --git a/lib/libs/email/preview/Withdraw Package/State/AppK.tsx b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx new file mode 100644 index 000000000..423110e6d --- /dev/null +++ b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx @@ -0,0 +1,6 @@ +import { WaiverStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; + +export default () => { + return ; +}; diff --git a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx index e5740c5bd..5e82c5feb 100644 --- a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx @@ -1,6 +1,6 @@ -import { Waiver1915bStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { WaiverStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; export default () => { - return ; + return ; }; diff --git a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx index 8730c8cd7..45ce74b77 100644 --- a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx +++ b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx @@ -1,4 +1,4 @@ -import { AppKCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { AppKStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; export const relatedEvent = { @@ -6,4 +6,4 @@ export const relatedEvent = { submitterEmail: "test@email.com", }; -export default () => ; +export default () => ; diff --git a/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx new file mode 100644 index 000000000..607c537de --- /dev/null +++ b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx @@ -0,0 +1,6 @@ +import { WaiverStateEmail } from "lib/libs/email/content/withdrawConfirmation/emailTemplates"; +import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; + +export default () => { + return ; +}; From 414158dec1ef1a428173af75766a091b7ba15ec1 Mon Sep 17 00:00:00 2001 From: Andie Swift Date: Tue, 26 Nov 2024 11:23:13 -0600 Subject: [PATCH 4/9] double checked all the templates are correct --- lib/libs/email/content/respondToRai/index.tsx | 28 ++++++++- .../emailTemplates/WaiverState.tsx | 2 +- .../emailTemplates/WaiverState.tsx | 10 +++- .../State/Waiver_RAI_Response.tsx | 58 ------------------- .../Respond to Rai/CMS/Waiver_Capitated.tsx | 2 +- .../preview/Withdraw Package/CMS/AppK.tsx | 2 +- .../preview/Withdraw Package/CMS/CHIP_SPA.tsx | 2 +- .../Withdraw Package/CMS/Medicaid_SPA.tsx | 2 +- .../Withdraw Package/CMS/Waiver_Capitated.tsx | 2 +- .../preview/Withdraw Package/State/AppK.tsx | 2 +- .../Withdraw Package/State/CHIP_SPA.tsx | 2 +- .../Withdraw Package/State/Medicaid_SPA.tsx | 2 +- .../State/Waiver_Capitated.tsx | 2 +- .../email/preview/Withdraw Rai/CMS/AppK.tsx | 2 +- .../preview/Withdraw Rai/CMS/CHIP_SPA.tsx | 2 +- .../preview/Withdraw Rai/CMS/Medicaid_SPA.tsx | 2 +- .../Withdraw Rai/CMS/Waiver_Contracting.tsx | 2 +- .../email/preview/Withdraw Rai/State/AppK.tsx | 2 +- .../preview/Withdraw Rai/State/CHIP_SPA.tsx | 2 +- .../Withdraw Rai/State/Medicaid_SPA.tsx | 2 +- .../Withdraw Rai/State/Waiver_Contracting.tsx | 2 +- .../State/Waiver_RAI_Response.tsx | 58 ------------------- .../WithdrawConfirmation/State/AppK.tsx | 6 +- 23 files changed, 59 insertions(+), 137 deletions(-) delete mode 100644 lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx delete mode 100644 lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx diff --git a/lib/libs/email/content/respondToRai/index.tsx b/lib/libs/email/content/respondToRai/index.tsx index 133c1d2e0..789710450 100644 --- a/lib/libs/email/content/respondToRai/index.tsx +++ b/lib/libs/email/content/respondToRai/index.tsx @@ -81,7 +81,33 @@ export const respondToRai: AuthoritiesWithUserTypesTemplate = { return { to: [`${variables.submitterName} <${variables.submitterEmail}>`], cc: variables.allStateUsersEmails, - subject: `Your Waiver Response for ${variables.id} has been submitted to CMS`, + subject: `Your 1915(b) RAI Response for ${variables.id} has been submitted to CMS`, + body: await render(), + }; + }, + }, + [Authority["1915c"]]: { + cms: async ( + variables: Events["RespondToRai"] & CommonEmailVariables & { emails: EmailAddresses }, + ) => { + return { + to: [ + ...variables.emails.osgEmail, + ...variables.emails.dmcoEmail, + ...variables.emails.cpocEmail, + ...variables.emails.srtEmails, + ], + subject: `Waiver RAI Response for ${variables.id} Submitted`, + body: await render(), + }; + }, + state: async ( + variables: Events["RespondToRai"] & CommonEmailVariables & { emails: EmailAddresses }, + ) => { + return { + to: [`${variables.submitterName} <${variables.submitterEmail}>`], + cc: variables.allStateUsersEmails, + subject: `Your 1915(c) RAI Response for ${variables.id} has been submitted to CMS`, body: await render(), }; }, diff --git a/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx index 458b58293..5d7d3b5da 100644 --- a/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx +++ b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx @@ -9,7 +9,7 @@ export const WaiverStateEmail = (props: { }) => { const variables = props.variables; const previewText = `Withdrawal of ${variables.authority} ${variables.id}`; - const heading = `This email is to confirm ${variables.authority} Waiver ${variables.id} was withdrawn by ${variables.submitterName}. The review of ${variables.authority} Waiver ${variables.id} has concluded.`; + const heading = `This email is to confirm ${variables.authority} ${variables.id} was withdrawn by ${variables.submitterName}. The review of ${variables.authority} ${variables.id} has concluded.`; return ( + + ); diff --git a/lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx b/lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx deleted file mode 100644 index 02c26d57b..000000000 --- a/lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import { Waiver1915bStateEmail } from "../../../content/respondToRai/emailTemplates"; -import { emailTemplateValue } from "../../../mock-data/respond-to-rai"; - -const Waiver1915bStateEmailPreview = () => { - return ( - - ); -}; - -export default Waiver1915bStateEmailPreview; diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx index 6c7bbe3fd..31eea9b2f 100644 --- a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx @@ -1,4 +1,4 @@ -import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { WaiverCMSEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; export default () => { diff --git a/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx index c84958cf8..cafe30093 100644 --- a/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx +++ b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx @@ -1,4 +1,4 @@ -import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { WaiverCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; export default () => { diff --git a/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx index 80d5aeca4..5cd374f40 100644 --- a/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx @@ -1,4 +1,4 @@ -import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; export default () => { diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx index 80d5aeca4..5cd374f40 100644 --- a/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx @@ -1,4 +1,4 @@ -import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; export default () => { diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx index 142775a74..f3db5978f 100644 --- a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx @@ -1,4 +1,4 @@ -import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { WaiverCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; export default () => { diff --git a/lib/libs/email/preview/Withdraw Package/State/AppK.tsx b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx index 423110e6d..24c2466e3 100644 --- a/lib/libs/email/preview/Withdraw Package/State/AppK.tsx +++ b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx @@ -1,4 +1,4 @@ -import { WaiverStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { WaiverStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; export default () => { diff --git a/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx index cfb36ab8d..3fdb0fbdc 100644 --- a/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx @@ -1,4 +1,4 @@ -import { ChipSpaStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { ChipSpaStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; export default () => { diff --git a/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx index 6b9453d67..3aec3de8b 100644 --- a/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx @@ -1,4 +1,4 @@ -import { MedSpaStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { MedSpaStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; export default () => { diff --git a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx index 5e82c5feb..343e6932a 100644 --- a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx @@ -1,4 +1,4 @@ -import { WaiverStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { WaiverStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; export default () => { diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx index 8730c8cd7..127910709 100644 --- a/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx +++ b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx @@ -1,4 +1,4 @@ -import { AppKCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { AppKCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; export const relatedEvent = { diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx index 01c1dfa41..2a39f5d59 100644 --- a/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx @@ -1,4 +1,4 @@ -import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "./AppK"; diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx index 30098cb7d..d35e6b11b 100644 --- a/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx @@ -1,4 +1,4 @@ -import { MedSpaCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { MedSpaCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "./AppK"; diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx index fde3ba4c3..d40b93fb1 100644 --- a/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx +++ b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx @@ -1,4 +1,4 @@ -import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { Waiver1915bCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "./AppK"; diff --git a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx index 45ce74b77..f59b72bff 100644 --- a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx +++ b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx @@ -1,4 +1,4 @@ -import { AppKStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { AppKStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; export const relatedEvent = { diff --git a/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx index cf16a2742..397d56a5f 100644 --- a/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx @@ -1,4 +1,4 @@ -import { ChipSpaStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { ChipSpaStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "../CMS/AppK"; diff --git a/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx index 50c7997d3..e7e841a90 100644 --- a/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx @@ -1,4 +1,4 @@ -import { MedSpaStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates"; +import { MedSpaStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "../CMS/AppK"; diff --git a/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx index 2b4823511..b801a221a 100644 --- a/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx +++ b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx @@ -1,4 +1,4 @@ -import { Waiver1915bStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates"; +import { Waiver1915bStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "../CMS/AppK"; diff --git a/lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx b/lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx deleted file mode 100644 index 5f315d13f..000000000 --- a/lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import { Waiver1915bStateEmail } from "../../content/respondToRai/emailTemplates"; -import { emailTemplateValue } from "../../mock-data/respond-to-rai"; - -const Waiver1915bStateEmailPreview = () => { - return ( - - ); -}; - -export default Waiver1915bStateEmailPreview; diff --git a/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx index 607c537de..f1e03cb57 100644 --- a/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx +++ b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx @@ -2,5 +2,9 @@ import { WaiverStateEmail } from "lib/libs/email/content/withdrawConfirmation/em import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; export default () => { - return ; + return ( + + ); }; From 4538c73faa40417f4e9748c79b1d946144977804 Mon Sep 17 00:00:00 2001 From: Andie Swift Date: Tue, 26 Nov 2024 11:37:58 -0600 Subject: [PATCH 5/9] verified all subject lines and added waivers where needed for index.tsx files --- .../content/withdrawConfirmation/index.tsx | 28 +++++++++- .../email/content/withdrawPackage/index.tsx | 53 ++++++++++++++++++- lib/libs/email/content/withdrawRai/index.tsx | 2 +- 3 files changed, 79 insertions(+), 4 deletions(-) diff --git a/lib/libs/email/content/withdrawConfirmation/index.tsx b/lib/libs/email/content/withdrawConfirmation/index.tsx index b88cfc436..7d341f424 100644 --- a/lib/libs/email/content/withdrawConfirmation/index.tsx +++ b/lib/libs/email/content/withdrawConfirmation/index.tsx @@ -1,2 +1,26 @@ -// TODO: Implement Logic for sending Package Withdraw confirmation emails after -// they are aproved in seatool +import { Authority, CommonEmailVariables, EmailAddresses } from "shared-types"; +import { AuthoritiesWithUserTypesTemplate } from "../.."; +import { WaiverStateEmail } from "./emailTemplates"; +import { render } from "@react-email/render"; + +export const withdrawConfirmation: AuthoritiesWithUserTypesTemplate = { + [Authority["1915b"]]: { + state: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => { + return { + to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to all state users + subject: `1915(b) ${variables.id} Withdrawal Confirmation`, + body: await render(), + }; + }, + }, + [Authority["1915c"]]: { + state: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => { + return { + to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to all state users + subject: `1915(c) ${variables.id} Withdrawal Confirmation`, + body: await render(), + }; + }, + }, + // TODO: add CHIP & SPA Withdraw Confirmation Here +}; diff --git a/lib/libs/email/content/withdrawPackage/index.tsx b/lib/libs/email/content/withdrawPackage/index.tsx index 86b03271a..73dda36b4 100644 --- a/lib/libs/email/content/withdrawPackage/index.tsx +++ b/lib/libs/email/content/withdrawPackage/index.tsx @@ -1,10 +1,12 @@ -import { Authority, CommonEmailVariables, EmailAddresses } from "shared-types"; +import { Events, Authority, CommonEmailVariables, EmailAddresses } from "shared-types"; import { AuthoritiesWithUserTypesTemplate } from "../.."; import { MedSpaCMSEmail, MedSpaStateEmail, ChipSpaCMSEmail, ChipSpaStateEmail, + WaiverCMSEmail, + WaiverStateEmail, } from "./emailTemplates"; import { render } from "@react-email/render"; @@ -48,4 +50,53 @@ export const withdrawPackage: AuthoritiesWithUserTypesTemplate = { }; }, }, + [Authority["1915b"]]: { + cms: async ( + variables: + | (Events["CapitatedInitial"] & CommonEmailVariables & { emails: EmailAddresses }) + | (Events["ContractingInitial"] & CommonEmailVariables & { emails: EmailAddresses }), + ) => { + return { + to: variables.emails.osgEmail, + subject: `Waiver Package ${variables.id} Withdraw Request`, + body: await render(), + }; + }, + state: async ( + variables: + | (Events["CapitatedInitial"] & CommonEmailVariables & { emails: EmailAddresses }) + | (Events["ContractingInitial"] & CommonEmailVariables & { emails: EmailAddresses }), + ) => { + return { + to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to ALL state users + subject: `Waiver Package ${variables.id} Withdraw Request`, + body: await render(), + }; + }, + }, + + [Authority["1915c"]]: { + cms: async ( + variables: Events["NewAppKSubmission"] & CommonEmailVariables & { emails: EmailAddresses }, + ) => { + return { + to: [ + ...variables.emails.osgEmail, + ...variables.emails.cpocEmail, + ...variables.emails.srtEmails, + ], + subject: `Waiver Package ${variables.id} Withdraw Request`, + body: await render(), + }; + }, + state: async ( + variables: Events["NewAppKSubmission"] & CommonEmailVariables & { emails: EmailAddresses }, + ) => { + return { + to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to ALL state users + subject: `Waiver Package ${variables.id} Withdraw Request`, + body: await render(), + }; + }, + }, }; diff --git a/lib/libs/email/content/withdrawRai/index.tsx b/lib/libs/email/content/withdrawRai/index.tsx index 4ebdc1128..d2787d6d9 100644 --- a/lib/libs/email/content/withdrawRai/index.tsx +++ b/lib/libs/email/content/withdrawRai/index.tsx @@ -86,7 +86,7 @@ export const withdrawRai: AuthoritiesWithUserTypesTemplate = { state: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => { const relatedEvent = await getLatestMatchingEvent(variables.id, Action.RESPOND_TO_RAI); return { - to: [`${variables.submitterName} <${variables.submitterEmail}>`], + to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to ALL state users cc: variables.allStateUsersEmails, subject: `Withdraw Formal RAI Response for Waiver Package ${variables.id}`, body: await render( From 843c36ebe0cbb82bfd2ba8480edf255f0a1c94b6 Mon Sep 17 00:00:00 2001 From: Andie Swift Date: Tue, 26 Nov 2024 17:32:59 -0600 Subject: [PATCH 6/9] fixed all TS errors in the emails folder --- .../respondToRai/emailTemplates/WaiverCMS.tsx | 2 -- .../emailTemplates/WaiverState.tsx | 3 ++- .../emailTemplates/MedSpaState.tsx | 12 ++++----- .../emailTemplates/WaiverCMS.tsx | 4 +-- .../emailTemplates/WaiverState.tsx | 4 +-- .../withdrawRai/emailTemplates/AppKCMS.tsx | 5 ++-- .../withdrawRai/emailTemplates/AppKState.tsx | 5 ++-- .../withdrawRai/emailTemplates/ChipSpaCMS.tsx | 5 ++-- .../emailTemplates/ChipSpaState.tsx | 5 ++-- .../withdrawRai/emailTemplates/MedSpaCMS.tsx | 5 ++-- .../emailTemplates/MedSpaState.tsx | 5 ++-- .../emailTemplates/Waiver1915bCMS.tsx | 5 ++-- .../emailTemplates/Waiver1915bState.tsx | 5 ++-- lib/libs/email/getAllStateUsers.test.ts | 10 +++----- .../email/preview/Respond to Rai/CMS/AppK.tsx | 2 ++ .../preview/Respond to Rai/CMS/CHIP_SPA.tsx | 22 +++++++++++++++- .../Respond to Rai/CMS/Medicaid_SPA.tsx | 22 +++++++++++++++- .../Respond to Rai/CMS/Waiver_Capitated.tsx | 22 +++++++++++++++- .../preview/Respond to Rai/State/AppK.tsx | 6 +++++ .../preview/Respond to Rai/State/CHIP_SPA.tsx | 22 +++++++++++++++- .../Respond to Rai/State/Medicaid_SPA.tsx | 23 ++++++++++++++++- .../Respond to Rai/State/Waiver_Capitated.tsx | 23 ++++++++++++++++- .../preview/Withdraw Package/CMS/AppK.tsx | 17 ++++++++++++- .../preview/Withdraw Package/CMS/CHIP_SPA.tsx | 6 ----- .../Withdraw Package/CMS/Medicaid_SPA.tsx | 19 ++++++++++++-- .../Withdraw Package/CMS/Waiver_Capitated.tsx | 17 ++++++++++++- .../preview/Withdraw Package/State/AppK.tsx | 17 ++++++++++++- .../Withdraw Package/State/CHIP_SPA.tsx | 6 ----- .../Withdraw Package/State/Medicaid_SPA.tsx | 17 ++++++++++++- .../State/Waiver_Capitated.tsx | 17 ++++++++++++- .../email/preview/Withdraw Rai/CMS/AppK.tsx | 25 ++++++++++++++++++- .../preview/Withdraw Rai/CMS/CHIP_SPA.tsx | 24 +++++++++++++++++- .../preview/Withdraw Rai/CMS/Medicaid_SPA.tsx | 24 +++++++++++++++++- .../Withdraw Rai/CMS/Waiver_Contracting.tsx | 24 +++++++++++++++++- .../email/preview/Withdraw Rai/State/AppK.tsx | 25 ++++++++++++++++++- .../preview/Withdraw Rai/State/CHIP_SPA.tsx | 24 +++++++++++++++++- .../Withdraw Rai/State/Medicaid_SPA.tsx | 24 +++++++++++++++++- .../Withdraw Rai/State/Waiver_Contracting.tsx | 24 +++++++++++++++++- .../WithdrawConfirmation/State/AppK.tsx | 15 ++++++++++- lib/packages/shared-types/email.ts | 3 +++ 40 files changed, 465 insertions(+), 80 deletions(-) delete mode 100644 lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx delete mode 100644 lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx diff --git a/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx index 3c86581a5..85ae4a9b2 100644 --- a/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx +++ b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx @@ -5,10 +5,8 @@ import { Attachments, BasicFooter, SpamWarning, - Divider, } from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; -import { formatDate } from "shared-utils"; export const WaiverCMSEmail = (props: { variables: Events["RespondToRai"] & CommonEmailVariables; diff --git a/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx index 5d7d3b5da..8305473bd 100644 --- a/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx +++ b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx @@ -5,7 +5,8 @@ import { BaseEmailTemplate } from "../../email-templates"; export const WaiverStateEmail = (props: { variables: | (Events["CapitatedInitial"] & CommonEmailVariables) - | (Events["ContractingInitial"] & CommonEmailVariables); + | (Events["ContractingInitial"] & CommonEmailVariables) + | (Events["NewAppKSubmission"] & CommonEmailVariables); }) => { const variables = props.variables; const previewText = `Withdrawal of ${variables.authority} ${variables.id}`; diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/MedSpaState.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/MedSpaState.tsx index 2c8e7ec68..02ea6f98b 100644 --- a/lib/libs/email/content/withdrawPackage/emailTemplates/MedSpaState.tsx +++ b/lib/libs/email/content/withdrawPackage/emailTemplates/MedSpaState.tsx @@ -1,15 +1,13 @@ -import { CommonEmailVariables } from "shared-types"; -import { WithdrawPackage } from "shared-types"; +import { CommonEmailVariables, Events } from "shared-types"; import { Container, Html } from "@react-email/components"; import { ContactStateLead } from "../../email-components"; -export const MedSpaStateEmail = (props: { variables: WithdrawPackage & CommonEmailVariables }) => { +export const MedSpaStateEmail = (props: { + variables: Events["WithdrawPackage"] & CommonEmailVariables; +}) => { const variables = props.variables; return ( - +

This email is to confirm Medicaid SPA {variables.id} was withdrawn by diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx index b1a62ca98..c12e12dcc 100644 --- a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx +++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx @@ -3,9 +3,7 @@ import { SpamWarning, PackageDetails, BasicFooter } from "../../email-components import { BaseEmailTemplate } from "../../email-templates"; export const WaiverCMSEmail = (props: { - variables: - | (Events["CapitatedInitial"] & CommonEmailVariables) - | (Events["ContractingInitial"] & CommonEmailVariables); + variables: Events["WithdrawPackage"] & CommonEmailVariables; }) => { const variables = props.variables; const previewText = `Withdrawal of ${variables.authority} ${variables.id}`; diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx index 5d3ad0d35..1df8f622a 100644 --- a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx +++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx @@ -9,9 +9,7 @@ import { import { BaseEmailTemplate } from "../../email-templates"; export const WaiverStateEmail = (props: { - variables: - | (Events["CapitatedInitial"] & CommonEmailVariables) - | (Events["ContractingInitial"] & CommonEmailVariables); + variables: Events["WithdrawPackage"] & CommonEmailVariables; }) => { const variables = props.variables; const previewText = `Withdrawal of ${variables.authority} ${variables.id}`; diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx index 6cc64eaac..f7166624e 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx @@ -1,10 +1,9 @@ -import { CommonEmailVariables } from "shared-types"; -import { RaiWithdraw } from "shared-types"; +import { CommonEmailVariables, Events } from "shared-types"; import { Attachments, PackageDetails, BasicFooter, SpamWarning } from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; export const AppKCMSEmail = (props: { - variables: RaiWithdraw & CommonEmailVariables; + variables: Events["RespondToRai"] & CommonEmailVariables; relatedEvent: any; }) => { const { variables, relatedEvent } = { ...props }; diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx index dd4e11771..076b921b5 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx @@ -1,5 +1,4 @@ -import { CommonEmailVariables } from "shared-types"; -import { RaiWithdraw } from "shared-types"; +import { CommonEmailVariables, Events } from "shared-types"; import { PackageDetails, BasicFooter, @@ -10,7 +9,7 @@ import { import { BaseEmailTemplate } from "../../email-templates"; export const AppKStateEmail = (props: { - variables: RaiWithdraw & CommonEmailVariables; + variables: Events["RespondToRai"] & CommonEmailVariables; relatedEvent: any; }) => { const { variables, relatedEvent } = { ...props }; diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaCMS.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaCMS.tsx index 4410648b6..fb4f92ca7 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaCMS.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaCMS.tsx @@ -1,10 +1,9 @@ -import { CommonEmailVariables } from "shared-types"; -import { RaiWithdraw } from "shared-types"; +import { CommonEmailVariables, Events } from "shared-types"; import { Container, Html } from "@react-email/components"; import { WithdrawRAI, PackageDetails, BasicFooter } from "../../email-components"; export const ChipSpaCMSEmail = (props: { - variables: RaiWithdraw & CommonEmailVariables; + variables: Events["RespondToRai"] & CommonEmailVariables; relatedEvent: any; }) => { const { variables, relatedEvent } = { ...props }; diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaState.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaState.tsx index b5ff5640c..cc2e69839 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaState.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaState.tsx @@ -1,10 +1,9 @@ -import { CommonEmailVariables } from "shared-types"; -import { RaiWithdraw } from "shared-types"; +import { CommonEmailVariables, Events } from "shared-types"; import { Container, Html } from "@react-email/components"; import { WithdrawRAI, PackageDetails, ContactStateLead } from "../../email-components"; export const ChipSpaStateEmail = (props: { - variables: RaiWithdraw & CommonEmailVariables; + variables: Events["RespondToRai"] & CommonEmailVariables; relatedEvent: any; }) => { const { variables, relatedEvent } = { ...props }; diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaCMS.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaCMS.tsx index 41efa6ec5..3c146895c 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaCMS.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaCMS.tsx @@ -1,10 +1,9 @@ -import { CommonEmailVariables } from "shared-types"; -import { RaiWithdraw } from "shared-types"; +import { CommonEmailVariables, Events } from "shared-types"; import { Container, Html } from "@react-email/components"; import { WithdrawRAI, PackageDetails, BasicFooter } from "../../email-components"; export const MedSpaCMSEmail = (props: { - variables: RaiWithdraw & CommonEmailVariables; + variables: Events["RespondToRai"] & CommonEmailVariables; relatedEvent: any; }) => { const { variables, relatedEvent } = { ...props }; diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaState.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaState.tsx index 945346b90..c611f5afc 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaState.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaState.tsx @@ -1,10 +1,9 @@ -import { CommonEmailVariables } from "shared-types"; -import { RaiWithdraw } from "shared-types"; +import { CommonEmailVariables, Events } from "shared-types"; import { Container, Html } from "@react-email/components"; import { WithdrawRAI, PackageDetails, ContactStateLead } from "../../email-components"; export const MedSpaStateEmail = (props: { - variables: RaiWithdraw & CommonEmailVariables; + variables: Events["RespondToRai"] & CommonEmailVariables; relatedEvent: any; }) => { const { variables, relatedEvent } = { ...props }; diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bCMS.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bCMS.tsx index 2030fc9c8..cf38991ac 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bCMS.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bCMS.tsx @@ -1,10 +1,9 @@ -import { CommonEmailVariables } from "shared-types"; -import { RaiWithdraw } from "shared-types"; +import { CommonEmailVariables, Events } from "shared-types"; import { Container, Html } from "@react-email/components"; import { WithdrawRAI, PackageDetails, BasicFooter } from "../../email-components"; export const Waiver1915bCMSEmail = (props: { - variables: RaiWithdraw & CommonEmailVariables; + variables: Events["RespondToRai"] & CommonEmailVariables; relatedEvent: any; }) => { const { variables, relatedEvent } = { ...props }; diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bState.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bState.tsx index 0a407966a..f6448e114 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bState.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bState.tsx @@ -1,5 +1,4 @@ -import { CommonEmailVariables } from "shared-types"; -import { RaiWithdraw } from "shared-types"; +import { CommonEmailVariables, Events } from "shared-types"; import { WithdrawRAI, PackageDetails, @@ -10,7 +9,7 @@ import { import { BaseEmailTemplate } from "../../email-templates"; export const Waiver1915bStateEmail = (props: { - variables: RaiWithdraw & CommonEmailVariables; + variables: Events["RespondToRai"] & CommonEmailVariables; relatedEvent: any; }) => { const { variables, relatedEvent } = { ...props }; diff --git a/lib/libs/email/getAllStateUsers.test.ts b/lib/libs/email/getAllStateUsers.test.ts index 4b4fb76dd..5f1a2195a 100644 --- a/lib/libs/email/getAllStateUsers.test.ts +++ b/lib/libs/email/getAllStateUsers.test.ts @@ -18,7 +18,7 @@ describe("getAllStateUsers", () => { }, ]); - const result = await getAllStateUsers("CA"); + const result = await getAllStateUsers({ userPoolId: "ID", state: "CA" }); expect(result).toEqual([ { firstName: "John", @@ -32,16 +32,14 @@ describe("getAllStateUsers", () => { it("should return an empty array when no users are found", async () => { vi.mocked(getAllStateUsers).mockResolvedValue([]); - const result = await getAllStateUsers("CA"); + const result = await getAllStateUsers({ userPoolId: "ID", state: "CA" }); expect(result).toEqual([]); }); it("should throw an error when there is an issue fetching users", async () => { - vi.mocked(getAllStateUsers).mockRejectedValue( - new Error("Error fetching users"), - ); + vi.mocked(getAllStateUsers).mockRejectedValue(new Error("Error fetching users")); - await expect(getAllStateUsers("CA")).rejects.toThrow( + await expect(getAllStateUsers({ userPoolId: "ID", state: "CA" })).rejects.toThrow( "Error fetching users", ); }); diff --git a/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx index 4f4a9c4f1..df81a450e 100644 --- a/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx +++ b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx @@ -7,12 +7,14 @@ export default () => { { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx index c10eb3b14..911ff95ec 100644 --- a/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx +++ b/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx @@ -1,6 +1,26 @@ import { MedSpaCMSEmail } from "../../../content/respondToRai/emailTemplates/MedSpaCMS"; import { emailTemplateValue } from "../../../mock-data/respond-to-rai"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx index 31eea9b2f..d84e85af4 100644 --- a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx @@ -1,6 +1,26 @@ import { WaiverCMSEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Respond to Rai/State/AppK.tsx b/lib/libs/email/preview/Respond to Rai/State/AppK.tsx index fd9f2f3b2..0b6ba9ad4 100644 --- a/lib/libs/email/preview/Respond to Rai/State/AppK.tsx +++ b/lib/libs/email/preview/Respond to Rai/State/AppK.tsx @@ -1,16 +1,22 @@ import { WaiverStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; +import * as attachments from "../../../mock-data/attachments"; const AppKStateEmailPreview = () => { return ( ); diff --git a/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx b/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx index e1b948f30..6463b9781 100644 --- a/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx +++ b/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx @@ -1,6 +1,26 @@ import { ChipSpaStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx index 74b2bd7f2..b301697b0 100644 --- a/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx +++ b/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx @@ -1,5 +1,26 @@ import { MedSpaStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; +import * as attachments from "../../../mock-data/attachments"; + export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx index e9b77f299..dee55efa1 100644 --- a/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx @@ -1,5 +1,26 @@ import { WaiverStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai"; +import * as attachments from "../../../mock-data/attachments"; + export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx index cafe30093..acff1b1cb 100644 --- a/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx +++ b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx @@ -1,6 +1,21 @@ import { WaiverCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx deleted file mode 100644 index 5cd374f40..000000000 --- a/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; -import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; - -export default () => { - return ; -}; diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx index 5cd374f40..0a2986bfd 100644 --- a/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx @@ -1,6 +1,21 @@ -import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; +import { MedSpaCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx index f3db5978f..5b29b6108 100644 --- a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx @@ -1,6 +1,21 @@ import { WaiverCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Package/State/AppK.tsx b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx index 24c2466e3..dd42dccc4 100644 --- a/lib/libs/email/preview/Withdraw Package/State/AppK.tsx +++ b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx @@ -1,6 +1,21 @@ import { WaiverStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx deleted file mode 100644 index 3fdb0fbdc..000000000 --- a/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import { ChipSpaStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; -import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; - -export default () => { - return ; -}; diff --git a/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx index 3aec3de8b..b0dae1ba0 100644 --- a/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx @@ -1,6 +1,21 @@ import { MedSpaStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx index 343e6932a..fce69bda0 100644 --- a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx +++ b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx @@ -1,6 +1,21 @@ import { WaiverStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx index 127910709..446bc1864 100644 --- a/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx +++ b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx @@ -1,9 +1,32 @@ import { AppKCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; +import * as attachments from "../../../mock-data/attachments"; export const relatedEvent = { submitterName: "George", submitterEmail: "test@email.com", }; -export default () => ; +export default () => ( + +); diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx index 2a39f5d59..28d294f17 100644 --- a/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx @@ -1,7 +1,29 @@ import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "./AppK"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx index d35e6b11b..0b718608e 100644 --- a/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx @@ -1,7 +1,29 @@ import { MedSpaCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "./AppK"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx index d40b93fb1..0fad0134a 100644 --- a/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx +++ b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx @@ -1,7 +1,29 @@ import { Waiver1915bCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "./AppK"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx index f59b72bff..06f3ebebc 100644 --- a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx +++ b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx @@ -1,9 +1,32 @@ import { AppKStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; +import * as attachments from "../../../mock-data/attachments"; export const relatedEvent = { submitterName: "George", submitterEmail: "test@email.com", }; -export default () => ; +export default () => ( + +); diff --git a/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx index 397d56a5f..795c92cd9 100644 --- a/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx @@ -1,7 +1,29 @@ import { ChipSpaStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "../CMS/AppK"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx index e7e841a90..d7d86b4a7 100644 --- a/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx +++ b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx @@ -1,7 +1,29 @@ import { MedSpaStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "../CMS/AppK"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx index b801a221a..118687a8f 100644 --- a/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx +++ b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx @@ -1,7 +1,29 @@ import { Waiver1915bStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai"; import { relatedEvent } from "../CMS/AppK"; +import * as attachments from "../../../mock-data/attachments"; export default () => { - return ; + return ( + + ); }; diff --git a/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx index f1e03cb57..0d0873c68 100644 --- a/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx +++ b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx @@ -1,10 +1,23 @@ import { WaiverStateEmail } from "lib/libs/email/content/withdrawConfirmation/emailTemplates"; import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission"; +import * as attachments from "../../../mock-data/attachments"; export default () => { return ( ); }; diff --git a/lib/packages/shared-types/email.ts b/lib/packages/shared-types/email.ts index ca2f1f671..19a835216 100644 --- a/lib/packages/shared-types/email.ts +++ b/lib/packages/shared-types/email.ts @@ -12,8 +12,11 @@ export type EmailAddresses = { export interface CommonEmailVariables { id: string; + authority: string; territory: string; applicationEndpointUrl: string; actionType: string; allStateUsersEmails?: string[]; + responseDate?: number; + title?: string; //Is this okay? } From ea7f5c0d07c192885702ad2c2410b7e03b5a479a Mon Sep 17 00:00:00 2001 From: Andie Swift Date: Fri, 29 Nov 2024 09:23:43 -0600 Subject: [PATCH 7/9] preview for state appK was incorrect --- lib/libs/email/preview/Initial Submissions/State/AppK.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libs/email/preview/Initial Submissions/State/AppK.tsx b/lib/libs/email/preview/Initial Submissions/State/AppK.tsx index e50121319..93d6b44c9 100644 --- a/lib/libs/email/preview/Initial Submissions/State/AppK.tsx +++ b/lib/libs/email/preview/Initial Submissions/State/AppK.tsx @@ -1,10 +1,10 @@ -import { AppKCMSEmail } from "../../../content/new-submission/emailTemplates"; +import { AppKStateEmail } from "../../../content/new-submission/emailTemplates"; import { emailTemplateValue } from "../../../mock-data/new-submission"; import * as attachments from "../../../mock-data/attachments"; const AppKCMSEmailPreview = () => { return ( - Date: Fri, 29 Nov 2024 09:40:39 -0600 Subject: [PATCH 8/9] addressed PR comments --- lib/libs/email/content/email-components.tsx | 4 +-- .../emailTemplates/WaiverState.tsx | 5 +--- .../content/withdrawConfirmation/index.tsx | 10 +++++-- .../emailTemplates/WaiverCMS.tsx | 5 ++-- .../emailTemplates/WaiverState.tsx | 11 ++++---- .../email/content/withdrawPackage/index.tsx | 28 +++++++++++-------- .../withdrawRai/emailTemplates/AppKCMS.tsx | 4 +-- .../withdrawRai/emailTemplates/AppKState.tsx | 4 +-- 8 files changed, 38 insertions(+), 33 deletions(-) diff --git a/lib/libs/email/content/email-components.tsx b/lib/libs/email/content/email-components.tsx index a8edfdc3f..fbfa521be 100644 --- a/lib/libs/email/content/email-components.tsx +++ b/lib/libs/email/content/email-components.tsx @@ -228,8 +228,8 @@ export const SpamWarning = () => { If the contents of this email seem suspicious, do not open them, and instead forward this email to{" "} - - SPAM@cms.hhs.gov + + {EMAIL_CONFIG.SPAM_EMAIL} . diff --git a/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx index 8305473bd..46c029ce5 100644 --- a/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx +++ b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx @@ -3,10 +3,7 @@ import { ContactStateLead, BasicFooter } from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; export const WaiverStateEmail = (props: { - variables: - | (Events["CapitatedInitial"] & CommonEmailVariables) - | (Events["ContractingInitial"] & CommonEmailVariables) - | (Events["NewAppKSubmission"] & CommonEmailVariables); + variables: Events["WithdrawPackage"] & CommonEmailVariables; }) => { const variables = props.variables; const previewText = `Withdrawal of ${variables.authority} ${variables.id}`; diff --git a/lib/libs/email/content/withdrawConfirmation/index.tsx b/lib/libs/email/content/withdrawConfirmation/index.tsx index 7d341f424..a72d4f839 100644 --- a/lib/libs/email/content/withdrawConfirmation/index.tsx +++ b/lib/libs/email/content/withdrawConfirmation/index.tsx @@ -1,11 +1,13 @@ -import { Authority, CommonEmailVariables, EmailAddresses } from "shared-types"; +import { Authority, CommonEmailVariables, EmailAddresses, Events } from "shared-types"; import { AuthoritiesWithUserTypesTemplate } from "../.."; import { WaiverStateEmail } from "./emailTemplates"; import { render } from "@react-email/render"; export const withdrawConfirmation: AuthoritiesWithUserTypesTemplate = { [Authority["1915b"]]: { - state: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => { + state: async ( + variables: Events["WithdrawPackage"] & CommonEmailVariables & { emails: EmailAddresses }, + ) => { return { to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to all state users subject: `1915(b) ${variables.id} Withdrawal Confirmation`, @@ -14,7 +16,9 @@ export const withdrawConfirmation: AuthoritiesWithUserTypesTemplate = { }, }, [Authority["1915c"]]: { - state: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => { + state: async ( + variables: Events["WithdrawPackage"] & CommonEmailVariables & { emails: EmailAddresses }, + ) => { return { to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to all state users subject: `1915(c) ${variables.id} Withdrawal Confirmation`, diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx index c12e12dcc..ac2447672 100644 --- a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx +++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx @@ -2,10 +2,11 @@ import { CommonEmailVariables, Events } from "shared-types"; import { SpamWarning, PackageDetails, BasicFooter } from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; -export const WaiverCMSEmail = (props: { +export const WaiverCMSEmail = ({ + variables, +}: { variables: Events["WithdrawPackage"] & CommonEmailVariables; }) => { - const variables = props.variables; const previewText = `Withdrawal of ${variables.authority} ${variables.id}`; const heading = "The OneMAC Submission Portal received a request to withdraw the package below. The package will no longer be considered for CMS review:"; diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx index 1df8f622a..854ac86a6 100644 --- a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx +++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx @@ -8,16 +8,15 @@ import { } from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; -export const WaiverStateEmail = (props: { +export const WaiverStateEmail = ({ + variables, +}: { variables: Events["WithdrawPackage"] & CommonEmailVariables; }) => { - const variables = props.variables; - const previewText = `Withdrawal of ${variables.authority} ${variables.id}`; - const heading = `This is confirmation that you have requested to withdraw the package below. The package will no longer be considered for CMS review:`; return ( } > diff --git a/lib/libs/email/content/withdrawPackage/index.tsx b/lib/libs/email/content/withdrawPackage/index.tsx index 73dda36b4..6b7b3f89e 100644 --- a/lib/libs/email/content/withdrawPackage/index.tsx +++ b/lib/libs/email/content/withdrawPackage/index.tsx @@ -12,7 +12,9 @@ import { render } from "@react-email/render"; export const withdrawPackage: AuthoritiesWithUserTypesTemplate = { [Authority.MED_SPA]: { - cms: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => { + cms: async ( + variables: Events["WithdrawPackage"] & CommonEmailVariables & { emails: EmailAddresses }, + ) => { return { to: variables.emails.osgEmail, cc: variables.emails.dpoEmail, @@ -20,7 +22,9 @@ export const withdrawPackage: AuthoritiesWithUserTypesTemplate = { body: await render(), }; }, - state: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => { + state: async ( + variables: Events["WithdrawPackage"] & CommonEmailVariables & { emails: EmailAddresses }, + ) => { return { to: [`${variables.submitterName} <${variables.submitterEmail}>`], subject: `Medicaid SPA Package ${variables.id} Withdrawal Confirmation`, @@ -29,7 +33,9 @@ export const withdrawPackage: AuthoritiesWithUserTypesTemplate = { }, }, [Authority.CHIP_SPA]: { - cms: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => { + cms: async ( + variables: Events["WithdrawPackage"] & CommonEmailVariables & { emails: EmailAddresses }, + ) => { return { to: [...variables.emails.cpocEmail, ...variables.emails.srtEmails], cc: variables.emails.chipCcList, @@ -37,7 +43,9 @@ export const withdrawPackage: AuthoritiesWithUserTypesTemplate = { body: await render(), }; }, - state: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => { + state: async ( + variables: Events["WithdrawPackage"] & CommonEmailVariables & { emails: EmailAddresses }, + ) => { return { to: [ ...variables.emails.cpocEmail, @@ -52,9 +60,7 @@ export const withdrawPackage: AuthoritiesWithUserTypesTemplate = { }, [Authority["1915b"]]: { cms: async ( - variables: - | (Events["CapitatedInitial"] & CommonEmailVariables & { emails: EmailAddresses }) - | (Events["ContractingInitial"] & CommonEmailVariables & { emails: EmailAddresses }), + variables: Events["WithdrawPackage"] & CommonEmailVariables & { emails: EmailAddresses }, ) => { return { to: variables.emails.osgEmail, @@ -63,9 +69,7 @@ export const withdrawPackage: AuthoritiesWithUserTypesTemplate = { }; }, state: async ( - variables: - | (Events["CapitatedInitial"] & CommonEmailVariables & { emails: EmailAddresses }) - | (Events["ContractingInitial"] & CommonEmailVariables & { emails: EmailAddresses }), + variables: Events["WithdrawPackage"] & CommonEmailVariables & { emails: EmailAddresses }, ) => { return { to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to ALL state users @@ -77,7 +81,7 @@ export const withdrawPackage: AuthoritiesWithUserTypesTemplate = { [Authority["1915c"]]: { cms: async ( - variables: Events["NewAppKSubmission"] & CommonEmailVariables & { emails: EmailAddresses }, + variables: Events["WithdrawPackage"] & CommonEmailVariables & { emails: EmailAddresses }, ) => { return { to: [ @@ -90,7 +94,7 @@ export const withdrawPackage: AuthoritiesWithUserTypesTemplate = { }; }, state: async ( - variables: Events["NewAppKSubmission"] & CommonEmailVariables & { emails: EmailAddresses }, + variables: Events["WithdrawPackage"] & CommonEmailVariables & { emails: EmailAddresses }, ) => { return { to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to ALL state users diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx index f7166624e..012c4fd69 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx @@ -1,10 +1,10 @@ -import { CommonEmailVariables, Events } from "shared-types"; +import { CommonEmailVariables, Events, RelatedEventType } from "shared-types"; import { Attachments, PackageDetails, BasicFooter, SpamWarning } from "../../email-components"; import { BaseEmailTemplate } from "../../email-templates"; export const AppKCMSEmail = (props: { variables: Events["RespondToRai"] & CommonEmailVariables; - relatedEvent: any; + relatedEvent: RelatedEventType; }) => { const { variables, relatedEvent } = { ...props }; return ( diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx index 076b921b5..dc24b4c66 100644 --- a/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx +++ b/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx @@ -1,4 +1,4 @@ -import { CommonEmailVariables, Events } from "shared-types"; +import { CommonEmailVariables, Events, RelatedEventType } from "shared-types"; import { PackageDetails, BasicFooter, @@ -10,7 +10,7 @@ import { BaseEmailTemplate } from "../../email-templates"; export const AppKStateEmail = (props: { variables: Events["RespondToRai"] & CommonEmailVariables; - relatedEvent: any; + relatedEvent: RelatedEventType; }) => { const { variables, relatedEvent } = { ...props }; return ( From 369ecf4234ab0704143f622704d2bb3788ed273e Mon Sep 17 00:00:00 2001 From: Andie Swift Date: Fri, 29 Nov 2024 10:06:19 -0600 Subject: [PATCH 9/9] made fixes found by QC also missed adding the ts change --- lib/libs/email/content/email-components.tsx | 2 +- .../content/withdrawPackage/emailTemplates/WaiverCMS.tsx | 2 +- lib/packages/shared-types/email.ts | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/libs/email/content/email-components.tsx b/lib/libs/email/content/email-components.tsx index fbfa521be..4035f3bdd 100644 --- a/lib/libs/email/content/email-components.tsx +++ b/lib/libs/email/content/email-components.tsx @@ -73,7 +73,7 @@ const LoginInstructions = ({
  • - The submission can be accessed in the OneMAC application at{" "} + The submission can be accessed in the OneMAC application, which you can find at{" "} {useThisLink ? "this link" : appEndpointURL}.
    • diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx index ac2447672..516a2b047 100644 --- a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx +++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx @@ -21,7 +21,7 @@ export const WaiverCMSEmail = ({ details={{ "State or territory": variables.territory, Name: variables.submitterName, - Email: variables.submitterEmail, + "Email Address": variables.submitterEmail, "Waiver Number": variables.id, Summary: variables.additionalInformation, }} diff --git a/lib/packages/shared-types/email.ts b/lib/packages/shared-types/email.ts index 19a835216..7783f9755 100644 --- a/lib/packages/shared-types/email.ts +++ b/lib/packages/shared-types/email.ts @@ -18,5 +18,10 @@ export interface CommonEmailVariables { actionType: string; allStateUsersEmails?: string[]; responseDate?: number; - title?: string; //Is this okay? + title?: string; +} + +export interface RelatedEventType { + submitterName: string; + submitterEmail: string; }