Merge branch 'bugfix/IJMP-1653' into 'release/v1.2.5-221'

IJMP-1653 Fixed error message behavior in Jobs filter

See merge request ijmp/for-mainframe!619

Author: Uladzislau Kalesnikau

src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/AddJobsFilterDialog.kt

@@ -11,7 +11,10 @@
 package eu.ibagroup.formainframe.explorer.ui
 
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.DialogPanel
 import com.intellij.openapi.ui.DialogWrapper
+import com.intellij.openapi.ui.ValidationInfo
+import com.intellij.openapi.ui.validation.DialogValidation
 import com.intellij.ui.components.JBTextField
 import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.panel
@@ -35,9 +38,24 @@ class AddJobsFilterDialog(
     lateinit var prefixField: JBTextField
     lateinit var ownerField: JBTextField
     lateinit var jobIdField: JBTextField
+    lateinit var dialogPanel: DialogPanel
     val sameWidthGroup = "ADD_JOB_FILTER_DIALOG_LABELS_WIDTH_GROUP"
 
-    return panel {
+    class ValidatePrefix(
+      var componentsToIsJobId: List<Pair<JBTextField, Boolean>>
+    ) : DialogValidation {
+      override fun validate(): ValidationInfo? {
+        dialogPanel.validateAll()
+        var validationInfo: ValidationInfo? = null
+        componentsToIsJobId.forEach { (component, isJobId) ->
+          validationInfo = validateJobFilter(prefixField.text, ownerField.text, jobIdField.text, state.ws.masks, component, isJobId)
+          if (validationInfo != null) return validationInfo
+        }
+        return null
+      }
+    }
+
+    dialogPanel = panel {
       row {
         label("JES working set: ")
           .widthGroup(sameWidthGroup)
@@ -49,9 +67,6 @@ class AddJobsFilterDialog(
         textField()
           .bindText(state::prefix)
           .also { prefixField = it.component }
-          .validationOnApply {
-            validateJobFilter(it.text, ownerField.text, jobIdField.text, state.ws.masks, it, false)
-          }
           .horizontalAlign(HorizontalAlign.FILL)
       }
       row {
@@ -60,9 +75,6 @@ class AddJobsFilterDialog(
         textField()
           .bindText(state::owner)
           .also { ownerField = it.component }
-          .validationOnApply {
-            validateJobFilter(prefixField.text, it.text, jobIdField.text, state.ws.masks, it, false)
-          }
           .horizontalAlign(HorizontalAlign.FILL)
       }
       row {
@@ -71,11 +83,16 @@ class AddJobsFilterDialog(
         textField()
           .bindText(state::jobId)
           .also { jobIdField = it.component }
-          .validationOnApply {
-            validateJobFilter(prefixField.text, ownerField.text, it.text, state.ws.masks, it, true)
-          }
           .horizontalAlign(HorizontalAlign.FILL)
       }
     }
+      .apply{
+        validationsOnInput=mapOf(
+          prefixField to listOf(ValidatePrefix(listOf(prefixField to false, ownerField to false, jobIdField to true))),
+          ownerField to listOf(ValidatePrefix(listOf(ownerField to false, prefixField to false, jobIdField to true))),
+          jobIdField to listOf(ValidatePrefix(listOf(jobIdField to true, prefixField to false, ownerField to false)))
+        )
+      }
+    return dialogPanel
   }
 }