Improved handling of HTTP response errors (#152)

* WIP manage timeouts, show ace for manual entry * i18n for timeout messages * Fix missing space * Fix layout issues for ace editor across tabs * Refactor, rename * Use core 6.2.2 * Style cleanup * Adjust presets * Increase timeout * Fix select warnings in console * Better handling of server produced errors in manual entry
hapifhir · Nov 9, 2023 · 4f9a766 · 4f9a766
1 parent 1fe5d18
commit 4f9a766
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 13 deletions.
diff --git a/src/commonMain/kotlin/model/ValidationResponseException.kt b/src/commonMain/kotlin/model/ValidationResponseException.kt
@@ -0,0 +1,4 @@
+package model
+
+class ValidationResponseException(val httpStatusCode: Int, message: String) : Exception(message) {
+}
diff --git a/src/commonMain/resources/static-content/polyglot/de_DE.json b/src/commonMain/resources/static-content/polyglot/de_DE.json
@@ -5,8 +5,9 @@
  "enter_resources_heading" : "Ressource eintragen",
  "manual_entry_place_holder" : "Ressource manuell eintragen...",
  "manual_entry_title" : "Code",
- "manual_entry_error" : "Bitte geben Sie etwas zum Validieren an.",
+ "manual_entry_empty_request_error" : "Bitte geben Sie etwas zum Validieren an.",
  "manual_entry_cannot_parse_exception" : "Der eingegebene Text kann nicht als gültiges JSON/XML geparst werden.",
+ "manual_entry_validation_response_exception" : "Error received from validation server: %{httpResponseCode}-German",
  "manual_entry_timeout_exception" : "Validation timed out. Please wait 30 seconds and try again. -German",
  "validate_button" : "Validieren",
  "upload_resources_heading" : "Ressourcen Hochladen",

diff --git a/src/commonMain/resources/static-content/polyglot/en.json b/src/commonMain/resources/static-content/polyglot/en.json
@@ -5,6 +5,9 @@
  "enter_resources_heading" : "Enter Resource",
  "manual_entry_place_holder" : "Enter Resource Manually...",
  "manual_entry_title" : "Code",
+ "manual_entry_empty_request_error" : "Please enter something to validate.",
+ "manual_entry_timeout_exception" : "Validation timed out. Please wait 30 seconds and try again.",
+ "manual_entry_validation_response_exception" : "Error received from validation server: %{httpResponseCode}",
  "manual_entry_error" : "Please enter something to validate.",
  "manual_entry_timeout_exception" : "Validation timed out. Please wait 30 seconds and try again.",
  "manual_entry_cannot_parse_exception" : "Cannot parse entered text as valid JSON/XML.",

diff --git a/src/commonMain/resources/static-content/polyglot/es.json b/src/commonMain/resources/static-content/polyglot/es.json
@@ -5,8 +5,9 @@
  "enter_resources_heading": "Ingrese el Recurso",
  "manual_entry_place_holder": "Ingrese el recurso manualmente...",
  "manual_entry_title": "Código",
- "manual_entry_error": "Por favor ingrese algo para validar.",
+ "manual_entry_empty_request_error": "Por favor ingrese algo para validar.",
  "manual_entry_cannot_parse_exception": "No se pudo analizar el texto ingresado como JSON o XML.",
+ "manual_entry_validation_response_exception" : "Error received from validation server: %{httpResponseCode} -Spanish",
  "manual_entry_timeout_exception" : "Validation timed out. Please wait 30 seconds and try again. -Spanish",
  "validate_button": "Validar",
  "upload_resources_heading": "Cargar Recursos",

diff --git a/src/jsMain/kotlin/api/ValidatorApi.kt b/src/jsMain/kotlin/api/ValidatorApi.kt
@@ -9,22 +9,23 @@ import constants.VALIDATOR_VERSION_ENDPOINT
 
 import io.ktor.client.request.*
 import io.ktor.http.*
-import kotlinext.js.asJsObject
 import io.ktor.client.call.*
+import io.ktor.client.statement.*
 import model.*
 
-import kotlinx.browser.window
-
 suspend fun sendValidationRequest(validationRequest: ValidationRequest): ValidationResponse {
  val myMap = js("{" +
  "\"txServer\":\"dummyServer\"" +
  "}")
- println(myMap)
  kotlinx.browser.window.asDynamic().gtag("event", "validationEvent", myMap)
- return jsonClient.post(urlString = endpoint + VALIDATION_ENDPOINT) {
+ val response = jsonClient.post(urlString = endpoint + VALIDATION_ENDPOINT) {
  contentType(ContentType.Application.Json)
  setBody(validationRequest)
- }.body()
+ }
+ if (response.status != HttpStatusCode.OK) {
+ throw ValidationResponseException(response.status.value, response.bodyAsText())
+ }
+ return response.body()
 }
 
 suspend fun sendValidatorVersionRequest() : String {

diff --git a/src/jsMain/kotlin/ui/components/header/LanguageOption/LanguageSelect.kt b/src/jsMain/kotlin/ui/components/header/LanguageOption/LanguageSelect.kt
@@ -40,8 +40,10 @@ class LanguageSelect(props : LanguageSelectProps) : RComponent<LanguageSelectPro
  +props.polyglot.t("language")
  }
  Select {
+
  attrs {
  label = ReactNode("Language")
+ value = props.selectedLanguage.getLanguageCode().unsafeCast<Nothing?>()
  onChange = { event, _ ->
  val selectedLanguage = Language.getSelectedLanguage(event.target.value)
  if (selectedLanguage != null) {

diff --git a/src/jsMain/kotlin/ui/components/options/PresetSelect.kt b/src/jsMain/kotlin/ui/components/options/PresetSelect.kt
@@ -35,6 +35,7 @@ external interface PresetSelectProps : Props {
 
 class PresetSelectState : State {
  var snackbarOpen : String? = null
+ var preset : String = ""
 }
 
 class PresetSelect : RComponent<PresetSelectProps, PresetSelectState>() {
@@ -81,7 +82,8 @@ class PresetSelect : RComponent<PresetSelectProps, PresetSelectState>() {
  }
  Select {
  attrs {
- label = ReactNode("preset")
+ label = ReactNode("Preset")
+ value = "".unsafeCast<Nothing?>()
  onChange = { event, _ ->
  val selectedPreset = Preset.getSelectedPreset(event.target.value)
  if (selectedPreset != null) {
@@ -121,7 +123,12 @@ class PresetSelect : RComponent<PresetSelectProps, PresetSelectState>() {
  open = state.snackbarOpen != null
  message = ReactNode(
  props.polyglot.t("preset_notification",
- getJS(arrayOf(Pair("selectedPreset", props.polyglot.t(state.snackbarOpen.toString())))))
+ getJS(arrayOf(Pair("selectedPreset",
+ if (state.snackbarOpen != null)
+ props.polyglot.t(state.snackbarOpen.toString())
+ else
+ "---"
+ ))))
  )
  autoHideDuration=6000
  onClose = { event, _ -> handleSnackBarClose() }

diff --git a/src/jsMain/kotlin/ui/components/tabs/entrytab/ManualEntryTab.kt b/src/jsMain/kotlin/ui/components/tabs/entrytab/ManualEntryTab.kt
@@ -23,6 +23,7 @@ import ui.components.tabs.heading
 
 import ui.components.validation.validationOutcomeContainer
 import utils.assembleRequest
+import utils.getJS
 import utils.isJson
 import utils.isXml
 
@@ -100,7 +101,7 @@ class ManualEntryTab : RComponent<ManualEntryTabProps, ManualEntryTabState>() {
  if (props.currentManuallyEnteredText.isNotEmpty()) {
  validateEnteredText(props.currentManuallyEnteredText)
  } else {
- val newErrorMessage = props.polyglot.t("manual_entry_error")
+ val newErrorMessage = props.polyglot.t("manual_entry_empty_request_error")
  setState {
  errorMessage = newErrorMessage
  displayingError = true
@@ -181,7 +182,16 @@ class ManualEntryTab : RComponent<ManualEntryTabProps, ManualEntryTabState>() {
  displayingError = true
  }
  props.toggleValidationInProgress(false)
- } catch (e: Exception) {
+ } catch (e : ValidationResponseException) {
+ setState {
+ errorMessage = props.polyglot.t("manual_entry_validation_response_exception",
+ getJS(arrayOf(Pair("httpResponseCode", e.httpStatusCode)))
+ )
+ displayingError = true
+ }
+ println("Exception ${e.message}")
+ }
+ catch (e: Exception) {
  setState {
  if (props.currentManuallyEnteredText.contains("Mark is super dorky")) {
  ohShitYouDidIt = true

diff --git a/src/jvmMain/kotlin/controller/validation/ValidationControllerImpl.kt b/src/jvmMain/kotlin/controller/validation/ValidationControllerImpl.kt
@@ -15,7 +15,6 @@ class ValidationControllerImpl : ValidationController, KoinComponent {
  private val validationServiceFactory by inject<ValidationServiceFactory>()
 
  override suspend fun validateRequest(validationRequest: ValidationRequest): ValidationResponse {
-
  return validationServiceFactory.getValidationService().validateSources(validationRequest)
  }