From a27480ac32e64c3814bb38f372728e7ce92d208e Mon Sep 17 00:00:00 2001 From: KeeyanGhoreshi Date: Thu, 1 Feb 2024 15:25:24 -0500 Subject: [PATCH 1/4] don't error on suggestions --- src/components/DisplayBox/DisplayBox.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/DisplayBox/DisplayBox.js b/src/components/DisplayBox/DisplayBox.js index f0f6f953..a08165da 100644 --- a/src/components/DisplayBox/DisplayBox.js +++ b/src/components/DisplayBox/DisplayBox.js @@ -377,6 +377,7 @@ export default class DisplayBox extends Component { {linksSection} + {suggestionsSection} ); @@ -401,7 +402,7 @@ export default class DisplayBox extends Component { // clear the suggestion buttons console.log(this.buttonList); this.buttonList.forEach((requestButton, id) => { - document.getElementById(requestButton).removeAttribute('disabled'); + document.getElementById(requestButton)?.removeAttribute('disabled'); }); } } From ad20295ba6f01d4b7b6ceb3d3ab46b20b00b1fc7 Mon Sep 17 00:00:00 2001 From: KeeyanGhoreshi Date: Thu, 1 Feb 2024 17:10:37 -0500 Subject: [PATCH 2/4] fix unrelated warning --- src/components/SMARTBox/PatientBox.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/SMARTBox/PatientBox.js b/src/components/SMARTBox/PatientBox.js index 2e225b07..13926cbb 100644 --- a/src/components/SMARTBox/PatientBox.js +++ b/src/components/SMARTBox/PatientBox.js @@ -465,7 +465,7 @@ export default class PatientBox extends Component { - + {columns.map((column) => ( {options.map((row) => ( - + this.handleRequestChange(row.value, patient)} From f8e138e695131be68c2b95756f802057912e3f71 Mon Sep 17 00:00:00 2001 From: KeeyanGhoreshi Date: Thu, 1 Feb 2024 17:11:23 -0500 Subject: [PATCH 3/4] remove unnecessary key --- src/components/SMARTBox/PatientBox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SMARTBox/PatientBox.js b/src/components/SMARTBox/PatientBox.js index 13926cbb..22f54f5b 100644 --- a/src/components/SMARTBox/PatientBox.js +++ b/src/components/SMARTBox/PatientBox.js @@ -465,7 +465,7 @@ export default class PatientBox extends Component {
- + {columns.map((column) => ( Date: Tue, 6 Feb 2024 01:20:18 -0500 Subject: [PATCH 4/4] disable on success --- src/components/DisplayBox/DisplayBox.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/components/DisplayBox/DisplayBox.js b/src/components/DisplayBox/DisplayBox.js index a08165da..cd8c1374 100644 --- a/src/components/DisplayBox/DisplayBox.js +++ b/src/components/DisplayBox/DisplayBox.js @@ -75,7 +75,7 @@ export default class DisplayBox extends Component { } } - supportedRequesType(resource) { + supportedRequestType(resource) { let resourceType = resource.resourceType.toUpperCase(); if ( resourceType === 'DEVICEREQUEST' || @@ -102,7 +102,9 @@ export default class DisplayBox extends Component { } } else { // disable this suggestion button if any are allowed - document.getElementById(buttonId).setAttribute('disabled', 'true'); + const element = document.getElementById(buttonId); + element.setAttribute('disabled', 'true'); + element.setAttribute('style', 'background-color:#4BB543;'); } if (suggestion.label) { @@ -131,7 +133,7 @@ export default class DisplayBox extends Component { console.log('suggested action CREATE result:'); console.log(result); - if (this.supportedRequesType(result)) { + if (this.supportedRequestType(result)) { // call into the request builder to resubmit the CRD request with the suggested request this.props.takeSuggestion(result); } @@ -398,11 +400,4 @@ export default class DisplayBox extends Component { } } - componentDidUpdate() { - // clear the suggestion buttons - console.log(this.buttonList); - this.buttonList.forEach((requestButton, id) => { - document.getElementById(requestButton)?.removeAttribute('disabled'); - }); - } }