Merge branch 'private-release/v1.2.5-221' into private-release/v1.2.5-223

Author: KUGDev

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to the For Mainframe Plugin will be documented in this file.
 
 ## [Unreleased]
 
+### Bugfixes
+
+* Bugfix: Fixed error when uploading local file to USS ([c5dcd7fa](https://github.com/zowe/zowe-explorer-intellij/commit/c5dcd7fa))
+* Bugfix: Fixed issue when error message does not disappear after errors are corrected in a Job Filter ([64a6d209](https://github.com/zowe/zowe-explorer-intellij/commit/64a6d209))
+* Bugfix: Privacy Policy was open for modifications ([cd917844](https://github.com/zowe/zowe-explorer-intellij/commit/cd917844))
+* Bugfix: Fixed NullPointerException on cancel operation ([f8d08fd4](https://github.com/zowe/zowe-explorer-intellij/commit/f8d08fd4))
+
 ## [1.2.4-221] (2024-11-18)
 
 ### Bugfixes

src/main/kotlin/eu/ibagroup/formainframe/dataops/operations/mover/LocalFileToUssDirMover.kt

@@ -42,6 +42,8 @@ class LocalFileToUssDirMoverFactory : OperationRunnerFactory {
  */
 class LocalFileToUssDirMover(val dataOpsManager: DataOpsManager) : AbstractFileMover() {
 
+  private val sourceContentType = "text/plain; charset=UTF-8"
+
   /**
    * Checks that source is local file, dest is uss directory, and destination
    * file is located on remote system (by fetching its attributes).
@@ -78,16 +80,19 @@ class LocalFileToUssDirMover(val dataOpsManager: DataOpsManager) : AbstractFileM
 
     val pathToFile = destAttributes.path + "/" + newName
 
-    val contentToUpload = sourceFile.contentsToByteArray().toMutableList()
+    val currentFileContent = sourceFile.contentsToByteArray()
     val xIBMDataType =
       if (sourceFile.fileType.isBinary) XIBMDataType(XIBMDataType.Type.BINARY) else XIBMDataType(XIBMDataType.Type.TEXT)
 
+    val contentToUpload = if (sourceFile.fileType.isBinary) currentFileContent else
+      currentFileContent.toString(sourceFile.charset).encodeToByteArray()
 
     val response = apiWithBytesConverter<DataAPI>(destConnectionConfig).writeToUssFile(
       authorizationToken = destConnectionConfig.authToken,
       filePath = FilePath(pathToFile),
-      body = contentToUpload.toByteArray(),
-      xIBMDataType = xIBMDataType
+      body = contentToUpload,
+      xIBMDataType = xIBMDataType,
+      contentType = sourceContentType
     ).applyIfNotNull(progressIndicator) { indicator ->
       cancelByIndicator(indicator)
     }.execute()

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
   }
 }