diff --git a/.env b/.env index 89681ed0..1c1599c9 100644 --- a/.env +++ b/.env @@ -25,6 +25,3 @@ NEXT_PUBLIC_RELEASE_DATE_URL=https://raw.githubusercontent.com/onc-healthit/site NEXT_PUBLIC_IS_DEBUG_MODE=false NEXT_PUBLIC_IS_EVENT_TRACKING=true NEXT_PUBLIC_SCORECARD_SAVESCORECARDSERVICE_API=https://ccda.healthit.gov/scorecard/savescorecardservice -NEXT_PUBLIC_ASTP_RELEASE_BLOG_URL=https://www.healthit.gov/newsroom/news-releases -NEXT_PUBLIC_ASTP_RELEASE_CONTENT_HEADER="SITE Unveils Revamped User Interface & Optimized Experience" -NEXT_PUBLIC_ASTP_RELEASE_CONTENT="The Standards Implementation & Testing Environment (SITE) have undergone comprehensive enhancements to improve security, usability, functionality, and performance, offering a more intuitive and efficient user experience." diff --git a/src/app/(resources)/docs/page.tsx b/src/app/(resources)/docs/page.tsx index f0a87891..6247bb5f 100644 --- a/src/app/(resources)/docs/page.tsx +++ b/src/app/(resources)/docs/page.tsx @@ -1,10 +1,13 @@ import DocsHomeComponent from '@/components/resources/DocsHome' import CommunicationFab from '@/components/shared/CommunicationFab' +import CommunicationsFabCard from '@/components/shared/server/CommunicationsFabCard' const DocsHome = () => { return ( <> - + + + ) } diff --git a/src/app/archived/page.tsx b/src/app/archived/page.tsx index a365146e..932df364 100644 --- a/src/app/archived/page.tsx +++ b/src/app/archived/page.tsx @@ -1,10 +1,13 @@ import ArchiveHomeComponent from '@/components/archived/ArchiveHome' import CommunicationFab from '@/components/shared/CommunicationFab' +import CommunicationsFabCard from '@/components/shared/server/CommunicationsFabCard' const ArchiveHome = () => { return ( <> - + + + ) } diff --git a/src/app/c-cda/page.tsx b/src/app/c-cda/page.tsx index 26ce8ad4..984defe0 100644 --- a/src/app/c-cda/page.tsx +++ b/src/app/c-cda/page.tsx @@ -1,10 +1,13 @@ import CCDAHomeComponent from '@/components/c-cda/CCDAHome' import CommunicationFab from '@/components/shared/CommunicationFab' +import CommunicationsFabCard from '@/components/shared/server/CommunicationsFabCard' const CCDAHome = () => { return ( <> - + + + ) } diff --git a/src/app/cqmt/page.tsx b/src/app/cqmt/page.tsx index eef244d2..25b296c0 100644 --- a/src/app/cqmt/page.tsx +++ b/src/app/cqmt/page.tsx @@ -1,10 +1,13 @@ import CqmComponent from '@/components/cqmt/CqmHome' import CommunicationFab from '@/components/shared/CommunicationFab' +import CommunicationsFabCard from '@/components/shared/server/CommunicationsFabCard' const CqmHome = () => { return ( <> - + + + ) } diff --git a/src/app/direct/page.tsx b/src/app/direct/page.tsx index 1ef6109d..01c40525 100644 --- a/src/app/direct/page.tsx +++ b/src/app/direct/page.tsx @@ -1,7 +1,15 @@ -import DirectHomeComponent from "@/components/direct/DirectHome" -import CommunicationFab from "@/components/shared/CommunicationFab" +import DirectHomeComponent from '@/components/direct/DirectHome' +import CommunicationFab from '@/components/shared/CommunicationFab' +import CommunicationsFabCard from '@/components/shared/server/CommunicationsFabCard' const DirectHome = () => { - return <> + return ( + <> + + + + + + ) } export default DirectHome diff --git a/src/app/industry-resources/page.tsx b/src/app/industry-resources/page.tsx index 023f605f..1f444bb2 100644 --- a/src/app/industry-resources/page.tsx +++ b/src/app/industry-resources/page.tsx @@ -1,10 +1,13 @@ import IndustryResourcesComp from '@/components/industry-resources/IndustryResourcesHome' import CommunicationFab from '@/components/shared/CommunicationFab' +import CommunicationsFabCard from '@/components/shared/server/CommunicationsFabCard' const IndustryResourcesHome = () => { return ( <> - + + + ) } diff --git a/src/app/page.tsx b/src/app/page.tsx index fa295d50..d220b5e6 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -2,6 +2,7 @@ import SiteHome from '@/components/home/SiteHome' import NotificationFab from '@/components/shared/Notifications' import CommunicationFab from '@/components/shared/CommunicationFab' import PHIBanner from '@/components/shared/PHIBanner' +import CommunicationsFabCard from '@/components/shared/server/CommunicationsFabCard' export default function Home() { return ( @@ -9,7 +10,9 @@ export default function Home() { - + + + ) } diff --git a/src/app/public-health-reporting/page.tsx b/src/app/public-health-reporting/page.tsx index b03e6f5a..c9a0bcd7 100644 --- a/src/app/public-health-reporting/page.tsx +++ b/src/app/public-health-reporting/page.tsx @@ -1,10 +1,13 @@ import PHRComponent from '@/components/public-health-reporting/PHRHome' import CommunicationFab from '@/components/shared/CommunicationFab' +import CommunicationsFabCard from '@/components/shared/server/CommunicationsFabCard' const PHRHome = () => { return ( <> - + + + ) } diff --git a/src/assets/SMTPTestCases.tsx b/src/assets/SMTPTestCases.tsx index 8d507523..0c962f7e 100644 --- a/src/assets/SMTPTestCases.tsx +++ b/src/assets/SMTPTestCases.tsx @@ -211,6 +211,17 @@ const testCases = { sutHisp: true, criteria: "['h2-8']", sutEdge: true, + fields: [ + { + label: 'Command timeout in seconds', + name: 'sutCommandTimeoutInSeconds', + datatype: 'String', + placeHolder: 'Command timeout in seconds', + value: 'Command timeout in seconds', + readOnly: false, + display: true, + }, + ], }, { name: 'SMTP MT Test 17 - Generate Unique Message-ID (Processed MDN suite)', @@ -338,7 +349,7 @@ const testCases = { actionLabel: 'RUN', }, desc: ' Verifies the ability of SUT to receive PDF and CCDA attachments', - longDesc: 'Verifies the ability of SUT to receive text and CCDA attachments', + longDesc: 'Verifies the ability of SUT to receive PDF and CCDA attachments', sutRole: 'receiver', sutHisp: true, criteria: "['b1-4','su1-4']", diff --git a/src/components/c-cda/validation/results/ValidationMenu.tsx b/src/components/c-cda/validation/results/ValidationMenu.tsx index 536d684e..8a4380d4 100644 --- a/src/components/c-cda/validation/results/ValidationMenu.tsx +++ b/src/components/c-cda/validation/results/ValidationMenu.tsx @@ -115,10 +115,13 @@ const ValidatorMenu = ({ return ( <> - onScroll(summaryRef, 'Summary & Results')}> + onScroll(summaryRef, 'Summary & Results')} + > Summary & Results - + {resultMetaData ? ( ) : null} - onScroll(originalCCDARef, 'Original C-CDA')}> + onScroll(originalCCDARef, 'Original C-CDA')} + > Submitted C-CDA Document diff --git a/src/components/direct/hisp/TestCard.tsx b/src/components/direct/hisp/TestCard.tsx index 34955c52..6100bc90 100644 --- a/src/components/direct/hisp/TestCard.tsx +++ b/src/components/direct/hisp/TestCard.tsx @@ -411,7 +411,7 @@ const TestCard = ({ {test.moreInfo?.subHeader} - {test.longDesc} + {test.longDesc ? test.longDesc : test.desc} {test.moreInfo?.tableData && ( diff --git a/src/components/direct/hisp/XDRTestCard.tsx b/src/components/direct/hisp/XDRTestCard.tsx index a413fdac..cb6df9d8 100644 --- a/src/components/direct/hisp/XDRTestCard.tsx +++ b/src/components/direct/hisp/XDRTestCard.tsx @@ -216,6 +216,7 @@ const TestCard = ({ test }: TestCardProps) => { '44mu2', ] const ccdaRequiredTestIds = ['1', '2', '3add'] + const sendXDRTestsIds = ['16', '17'] const sendEdgeTestsIds = ['1', '2', '6', '7', '10', '11', '12', '20amu2', '20bmu2', '49mu2'] const isCCDADocumentRequired = ccdaRequiredTestIds.includes(test.id.toString()) const StepText = ({ inputs, role, endpointsGenerated, criteriaMet }: StepTextProps) => { @@ -250,6 +251,7 @@ const TestCard = ({ test }: TestCardProps) => { ))} {/* {role === 'sender' ? senderText : receiverText} */} + {/* {role === 'sender' ? senderText : receiverText} */} ) @@ -416,14 +418,14 @@ const TestCard = ({ test }: TestCardProps) => { } const renderCriteriaMetIcon = () => { - if (endpointsGenerated && !isFinished) { + if (endpointsGenerated && criteriaMet === 'PENDING') { return } if ( criteriaMet === 'TRUE' || criteriaMet === 'PASSED' || criteriaMet === 'SUCCESS' || - (criteriaMet === 'PENDING' && isFinished) + (criteriaMet === 'MANUAL' && isFinished) ) { return } else if (criteriaMet === 'FALSE' || criteriaMet === 'ERROR' || criteriaMet === 'FAILED') { @@ -727,7 +729,10 @@ const TestCard = ({ test }: TestCardProps) => { { +interface CommunicationFabProps { + children: React.ReactNode +} + +const CommunicationFab: React.FC = ({ children }) => { const [drawerOpen, setDrawerOpen] = useState(false) const handleDrawerOpen = () => { setDrawerOpen(true) @@ -69,30 +59,7 @@ const CommunicationFab: React.FC = () => { }} > - - - Placeholder - - - - {process.env.NEXT_PUBLIC_ASTP_RELEASE_CONTENT ?? ''} - - - - - + {children} = ({ {title} e.stopPropagation()} > {/* Menu */} {menuContent && ( = ({ )} {/* Results */} - {resultsContent} + + {resultsContent} + {/* Actions */} {actionsContent} diff --git a/src/components/shared/notifications/NotificationsHistory.tsx b/src/components/shared/notifications/NotificationsHistory.tsx index 4c602f50..45937388 100644 --- a/src/components/shared/notifications/NotificationsHistory.tsx +++ b/src/components/shared/notifications/NotificationsHistory.tsx @@ -66,7 +66,7 @@ export default function NotificationHistory() { ({ title: notification.title, - date: new Date().toLocaleDateString(), // Placeholder; adjust if you have actual dates + date: '11/6/2024', description: notification.content, }))} /> diff --git a/src/components/shared/server/CommunicationsFabCard.tsx b/src/components/shared/server/CommunicationsFabCard.tsx new file mode 100644 index 00000000..4dcd222d --- /dev/null +++ b/src/components/shared/server/CommunicationsFabCard.tsx @@ -0,0 +1,35 @@ +'use server' +import { Button, Card, CardActions, CardHeader, CardMedia, Typography } from '@mui/material' +import Image from 'next/image' +import websiteLaunch from '@public/shared/SITE_Website_Launch.svg' + +const CommunicationsFabCard = () => { + return ( + + + Placeholder + + + + {process.env.ASTP_RELEASE_CONTENT ?? ''} + + + + + + ) +} + +export default CommunicationsFabCard