Merge branch 'private-release/v2.0.1' into zowe-release/v2.0.1

Signed-off-by: Uladzislau <[email protected]>
zowe · Nov 18, 2024 · e49a151 · e49a151
2 parents e2b7d7d + 31d14a7
commit e49a151
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 .intellijPlatform
 /build
 /ide_for_launch
+/out
+/allure-results
 
 verifier-all.jar
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to the Zowe Explorer plug-in for IntelliJ IDEA will be docum
 ### Bugfixes
 
 * Bugfix: Fixed IDE error in case of invalid Zowe config ([71b495c4](https://github.com/zowe/zowe-explorer-intellij/commit/71b495c4))
+* Bugfix: Fixed IndexOutOfBoundException in JES Explorer ([a80bf073](https://github.com/zowe/zowe-explorer-intellij/commit/a80bf073))
 * Bugfix: Fixed FileNotFoundException for Zowe config ([d4665459](https://github.com/zowe/zowe-explorer-intellij/commit/d4665459))
 * Bugfix: Fixed NullPointerException during a sort action ([42c9ee5a](https://github.com/zowe/zowe-explorer-intellij/commit/42c9ee5a))
 * Bugfix: Fixed issue with purge that won't trigger a refresh ([b93118b7](https://github.com/zowe/zowe-explorer-intellij/commit/b93118b7))

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/actions/PurgeJobAction.kt b/src/main/kotlin/org/zowe/explorer/explorer/actions/PurgeJobAction.kt
@@ -315,7 +315,7 @@ class PurgeJobAction : AnAction() {
       val selected = view.mySelectedNodesData
       val wrongNode = selected.find { it.node !is JobNode }
       e.presentation.apply {
-        isEnabledAndVisible = wrongNode == null && isSelectedJobNodesFromSameWS(selected)
+        isEnabledAndVisible = selected.isNotEmpty() && wrongNode == null && isSelectedJobNodesFromSameWS(selected)
         text = if (isEnabledAndVisible && selected.size > 1) "Purge Jobs" else "Purge Job"
       }
     } else if (view is JobBuildTreeView) {

diff --git a/src/test/kotlin/org/zowe/explorer/explorer/actions/PurgeJobActionTestSpec.kt b/src/test/kotlin/org/zowe/explorer/explorer/actions/PurgeJobActionTestSpec.kt
@@ -397,6 +397,18 @@ class PurgeJobActionTestSpec : WithApplicationShouldSpec({
             isEnableAndVisibleAction = true
           }
 
+          should("action is not visible when no selected nodes") {
+            isEnableAndVisibleAction = true
+            mySelectedData = mutableListOf()
+            every { jesExplorerView.mySelectedNodesData } returns mySelectedData
+            every { mockActionEventForJesEx.presentation.isEnabledAndVisible } returns false
+            purgeAction.update(mockActionEventForJesEx)
+
+            assertSoftly {
+              isEnableAndVisibleAction shouldBe false
+            }
+          }
+
           should("action is not visible when selected job nodes contains wrong node") {
             isEnableAndVisibleAction = true
             val nodeData1 = NodeData(jobNode1, virtualFileMock, attributes1)