From 67f5afbbda7e57baf8433557f9be88ae813aaef4 Mon Sep 17 00:00:00 2001 From: Mike Dial <48921055+mdial89f@users.noreply.github.com> Date: Tue, 13 Feb 2024 06:54:49 -0500 Subject: [PATCH] fix(waiver forms): Waiver form QE remediation (#379) * QE remediation * whoops * Fix regex --- src/packages/shared-types/attachments.ts | 4 ++-- src/services/ui/src/components/Routing/routes.ts | 2 +- src/services/ui/src/pages/create/options.tsx | 2 +- .../capitated/capitated-1915-b-waiver-amendment.tsx | 4 ++-- .../capitated/capitated-1915-b-waiver-initial.tsx | 4 ++-- .../capitated/capitated-1915-b-waiver-renewal.tsx | 10 +++++++++- .../contracting-1915-b-waiver-amendment.tsx | 4 ++-- .../contracting/contracting-1915-b-waiver-initial.tsx | 2 +- .../contracting/contracting-1915-b-waiver-renewal.tsx | 4 ++-- src/services/ui/src/pages/form/zod.ts | 8 ++++---- src/services/ui/src/router.tsx | 2 +- src/services/ui/src/utils/labelMappers.ts | 4 ++-- 12 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/packages/shared-types/attachments.ts b/src/packages/shared-types/attachments.ts index 52fbfd0ab2..2948a1962d 100644 --- a/src/packages/shared-types/attachments.ts +++ b/src/packages/shared-types/attachments.ts @@ -27,11 +27,11 @@ export const attachmentTitleMap: Record = { bCapCostSpreadsheets: "1915(b) Comprehensive (Capitated) Waiver Cost Effectiveness Spreadsheets", bCapIndependentAssessment: - "1915(b) Comprehensive (Capitated) Waiver Independent Assessment", + "1915(b) Comprehensive (Capitated) Waiver Independent Assessment (first two renewals only)", b4WaiverApplication: "1915(b)(4) FFS Selective Contracting (Streamlined) Waiver Application Pre-print", b4IndependentAssessment: - "1915(b)(4) FFS Selective Contracting (Streamlined) Independent Assessment", + "1915(b)(4) FFS Selective Contracting (Streamlined) Independent Assessment (first two renewals only)", }; export type AttachmentKey = keyof typeof attachmentTitleMap; export type AttachmentTitle = typeof attachmentTitleMap[AttachmentKey]; diff --git a/src/services/ui/src/components/Routing/routes.ts b/src/services/ui/src/components/Routing/routes.ts index 73ea86c7b1..3bd8b37b12 100644 --- a/src/services/ui/src/components/Routing/routes.ts +++ b/src/services/ui/src/components/Routing/routes.ts @@ -15,7 +15,7 @@ export const B_WAIVER_SUBMISSION_OPTIONS = "/new-submission/waiver/b"; export const B4_WAIVER_OPTIONS = "/new-submission/waiver/b/b4"; export const BCAP_WAIVER_OPTIONS = "/new-submission/waiver/b/capitated"; export const WAIVER_1915_B_AMEND_CAP = - "/new-submission/waiver/b/capitated/amend/create"; + "/new-submission/waiver/b/capitated/amendment/create"; export const WAIVER_1915_B_RENEWAL_CAP = "/new-submission/waiver/b/capitated/renewal/create"; export const WAIVER_1915_B_INITIAL_CAP = diff --git a/src/services/ui/src/pages/create/options.tsx b/src/services/ui/src/pages/create/options.tsx index 4686f66789..6410b16e93 100644 --- a/src/services/ui/src/pages/create/options.tsx +++ b/src/services/ui/src/pages/create/options.tsx @@ -137,6 +137,6 @@ export const BCAP_WAIVER_OPTIONS: OptionData[] = [ { title: "1915(b) Comprehensive (Capitated) Waiver Amendment ", description: "Amend an existing 1915(b) Comprehensive (Capitated) Waiver", - linkTo: "/new-submission/waiver/b/capitated/amend/create", + linkTo: "/new-submission/waiver/b/capitated/amendment/create", }, ]; diff --git a/src/services/ui/src/pages/form/waiver/capitated/capitated-1915-b-waiver-amendment.tsx b/src/services/ui/src/pages/form/waiver/capitated/capitated-1915-b-waiver-amendment.tsx index 35ca4b8210..afacb37897 100644 --- a/src/services/ui/src/pages/form/waiver/capitated/capitated-1915-b-waiver-amendment.tsx +++ b/src/services/ui/src/pages/form/waiver/capitated/capitated-1915-b-waiver-amendment.tsx @@ -97,7 +97,7 @@ export const Capitated1915BWaiverAmendment = () => { className="my-6 space-y-8 mx-auto justify-center flex flex-col" >

- Amend a 1915(b) Waiver + 1915(b) Comprehensive (Capitated) Waiver Amendment

@@ -106,7 +106,7 @@ export const Capitated1915BWaiverAmendment = () => { Waiver Authority - All other 1915(b) Waivers + 1915(b) { className="my-6 space-y-8 mx-auto justify-center flex flex-col" >

- 1915(b) Initial Waiver Submission + 1915(b) Comprehensive (Capitated) Initial Waiver

@@ -107,7 +107,7 @@ export const Capitated1915BWaiverInitial = () => { Waiver Authority - All other 1915(b) Waivers + 1915(b) { className="my-6 space-y-8 mx-auto justify-center flex flex-col" >

- Renew a 1915(b) Waiver + 1915(b) Comprehensive (Capitated) Renewal Waiver

+
+ + Waiver Authority + + + 1915(b) + +
{ className="my-6 space-y-8 mx-auto justify-center flex flex-col" >

- Amend a 1915(b) Waiver + 1915(b)(4) FFS Selective Contracting Waiver Amendment

@@ -103,7 +103,7 @@ export const Contracting1915BWaiverAmendment = () => { Waiver Authority - 1915(b)(4) FFS Selective Contracting waviers + 1915(b) { Waiver Authority - 1915(b)(4) FFS Selective Contracting waviers + 1915(b) { className="my-6 space-y-8 mx-auto justify-center flex flex-col" >

- Renew a 1915(b) Waiver + 1915(b)(4) FFS Selective Contracting Renewal Waiver

@@ -127,7 +127,7 @@ export const Contracting1915BWaiverRenewal = () => { Waiver Authority - 1915(b)(4) FFS Selective Contracting waviers + 1915(b) isAuthorizedState(value), { message: @@ -73,7 +73,7 @@ export const zAmendmentWaiverNumberSchema = z .string() .regex( /^[A-Z]{2}-\d{4,5}\.R\d{2}\.(?!00)\d{2}$/, - "The 1915(b) Waiver Amendment Number must be in the format of SS-####.R##.## or SS-#####.R##.##. For amendments, the last two digits start with ‘01’ and ascends." + "The 1915(b) Waiver Amendment Number must be in the format of SS-####.R##.## or SS-#####.R##.##. For amendments, the last two digits start with '01' and ascends." ) .refine((value) => isAuthorizedState(value), { message: @@ -88,7 +88,7 @@ export const zAmendmentOriginalWaiverNumberSchema = z .string() .regex( /^[A-Z]{2}-\d{4,5}\.R\d{2}\.\d{2}$/, - "The 1915(b) Waiver Amendment Number must be in the format of SS-####.R##.## or SS-#####.R##.##. For amendments, the last two digits start with ‘01’ and ascends." + "The 1915(b) Waiver Amendment Number must be in the format of SS-####.R##.## or SS-#####.R##.##. For amendments, the last two digits start with '01' and ascends." ) .refine((value) => isAuthorizedState(value), { message: diff --git a/src/services/ui/src/router.tsx b/src/services/ui/src/router.tsx index 8140ca9213..d402fe33ee 100644 --- a/src/services/ui/src/router.tsx +++ b/src/services/ui/src/router.tsx @@ -67,7 +67,7 @@ export const router = createBrowserRouter([ element: , }, { - path: "/new-submission/waiver/b/capitated/amend/create", + path: "/new-submission/waiver/b/capitated/amendment/create", element: , }, { diff --git a/src/services/ui/src/utils/labelMappers.ts b/src/services/ui/src/utils/labelMappers.ts index 98925119e2..82b7bd2a7f 100644 --- a/src/services/ui/src/utils/labelMappers.ts +++ b/src/services/ui/src/utils/labelMappers.ts @@ -27,10 +27,10 @@ export const mapSubmissionCrumb = (path: Route) => { case "/new-submission/spa/chip/create": return "Submit new CHIP SPA"; case "/new-submission/waiver/b/capitated/initial/create": - return "1915(b) Comprehensive (Capitated) New Initial Waiver"; + return "1915(b) Comprehensive (Capitated) Initial Waiver"; case "/new-submission/waiver/b/capitated/renewal/create": return "1915(b) Comprehensive (Capitated) Renewal Waiver"; - case "/new-submission/waiver/b/capitated/amend/create": + case "/new-submission/waiver/b/capitated/amendment/create": return "1915(b) Comprehensive (Capitated) Waiver Amendment"; case "/new-submission/waiver/b/b4/initial/create": return "1915(b)(4) FFS Selective Contracting Initial Waiver";