Allow fileType to be null and derived from content in ValidationService

gradle.properties

@@ -2,7 +2,7 @@ kotlin.code.style=official
 kotlin.js.generate.executable.default=false
 
 # versions
-fhirCoreVersion=6.1.2
+fhirCoreVersion=6.1.8-SNAPSHOT
 
 junitVersion=5.7.1
 mockk_version=1.10.2

src/commonMain/kotlin/model/FileInfo.kt

@@ -5,6 +5,6 @@ expect class FileInfo() {
  fun getFileName(): String
  fun setFileContent(fileContent: String): FileInfo
  fun getFileContent(): String
- fun setFileType(fileType: String): FileInfo
- fun getFileType(): String
+ fun setFileType(fileType: String?): FileInfo
+ fun getFileType(): String?
 }

src/jsMain/kotlin/model/FileInfo.kt

@@ -7,9 +7,9 @@ actual class FileInfo actual constructor() {
 
  var fileName: String = ""
  var fileContent: String = ""
- var fileType: String = ""
+ var fileType: String? = ""
 
- constructor(fileName: String, fileContent: String, fileType: String) : this() {
+ constructor(fileName: String, fileContent: String, fileType: String?) : this() {
  this.fileName = fileName
  this.fileContent = fileContent
  this.fileType = fileType
@@ -33,11 +33,11 @@ actual class FileInfo actual constructor() {
  return this
  }
 
- actual fun getFileType(): String {
+ actual fun getFileType(): String? {
  return fileType
  }
 
- actual fun setFileType(fileType: String): FileInfo {
+ actual fun setFileType(fileType: String?): FileInfo {
  this.fileType = fileType
  return this
  }

src/jsMain/kotlin/ui/components/tabs/entrytab/ManualEntryTab.kt

@@ -125,7 +125,7 @@ class ManualEntryTab : RComponent<ManualEntryTabProps, ManualEntryTabState>() {
  cliContext = props.cliContext,
  fileName = generateFileName(fileContent),
  fileContent = fileContent,
- fileType = FhirFormat.JSON
+ fileType = null
  ).setSessionId(props.sessionId)
  mainScope.launch {
  try {

src/jsMain/kotlin/utils/RequestUtils.kt

@@ -9,9 +9,9 @@ fun assembleRequest(
  cliContext: CliContext,
  fileName: String,
  fileContent: String,
- fileType: FhirFormat,
+ fileType: FhirFormat?,
 ): ValidationRequest {
- return assembleRequest(cliContext, FileInfo(fileName, fileContent, fileType.code))
+ return assembleRequest(cliContext, FileInfo(fileName, fileContent, if (fileType == null) null else fileType.code))
 }
 
 fun assembleRequest(cliContext: CliContext, file: FileInfo): ValidationRequest {

src/jvmMain/kotlin/model/FileInfo.kt

@@ -19,7 +19,7 @@ fun FileInfo.isValidFileName(): Boolean {
 }
 
 fun FileInfo.isValidFileType(): Boolean {
- return (this.fileType != null && FhirFormat.fromCode(this.fileType) != null)
+ return (this.fileType == null || FhirFormat.fromCode(this.fileType) != null)
 }
 
 fun FileInfo.isValidFileContent(): Boolean {