Merge branch 'public-release/v1.2.5-223' into public-release/v2.1.0

Signed-off-by: Uladzislau <[email protected]>

Author: KUGDev

.gitignore

@@ -1,10 +1,15 @@
 .gradle
-.idea
+**/.idea/*
+!/.idea/copyright/
+!/.idea/copyright/*
+!/.idea/runConfigurations/
+!/.idea/runConfigurations/*
 .intellijPlatform
 /build
 /ide_for_launch
 /out
 /allure-results
+**/mock_project/*
 
 verifier-all.jar
 

.idea/copyright/ijmp.xml

@@ -2,6 +2,15 @@
 
 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))
+
 ## [2.0.1] (2024-11-18)
 
 ### Bugfixes

.idea/copyright/profiles_settings.xml

@@ -13,7 +13,7 @@
 #
 org.gradle.jvmargs=-Xss1M
 # SemVer format -> https://semver.org
-pluginVersion=2.0.1
+pluginVersion=2.1.0
 pluginGroup=eu.ibagroup
 pluginRepositoryUrl=https://github.com/for-mainframe/For-Mainframe
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html

.idea/runConfigurations/_template__of_Kotest.xml

@@ -66,6 +66,7 @@ class AnalyticsPolicyDialog(
             lineWrap = true
             wrapStyleWord = true
             caretPosition = 0
+            isEditable = false
           }
         scrollCell(licenseTextArea)
           .align(AlignX.FILL.plus(AlignY.FILL))

CHANGELOG.md

@@ -27,16 +27,15 @@ import eu.ibagroup.formainframe.config.connect.ZOSMFConnectionConfigDeclaration
 interface ConfigDeclarationFactory {
 
   /** Creates instance of [ConfigDeclaration]. */
-  fun buildConfigDeclaration(crudable: Crudable): ConfigDeclaration<*>
+  fun buildConfigDeclaration(): ConfigDeclaration<*>
 }
 
 /**
  * Declares config class, that will be stored in persisted state [ConfigService].
  * @param T template parameter that specifies config class.
- * @property crudable instance of [Crudable] through which to work with config data.
  * @author Valiantsin Krus
  */
-abstract class ConfigDeclaration<T: Any>(val crudable: Crudable) {
+abstract class ConfigDeclaration<T: Any> {
 
   /** Instance of connection config class */
   abstract val clazz: Class<out T>
@@ -79,8 +78,11 @@ abstract class ConfigDeclaration<T: Any>(val crudable: Crudable) {
   }
 
 
-  /** Provider decider in for config class. */
-  abstract fun getDecider(): ConfigDecider<T>
+  /**
+   * Provider decider in for config class.
+   * @param crudable instance of [Crudable] through which to work with config data.
+   * */
+  abstract fun getDecider(crudable: Crudable): ConfigDecider<T>
 
   /** Builds configurable that will be displayed in settings. */
   open fun getConfigurable(): BoundSearchableConfigurable? = null

gradle.properties

@@ -76,7 +76,7 @@ class ConfigServiceImpl : ConfigService {
   /** List of registered config declarations */
   private val configDeclarations: List<ConfigDeclaration<out Any>> by lazy {
     ConfigDeclaration.EP.extensionList.map {
-      it.buildConfigDeclaration(crudable)
+      it.buildConfigDeclaration()
     }
   }
 
@@ -152,15 +152,17 @@ internal fun makeCrudableWithoutListeners(
   credentialsGetter: () -> MutableList<Credentials> = { mutableListOf() },
   stateGetter: () -> ConfigStateV2,
 ): Crudable {
+  lateinit var crudable: Crudable
+
   val crudableLists = CrudableLists(
     addFilter = object : AddFilter {
       override operator fun <T : Any> invoke(clazz: Class<out T>, addingRow: T): Boolean {
-        return ConfigService.getService().getConfigDeclaration(clazz).getDecider().canAdd(addingRow)
+        return ConfigService.getService().getConfigDeclaration(clazz).getDecider(crudable).canAdd(addingRow)
       }
     },
     updateFilter = object : UpdateFilter {
       override operator fun <T : Any> invoke(clazz: Class<out T>, currentRow: T, updatingRow: T): Boolean {
-        return ConfigService.getService().getConfigDeclaration(clazz).getDecider().canUpdate(currentRow, updatingRow)
+        return ConfigService.getService().getConfigDeclaration(clazz).getDecider(crudable).canUpdate(currentRow, updatingRow)
       }
     },
     nextUuidProvider = { UUID.randomUUID().toString() },
@@ -174,5 +176,7 @@ internal fun makeCrudableWithoutListeners(
       }
     }
   )
-  return ConcurrentCrudable(crudableLists, SimpleReadWriteAdapter())
+
+  crudable = ConcurrentCrudable(crudableLists, SimpleReadWriteAdapter())
+  return crudable
 }

src/main/kotlin/eu/ibagroup/formainframe/analytics/ui/AnalyticsPolicyDialog.kt

@@ -16,16 +16,13 @@ package eu.ibagroup.formainframe.config.connect
 import com.intellij.openapi.options.BoundSearchableConfigurable
 import eu.ibagroup.formainframe.config.ConfigDeclaration
 import eu.ibagroup.formainframe.config.connect.ui.CollectedConfigurable
-import eu.ibagroup.formainframe.utils.crudable.Crudable
 
 /**
  * Abstract class to declare connection configs.
  * @param Connection The system (such as zosmf, cics etc.) connection class to work with (see [ConnectionConfigBase]).
- * @param crudable [Crudable] instance to get data from.
  * @author Valiantsin Krus
  */
-abstract class ConnectionConfigDeclaration<Connection: ConnectionConfigBase>(crudable: Crudable)
-  : ConfigDeclaration<Connection>(crudable) {
+abstract class ConnectionConfigDeclaration<Connection : ConnectionConfigBase> : ConfigDeclaration<Connection>() {
 
   companion object {
     /** list of available connection configurables. */

src/main/kotlin/eu/ibagroup/formainframe/config/ConfigDeclaration.kt

@@ -22,25 +22,24 @@ import eu.ibagroup.formainframe.utils.crudable.Crudable
  * Factory to create instance of [CredentialsConfigDeclaration].
  * @author Valiantsin Krus
  */
-class CredentialsConfigDeclarationFactory: ConfigDeclarationFactory {
-  override fun buildConfigDeclaration(crudable: Crudable): ConfigDeclaration<*> {
-    return CredentialsConfigDeclaration(crudable)
+class CredentialsConfigDeclarationFactory : ConfigDeclarationFactory {
+  override fun buildConfigDeclaration(): ConfigDeclaration<*> {
+    return CredentialsConfigDeclaration()
   }
 }
 
 /**
  * Declares config to work with credentials. It is the only class that is necessary to declare without
  * any logical load. All the logic of storing credentials securely is described in [CredentialService].
- * @param crudable instance of [Crudable] (not used in this class).
  * @author Valiantsin Krus
  */
-class CredentialsConfigDeclaration(crudable: Crudable): ConfigDeclaration<Credentials>(crudable) {
+class CredentialsConfigDeclaration : ConfigDeclaration<Credentials>() {
 
   override val clazz = Credentials::class.java
   override val configPriority = -100.0
 
-  override fun getDecider(): ConfigDecider<Credentials> {
-    return object: ConfigDecider<Credentials>() {
+  override fun getDecider(crudable: Crudable): ConfigDecider<Credentials> {
+    return object : ConfigDecider<Credentials>() {
       override fun canUpdate(currentRow: Credentials, updatingRow: Credentials) = true
       override fun canAdd(row: Credentials) = true
     }

src/main/kotlin/eu/ibagroup/formainframe/config/ConfigServiceImpl.kt

@@ -26,24 +26,22 @@ import eu.ibagroup.formainframe.utils.crudable.getByColumnLambda
  * @author Valiantsin Krus
  */
 class ConnectionConfigDeclarationFactory : ConfigDeclarationFactory {
-  override fun buildConfigDeclaration(crudable: Crudable): ConfigDeclaration<*> {
-    return ZOSMFConnectionConfigDeclaration(crudable)
+  override fun buildConfigDeclaration(): ConfigDeclaration<*> {
+    return ZOSMFConnectionConfigDeclaration()
   }
 }
 
 /**
  * Declares connection config that will represent connection to zosmf.
- * @param crudable instance of [Crudable] through which to work with config data.
  * @author Valiantsin Krus
  */
-class ZOSMFConnectionConfigDeclaration(crudable: Crudable) :
-  ConnectionConfigDeclaration<ConnectionConfig>(crudable) {
+class ZOSMFConnectionConfigDeclaration : ConnectionConfigDeclaration<ConnectionConfig>() {
 
   override val clazz = ConnectionConfig::class.java
   override val useCredentials = true
   override val configPriority = 1.0
 
-  override fun getDecider(): ConfigDecider<ConnectionConfig> {
+  override fun getDecider(crudable: Crudable): ConfigDecider<ConnectionConfig> {
     return object : ConfigDecider<ConnectionConfig>() {
       /**
        * Enables to add connection config only if no existing connection with such name found.

src/main/kotlin/eu/ibagroup/formainframe/config/connect/ConnectionConfigDeclaration.kt

@@ -26,8 +26,8 @@ import eu.ibagroup.formainframe.utils.crudable.Crudable
  */
 class FilesWorkingSetConfigDeclarationFactory : ConfigDeclarationFactory {
 
-  override fun buildConfigDeclaration(crudable: Crudable): ConfigDeclaration<*> {
-    return object : WorkingSetConfigDeclaration<FilesWorkingSetConfig>(crudable, FilesWorkingSetConfig::class.java) {
+  override fun buildConfigDeclaration(): ConfigDeclaration<*> {
+    return object : WorkingSetConfigDeclaration<FilesWorkingSetConfig>(FilesWorkingSetConfig::class.java) {
       override val configPriority = 3.0
       override fun getConfigurable() = FilesWSConfigurable()
     }
@@ -40,8 +40,8 @@ class FilesWorkingSetConfigDeclarationFactory : ConfigDeclarationFactory {
  * @author Valiantsin Krus
  */
 class JesWorkingSetConfigDeclarationFactory : ConfigDeclarationFactory {
-  override fun buildConfigDeclaration(crudable: Crudable): ConfigDeclaration<*> {
-    return object : WorkingSetConfigDeclaration<JesWorkingSetConfig>(crudable, JesWorkingSetConfig::class.java) {
+  override fun buildConfigDeclaration(): ConfigDeclaration<*> {
+    return object : WorkingSetConfigDeclaration<JesWorkingSetConfig>(JesWorkingSetConfig::class.java) {
       override val configPriority = 2.0
       override fun getConfigurable() = JesWsConfigurable()
     }
@@ -50,16 +50,14 @@ class JesWorkingSetConfigDeclarationFactory : ConfigDeclarationFactory {
 
 /**
  * Abstract class with wrapped logic of working with working sets configs.
- * @param crudable instance of [Crudable] through which to work with config data.
  * @param clazz instance of class that implements [WorkingSetConfig].
  * @author Valiantsin Krus.
  */
 abstract class WorkingSetConfigDeclaration<WS : WorkingSetConfig>(
-  crudable: Crudable,
   override val clazz: Class<out WS>
-) : ConfigDeclaration<WS>(crudable) {
+) : ConfigDeclaration<WS>() {
 
-  override fun getDecider(): ConfigDecider<WS> {
+  override fun getDecider(crudable: Crudable): ConfigDecider<WS> {
     return object : ConfigDecider<WS>() {
 
       /**

src/main/kotlin/eu/ibagroup/formainframe/config/connect/CredentialsConfigDeclaration.kt

@@ -46,6 +46,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).
@@ -82,16 +84,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/config/connect/ZOSMFConnectionConfigDeclaration.kt

@@ -54,9 +54,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: ")
         if (wsSize > 1) {
@@ -102,5 +117,13 @@ class AddJobsFilterDialog(
           .align(AlignX.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
   }
 }