Skip to content

Commit

Permalink
REVERTME these are changes that just comment out a bunch of broken st…
Browse files Browse the repository at this point in the history
…uff, broken due to our development, this should be reverted and these forms updated before merge obviously, but this will allow the ui to build
  • Loading branch information
mdial89f committed Aug 16, 2024
1 parent e1d2f45 commit 8c3b713
Show file tree
Hide file tree
Showing 18 changed files with 260 additions and 254 deletions.
5 changes: 4 additions & 1 deletion lib/packages/shared-types/opensearch/changelog/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ export type Document = newSubmission.NewSubmission &
oldPackageId: string;
newPackageId: string;
} & z.infer<legacyEvent.Schema> &
z.infer<legacyAdminChange.Schema>;
z.infer<legacyAdminChange.Schema> & {
appkParentId: string;
appkParent: boolean;
};

export type Response = Res<Document>;
export type ItemResult = Hit<Document> & {
Expand Down
8 changes: 4 additions & 4 deletions lib/packages/shared-utils/package-check.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ export const PackageCheck = ({
raiWithdrawEnabled,
authority,
actionType,
appkParentId,
appkParent,
// appkParentId,
// appkParent,
initialIntakeNeeded,
submissionDate,
leadAnalystName,
Expand All @@ -46,8 +46,8 @@ export const PackageCheck = ({
Authority["1915b"],
Authority["1915c"],
]),
isAppk: appkParent,
isAppkChild: appkParentId,
isAppk: false,
isAppkChild: false,
/** Keep excess methods to a minimum with `is` **/
authorityIs: (validAuthorities: Authority[]) =>
checkAuthority(authority, validAuthorities),
Expand Down
12 changes: 6 additions & 6 deletions react-app/src/components/Opensearch/main/useOpensearch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ export const DEFAULT_FILTERS: Record<OsTab, Partial<OsUrlState>> = {
value: ["1915(b)", "1915(c)"],
prefix: "must",
},
{
field: "appkParentId",
type: "exists",
value: true,
prefix: "must_not",
},
// {
// field: "appkParentId",
// type: "exists",
// value: true,
// prefix: "must_not",
// },
],
},
};
Expand Down
2 changes: 1 addition & 1 deletion react-app/src/features/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ export * from "./welcome";
export * from "./guides";
export * from "./faq";
export * from "./webforms";
export * from "./submission";
// export * from "./submission";
export * from "./forms";
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ export const spaRaiContent: FormContentHydrator = (document) => ({
export * from "./waiver/b-waiver-rai";
// TODO: C waiver rai??
export const waiverRaiContent: FormContentHydrator = (document) => {
const title = document.appkParent
? `${document.authority} Appendix K Formal RAI Response Details`
: `${document.authority} Waiver Formal RAI Response Details`;
// const title = document.appkParent
// ? `${document.authority} Appendix K Formal RAI Response Details`
// : `${document.authority} Waiver Formal RAI Response Details`;
const title = "asdf";
return {
title,
preSubmitNotice:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const mapActionType: Record<string, string> = {
};
const confirmationModalBody = (document: opensearch.main.Document) => {
const beginning = `You are about to withdraw ${document.authority} ${mapActionType[document.actionType]} waiver ${document.id}.`;
const middle = document.appkParent
const middle = false
? `Completing this action will conclude
the review of this ${document.authority} ${mapActionType[document.actionType]} waiver package, and all packages associated with ${document.id} will also be withdrawn.`
: `Completing this action will conclude
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@ export const defaultWithdrawRaiFields: ReactElement[] = [
/>,
];
export const defaultWithdrawRaiContent: FormContentHydrator = (document) => {
const title = document.appkParent
const title = false
? `${document.authority} Appendix K Withdraw Formal RAI Response Details`
: `${document.authority} Withdraw Formal RAI Response Details`;
return {
title,
preSubmitNotice: "Once complete, you and CMS will receive an email confirmation.",
preSubmitNotice:
"Once complete, you and CMS will receive an email confirmation.",
confirmationModal: {
header: "Withdraw RAI response?",
body: `The RAI response for ${document.id} will be withdrawn, and CMS will be notified.`,
Expand Down
4 changes: 2 additions & 2 deletions react-app/src/features/package/package-details/hooks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ export const recordDetails = (
},
{
label: "Amendment Title",
value: <p>{data?.appkTitle || BLANK_VALUE}</p>,
canView: () => !!data.appkTitle,
value: <p>{"asdf" || BLANK_VALUE}</p>,
canView: () => false,
},
{
label: "Subject",
Expand Down
3 changes: 2 additions & 1 deletion react-app/src/features/package/package-details/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ export const PackageDetails = ({ itemResult }: PackageDetailsProps) => {
case Authority["1915b"]:
case Authority["1915c"]:
case undefined: // Some TEs have no authority
if (source.appkParent) return "1915(c) Appendix K Package Details";
if (source.id === "NOASDFASDFASDF")
return "1915(c) Appendix K Package Details";
if (source.actionType == "Extend")
return "Temporary Extension Request Details";
}
Expand Down
46 changes: 23 additions & 23 deletions react-app/src/features/submission/spa/chip-intitial.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,27 @@ type ChipFormSchema = z.infer<typeof formSchema>;

// first argument in the array is the name that will show up in the form submission
// second argument is used when mapping over for the label
const attachmentList = [
{ name: "currentStatePlan", label: "Current State Plan", required: true },
{
name: "amendedLanguage",
label: "Amended State Plan Language",
required: true,
},
{
name: "coverLetter",
label: "Cover Letter",
required: true,
},
{
name: "budgetDocuments",
label: "Budget Documents",
required: false,
},
{ name: "publicNotice", label: "Public Notice", required: false },
{ name: "tribalConsultation", label: "Tribal Consultation", required: false },
{ name: "other", label: "Other", required: false },
] as const;
// const attachmentList = [
// { name: "currentStatePlan", label: "Current State Plan", required: true },
// {
// name: "amendedLanguage",
// label: "Amended State Plan Language",
// required: true,
// },
// {
// name: "coverLetter",
// label: "Cover Letter",
// required: true,
// },
// {
// name: "budgetDocuments",
// label: "Budget Documents",
// required: false,
// },
// { name: "publicNotice", label: "Public Notice", required: false },
// { name: "tribalConsultation", label: "Tribal Consultation", required: false },
// { name: "other", label: "Other", required: false },
// ] as const;

export const ChipSpaFormPage = () => {
const crumbs = useLocationCrumbs();
Expand Down Expand Up @@ -184,7 +184,7 @@ export const ChipSpaFormPage = () => {
)}
/>
</SectionCard>
<SectionCard title="Attachments">
{/* <SectionCard title="Attachments">
<Content.AttachmentsSizeTypesDesc faqAttLink="/faq/chip-spa-attachments" />
{attachmentList.map(({ name, label, required }) => (
<Inputs.FormField
Expand All @@ -210,7 +210,7 @@ export const ChipSpaFormPage = () => {
)}
/>
))}
</SectionCard>
</SectionCard> */}
<SectionCard title={"Additional Information"}>
<FormField
control={form.control}
Expand Down
42 changes: 21 additions & 21 deletions react-app/src/features/submission/spa/medicaid-initial.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,25 @@ type MedicaidFormSchema = z.infer<typeof formSchema>;

// first argument in the array is the name that will show up in the form submission
// second argument is used when mapping over for the label
const attachmentList = [
{ name: "cmsForm179", label: "CMS Form 179", required: true },
{ name: "spaPages", label: "SPA Pages", required: true },
{ name: "coverLetter", label: "Cover Letter", required: false },
{
name: "tribalEngagement",
label: "Document Demonstrating Good-Faith Tribal Engagement",
required: false,
},
{
name: "existingStatePlanPages",
label: "Existing State Plan Page(s)",
required: false,
},
{ name: "publicNotice", label: "Public Notice", required: false },
{ name: "sfq", label: "Standard Funding Questions (SFQs)", required: false },
{ name: "tribalConsultation", label: "Tribal Consultation", required: false },
{ name: "other", label: "Other", required: false },
] as const;
// const attachmentList = [
// { name: "cmsForm179", label: "CMS Form 179", required: true },
// { name: "spaPages", label: "SPA Pages", required: true },
// { name: "coverLetter", label: "Cover Letter", required: false },
// {
// name: "tribalEngagement",
// label: "Document Demonstrating Good-Faith Tribal Engagement",
// required: false,
// },
// {
// name: "existingStatePlanPages",
// label: "Existing State Plan Page(s)",
// required: false,
// },
// { name: "publicNotice", label: "Public Notice", required: false },
// { name: "sfq", label: "Standard Funding Questions (SFQs)", required: false },
// { name: "tribalConsultation", label: "Tribal Consultation", required: false },
// { name: "other", label: "Other", required: false },
// ] as const;

export const MedicaidSpaFormPage = () => {
const { data: user } = useGetUser();
Expand Down Expand Up @@ -186,7 +186,7 @@ export const MedicaidSpaFormPage = () => {
)}
/>
</SectionCard>
<SectionCard title="Attachments">
{/* <SectionCard title="Attachments">
<Content.AttachmentsSizeTypesDesc
faqAttLink="/faq/medicaid-spa-attachments"
includeCMS179
Expand Down Expand Up @@ -220,7 +220,7 @@ export const MedicaidSpaFormPage = () => {
)}
/>
))}
</SectionCard>
</SectionCard> */}
<SectionCard title={"Additional Information"}>
<FormField
control={form.control}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,29 +44,29 @@ const formSchema = z.object({
});
type Waiver1915BCapitatedAmendment = z.infer<typeof formSchema>;

const attachmentList = [
{
name: "bCapWaiverApplication",
label: "1915(b) Comprehensive (Capitated) Waiver Application Pre-print",
required: true,
},
{
name: "bCapCostSpreadsheets",
label:
"1915(b) Comprehensive (Capitated) Waiver Cost Effectiveness Spreadsheets",
required: true,
},
{
name: "tribalConsultation",
label: "Tribal Consultation",
required: false,
},
{
name: "other",
label: "Other",
required: false,
},
] as const;
// const attachmentList = [
// {
// name: "bCapWaiverApplication",
// label: "1915(b) Comprehensive (Capitated) Waiver Application Pre-print",
// required: true,
// },
// {
// name: "bCapCostSpreadsheets",
// label:
// "1915(b) Comprehensive (Capitated) Waiver Cost Effectiveness Spreadsheets",
// required: true,
// },
// {
// name: "tribalConsultation",
// label: "Tribal Consultation",
// required: false,
// },
// {
// name: "other",
// label: "Other",
// required: false,
// },
// ] as const;

export const Capitated1915BWaiverAmendmentPage = () => {
const location = useLocation();
Expand Down Expand Up @@ -226,7 +226,7 @@ export const Capitated1915BWaiverAmendmentPage = () => {
)}
/>
</SectionCard>
<SectionCard title="Attachments">
{/* <SectionCard title="Attachments">
<Content.AttachmentsSizeTypesDesc faqAttLink="/faq/waiverb-attachments" />
{attachmentList.map(({ name, label, required }) => (
<Inputs.FormField
Expand All @@ -248,7 +248,7 @@ export const Capitated1915BWaiverAmendmentPage = () => {
)}
/>
))}
</SectionCard>
</SectionCard> */}
<SectionCard title={"Additional Information"}>
<FormField
control={form.control}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,29 +45,29 @@ export type Waiver1915BCapitatedAmendment = z.infer<typeof formSchema>;

// first argument in the array is the name that will show up in the form submission
// second argument is used when mapping over for the label
const attachmentList = [
{
name: "bCapWaiverApplication",
label: "1915(b) Comprehensive (Capitated) Waiver Application Pre-print",
required: true,
},
{
name: "bCapCostSpreadsheets",
label:
"1915(b) Comprehensive (Capitated) Waiver Cost Effectiveness Spreadsheets",
required: true,
},
{
name: "tribalConsultation",
label: "Tribal Consultation",
required: false,
},
{
name: "other",
label: "Other",
required: false,
},
] as const;
// const attachmentList = [
// {
// name: "bCapWaiverApplication",
// label: "1915(b) Comprehensive (Capitated) Waiver Application Pre-print",
// required: true,
// },
// {
// name: "bCapCostSpreadsheets",
// label:
// "1915(b) Comprehensive (Capitated) Waiver Cost Effectiveness Spreadsheets",
// required: true,
// },
// {
// name: "tribalConsultation",
// label: "Tribal Consultation",
// required: false,
// },
// {
// name: "other",
// label: "Other",
// required: false,
// },
// ] as const;

export const Capitated1915BWaiverInitialPage = () => {
const location = useLocation();
Expand Down Expand Up @@ -202,7 +202,7 @@ export const Capitated1915BWaiverInitialPage = () => {
)}
/>
</SectionCard>
<SectionCard title="Attachments">
{/* <SectionCard title="Attachments">
<Content.AttachmentsSizeTypesDesc faqAttLink="/faq/waiverb-attachments" />
{attachmentList.map(({ name, label, required }) => (
<Inputs.FormField
Expand All @@ -224,7 +224,7 @@ export const Capitated1915BWaiverInitialPage = () => {
)}
/>
))}
</SectionCard>
</SectionCard> */}
<SectionCard title={"Additional Information"}>
<FormField
control={form.control}
Expand Down
Loading

0 comments on commit 8c3b713

Please sign in to comment.