Refactor, rename

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

@@ -21,8 +21,7 @@ import styled.*
 import ui.components.options.presetSelect
 import ui.components.tabs.heading
 
-import ui.components.validation.issuelist.filteredIssueEntryList
-import ui.components.validation.validationSummary
+import ui.components.validation.validationOutcomeContainer
 import utils.assembleRequest
 import utils.isJson
 import utils.isXml
@@ -139,7 +138,7 @@ class ManualEntryTab : RComponent<ManualEntryTabProps, ManualEntryTabState>() {
  css {
  +ManualEntryTabStyle.resultsContainer
  }
- validationSummary {
+ validationOutcomeContainer {
  polyglot = props.polyglot
  validationOutcome = props.validationOutcome!!
  }

src/jsMain/kotlin/ui/components/tabs/uploadtab/FileUploadTab.kt

@@ -17,7 +17,7 @@ import styled.styledDiv
 import ui.components.options.presetSelect
 import ui.components.tabs.heading
 import ui.components.tabs.uploadtab.filelist.fileEntryList
-import ui.components.validation.validationSummaryPopup
+import ui.components.validation.validationOutcomePopup
 import utils.assembleRequest
 
 external interface FileUploadTabProps : Props {
@@ -120,7 +120,7 @@ class FileUploadTab : RComponent<FileUploadTabProps, FileUploadTabState>() {
  }
  }
  state.currentlyDisplayedValidationOutcome?.let {
- validationSummaryPopup {
+ validationOutcomePopup {
  polyglot = props.polyglot
  validationOutcome = state.currentlyDisplayedValidationOutcome!!
  onClose = {

src/jsMain/kotlin/ui/components/validation/FileValidationResults.kt → src/jsMain/kotlin/ui/components/validation/FileValidationOutcome.kt

@@ -13,35 +13,35 @@ import styled.styledDiv
 import ui.components.validation.codeissuedisplay.codeIssueDisplay
 import ui.components.validation.issuelist.issueEntryList
 
-external interface FileValidationResultsProps : Props {
+external interface FileValidationOutcomeProps : Props {
  var validationOutcome: ValidationOutcome
  var messageFilter: MessageFilter
 }
 
-class FileValidationResultsState : State {
+class FileValidationOutcomeState : State {
  var highlightedMessages: List<ValidationMessage> = emptyList()
 }
 
 /**
  * A React component displaying the code with highlighted issues, alongside the list of issues with associated details
  * and line numbers. Layout will change depending on current horizontal space for display.
  */
-class FileValidationResults : RComponent<FileValidationResultsProps, FileValidationResultsState>() {
+class FileValidationOutcome : RComponent<FileValidationOutcomeProps, FileValidationOutcomeState>() {
 
  init {
- state = FileValidationResultsState()
+ state = FileValidationOutcomeState()
  }
 
  var editorRefFV : RefObject<Nothing> = createRef<Nothing>()
 
  override fun RBuilder.render() {
  styledDiv {
  css {
- +FileValidationResultsStyle.parentContainer
+ +FileValidationOutcomeStyle.parentContainer
  }
  styledDiv {
  css {
- +FileValidationResultsStyle.containerLeft
+ +FileValidationOutcomeStyle.containerLeft
  }
  codeIssueDisplay {
  validationOutcome = props.validationOutcome
@@ -57,7 +57,7 @@ class FileValidationResults : RComponent<FileValidationResultsProps, FileValidat
  }
  styledDiv {
  css {
- +FileValidationResultsStyle.containerRight
+ +FileValidationOutcomeStyle.containerRight
  }
  issueEntryList {
  validationOutcome = props.validationOutcome
@@ -78,16 +78,16 @@ class FileValidationResults : RComponent<FileValidationResultsProps, FileValidat
 /**
  * React Component Builder
  */
-fun RBuilder.fileValidationResults(handler: FileValidationResultsProps.() -> Unit) {
- return child(FileValidationResults::class) {
+fun RBuilder.fileValidationOutcome(handler: FileValidationOutcomeProps.() -> Unit) {
+ return child(FileValidationOutcome::class) {
  this.attrs(handler)
  }
 }
 
 /**
  * CSS
  */
-object FileValidationResultsStyle : StyleSheet("FileValidationSummaryStyle", isStatic = true) {
+object FileValidationOutcomeStyle : StyleSheet("FileValidationOutcomeStyle", isStatic = true) {
  val parentContainer by css {
  display = Display.flex
  flexDirection = FlexDirection.column

src/jsMain/kotlin/ui/components/validation/ValidationSummary.kt → src/jsMain/kotlin/ui/components/validation/ValidationOutcomeContainer.kt

@@ -8,34 +8,33 @@ import kotlinx.css.properties.border
 import model.MessageFilter
 import model.ValidationOutcome
 import react.*
-import react.dom.div
 import styled.StyleSheet
 import styled.css
 import styled.styledDiv
 import ui.components.tabs.heading
 import ui.components.validation.issuelist.issueFilterButtonBar
 
-external interface ValidationSummaryProps : Props {
+external interface ValidationOutcomeContainerProps : Props {
  var validationOutcome: ValidationOutcome
  var polyglot: Polyglot
  var onClose: () -> Unit
 }
 
-class ValidationSummaryState : State {
+class ValidationOutcomeContainerState : State {
  var messageFilter: MessageFilter = MessageFilter()
 }
 
-class ValidationSummary : RComponent<ValidationSummaryProps, ValidationSummaryState>() {
+class ValidationOutcomeContainer : RComponent<ValidationOutcomeContainerProps, ValidationOutcomeContainerState>() {
 
  init {
- state = ValidationSummaryState()
+ state = ValidationOutcomeContainerState()
  }
 
  override fun RBuilder.render() {
 
  styledDiv {
  css {
- +ValidationSummaryStyle.filterMenuContainer
+ +ValidationOutcomeContainerStyle.filterMenuContainer
  }
  heading {
  text = props.polyglot.t("validation_results") + " (${state.messageFilter.determineNumberDisplayedIssues(props.validationOutcome.getMessages())}):"
@@ -57,9 +56,9 @@ class ValidationSummary : RComponent<ValidationSummaryProps, ValidationSummarySt
  }
  styledDiv {
  css {
- +ValidationSummaryStyle.resultsDiv
+ +ValidationOutcomeContainerStyle.resultsDiv
  }
- fileValidationResults {
+ fileValidationOutcome {
  validationOutcome = props.validationOutcome
  messageFilter = state.messageFilter
  }
@@ -71,16 +70,16 @@ class ValidationSummary : RComponent<ValidationSummaryProps, ValidationSummarySt
 /**
  * React Component Builder
  */
-fun RBuilder.validationSummary(handler: ValidationSummaryProps.() -> Unit) {
- return child(ValidationSummary::class) {
+fun RBuilder.validationOutcomeContainer(handler: ValidationOutcomeContainerProps.() -> Unit) {
+ return child(ValidationOutcomeContainer::class) {
  this.attrs(handler)
  }
 }
 
 /**
  * CSS
  */
-object ValidationSummaryStyle : StyleSheet("ValidationSummaryStyle", isStatic = true) {
+object ValidationOutcomeContainerStyle : StyleSheet("ValidationOutcomeContainerStyle", isStatic = true) {
  val mainContainer by css {
  display = Display.flex
  flexDirection = FlexDirection.column
@@ -98,7 +97,6 @@ object ValidationSummaryStyle : StyleSheet("ValidationSummaryStyle", isStatic =
  display = Display.flex
  flexDirection = FlexDirection.row
  justifyContent = JustifyContent.left
- //padding(horizontal = 16.px)
  }
  val resultsDiv by css {
  display = Display.flex

src/jsMain/kotlin/ui/components/validation/ValidationSummaryPopup.kt → src/jsMain/kotlin/ui/components/validation/ValidationOutcomePopup.kt

@@ -11,33 +11,33 @@ import styled.StyleSheet
 import styled.css
 import styled.styledDiv
 
-external interface ValidationSummaryPopupProps : Props {
+external interface ValidationOutcomePopupProps : Props {
  var validationOutcome: ValidationOutcome
  var polyglot: Polyglot
  var onClose: () -> Unit
 }
 
-class ValidationSummaryPopup : RComponent<ValidationSummaryPopupProps, State>() {
+class ValidationOutcomePopup : RComponent<ValidationOutcomePopupProps, State>() {
 
  override fun RBuilder.render() {
  styledDiv {
  css {
- +ValidationSummaryPopupStyle.overlay
+ +ValidationOutcomePopupStyle.overlay
  }
  styledDiv {
  css {
- +ValidationSummaryPopupStyle.content
+ +ValidationOutcomePopupStyle.content
  }
  styledDiv {
  css {
- +ValidationSummaryStyle.mainContainer
+ +ValidationOutcomeContainerStyle.mainContainer
  }
 
  styledDiv {
  css {
- +ValidationSummaryStyle.headerContainer
+ +ValidationOutcomeContainerStyle.headerContainer
  }
- validationResultDialogHeader {
+ validationOutcomePopupHeader {
  filename = props.validationOutcome.getFileInfo().fileName
  onClose = {
  props.onClose()
@@ -46,9 +46,9 @@ class ValidationSummaryPopup : RComponent<ValidationSummaryPopupProps, State>()
  }
  styledDiv {
  css {
- + ValidationSummaryPopupStyle.resultsContainer
+ + ValidationOutcomePopupStyle.resultsContainer
  }
- validationSummary {
+ validationOutcomeContainer {
  polyglot = props.polyglot
  validationOutcome = props.validationOutcome
  onClose = {
@@ -65,16 +65,16 @@ class ValidationSummaryPopup : RComponent<ValidationSummaryPopupProps, State>()
 /**
  * React Component Builder
  */
-fun RBuilder.validationSummaryPopup(handler: ValidationSummaryPopupProps.() -> Unit) {
- return child(ValidationSummaryPopup::class) {
+fun RBuilder.validationOutcomePopup(handler: ValidationOutcomePopupProps.() -> Unit) {
+ return child(ValidationOutcomePopup::class) {
  this.attrs(handler)
  }
 }
 
 /**
  * CSS
  */
-object ValidationSummaryPopupStyle : StyleSheet("ValidationSummaryPopupStyle", isStatic = true) {
+object ValidationOutcomePopupStyle : StyleSheet("ValidationOutcomePopupStyle", isStatic = true) {
  val overlay by css {
  display = Display.flex
  position = Position.fixed

src/jsMain/kotlin/ui/components/validation/ValidationResultDialogHeader.kt → src/jsMain/kotlin/ui/components/validation/ValidationOutcomePopupHeader.kt

@@ -11,28 +11,28 @@ import react.*
 import react.dom.attrs
 import styled.*
 
-external interface ValidationResultDialogHeaderProps : Props {
+external interface ValidationOutcomePopupHeaderProps : Props {
  var filename: String
  var onClose: () -> Unit
 }
 
-class ValidationResultDialogHeader : RComponent<ValidationResultDialogHeaderProps, State>() {
+class ValidationOutcomePopupHeader : RComponent<ValidationOutcomePopupHeaderProps, State>() {
 
  override fun RBuilder.render() {
  styledDiv {
  css {
- +ValidationSummaryHeaderStyle.container
+ +ValidationOutcomePopupHeaderStyle.container
  }
  styledSpan {
  css {
  +TextStyle.tabSectionHeading
- +ValidationSummaryHeaderStyle.titleField
+ +ValidationOutcomePopupHeaderStyle.titleField
  }
  +props.filename
  }
  styledImg {
  css {
- +ValidationSummaryHeaderStyle.closeIcon
+ +ValidationOutcomePopupHeaderStyle.closeIcon
  hover {
  backgroundColor = INACTIVE_GRAY
  }
@@ -54,16 +54,16 @@ class ValidationResultDialogHeader : RComponent<ValidationResultDialogHeaderProp
 /**
  * React Component Builder
  */
-fun RBuilder.validationResultDialogHeader(handler: ValidationResultDialogHeaderProps.() -> Unit) {
- return child(ValidationResultDialogHeader::class) {
+fun RBuilder.validationOutcomePopupHeader(handler: ValidationOutcomePopupHeaderProps.() -> Unit) {
+ return child(ValidationOutcomePopupHeader::class) {
  this.attrs(handler)
  }
 }
 
 /**
  * CSS
  */
-object ValidationSummaryHeaderStyle : StyleSheet("ValidationSummaryHeaderStyle", isStatic = true) {
+object ValidationOutcomePopupHeaderStyle : StyleSheet("ValidationOutcomePopupHeaderStyle", isStatic = true) {
  val container by css {
  display = Display.flex
  flexDirection = FlexDirection.row