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.

Sign up for GitHub

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 XDR Test 16 and 17 #205

Merged
merged 27 commits into from
Oct 31, 2024
Merged

Fix XDR Test 16 and 17 #205

Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
fd75bec
Add H2 tab
ebrockainq Oct 14, 2024
3bb0612
Refine sub-criteria
ebrockainq Oct 15, 2024
0ec59d0
Merge branch 'dev' into evan-dev-H2-tab
ebrockainq Oct 15, 2024
4c2315d
Resolve merge conflict
ebrockainq Oct 15, 2024
0b8a2c0
Fix manual validation on tests that did not require it
ebrockainq Oct 16, 2024
a935c33
Fix pending displayed when successful response already generated
ebrockainq Oct 16, 2024
1bc2efd
Merge branch 'dev' into evan-dev-H2-tab
ebrockainq Oct 16, 2024
3d932b2
Fix H2 subgroups
ebrockainq Oct 22, 2024
09b4832
Merge branch 'dev' into evan-dev-H2-tab
ebrockainq Oct 22, 2024
447cd88
Fix receive tab
ebrockainq Oct 22, 2024
fff243f
Merge branch 'evan-dev-H2-tab' of https://github.com/onc-healthit/sit…
ebrockainq Oct 22, 2024
2acada7
Merge branch 'dev' into evan-dev-H2-tab
ebrockainq Oct 22, 2024
c64f36d
Minor fixes to fixed endpoints and H2 subgroups
ebrockainq Oct 23, 2024
2206f9f
Merge branch 'dev' into evan-dev-H2-tab
ebrockainq Oct 23, 2024
fe761fd
Merge branch 'dev' into evan-dev-H2-tab
ebrockainq Oct 23, 2024
6fdada6
Fix incorrect endpoint display
ebrockainq Oct 24, 2024
433cf07
Fix sub-criteria selection and MT test accept/reject buttons
ebrockainq Oct 24, 2024
fe3c8b5
Add tests to sendEdgeTests
ebrockainq Oct 24, 2024
b8b7eec
Merge remote-tracking branch 'origin/dev' into evan-dev-H2-tab
akanuri9 Oct 29, 2024
64eb28a
Fix pending status after refresh
akanuri9 Oct 29, 2024
da9088b
Add criteriaMet type manual
akanuri9 Oct 31, 2024
7e0bc3e
Resolve merge conflicts with dev
akanuri9 Oct 31, 2024
684fcf8
Remove duplicate
akanuri9 Oct 31, 2024
d122665
Merge remote-tracking branch 'origin/dev' into evan-dev-H2-tab
akanuri9 Oct 31, 2024
80edb1d
Fix issues for HISP tabs
akanuri9 Oct 31, 2024
7de0b36
Fix XDR Test 16 and 17
akanuri9 Oct 31, 2024
caae60c
Merge remote-tracking branch 'origin/dev' into evan-dev-H2-tab
akanuri9 Oct 31, 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
6 changes: 5 additions & 1 deletion src/components/direct/hisp/XDRTestCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -728,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"
Expand Down