Merge branch 'master' into cmdct-3961-nonzero

Enterprise-CMCS · Sep 20, 2024 · b4d5bc8 · b4d5bc8
2 parents bc4b21d + 7024b16
commit b4d5bc8
Show file tree

Hide file tree

Showing 48 changed files with 114 additions and 3,476 deletions.
diff --git a/.github/workflows/scan_security-hub-jira-integration.yml b/.github/workflows/scan_security-hub-jira-integration.yml
@@ -21,13 +21,12 @@ jobs:
           aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
           role-to-assume: ${{ secrets.PRODUCTION_SYNC_OIDC_ROLE }}
       - name: Sync Security Hub and Jira
-        uses: Enterprise-CMCS/mac-fc-security-hub-visibility@v1.0.5
+        uses: Enterprise-CMCS/mac-fc-security-hub-visibility@v2.0.9
         with:
           jira-username: "mdct_github_service_account"
           jira-token: ${{ secrets.JIRA_ENT_USER_TOKEN }}
-          jira-host: jiraent.cms.gov
           jira-project-key: CMDCT
           jira-ignore-statuses: Done, Closed, Canceled
           jira-custom-fields: '{ "customfield_10100": "CMDCT-2280", "customfield_26700" : [{"id": "40103", "value": "QMR"}] }'
           aws-severities: CRITICAL, HIGH, MEDIUM
-          assign-jira-ticket-to: "MWTW"
+          jira-assignee: "MWTW"
diff --git a/...easures/2021/globalValidations/ComplexValidations/ComplexAtLeastOneRateComplete/index.tsx b/...easures/2021/globalValidations/ComplexValidations/ComplexAtLeastOneRateComplete/index.tsx
diff --git a/services/ui-src/src/measures/2021/globalValidations/index.ts b/services/ui-src/src/measures/2021/globalValidations/index.ts
@@ -6,15 +6,15 @@ export * from "shared/globalValidations/validateAtLeastOneDataSource";
 export * from "./validateAtLeastOneDeviationFieldFilled";
 export * from "shared/globalValidations/validateAtLeastOneRateComplete";
 export * from "shared/globalValidations/validateBothDatesInRange";
-export * from "./validateDualPopInformation";
-export * from "./validateEqualCategoryDenominators";
+export * from "shared/globalValidations/validateDualPopInformation";
+export * from "shared/globalValidations/validateEqualCategoryDenominators";
 export * from "shared/globalValidations/validateEqualQualifierDenominators";
-export * from "./validateRateNotZero";
+export * from "shared/globalValidations/validateRateNotZero";
 export * from "./validateRateZero";
 export * from "shared/globalValidations/validateNumeratorsLessThanDenominators";
 export * from "shared/globalValidations/validateOneCatRateHigherThanOtherCat";
 export * from "shared/globalValidations/validateOneQualDenomHigherThanOtherDenomOMS";
-export * from "./validateOneQualRateHigherThanOtherQual";
+export * from "shared/globalValidations/validateOneQualRateHigherThanOtherQual";
 export * from "shared/globalValidations/validateReasonForNotReporting";
 export * from "shared/globalValidations/validateRequiredRadioButtonForCombinedRates";
 export * from "./validateTotals";
@@ -31,7 +31,7 @@ export {
   ComplexNoNonZeroNumOrDenom,
   ComplexNoNonZeroNumOrDenomOMS,
 } from "shared/globalValidations/ComplexValidations/ComplexNoNonZeroNumOrDenom";
-export { ComplexValidateAtLeastOneNDRInDeviationOfMeasureSpec } from "./ComplexValidations/ComplexValidateAtLeastOneNDRInDeviationOfMeasureSpec";
+export { ComplexValidateAtLeastOneNDRInDeviationOfMeasureSpec } from "shared/globalValidations/ComplexValidations/ComplexValidateAtLeastOneNDRInDeviationOfMeasureSpec"; //pragma: allowlist secret
 export {
   ComplexValidateNDRTotals,
   ComplexValidateNDRTotalsOMS,

diff --git a/services/ui-src/src/measures/2021/globalValidations/validateDualPopInformation/index.test.ts b/services/ui-src/src/measures/2021/globalValidations/validateDualPopInformation/index.test.ts
diff --git a/services/ui-src/src/measures/2021/globalValidations/validateDualPopInformation/index.ts b/services/ui-src/src/measures/2021/globalValidations/validateDualPopInformation/index.ts