Merge remote-tracking branch 'origin/main' into add-mmdl-sec

Enterprise-CMCS · Dec 2, 2024 · 4a88c2f · 4a88c2f
2 parents 422cf36 + 0a8c822
commit 4a88c2f
Show file tree

Hide file tree

Showing 12 changed files with 461 additions and 462 deletions.
diff --git a/lib/libs/email/content/email-components.tsx b/lib/libs/email/content/email-components.tsx
@@ -73,7 +73,7 @@ const LoginInstructions = ({
   <ul style={{ marginLeft: "-20px" }}>
     <li>
       <Text style={styles.text.description}>
-        The submission can be accessed in the OneMAC application at{" "}
+        The submission can be accessed in the OneMAC application, which you can find at{" "}
         <Link href={appEndpointURL}>{useThisLink ? "this link" : appEndpointURL}</Link>.
       </Text>
     </li>
@@ -228,8 +228,8 @@ export const SpamWarning = () => {
       <Text style={{ fontSize: "14px" }}>
         If the contents of this email seem suspicious, do not open them, and instead forward this
         email to{" "}
-        <Link style={{ textDecoration: "underline" }} href="mailto:SPAM@cms.hhs.gov">
-          SPAM@cms.hhs.gov
+        <Link style={{ textDecoration: "underline" }} href={`mailto:${EMAIL_CONFIG.SPAM_EMAIL}`}>
+          {EMAIL_CONFIG.SPAM_EMAIL}
         </Link>
         .
       </Text>

diff --git 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
@@ -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
@@ -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:";
@@ -20,7 +21,7 @@ export const WaiverCMSEmail = (props: {
         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/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 (
     <BaseEmailTemplate
-      previewText={previewText}
-      heading={heading}
+      previewText={`Withdrawal of ${variables.authority} ${variables.id}`}
+      heading={`This is confirmation that you have requested to withdraw the package below. The package will no longer be considered for CMS review:`}
       applicationEndpointUrl={variables.applicationEndpointUrl}
       footerContent={<BasicFooter />}
     >

diff --git a/lib/libs/email/content/withdrawPackage/index.tsx b/lib/libs/email/content/withdrawPackage/index.tsx
@@ -12,15 +12,19 @@ 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,
         subject: `SPA Package ${variables.id} Withdraw Request`,
         body: await render(<MedSpaCMSEmail variables={variables} />),
       };
     },
-    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,15 +33,19 @@ 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,
         subject: `CHIP SPA Package ${variables.id} Withdraw Request`,
         body: await render(<ChipSpaCMSEmail variables={variables} />),
       };
     },
-    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
@@ -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
@@ -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 (

diff --git 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 (
-    <AppKCMSEmail
+    <AppKStateEmail
       variables={{
         ...emailTemplateValue,
         event: "app-k",