Merge branch 'master' into dependabot/npm_and_yarn/services/ui-src/ip…

…-1.1.9

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 # Default repo owners
-*     @BearHanded @braxex @cassandradanger
+*     @BearHanded @braxex @ailZhou
 
 # Rate label file changes require application owner approval
 *rateLabelText.ts @davidkoger

.github/workflows/codeql-analysis.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

.github/workflows/cypress-workflow.yml

@@ -35,7 +35,7 @@ jobs:
     name: Setup Cypress Test Matrix
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - id: set-test-matrix
         run: |
           echo "test-matrix=$(ls -1 tests/cypress/cypress/e2e/${{ inputs.test-path }}/* | xargs -n 1 basename | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
@@ -53,7 +53,7 @@ jobs:
       matrix:
         containers: ${{ fromJson(needs.setup.outputs.test-matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies
         run: yarn install --frozen-lockfile
       - name: set path

.github/workflows/git-secrets.yaml

@@ -4,7 +4,7 @@ jobs:
   gitleaks-scan:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run gitleaks docker
         uses: docker://zricethezav/gitleaks
         with:

.github/workflows/pull-request.yml

@@ -15,7 +15,7 @@ jobs:
   assignAuthor:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Assign PR to Creator
         run: |
           if [ "$PR_AUTHOR_TYPE" != "Bot" ]

.github/workflows/pullrequest-precommit-check.yml

@@ -6,7 +6,7 @@ jobs:
   prettier:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v3
       - uses: pre-commit/[email protected]
         with:

.github/workflows/scan_security-hub-jira-integration.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:

.github/workflows/scan_snyk-jira-integration.yml

@@ -16,7 +16,7 @@ jobs:
     if: github.event_name == 'pull_request'
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Snyk and Run Snyk test
         run: |
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'schedule'
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Snyk and Run Snyk test
         run: |

.github/workflows/unittest-workflow.yml

@@ -11,7 +11,7 @@ jobs:
     name: Unit Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: set variable values
         run: ./.github/build_vars.sh set_values
         env:

services/ui-auth/serverless.yml

@@ -36,7 +36,6 @@ custom:
       - master
       - val
       - prod
-  sesSourceEmailAddress: ${ssm:/configuration/${self:custom.stage}/sesSourceEmailAddress, ssm:/configuration/default/sesSourceEmailAddress, ""}
   attachments_bucket_arn: ${cf:uploads-${self:custom.stage}.AttachmentsBucketArn}
   api_gateway_rest_api_name: ${cf:app-api-${self:custom.stage}.ApiGatewayRestApiName}
   okta_metadata_url: ${ssm:/configuration/${self:custom.stage}/okta_metadata_url, ""}
@@ -61,11 +60,6 @@ functions:
 
 resources:
   Conditions:
-    CreateEmailConfiguration:
-      Fn::Not:
-        - Fn::Equals:
-            - ""
-            - ${self:custom.sesSourceEmailAddress}
     BackWithOkta:
       Fn::Not:
         - Fn::Equals:
@@ -80,12 +74,6 @@ resources:
           - email
         AutoVerifiedAttributes:
           - email
-        EmailConfiguration:
-          Fn::If:
-            - CreateEmailConfiguration
-            - EmailSendingAccount: DEVELOPER
-              SourceArn: !Sub arn:aws:ses:us-east-1:${AWS::AccountId}:identity/${self:custom.sesSourceEmailAddress}
-            - !Ref AWS::NoValue
         Schema:
           - Name: given_name
             AttributeDataType: String

services/ui-src/src/measures/2021/ADDCH/index.tsx

@@ -5,7 +5,8 @@ import * as PMD from "./data";
 import { validationFunctions } from "./validation";
 import { getPerfMeasureRateArray } from "measures/2021/globalValidations";
 import * as QMR from "components";
-import { FormData } from "./types";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 export const ADDCH = ({
   name,

services/ui-src/src/measures/2021/ADDCH/validation.ts

@@ -2,8 +2,9 @@ import * as DC from "dataConstants";
 import * as GV from "measures/2021/globalValidations";
 import * as PMD from "./data";
 import { getPerfMeasureRateArray } from "../globalValidations";
-import { FormData } from "./types";
 import { OMSData } from "measures/2021/CommonQuestions/OptionalMeasureStrat/data";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 const ADDCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;

services/ui-src/src/measures/2021/AIFHH/index.tsx

@@ -1,12 +1,13 @@
 import * as CMQ from "measures/2021/CommonQuestions";
 import * as PMD from "./data";
 import * as QMR from "components";
-import { FormData } from "./types";
 import { getPerfMeasureRateArray } from "measures/2021/globalValidations";
 import { useEffect } from "react";
 import { useFormContext } from "react-hook-form";
 import { validationFunctions } from "./validation";
 import { xNumbersYDecimals } from "utils";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 export const AIFHH = ({
   name,

services/ui-src/src/measures/2021/AIFHH/validation.ts

@@ -1,8 +1,9 @@
 import * as DC from "dataConstants";
 import * as GV from "measures/2021/globalValidations";
 import * as PMD from "./data";
-import { FormData } from "./types";
 import { OMSData } from "measures/2021/CommonQuestions/OptionalMeasureStrat/data";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 // Rate structure by index in row
 const ndrFormulas = [

services/ui-src/src/measures/2021/AMBCH/index.tsx

@@ -1,12 +1,13 @@
 import * as CMQ from "measures/2021/CommonQuestions";
 import * as PMD from "./data";
 import * as QMR from "components";
-import { FormData } from "./types";
 import { getPerfMeasureRateArray } from "measures/2021/globalValidations";
 import { positiveNumbersWithMaxDecimalPlaces } from "utils";
 import { useEffect } from "react";
 import { useFormContext } from "react-hook-form";
 import { validationFunctions } from "./validation";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 export const AMBCH = ({
   name,

services/ui-src/src/measures/2021/AMBCH/validation.ts

@@ -1,8 +1,9 @@
 import * as DC from "dataConstants";
 import * as GV from "measures/2021/globalValidations";
 import * as PMD from "./data";
-import { FormData } from "./types";
 import { OMSData } from "measures/2021/CommonQuestions/OptionalMeasureStrat/data";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 const AMBCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;

services/ui-src/src/measures/2021/AMBHH/index.tsx

@@ -5,8 +5,9 @@ import * as PMD from "./data";
 import * as QMR from "components";
 import { validationFunctions } from "./validation";
 import { getPerfMeasureRateArray } from "measures/2021/globalValidations";
-import { FormData } from "./types";
 import { positiveNumbersWithMaxDecimalPlaces } from "utils";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 export const AMBHH = ({
   name,

services/ui-src/src/measures/2021/AMBHH/validation.ts

@@ -1,8 +1,9 @@
 import * as DC from "dataConstants";
 import * as GV from "measures/2021/globalValidations";
 import * as PMD from "./data";
-import { FormData } from "./types";
 import { OMSData } from "measures/2021/CommonQuestions/OptionalMeasureStrat/data";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 const AMBHHValidation = (data: FormData) => {
   const definitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];

services/ui-src/src/measures/2021/AMMAD/index.tsx

@@ -5,7 +5,7 @@ import * as PMD from "./data";
 import { validationFunctions } from "./validation";
 import { getPerfMeasureRateArray } from "measures/2021/globalValidations";
 import * as QMR from "components";
-import { FormData } from "./types";
+import { DefaultFormData } from "measures/2021/CommonQuestions/types";
 
 export const AMMAD = ({
   name,
@@ -17,7 +17,7 @@ export const AMMAD = ({
   showOptionalMeasureStrat,
   isOtherMeasureSpecSelected,
 }: QMR.MeasureWrapperProps) => {
-  const { watch } = useFormContext<FormData>();
+  const { watch } = useFormContext<DefaultFormData>();
   const data = watch();
 
   useEffect(() => {

services/ui-src/src/measures/2021/AMMAD/validation.ts

@@ -2,7 +2,7 @@ import * as DC from "dataConstants";
 import * as GV from "measures/2021/globalValidations";
 import * as PMD from "./data";
 import { cleanString } from "utils/cleanString";
-import { FormData } from "./types";
+import { DefaultFormData } from "measures/2021/CommonQuestions/types";
 import { OMSData } from "measures/2021/CommonQuestions/OptionalMeasureStrat/data";
 
 const sameDenominatorSets: GV.Types.OmsValidationCallback = ({
@@ -44,7 +44,7 @@ const sameDenominatorSets: GV.Types.OmsValidationCallback = ({
   return errorArray;
 };
 
-const AMMADValidation = (data: FormData) => {
+const AMMADValidation = (data: DefaultFormData) => {
   const ageGroups = PMD.qualifiers;
   const age65PlusIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];

services/ui-src/src/measures/2021/AMRCH/index.tsx

@@ -5,7 +5,8 @@ import * as PMD from "./data";
 import { validationFunctions } from "./validation";
 import { getPerfMeasureRateArray } from "measures/2021/globalValidations";
 import * as QMR from "components";
-import { FormData } from "./types";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 export const AMRCH = ({
   name,

services/ui-src/src/measures/2021/AMRCH/validation.ts

@@ -1,8 +1,9 @@
 import * as DC from "dataConstants";
 import * as GV from "measures/2021/globalValidations";
 import * as PMD from "./data";
-import { FormData } from "./types";
 import { OMSData } from "measures/2021/CommonQuestions/OptionalMeasureStrat/data";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 const AMRCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;

services/ui-src/src/measures/2021/APMCH/index.tsx

@@ -1,11 +1,12 @@
 import * as CMQ from "measures/2021/CommonQuestions";
 import * as PMD from "./data";
 import * as QMR from "components";
-import { FormData } from "./types";
 import { getPerfMeasureRateArray } from "measures/2021/globalValidations";
 import { useEffect } from "react";
 import { useFormContext } from "react-hook-form";
 import { validationFunctions } from "./validation";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 export const APMCH = ({
   name,

services/ui-src/src/measures/2021/APMCH/validation.ts

@@ -1,8 +1,9 @@
 import * as DC from "dataConstants";
 import * as GV from "measures/2021/globalValidations";
 import * as PMD from "./data";
-import { FormData } from "./types";
 import { OMSData } from "measures/2021/CommonQuestions/OptionalMeasureStrat/data";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 const APMCHValidation = (data: FormData) => {
   const dateRange = data[DC.DATE_RANGE];

services/ui-src/src/measures/2021/APPCH/index.tsx

@@ -1,11 +1,12 @@
 import * as CMQ from "measures/2021/CommonQuestions";
 import * as PMD from "./data";
 import * as QMR from "components";
-import { FormData } from "./types";
 import { getPerfMeasureRateArray } from "measures/2021/globalValidations";
 import { useEffect } from "react";
 import { useFormContext } from "react-hook-form";
 import { validationFunctions } from "./validation";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 export const APPCH = ({
   name,

services/ui-src/src/measures/2021/APPCH/validation.ts

@@ -1,8 +1,9 @@
 import * as DC from "dataConstants";
 import * as GV from "measures/2021/globalValidations";
 import * as PMD from "./data";
-import { FormData } from "./types";
 import { OMSData } from "measures/2021/CommonQuestions/OptionalMeasureStrat/data";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 const APPCHValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];

services/ui-src/src/measures/2021/AUDCH/index.tsx

@@ -5,7 +5,8 @@ import * as PMD from "./data";
 import { validationFunctions } from "./validation";
 import { getPerfMeasureRateArray } from "measures/2021/globalValidations";
 import * as QMR from "components";
-import { FormData } from "./types";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 export const AUDCH = ({
   name,

services/ui-src/src/measures/2021/AUDCH/validation.ts

@@ -1,8 +1,9 @@
 import * as DC from "dataConstants";
 import * as GV from "measures/2021/globalValidations";
 import * as PMD from "./data";
-import { FormData } from "./types";
 import { OMSData } from "measures/2021/CommonQuestions/OptionalMeasureStrat/data";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 const AUDCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;

services/ui-src/src/measures/2021/BCSAD/index.tsx

@@ -5,7 +5,8 @@ import * as PMD from "./data";
 import { validationFunctions } from "./validation";
 import { getPerfMeasureRateArray } from "measures/2021/globalValidations";
 import * as QMR from "components";
-import { FormData } from "./types";
+//form type
+import { DefaultFormData as FormData } from "measures/2021/CommonQuestions/types";
 
 export const BCSAD = ({
   name,