Merge dev to main for UAT-2024-10-31 Release

onc-healthit · Nov 1, 2024 · 63fe9ce · 63fe9ce
2 parents 4d31e50 + 388aa29
commit 63fe9ce
Show file tree

Hide file tree

Showing 17 changed files with 144 additions and 69 deletions.
diff --git 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
@@ -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 (
     <>
       <DocsHomeComponent />
-      <CommunicationFab />
+      <CommunicationFab>
+        <CommunicationsFabCard />
+      </CommunicationFab>
     </>
   )
 }

diff --git 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 (
     <>
       <ArchiveHomeComponent />
-      <CommunicationFab />
+      <CommunicationFab>
+        <CommunicationsFabCard />
+      </CommunicationFab>
     </>
   )
 }

diff --git 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 (
     <>
       <CCDAHomeComponent />
-      <CommunicationFab />
+      <CommunicationFab>
+        <CommunicationsFabCard />
+      </CommunicationFab>
     </>
   )
 }

diff --git 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 (
     <>
       <CqmComponent />
-      <CommunicationFab />
+      <CommunicationFab>
+        <CommunicationsFabCard />
+      </CommunicationFab>
     </>
   )
 }

diff --git 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 <><DirectHomeComponent/><CommunicationFab/></>
+  return (
+    <>
+      <DirectHomeComponent />
+      <CommunicationFab>
+        <CommunicationsFabCard />
+      </CommunicationFab>
+    </>
+  )
 }
 
 export default DirectHome
diff --git 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 (
     <>
       <IndustryResourcesComp />
-      <CommunicationFab />
+      <CommunicationFab>
+        <CommunicationsFabCard />
+      </CommunicationFab>
     </>
   )
 }

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -2,14 +2,17 @@ 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 (
     <>
       <SiteHome />
       <PHIBanner />
       <NotificationFab />
-      <CommunicationFab />
+      <CommunicationFab>
+        <CommunicationsFabCard />
+      </CommunicationFab>
     </>
   )
 }
diff --git 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 (
     <>
       <PHRComponent />
-      <CommunicationFab />
+      <CommunicationFab>
+        <CommunicationsFabCard />
+      </CommunicationFab>
     </>
   )
 }

diff --git 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
@@ -115,10 +115,13 @@ const ValidatorMenu = ({
   return (
     <>
       <List>
-        <MenuItem sx={{ fontWeight: 'bold', py: 1 }} onClick={() => onScroll(summaryRef, 'Summary & Results')}>
+        <MenuItem
+          sx={{ fontWeight: 'bold', py: 1, whiteSpace: 'break-spaces' }}
+          onClick={() => onScroll(summaryRef, 'Summary & Results')}
+        >
           Summary & Results
         </MenuItem>
-        
+
         {resultMetaData ? (
           <ResultsSection
             resultMetaData={resultMetaData}
@@ -135,7 +138,10 @@ const ValidatorMenu = ({
           />
         ) : null}
 
-        <MenuItem sx={{ fontWeight: 'bold' }} onClick={() => onScroll(originalCCDARef, 'Original C-CDA')}>
+        <MenuItem
+          sx={{ fontWeight: 'bold', whiteSpace: 'break-spaces' }}
+          onClick={() => onScroll(originalCCDARef, 'Original C-CDA')}
+        >
           Submitted C-CDA Document
         </MenuItem>
       </List>

diff --git a/src/components/direct/hisp/TestCard.tsx b/src/components/direct/hisp/TestCard.tsx
@@ -411,7 +411,7 @@ const TestCard = ({
                 {test.moreInfo?.subHeader}
               </Typography>
               <Typography variant="body2" sx={{ fontSize: '0.875rem' }}>
-                {test.longDesc}
+                {test.longDesc ? test.longDesc : test.desc}
               </Typography>
               {test.moreInfo?.tableData && (
                 <DynamicTable headers={test.moreInfo.headers} rows={test.moreInfo.tableData} />

diff --git 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) => {
             </span>
           ))}
           {/* {role === 'sender' ? senderText : receiverText} */}
+          {/* {role === 'sender' ? senderText : receiverText} */}
         </Typography>
       </>
     )
@@ -416,14 +418,14 @@ const TestCard = ({ test }: TestCardProps) => {
   }
 
   const renderCriteriaMetIcon = () => {
-    if (endpointsGenerated && !isFinished) {
+    if (endpointsGenerated && criteriaMet === 'PENDING') {
       return <Chip variant="outlined" color="warning" label="Pending"></Chip>
     }
     if (
       criteriaMet === 'TRUE' ||
       criteriaMet === 'PASSED' ||
       criteriaMet === 'SUCCESS' ||
-      (criteriaMet === 'PENDING' && isFinished)
+      (criteriaMet === 'MANUAL' && isFinished)
     ) {
       return <Chip color="success" label="Success"></Chip>
     } else if (criteriaMet === 'FALSE' || criteriaMet === 'ERROR' || criteriaMet === 'FAILED') {
@@ -727,7 +729,10 @@ const TestCard = ({ test }: TestCardProps) => {
                   <LoadingButton
                     loading={isLoading}
                     done={isFinished}
-                    progressive={sendEdgeTestsIds.includes(test.id.toString()) && !endpointsGenerated}
+                    progressive={
+                      (sendEdgeTestsIds.includes(test.id.toString()) || sendXDRTestsIds.includes(test.id.toString())) &&
+                      !endpointsGenerated
+                    }
                     progressDuration={loadingTime}
                     onClick={handleRunTest}
                     variant="contained"

diff --git a/src/components/shared/CommunicationFab.tsx b/src/components/shared/CommunicationFab.tsx
@@ -1,18 +1,6 @@
 // src/components/CommunicationFab.tsx
 'use client'
-import {
-  Box,
-  Button,
-  Card,
-  CardActions,
-  CardContent,
-  CardHeader,
-  CardMedia,
-  Drawer,
-  Fab,
-  Tooltip,
-  Typography,
-} from '@mui/material'
+import { Box, Drawer, Fab, Tooltip, Typography } from '@mui/material'
 import React, { useEffect, useState } from 'react'
 import CloseIcon from '@mui/icons-material/Close'
 import ExitToAppIcon from '@mui/icons-material/ExitToApp'
@@ -21,14 +9,16 @@ import SecurityIcon from '@mui/icons-material/Security'
 import LinkButton from './LinkButton'
 import { fetchReleaseData } from '@/assets/ReleaseService'
 import palette from '@/styles/palette'
-import websiteLaunch from '@public/shared/SITE_Website_Launch.svg'
-import Image from 'next/image'
 import ForwardToInboxOutlinedIcon from '@mui/icons-material/ForwardToInboxOutlined'
 import eventTrack from '@/services/analytics'
 
 const drawerWidth = 350
 
-const CommunicationFab: React.FC = () => {
+interface CommunicationFabProps {
+  children: React.ReactNode
+}
+
+const CommunicationFab: React.FC<CommunicationFabProps> = ({ children }) => {
   const [drawerOpen, setDrawerOpen] = useState(false)
   const handleDrawerOpen = () => {
     setDrawerOpen(true)
@@ -69,30 +59,7 @@ const CommunicationFab: React.FC = () => {
         }}
       >
         <Box width={'auto'} p={2} mb={8} display={'flex'} flexDirection={'column'} gap={4}>
-          <Card>
-            <CardMedia sx={{ width: 'auto' }}>
-              <Image style={{ width: '330px', height: 'auto' }} src={websiteLaunch} alt="Placeholder" />
-            </CardMedia>
-            <CardHeader
-              sx={{ px: 1, pt: 1, pb: 0 }}
-              titleTypographyProps={{ variant: 'body1', fontSize: '.85em', fontWeight: 'bold' }}
-              title={process.env.NEXT_PUBLIC_ASTP_RELEASE_CONTENT_HEADER ?? ''}
-            ></CardHeader>
-            <Typography sx={{ px: 1, fontSize: '.75em' }} variant="body2">
-              {process.env.NEXT_PUBLIC_ASTP_RELEASE_CONTENT ?? ''}
-            </Typography>
-            <CardActions>
-              <Button
-                href={process.env.NEXT_PUBLIC_ASTP_RELEASE_BLOG_URL ?? '/'}
-                size="small"
-                variant="text"
-                color="secondary"
-                target="_blank"
-              >
-                Read More...
-              </Button>
-            </CardActions>
-          </Card>
+          {children}
           <LinkButton
             label="Access Forum"
             url="https://groups.google.com/g/edge-test-tool"

diff --git a/src/components/shared/dialog/DialogTemplate.tsx b/src/components/shared/dialog/DialogTemplate.tsx
@@ -1,4 +1,3 @@
-import { lightThemeOptions } from '@/styles/lightThemeOptions'
 import palette from '@/styles/palette'
 import CloseIcon from '@mui/icons-material/Close'
 import { Box, Dialog, DialogContent, DialogTitle, IconButton } from '@mui/material'
@@ -46,21 +45,35 @@ const DialogTemplate: FC<DialogTemplateProps> = ({
     <Dialog disableScrollLock disableEnforceFocus maxWidth="xl" open={open} onClose={handleClose}>
       <CustomDialogTitle handleClose={handleClose}>{title}</CustomDialogTitle>
       <DialogContent
-        sx={{ display: 'flex', borderColor: palette.divider, alignItems: 'stretch', flexDirection: 'row' }}
+        sx={{
+          display: 'flex',
+          borderColor: palette.divider,
+          alignItems: 'stretch',
+          flexDirection: 'row',
+          overflowX: 'hidden',
+        }}
         onClick={(e) => e.stopPropagation()}
       >
         {/* Menu */}
         {menuContent && (
           <Box
             sx={{
-              minWidth: '275px',
               scrollBehavior: 'smooth',
               overflowY: 'scroll',
-              [`@media (min-width: ${lightThemeOptions?.breakpoints?.values?.lg}px)`]: {
-                // Use theme breakpoint value
-                overflowY: 'auto',
+              minWidth: {
+                xs: '50%', // small screens
+                sm: '200px', // small screens
+                md: 'min-content', // medium screens
+                lg: '275px', // large screens and above
+              },
+              maxWidth: {
+                xs: '50%', // small screens
+                sm: '200px', // small screens
+                md: 'min-content', // medium screens
+                lg: '275px', // large screens and above
               },
             }}
+            maxHeight={'100vh'}
             top={'0px'}
             position={'sticky'}
             borderRight={`1px solid ${palette.divider} `}
@@ -69,7 +82,19 @@ const DialogTemplate: FC<DialogTemplateProps> = ({
           </Box>
         )}
         {/* Results */}
-        {resultsContent}
+        <Box
+          sx={{
+            maxWidth: {
+              xs: '50%', // small screens
+              sm: '75%', // small screens
+              md: '85%', // medium screens
+              lg: 'max-content',
+              xl: 'max-content',
+            },
+          }}
+        >
+          {resultsContent}
+        </Box>
       </DialogContent>
       {/* Actions */}
       {actionsContent}

diff --git a/src/components/shared/notifications/NotificationsHistory.tsx b/src/components/shared/notifications/NotificationsHistory.tsx
@@ -66,7 +66,7 @@ export default function NotificationHistory() {
         <Timeline
           items={notifications.map((notification) => ({
             title: notification.title,
-            date: new Date().toLocaleDateString(), // Placeholder; adjust if you have actual dates
+            date: '11/6/2024',
             description: notification.content,
           }))}
         />