Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(faq links): Correcting faq llinks and behavior #467

Merged
merged 32 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e740035
fix(faq links): Correcting faq llinks and behavior
benjaminpaige Mar 22, 2024
073a959
adjust faq links
benjaminpaige Mar 24, 2024
99ffb69
updaded faq links
benjaminpaige Mar 27, 2024
095d9e7
found another few
benjaminpaige Mar 27, 2024
0fdcdf1
Final one
benjaminpaige Mar 27, 2024
0005424
add s
mdial89f Mar 27, 2024
d4d6be6
Merge branch 'master' of github.com:Enterprise-CMCS/macpro-mako into …
benjaminpaige Mar 28, 2024
d82de20
fixed a couple small things
benjaminpaige Mar 28, 2024
a273c4d
Merge branch 'faq-audit' of github.com:Enterprise-CMCS/macpro-mako in…
benjaminpaige Mar 28, 2024
d4deaee
bump
mdial89f Apr 4, 2024
9e5ccd2
bump
mdial89f Apr 5, 2024
ebcc04a
bump
mdial89f Apr 6, 2024
08969aa
Merge branch 'master' into faq-audit
mdial89f Apr 6, 2024
d82ed6d
Update links and text t match existing site
benjaminpaige Apr 11, 2024
0c950ba
Merge branch 'master' into faq-audit
benjaminpaige Apr 11, 2024
6fb5c0b
update something
benjaminpaige Apr 17, 2024
42cedad
Merge branch 'master' of github.com:Enterprise-CMCS/macpro-mako into …
benjaminpaige Apr 17, 2024
ed30de9
last ones
benjaminpaige Apr 17, 2024
d133e26
last one
benjaminpaige Apr 17, 2024
46a2954
Typo
benjaminpaige Apr 17, 2024
e422bf6
yup
benjaminpaige Apr 17, 2024
ef0bbb2
Fix
benjaminpaige Apr 23, 2024
f2b5c11
Merge
benjaminpaige Apr 23, 2024
39f4991
Merge branch 'master' of github.com:Enterprise-CMCS/macpro-mako into …
benjaminpaige Apr 25, 2024
5fb2742
corrected up to a point
benjaminpaige Apr 25, 2024
75c4ede
Merged and updated
benjaminpaige Apr 25, 2024
f0f2877
update faqs
benjaminpaige Apr 25, 2024
903bbc2
add default
benjaminpaige Apr 25, 2024
74a3263
Merge branch 'master' of github.com:Enterprise-CMCS/macpro-mako into …
benjaminpaige Apr 26, 2024
64b349c
Last fix
benjaminpaige Apr 26, 2024
f24866e
te fix
benjaminpaige Apr 29, 2024
e62f965
Merge branch 'master' into faq-audit
benjaminpaige Apr 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/services/ui/src/components/Form/content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,17 @@ export const AttachmentsSizeTypesDesc = ({
<br />
<p>
We accept the following file formats:{" "}
<strong className="bold">.docx, .jpg, .pdf, .png, .xlsx.</strong> See the
full list on the{" "}
<strong className="bold">
.docx, .docx, .pdf, .jpg, .opd, and more.{" "}
</strong>{" "}
{
<Link
to="/faq/acceptable-file-formats"
target={FAQ_TAB}
rel="noopener noreferrer"
className="text-blue-700 hover:underline"
>
FAQ Page
See the full list
</Link>
}
.
Expand Down
4 changes: 1 addition & 3 deletions src/services/ui/src/features/actions/RespondToRai.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@ export const RespondToRai = ({
<PackageInfo item={item} />
{/* Attachments */}
<h3 className="font-bold text-2xl font-sans">Attachments</h3>
<AttachmentsSizeTypesDesc
faqLink={"/faq/medicaid-spa-rai-attachments"}
/>
<AttachmentsSizeTypesDesc faqLink={"/faq/chip-spa-rai-attachments"} />
{attachments.map(({ name, label, required }) => (
<FormField
key={String(name)}
Expand Down
12 changes: 6 additions & 6 deletions src/services/ui/src/features/faq/content/oneMACFAQContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ export const oneMACFAQContent: FAQContent[] = [
sectionTitle: "General",
qanda: [
{
anchorText: "system",
anchorText: "crosswalk-system",
question: "Which system should I use for my state’s submission?",
answerJSX: (
<section id={"system"}>
<section>
<p>
Check which system to submit your state plan in with this
crosswalk training document.
Expand Down Expand Up @@ -414,7 +414,7 @@ export const oneMACFAQContent: FAQContent[] = [
<tbody>
<tr>
<td className="border border-gray-300 px-4 py-2">
RAI Response*
RAI Response Letter*
</td>
<td className="border border-gray-300 px-4 py-2">
Letter responding to RAI questions, any updated SPA pages,
Expand Down Expand Up @@ -916,7 +916,7 @@ export const oneMACFAQContent: FAQContent[] = [
),
},
{
anchorText: "1915(b)-waiver-extension-attachments",
anchorText: "temporary-extensions-b-attachments",
question:
"What are the attachments for a 1915(b) Waiver - Request for Temporary Extension?",
answerJSX: (
Expand Down Expand Up @@ -957,9 +957,9 @@ export const oneMACFAQContent: FAQContent[] = [
),
},
{
anchorText: "1915(c)-waiver-extension-attachments",
anchorText: "temporary-extensions-b-attachments",
question:
"What are the attachments for a 1915(c) Waiver - Request for Temporary Extension",
"What are the attachments for a 1915(c) Waiver - Request for Temporary Extension?",
answerJSX: (
<>
<p>Note: “*” indicates a required attachment.</p>
Expand Down
10 changes: 5 additions & 5 deletions src/services/ui/src/features/faq/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@ export const Faq = () => {
</SubNavHeader>
<section className="block md:flex md:flex-row max-w-screen-xl m-auto px-4 lg:px-8 pt-8 gap-10">
<div className="flex-1">
<article key={"Asdf"} className="mb-8">
<article className="mb-8">
<Accordion
type="multiple"
value={openItems}
onValueChange={setOpenItems}
>
{oneMACFAQContent.map(({ sectionTitle, qanda }) => (
<article key={sectionTitle} className="mb-8">
<h2 className="text-2xl mb-4 text-primary">
{sectionTitle}
</h2>
<h2 className="text-2xl mb-4 text-primary">{sectionTitle}</h2>
{qanda.map(({ anchorText, answerJSX, question }) => (
<AccordionItem
value={anchorText}
id={anchorText}
key={anchorText}
>
<AccordionTrigger>{question}</AccordionTrigger>
<AccordionTrigger className="text-left">
{question}
</AccordionTrigger>
<AccordionContent>{answerJSX}</AccordionContent>
</AccordionItem>
))}
Expand Down
19 changes: 9 additions & 10 deletions src/services/ui/src/features/package-actions/shared-components.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ import {
} from "@/components";
import {
Button,
FormDescription,
FormField,
FormItem,
FormLabel,
FormMessage,
RequiredIndicator,
Textarea,
Upload,
} from "@/components/Inputs";
import { FAQ_TAB } from "@/components/Routing/consts";
Expand All @@ -26,8 +24,8 @@ import {
useLocation,
useNavigate,
useNavigation,
useParams,
useSubmit,
useParams,
} from "react-router-dom";
import { Authority } from "shared-types";

Expand Down Expand Up @@ -67,29 +65,30 @@ export const AttachmentsSection = <T extends string>({
<h2 className="font-bold text-2xl font-sans mb-2">Attachments</h2>
{supportingInformation && <p>{supportingInformation}</p>}
<p>
Maximum file size of 80 MB per attachment.{" "}
<strong>You can add multiple files per attachment type.</strong> Read
the description for each of the attachment types on the{" "}
Maximum file size of 80 MB per attachment. You can add multiple files
per attachment type. Read the description for each of the attachment
types on the
<Link
className="text-blue-700 hover:underline"
to={"/faq/medicaid-spa-attachments"} // arbitrary default, covered by a bug to be fixed soon
to="/faq/temporary-extensions-b-attachments"
target={FAQ_TAB}
rel="noopener noreferrer"
>
{" "}
FAQ Page.
</Link>
</p>
<p>
We accept the following file formats:{" "}
<strong>.docx, .jpg, .pdf, .png, .xlsx. </strong>
See the full list on the{" "}
<strong>.docx, .docx, .pdf, .jpg, .opd, and more. </strong>
<Link
className="text-blue-700 hover:underline"
to={"/faq/acceptable-file-formats"}
target={FAQ_TAB}
rel="noopener noreferrer"
>
{" "}
FAQ Page.
See the full list
</Link>
</p>
{attachments.map(({ name, required, registerName }) => (
Expand Down
5 changes: 2 additions & 3 deletions src/services/ui/src/features/package/hooks.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useGetItem } from "@/api";
import { removeUnderscoresAndCapitalize } from "@/utils";
import { useEffect, useLayoutEffect, useState } from "react";
import { useLayoutEffect, useState } from "react";

export type DetailsSidebarLink = {
id: string;
Expand All @@ -16,10 +16,9 @@ export const useDetailsSidebarLinks = (

useLayoutEffect(() => {
const ids = [
"package_details",
"package_detailss",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

haha omg

"package_activity",
"administrative_package_changess",
"appendix_k",
];

// Check if dataId is not undefined before proceeding
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const PackageDetails: FC<{
const { data } = usePackageDetailsCache();
// const title = props.title || `${data.authority} Package Details`;
return (
<DetailsSection id="package_details" title={props.title}>
<DetailsSection id="package_detailss" title={props.title}>
<div className="flex-col gap-4 max-w-2xl">
<DetailItemsGrid displayItems={recordDetails(data)} />
<DetailItemsGrid
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { PropsWithChildren, ReactElement } from "react";
import { useLocation } from "react-router-dom";
import { useLocation, Link } from "react-router-dom";
import {
Button,
Link,
SimplePageContainer,
BreadCrumbs,
FAQ_TAB,
Expand Down Expand Up @@ -34,10 +33,10 @@ const FAQHelperText = () => (
For additional information on where to submit, refer to the{" "}
{/* TODO: Get desired FAQ `target` from Wale */}
<Link
className="text-sky-700 hover:text-sky-800 underline"
to="/faq/crosswalk-system"
benjaminpaige marked this conversation as resolved.
Show resolved Hide resolved
target={FAQ_TAB}
path="/faq"
hash={"system"}
rel="noopener noreferrer"
className="text-blue-700 hover:underline flex items-center"
>
Crosswalk from Paper-based State Plan to MACPro and MMDL
</Link>{" "}
Expand Down
5 changes: 2 additions & 3 deletions src/services/ui/src/features/submission/app-k/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export const AppKSubmissionForm = () => {
<>
<p>
<Link
to="/faq/waiver-c-id"
to="/faq/app-k-id"
target={C.FAQ_TAB}
rel="noopener noreferrer"
className="text-blue-700 hover:underline"
Expand Down Expand Up @@ -188,8 +188,7 @@ export const AppKSubmissionForm = () => {
/>
</C.SectionCard>
<C.SectionCard title="Attachments">
<C.AttachmentsSizeTypesDesc faqLink="/faq/#chip-spa-attachments" />

<C.AttachmentsSizeTypesDesc faqLink="/faq/appk-attachments" />
<I.FormField
control={form.control}
name={"attachments.appk"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export const Capitated1915BWaiverAmendmentPage = () => {
/>
</SectionCard>
<SectionCard title="Attachments">
<Content.AttachmentsSizeTypesDesc faqLink="/faq/medicaid-spa-attachments" />
<Content.AttachmentsSizeTypesDesc faqLink="/faq/waiverb-attachments" />
{attachmentList.map(({ name, label, required }) => (
<Inputs.FormField
key={name}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export const Capitated1915BWaiverInitialPage = () => {
/>
</SectionCard>
<SectionCard title="Attachments">
<Content.AttachmentsSizeTypesDesc faqLink="/faq/medicaid-spa-attachments" />
<Content.AttachmentsSizeTypesDesc faqLink="/faq/waiverb-attachments" />
{attachmentList.map(({ name, label, required }) => (
<Inputs.FormField
key={name}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export const Capitated1915BWaiverRenewalPage = () => {
1915(b) Waiver Renewal Number <Inputs.RequiredIndicator />
</Inputs.FormLabel>
<Link
to="/faq/waiver-amendment-id-format"
to="/faq/waiver-renewal-id-format"
target={FAQ_TAB}
rel="noopener noreferrer"
className="text-blue-700 hover:underline flex items-center"
Expand Down Expand Up @@ -256,7 +256,7 @@ export const Capitated1915BWaiverRenewalPage = () => {
/>
</SectionCard>
<SectionCard title="Attachments">
<Content.AttachmentsSizeTypesDesc faqLink="/faq/medicaid-spa-attachments" />
<Content.AttachmentsSizeTypesDesc faqLink="/faq/waiverb-attachments" />
{attachmentList.map(({ name, label, required }) => (
<Inputs.FormField
key={name}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ export const Contracting1915BWaiverAmendmentPage = () => {
/>
</SectionCard>
<SectionCard title="Attachments">
<Content.AttachmentsSizeTypesDesc faqLink="/faq/medicaid-spa-attachments" />
<Content.AttachmentsSizeTypesDesc faqLink="/faq/waiverb-attachments" />
{attachmentList.map(({ name, label, required }) => (
<Inputs.FormField
key={name}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ export const Contracting1915BWaiverInitialPage = () => {
/>
</SectionCard>
<SectionCard title="Attachments">
<Content.AttachmentsSizeTypesDesc faqLink="/faq/medicaid-spa-attachments" />
<Content.AttachmentsSizeTypesDesc faqLink="/faq/waiverb-attachments" />
{attachmentList.map(({ name, label, required }) => (
<Inputs.FormField
key={name}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export const Contracting1915BWaiverRenewalPage = () => {
1915(b) Waiver Renewal Number <Inputs.RequiredIndicator />
</Inputs.FormLabel>
<Link
to="/faq/waiver-amendment-id-format"
to="/faq/waiver-renewal-id-format"
target={FAQ_TAB}
rel="noopener noreferrer"
className="text-blue-700 hover:underline flex items-center"
Expand Down Expand Up @@ -249,7 +249,7 @@ export const Contracting1915BWaiverRenewalPage = () => {
/>
</SectionCard>
<SectionCard title="Attachments">
<Content.AttachmentsSizeTypesDesc faqLink="/faq/medicaid-spa-attachments" />
<Content.AttachmentsSizeTypesDesc faqLink="/faq/waiver-renewal-id-format" />
{attachmentList.map(({ name, label, required }) => (
<Inputs.FormField
key={name}
Expand Down
Loading