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

Jump to bottom

Improved handling of HTTP response errors #152

Merged
merged 12 commits into from
Nov 9, 2023
Merged

Improved handling of HTTP response errors #152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e7f3920
WIP manage timeouts, show ace for manual entry
dotasek Nov 6, 2023
2815fc2
i18n for timeout messages
dotasek Nov 7, 2023
0f388f7
Fix missing space
dotasek Nov 8, 2023
cb48cdf
Fix layout issues for ace editor across tabs
dotasek Nov 8, 2023
c963cf3
Refactor, rename
dotasek Nov 8, 2023
91cdcdc
Use core 6.2.2
dotasek Nov 8, 2023
477487f
Style cleanup
dotasek Nov 8, 2023
6429f86
Adjust presets
dotasek Nov 8, 2023
481c605
Increase timeout
dotasek Nov 8, 2023
e094518
Fix select warnings in console
dotasek Nov 9, 2023
d9fdb10
Better handling of server produced errors in manual entry
dotasek Nov 9, 2023
0a137ae
Merge branch 'master' into do-20231106-ui-improvements
dotasek Nov 9, 2023
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
Next Next commit
WIP manage timeouts, show ace for manual entry
  • Loading branch information
@dotasek
dotasek committed Nov 6, 2023
commit e7f392051a64b4e632dd0298f1cc2c3a294b787f
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ kotlin.code.style=official
kotlin.js.generate.executable.default=false

# versions
fhirCoreVersion=6.2.1
fhirCoreVersion=6.2.2-SNAPSHOT

junitVersion=5.7.1
mockk_version=1.10.2
Expand Down
15 changes: 8 additions & 7 deletions src/jsMain/kotlin/ui/components/tabs/entrytab/ManualEntryTab.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ import kotlinx.coroutines.withTimeout
import kotlinx.css.*
import kotlinx.css.properties.border
import mainScope
import model.BundleValidationRule
import model.CliContext
import model.PackageInfo
import model.ValidationOutcome
import model.*
import react.*
import react.dom.attrs

Expand All @@ -25,6 +22,7 @@ import ui.components.options.presetSelect
import ui.components.tabs.heading

import ui.components.validation.issuelist.filteredIssueEntryList
import ui.components.validation.validationSummary
import utils.assembleRequest
import utils.isJson
import utils.isXml
Expand Down Expand Up @@ -137,7 +135,7 @@ class ManualEntryTab : RComponent<ManualEntryTabProps, ManualEntryTabState>() {
}
}
props.validationOutcome?.let {
filteredIssueEntryList {
validationSummary {
polyglot = props.polyglot
validationOutcome = props.validationOutcome!!
}
Expand Down Expand Up @@ -174,8 +172,11 @@ class ManualEntryTab : RComponent<ManualEntryTabProps, ManualEntryTabState>() {
props.toggleValidationInProgress(false)
}
} catch (e: TimeoutCancellationException) {
//TODO
println("Timeout ${e.message}")
setState {
errorMessage = props.polyglot.t("manual_entry_timeout_exception")
displayingError = true
}
props.toggleValidationInProgress(false)
} catch (e: Exception) {
setState {
if (props.currentManuallyEnteredText.contains("Mark is super dorky")) {
Expand Down
2 changes: 1 addition & 1 deletion src/jsMain/kotlin/ui/components/validation/issuelist/IssueEntry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,6 @@ object IssueEntryStyle : StyleSheet("IssueEntryStyle", isStatic = true) {
val messageDetails by css {
flex(flexBasis = 100.pct)
alignSelf = Align.center
overflowWrap = OverflowWrap.breakWord
overflowWrap = OverflowWrap.anywhere
}
}
9 changes: 8 additions & 1 deletion src/jsMain/kotlin/utils/Preset.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@ val IPS_AU_IG = PackageInfo(

val CDA_IG = PackageInfo(
"hl7.cda.uv.core",
"2.1.0-draft1",
"2.0.0-sd-ballot",
"5.0.0",
"http:https://hl7.org/cda/stds/core/ImplementationGuide/hl7.cda.uv.core"
)

val CCDA_IG = PackageInfo(
"hl7.cda.us.ccda",
"current",
"5.0.0",
"http:https://hl7.org/cda/stds/core/ImplementationGuide/hl7.cda.uv.core"
)
Expand Down