From 0d4315cf920f836fabe428540a684252a56162d9 Mon Sep 17 00:00:00 2001 From: Zach Robin Date: Tue, 23 Aug 2022 12:08:17 -0700 Subject: [PATCH 1/3] Added in pause for loading with spinner --- .gitignore | 3 ++- src/components/RequestBox/RequestBox.js | 5 ++++- src/containers/RequestBuilder.js | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0445a1b8..e856ea58 100644 --- a/.gitignore +++ b/.gitignore @@ -62,4 +62,5 @@ typings/ # local build files build/ -package-lock.json \ No newline at end of file +package-lock.json +src/db.json diff --git a/src/components/RequestBox/RequestBox.js b/src/components/RequestBox/RequestBox.js index 5ab0dd95..91c57007 100644 --- a/src/components/RequestBox/RequestBox.js +++ b/src/components/RequestBox/RequestBox.js @@ -745,7 +745,7 @@ export default class RequestBox extends Component { if (this.props.access_token) { params['tokenResponse'] = {access_token: this.props.access_token.access_token}; } - const disableSendToCRD = this.isOrderNotSelected(); + const disableSendToCRD = this.isOrderNotSelected() || this.props.loading ; const disableLaunchDTR = this.isOrderNotSelected() && Object.keys(this.state.response).length === 0; return (
@@ -803,6 +803,9 @@ export default class RequestBox extends Component {
+
+
+
diff --git a/src/containers/RequestBuilder.js b/src/containers/RequestBuilder.js index b3d87e64..e63a248f 100644 --- a/src/containers/RequestBuilder.js +++ b/src/containers/RequestBuilder.js @@ -130,6 +130,7 @@ export default class RequestBuilder extends Component { } submit_info(prefetch, request, patient, extraPrefetch, hook) { + this.setState({loading: true}); this.consoleLog("Initiating form submission", types.info); this.setState({patient}); const hookConfig = { @@ -383,6 +384,7 @@ retrieveLaunchContext(link, accessToken, patientId, fhirBaseUrl, fhirVersion) { launchUrl={this.state.launchUrl} responseExpirationDays={this.state.responseExpirationDays} ref={this.requestBox} + loading={this.state.loading} /> From 120892108db7038fd57f3506cd4e8b88c85227f3 Mon Sep 17 00:00:00 2001 From: Zach Robin Date: Tue, 23 Aug 2022 13:13:43 -0700 Subject: [PATCH 2/3] removed extraPrefetch fixed hook issue --- src/containers/RequestBuilder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/RequestBuilder.js b/src/containers/RequestBuilder.js index 2f43e1d6..d791f21f 100644 --- a/src/containers/RequestBuilder.js +++ b/src/containers/RequestBuilder.js @@ -109,7 +109,7 @@ export default class RequestBuilder extends Component { } - submit_info(prefetch, request, patient, extraPrefetch, hook) { + submit_info(prefetch, request, patient, hook) { this.setState({loading: true}); this.consoleLog("Initiating form submission", types.info); this.setState({patient}); From bc6002724e861b1f4f9cc13f70d1480af6715cc2 Mon Sep 17 00:00:00 2001 From: Zach Robin Date: Tue, 23 Aug 2022 13:15:23 -0700 Subject: [PATCH 3/3] Fixed class to className --- src/components/RequestBox/RequestBox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/RequestBox/RequestBox.js b/src/components/RequestBox/RequestBox.js index bd2ee01d..ac9fa2f2 100644 --- a/src/components/RequestBox/RequestBox.js +++ b/src/components/RequestBox/RequestBox.js @@ -384,7 +384,7 @@ export default class RequestBox extends Component {
-
+