Merge branch 'private-release/v1.2.1-231' into public-release/v1.2.1-231

Signed-off-by: Uladzislau <leksilonchikk@gmail.com>
for-mainframe · Jun 12, 2024 · fa1ef74 · fa1ef74
2 parents ae0d83a + a355cf0
commit fa1ef74
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,12 +5,14 @@ All notable changes to the Zowe IntelliJ Plugin will be documented in this file.
 ## [Unreleased]
 
 ### Features
+* Feature: GitHub issue #182 ([4631d76f](https://github.com/zowe/zowe-explorer-intellij/commit/4631d76f))
 * Feature: Change dialogs as DoNotAskOption is going to be removed soon ([0d6b5d57](https://github.com/zowe/zowe-explorer-intellij/commit/0d6b5d57))
 * Feature: Add 'Unknown' to fields in dataset properties dialog when there is no information for fields ([5b32a4df](https://github.com/zowe/zowe-explorer-intellij/commit/5b32a4df))
 * Feature: Validate owner when receiving information from TSO ([9db42fb8](https://github.com/zowe/zowe-explorer-intellij/commit/9db42fb8))
 * Feature: Conflicts dialog on copy/move improvement ([c8f4d525](https://github.com/zowe/zowe-explorer-intellij/commit/c8f4d525))
 
 ### Bugfixes
+* Bugfix: When all errors are corrected, the ok button is inactive ([4558495c](https://github.com/zowe/zowe-explorer-intellij/commit/4558495c))
 * Bugfix: Rename of the opened file causes exception ([09453311](https://github.com/zowe/zowe-explorer-intellij/commit/09453311))
 * Bugfix: Refresh does not work on the first try ([7af1c668](https://github.com/zowe/zowe-explorer-intellij/commit/7af1c668))
 * Bugfix: "File Cache Conflict" when downloading file ([3f84b02a](https://github.com/zowe/zowe-explorer-intellij/commit/3f84b02a))

diff --git a/gradle.properties b/gradle.properties
@@ -20,7 +20,7 @@ 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
 pluginSinceBuild = 231.8109
-pluginUntilBuild = 241.*
+pluginUntilBuild = 242.*
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion = 8.7
diff --git a/src/main/kotlin/eu/ibagroup/formainframe/config/ws/ui/AbstractWsDialog.kt b/src/main/kotlin/eu/ibagroup/formainframe/config/ws/ui/AbstractWsDialog.kt
@@ -166,6 +166,13 @@ abstract class AbstractWsDialog<Connection : ConnectionConfigBase, WSConfig : Wo
     }
   }
 
+  /**
+   * Enables continuous validation of the dialog components
+   */
+  override fun continuousValidation(): Boolean {
+    return true
+  }
+
   override fun createCenterPanel(): JComponent {
     return panel
   }

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/dataops/content/synchronizer/SyncAction.kt b/src/main/kotlin/eu/ibagroup/formainframe/dataops/content/synchronizer/SyncAction.kt
@@ -13,7 +13,6 @@ package eu.ibagroup.formainframe.dataops.content.synchronizer
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import com.intellij.openapi.actionSystem.ex.ActionUtil
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.ex.EditorEx

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProvider.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProvider.kt
@@ -356,7 +356,8 @@ class ExplorerPasteProvider : PasteProvider {
             "Ok",
             "Skip This Files",
             AllIcons.General.WarningDialog
-          )) {
+          )
+        ) {
           conflictsResolutions.apply {
             clear()
             addAll(ussOrLocalFileToPdsWarnings.map { ConflictResolution(it.second, it.first).apply { resolveBySkip() } })

diff --git a/src/test/kotlin/eu/ibagroup/formainframe/utils/ui/WindowsLikeMessageDialogTestSpec.kt b/src/test/kotlin/eu/ibagroup/formainframe/utils/ui/WindowsLikeMessageDialogTestSpec.kt
@@ -94,7 +94,6 @@ class WindowsLikeMessageDialogTestSpec : WithApplicationShouldSpec({
         ((result.getComponent(2) as JPanel).getComponent(0) as JButton).text shouldBe "Decide for each file"
       }
     }
-    unmockkAll()
   }
 
   context("test showWindowsLikeMessageDialog static function") {
-Original file line number
+Diff line change
@@ Expand Up @@
             ((result.getComponent(2) as JPanel).getComponent(0) as JButton).text shouldBe "Decide for each file"
           }
         }
-        unmockkAll()
       }
       context("test showWindowsLikeMessageDialog static function") {
@@ Expand Down @@