Skip to content

Commit

Permalink
Merge dev to main for UAT-2024-10-30 Release
Browse files Browse the repository at this point in the history
  • Loading branch information
drbgfc authored Oct 30, 2024
2 parents 2201aab + 3d7aad9 commit 4d31e50
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ 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.google.com
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."
6 changes: 0 additions & 6 deletions src/assets/NotificationService.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ export const fetchNotifications = async (): Promise<Announcement[]> => {
return [
{
id: '1',
title: 'Scheduled Maintenance',
content:
'Our site will be undergoing scheduled maintenance on Friday, July 28th, from 2 AM to 4 AM (UTC). During this time, some services may be unavailable. We apologize for any inconvenience and appreciate your patience.',
},
{
id: '2',
title: 'Monthly Updates',
content:
'We regularly implement monthly updates to enhance your experience with our SITE tools. To stay informed about the latest features, improvements, and any important changes, we encourage you to review our release notes. You can find them in the bottom left corner of the navigation. Keeping up with these updates will help you maximize the benefits of our tools and ensure you’re using them to their full potential!',
Expand Down
36 changes: 28 additions & 8 deletions src/components/direct/dcdt/DiscoverResults.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import palette from '@/styles/palette'
import { Dialog, Divider, DialogContent, Typography, Button, Box } from '@mui/material'
import { Dialog, Divider, DialogContent, Typography, Button, Box, DialogTitle, LinearProgress } from '@mui/material'
import { FC, useEffect, useState } from 'react'
import { useFormStatus } from 'react-dom'
import { Check } from '@mui/icons-material'
Expand Down Expand Up @@ -145,6 +145,31 @@ const DiscoverResultsDialog: FC<DiscoverResultsDialogProps> = ({ open, handleClo
)
}

const LoadingResults = () => {
return (
<Dialog open maxWidth="lg">
<DialogTitle typography={'h3'} sx={{ fontWeight: '600', pb: 2 }} id="dialog-title">
Sending...
</DialogTitle>
<Divider />
<DialogContent>
<Typography>{}</Typography>
<LinearProgress
sx={{
height: 4,
borderRadius: 5,
mt: 2,
backgroundColor: palette.secondaryLight,
'& .MuiLinearProgress-bar': {
backgroundColor: palette.secondary,
},
}}
/>
</DialogContent>
</Dialog>
)
}

const DiscoverResultsComponent = ({ response }: DiscoverResultsComponentProps) => {
const [openDialog, setOpenDialog] = useState(false)
const { pending } = useFormStatus()
Expand Down Expand Up @@ -183,15 +208,10 @@ const DiscoverResultsComponent = ({ response }: DiscoverResultsComponentProps) =
}, [pending, response])
return (
<>
<Button
variant="contained"
sx={{ color: palette.white }}
type="submit"
onClick={handleOpenDialog}
disabled={pending}
>
<Button variant="contained" sx={{ color: palette.white }} type="submit" disabled={pending}>
SUBMIT
</Button>
{pending && <LoadingResults />}
{!pending && _.has(response, 'error') && (
<ErrorDisplayCard open={errorOpen} handleClose={handleErrorClose} response={response} />
)}
Expand Down
8 changes: 1 addition & 7 deletions src/components/direct/dcdt/HostingResults.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -330,13 +330,7 @@ const HostingResultsComponent = ({ response }: HostingResultsComponentProps) =>

return (
<>
<Button
variant="contained"
sx={{ color: palette.white }}
type="submit"
onClick={handleOpenDialog}
disabled={pending}
>
<Button variant="contained" sx={{ color: palette.white }} type="submit" disabled={pending}>
SUBMIT
</Button>
{pending && <LoadingResults />}
Expand Down
18 changes: 10 additions & 8 deletions src/components/direct/hisp/XDRTestCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ const TestCard = ({ test }: TestCardProps) => {
{inputs.length - 1 === i ? '. ' : ', '}
</span>
))}
{role === 'sender' ? senderText : receiverText}
{/* {role === 'sender' ? senderText : receiverText} */}
</Typography>
</>
)
Expand Down Expand Up @@ -306,7 +306,6 @@ const TestCard = ({ test }: TestCardProps) => {
setIsLoading(true)
setIsFinished(false)
setCriteriaMet('')

if (endpointsGenerated) {
const status = await GetStatus(test.id.toString())
console.log('Test status:', status)
Expand Down Expand Up @@ -417,10 +416,15 @@ const TestCard = ({ test }: TestCardProps) => {
}

const renderCriteriaMetIcon = () => {
if (endpointsGenerated) {
if (endpointsGenerated && !isFinished) {
return <Chip variant="outlined" color="warning" label="Pending"></Chip>
}
if (criteriaMet === 'TRUE' || criteriaMet === 'PASSED' || criteriaMet === 'SUCCESS') {
if (
criteriaMet === 'TRUE' ||
criteriaMet === 'PASSED' ||
criteriaMet === 'SUCCESS' ||
(criteriaMet === 'PENDING' && isFinished)
) {
return <Chip color="success" label="Success"></Chip>
} else if (criteriaMet === 'FALSE' || criteriaMet === 'ERROR' || criteriaMet === 'FAILED') {
return <Chip color="error" label="Failed"></Chip>
Expand Down Expand Up @@ -662,7 +666,7 @@ const TestCard = ({ test }: TestCardProps) => {
</Button>
</Tooltip>
<Typography whiteSpace={'preline'} variant="caption">
{endpointsGenerated ? defaultEndpoint : defaultEndpoint}
{endpointsGenerated ? endpoint : defaultEndpoint}
</Typography>
</Box>
<Box width={'30%'} display={'flex'} flexDirection={'column'}>
Expand All @@ -677,9 +681,7 @@ const TestCard = ({ test }: TestCardProps) => {
Endpoint TLS
</Button>
</Tooltip>
<Typography variant="caption">
{endpointsGenerated ? defaultEndpointTLS : defaultEndpointTLS}
</Typography>
<Typography variant="caption">{endpointsGenerated ? endpointTLS : defaultEndpointTLS}</Typography>
</Box>
</Box>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const ValidationHome = ({ messageId, category }: ValidationHomeProps) => {
<Link color="inherit" href="/direct/senddirect#message-status" key="2" className={styles.link}>
Message Status
</Link>,
<Link color="inherit" href="/direct/messagestatus/validationreport" key="3" className={styles.link}>
<Link color="inherit" href={window.location.href} key="3" className={styles.link}>
Validation Report
</Link>,
]}
Expand Down
28 changes: 19 additions & 9 deletions src/components/resources/DocsHome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ const DocsHome = () => {
/>
<DocsCard
cardHeader="Content Validator API"
description={' '}
description={'Source code for the C-CDA Validator API'}
buttonLink="https://github.com/onc-healthit/content-validator-api"
/>
<DocsCard
Expand All @@ -163,39 +163,49 @@ const DocsHome = () => {
/>
<DocsCard
cardHeader="Direct Transport Message Sender"
description={' '}
description={'Source code for Direct transport sender service'}
buttonLink="https://github.com/onc-healthit/direct-transport-message-sender"
/>
<DocsCard
cardHeader="Trust Anchor Uploader"
description={' '}
description={
'Upload trust anchors so they can be added to the trust bundle used for Direct Transport'
}
buttonLink="https://github.com/onc-healthit/trustanchor-uploader"
/>
<DocsCard
cardHeader="XDR Message Sender"
description={' '}
description={'Source code for the XDR Message Sender service'}
buttonLink="https://github.com/onc-healthit/xdr-message-sender"
/>
<DocsCard
cardHeader="Scorecard Results Mailer Job"
description={' '}
description={'Source code for Scorecard Results Mailer Job'}
buttonLink="https://github.com/onc-healthit/scorecard-results-mailer-job"
/>
<DocsCard
cardHeader=" Direct Certificate Discovery Tool (DCDT)"
description={'The open code repository for the Direct Certificate Discovery Tool (DCDT). '}
buttonLink="https://github.com/onc-healthit/dcdt"
/>
<DocsCard cardHeader="ETT" description={' '} buttonLink="https://github.com/onc-healthit/ett" />
<DocsCard cardHeader="SITE UI" description={' '} buttonLink="https://github.com/onc-healthit/site-ui" />
<DocsCard
cardHeader="ETT"
description={'Source code for the Edge Testing Tool'}
buttonLink="https://github.com/onc-healthit/ett"
/>
<DocsCard
cardHeader="SITE UI"
description={'Source code for SITE UI'}
buttonLink="https://github.com/onc-healthit/site-ui"
/>
<DocsCard
cardHeader="C-CDA Parser"
description={' '}
description={'Source code for the C-CDA Parser'}
buttonLink="https://github.com/onc-healthit/ccda-parser"
/>
<DocsCard
cardHeader="C-CDA USCDI Certification Test Data"
description={' '}
description={'Source code for C-CDA USCDI Certification Test Data '}
buttonLink="https://github.com/onc-healthit/ccda-uscdi-certification-testdata"
/>
</Box>
Expand Down

0 comments on commit 4d31e50

Please sign in to comment.