Merge branch 'main' into ma_3211_migrator

Enterprise-CMCS · Sep 19, 2023 · b477396 · b477396
2 parents 1ec5388 + e783801
commit b477396
Show file tree

Hide file tree

Showing 23 changed files with 949 additions and 295 deletions.
diff --git a/.github/workflows/sechub-jira-sync.yml b/.github/workflows/sechub-jira-sync.yml
@@ -25,7 +25,7 @@ jobs:
           stage-name: prod
 
       - name: Sync Security Hub and Jira
-        uses: Enterprise-CMCS/mac-fc-security-hub-visibility@v1.0.3
+        uses: Enterprise-CMCS/mac-fc-security-hub-visibility@v1.0.4
         with:
           jira-token: ${{ secrets.JIRA_TOKEN }}
           jira-username: ${{ secrets.JIRA_USERNAME }}

diff --git a/services/app-web/src/components/FileUpload/FileUpload.module.scss b/services/app-web/src/components/FileUpload/FileUpload.module.scss
@@ -28,10 +28,15 @@
 .fileInputHint {
     display: flex;
     flex-direction: column;
-    color: #71767a;
+    color: theme-color-hint;
     margin-bottom: 0.5rem;
 }
 
+.requiredOptionalText {
+    display: block;
+    color: $theme-color-hint;
+}
+
 .fileSummary {
     font-weight: normal;
     @include u-font('sans', 'sm');

diff --git a/services/app-web/src/components/FileUpload/FileUpload.tsx b/services/app-web/src/components/FileUpload/FileUpload.tsx
@@ -71,8 +71,8 @@ export const FileUpload = ({
     const fileInputRef = useRef<FileInputRef>(null) // reference to the HTML input which has files
     const summaryRef = useRef<HTMLHeadingElement>(null) // reference to the heading that we will focus
     const previousFileItems = usePrevious(fileItems)
+    const isRequired = inputProps['aria-required']
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
     const handleCheckboxClick = (
         event: React.ChangeEvent<HTMLInputElement>
     ) => {
@@ -424,6 +424,9 @@ export const FileUpload = ({
             <Label className={isLabelVisible ? '' : 'srOnly'} htmlFor={id}>
                 {label}
             </Label>
+            <span className={styles.requiredOptionalText}>
+                {isRequired ? 'Required' : 'Optional'}
+            </span>
 
             <PoliteErrorMessage id={`${id}-error`}>{error}</PoliteErrorMessage>
             {hint && (

diff --git a/services/app-web/src/components/FileUpload/constants.ts b/services/app-web/src/components/FileUpload/constants.ts
@@ -6,3 +6,6 @@ export const ACCEPTED_SUBMISSION_FILE_TYPES =
 
 export const ACCEPTED_RATE_CERTIFICATION_FILE_TYPES =
     'application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+
+export const ACCEPTED_RATE_SUPPORTING_DOCS_FILE_TYPES =
+    'application/pdf,text/csv,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel.sheet.macroEnabled.12'
diff --git a/services/app-web/src/components/FileUpload/index.ts b/services/app-web/src/components/FileUpload/index.ts
@@ -6,6 +6,7 @@ export { FileUpload } from './FileUpload'
 export {
     ACCEPTED_SUBMISSION_FILE_TYPES,
     ACCEPTED_RATE_CERTIFICATION_FILE_TYPES,
+    ACCEPTED_RATE_SUPPORTING_DOCS_FILE_TYPES,
 } from './constants'
 export {
     hasNoLoadingFiles,

diff --git a/services/app-web/src/components/Form/FieldTextarea/FieldTextarea.module.scss b/services/app-web/src/components/Form/FieldTextarea/FieldTextarea.module.scss
@@ -0,0 +1,7 @@
+@import '../../../styles/uswdsImports.scss';
+@import '../../../styles/custom.scss';
+
+.requiredOptionalText {
+    display: block;
+    color: $theme-color-hint;
+}
diff --git a/services/app-web/src/components/Form/FieldTextarea/FieldTextarea.tsx b/services/app-web/src/components/Form/FieldTextarea/FieldTextarea.tsx
@@ -2,6 +2,7 @@ import React from 'react'
 import { useField } from 'formik'
 import { Label, Textarea, FormGroup } from '@trussworks/react-uswds'
 import { PoliteErrorMessage } from '../..'
+import styles from './FieldTextarea.module.scss'
 
 /**
  * This component renders a ReactUSWDS TextArea component inside of a FormGroup,
@@ -34,6 +35,7 @@ export const FieldTextarea = ({
     ...inputProps
 }: TextAreaProps): React.ReactElement => {
     const [field, meta] = useField({ name })
+    const isRequired = inputProps['aria-required']
 
     // Latch into onBlur to do any input cleaning
     // Initial use case is to trim away trailing whitespace in email addresses
@@ -50,6 +52,9 @@ export const FieldTextarea = ({
             <Label htmlFor={id} error={showError}>
                 {label}
             </Label>
+            <span className={styles.requiredOptionalText}>
+                {isRequired ? 'Required' : 'Optional'}
+            </span>
             {showError && <PoliteErrorMessage>{meta.error}</PoliteErrorMessage>}
             {hint && (
                 <div

diff --git a/services/app-web/src/components/Form/FieldYesNo/FieldYesNo.module.scss b/services/app-web/src/components/Form/FieldYesNo/FieldYesNo.module.scss
@@ -1,3 +1,6 @@
+@import '../../../styles/uswdsImports.scss';
+@import '../../../styles/custom.scss';
+
 .optionsContainer {
     display: flex;
 }
@@ -18,3 +21,8 @@
 .no {
     margin-left: 3em;
 }
+
+.requiredOptionalText {
+    display: block;
+    color: $theme-color-hint;
+}
diff --git a/services/app-web/src/components/Form/FieldYesNo/FieldYesNo.tsx b/services/app-web/src/components/Form/FieldYesNo/FieldYesNo.tsx
@@ -47,7 +47,6 @@ export const FieldYesNo = ({
 
     const isRequired =
         inputProps['aria-required'] !== false && inputProps.required !== false // consumer must explicitly say this field is not required, otherwise we assume aria-required
-
     return (
         <Fieldset
             role="radiogroup"
@@ -57,6 +56,11 @@ export const FieldYesNo = ({
             className={classes}
             data-testid="yes-no-radio-fieldset"
         >
+            {inputProps['aria-required'] !== undefined && (
+                <span className={styles.requiredOptionalText}>
+                    {isRequired ? 'Required' : 'Optional'}
+                </span>
+            )}
             {showError && <PoliteErrorMessage>{meta.error}</PoliteErrorMessage>}
             {hint && (
                 <div

diff --git a/services/app-web/src/pages/StateSubmission/Contacts/ActuaryContactFields.tsx b/services/app-web/src/pages/StateSubmission/Contacts/ActuaryContactFields.tsx
@@ -5,6 +5,7 @@ import { Fieldset, FormGroup } from '@trussworks/react-uswds'
 import { FieldRadio, FieldTextInput } from '../../../components/Form'
 import { PoliteErrorMessage } from '../../../components/PoliteErrorMessage'
 import { RateCertFormType } from '../RateDetails/SingleRateCert/SingleRateCert'
+import styles from '../StateSubmissionForm.module.scss'
 
 type FormError =
     FormikErrors<RateCertFormType>[keyof FormikErrors<RateCertFormType>]
@@ -35,11 +36,11 @@ export const ActuaryContactFields = ({
 
     return (
         <Fieldset legend={fieldSetLegend}>
+            <span className={styles.requiredOptionalText}>Required</span>
             <FieldTextInput
                 name={`${fieldNamePrefix}.name`}
                 id={`${fieldNamePrefix}.name`}
                 label="Name"
-                aria-required={false}
                 showError={Boolean(
                     showFieldErrors(getIn(errors, `${fieldNamePrefix}.name`))
                 )}
@@ -52,7 +53,6 @@ export const ActuaryContactFields = ({
                 name={`${fieldNamePrefix}.titleRole`}
                 id={`${fieldNamePrefix}.titleRole`}
                 label="Title/Role"
-                aria-required={false}
                 showError={Boolean(
                     showFieldErrors(
                         getIn(errors, `${fieldNamePrefix}.titleRole`)
@@ -66,7 +66,6 @@ export const ActuaryContactFields = ({
                 name={`${fieldNamePrefix}.email`}
                 id={`${fieldNamePrefix}.email`}
                 label="Email"
-                aria-required={false}
                 showError={Boolean(
                     showFieldErrors(getIn(errors, `${fieldNamePrefix}.email`))
                 )}
@@ -82,6 +81,7 @@ export const ActuaryContactFields = ({
                 <label htmlFor={`${fieldNamePrefix}.actuarialFirm`}>
                     Actuarial firm
                 </label>
+                <span className={styles.requiredOptionalText}>Required</span>
                 {showFieldErrors(
                     getIn(errors, `${fieldNamePrefix}.actuarialFirm`)
                 ) && (

diff --git a/services/app-web/src/pages/StateSubmission/Contacts/Contacts.test.tsx b/services/app-web/src/pages/StateSubmission/Contacts/Contacts.test.tsx
@@ -41,6 +41,7 @@ describe('Contacts', () => {
 
         await waitFor(() => {
             expect(screen.getByTestId('state-contacts')).toBeInTheDocument()
+            expect(screen.getByText('State contacts 1')).toBeInTheDocument()
             expect(screen.getByLabelText('Name')).toBeInTheDocument()
             expect(screen.getByLabelText('Title/Role')).toBeInTheDocument()
             expect(screen.getByLabelText('Email')).toBeInTheDocument()
@@ -57,9 +58,10 @@ describe('Contacts', () => {
             }
         )
 
-        expect(
-            screen.getByText(/A state contact is required/)
-        ).toBeInTheDocument()
+        const requiredLabels = await screen.findAllByText('Required')
+        expect(requiredLabels).toHaveLength(1)
+        const optionalLabels = await screen.queryAllByText('Optional')
+        expect(optionalLabels).toHaveLength(0)
     })
 
     it('displays correct form guidance for contract and rates submission', async () => {
@@ -75,9 +77,10 @@ describe('Contacts', () => {
             }
         )
 
-        expect(
-            screen.getByText('A state contact is required')
-        ).toBeInTheDocument()
+        const requiredLabels = await screen.findAllByText('Required')
+        expect(requiredLabels).toHaveLength(2)
+        const optionalLabels = await screen.queryAllByText('Optional')
+        expect(optionalLabels).toHaveLength(0)
         expect(
             screen.getByText('Additional Actuary Contacts')
         ).toBeInTheDocument()

diff --git a/services/app-web/src/pages/StateSubmission/Contacts/Contacts.tsx b/services/app-web/src/pages/StateSubmission/Contacts/Contacts.tsx
@@ -228,10 +228,9 @@ export const Contacts = ({
     // Also handles the difference between State Contacts and Actuary Contacts
     const handleContactLegend = (index: number, contactText: string) => {
         const count = index + 1
-        const required = index ? '' : ' (required)'
 
         if (contactText === 'State') {
-            return `State contacts ${count} ${required}`
+            return `State contacts ${count}`
         }
 
         if (contactText === 'Actuary') {
@@ -297,9 +296,6 @@ export const Contacts = ({
                                 communication about this submission.
                             </p>
                             <legend className="srOnly">State contacts</legend>
-                            <span id="form-guidance">
-                                A state contact is required
-                            </span>
 
                             {shouldValidate && (
                                 <ErrorSummary
@@ -329,6 +325,13 @@ export const Contacts = ({
                                                                 'State'
                                                             )}
                                                         >
+                                                            <span
+                                                                className={
+                                                                    styles.requiredOptionalText
+                                                                }
+                                                            >
+                                                                Required
+                                                            </span>
                                                             <FieldTextInput
                                                                 id={`stateContacts.${index}.name`}
                                                                 label="Name"
@@ -543,6 +546,13 @@ export const Contacts = ({
                                             className={styles.radioGroup}
                                             legend="Communication preference between CMS Office of the Actuary (OACT) and all state’s actuaries (i.e. certifying actuaries and additional actuary contacts)"
                                         >
+                                            <span
+                                                className={
+                                                    styles.requiredOptionalText
+                                                }
+                                            >
+                                                Required
+                                            </span>
                                             {showFieldErrors(`True`) && (
                                                 <ErrorMessage
                                                     name={`actuaryCommunicationPreference`}

diff --git a/services/app-web/src/pages/StateSubmission/ContractDetails/ContractDetails.test.tsx b/services/app-web/src/pages/StateSubmission/ContractDetails/ContractDetails.test.tsx
@@ -51,8 +51,13 @@ describe('ContractDetails', () => {
                 },
             }
         )
-
-        expect(screen.getByText(/All fields are required/)).toBeInTheDocument()
+        expect(
+            screen.queryByText(/All fields are required/)
+        ).not.toBeInTheDocument()
+        const requiredLabels = await screen.findAllByText('Required')
+        expect(requiredLabels).toHaveLength(6)
+        const optionalLabels = await screen.queryAllByText('Optional')
+        expect(optionalLabels).toHaveLength(0)
     })
 
     describe('Contract documents file upload', () => {

diff --git a/services/app-web/src/pages/StateSubmission/ContractDetails/ContractDetails.tsx b/services/app-web/src/pages/StateSubmission/ContractDetails/ContractDetails.tsx
@@ -499,9 +499,6 @@ export const ContractDetails = ({
                     >
                         <fieldset className="usa-fieldset">
                             <legend className="srOnly">Contract Details</legend>
-                            <span id="form-guidance">
-                                All fields are required
-                            </span>
 
                             {shouldValidate && (
                                 <ErrorSummary
@@ -571,6 +568,11 @@ export const ContractDetails = ({
                                     className={styles.radioGroup}
                                     legend="Contract status"
                                 >
+                                    <span
+                                        className={styles.requiredOptionalText}
+                                    >
+                                        Required
+                                    </span>
                                     {showFieldErrors(
                                         errors.contractExecutionStatus
                                     ) && (
@@ -616,6 +618,13 @@ export const ContractDetails = ({
                                                     : 'Contract effective dates'
                                             }
                                         >
+                                            <span
+                                                className={
+                                                    styles.requiredOptionalText
+                                                }
+                                            >
+                                                Required
+                                            </span>
                                             {showFieldErrors(
                                                 errors.contractDateStart ||
                                                     errors.contractDateEnd
@@ -697,6 +706,13 @@ export const ContractDetails = ({
                                             aria-required
                                             legend="Managed Care entities"
                                         >
+                                            <span
+                                                className={
+                                                    styles.requiredOptionalText
+                                                }
+                                            >
+                                                Required
+                                            </span>
                                             <Link
                                                 variant="external"
                                                 href={
@@ -762,6 +778,13 @@ export const ContractDetails = ({
                                             aria-required
                                             legend="Active federal operating authority"
                                         >
+                                            <span
+                                                className={
+                                                    styles.requiredOptionalText
+                                                }
+                                            >
+                                                Required
+                                            </span>
                                             <Link
                                                 variant="external"
                                                 href={
@@ -815,6 +838,13 @@ export const ContractDetails = ({
                                                         : 'Does this contract action include new or modified provisions related to any of the following'
                                                 }
                                             >
+                                                <span
+                                                    className={
+                                                        styles.requiredOptionalText
+                                                    }
+                                                >
+                                                    Required
+                                                </span>
                                                 {applicableProvisions.map(
                                                     (modifiedProvisionName) => (
                                                         <FieldYesNo

diff --git a/...src/pages/StateSubmission/RateDetails/PackagesWithSharedRates/PackagesWithSharedRates.tsx b/...src/pages/StateSubmission/RateDetails/PackagesWithSharedRates/PackagesWithSharedRates.tsx
@@ -120,6 +120,7 @@ export const PackagesWithSharedRates = ({
                 name={`${fieldNamePrefix}.hasSharedRateCert`}
                 label="Was this rate certification uploaded to any other submissions?"
                 showError={Boolean(showFieldErrors('hasSharedRateCert'))}
+                aria-required
             />
 
             {getIn(values, `${fieldNamePrefix}.hasSharedRateCert`) ===
@@ -131,6 +132,9 @@ export const PackagesWithSharedRates = ({
                         Please select the submissions that also contain this
                         rate certification.
                     </Label>
+                    <span className={styles.requiredOptionalText}>
+                        Required
+                    </span>
                     <Link
                         aria-label="View all submissions (opens in new window)"
                         href={'/dashboard'}