Fix S3 actions failing when short cuts are triggered outside of viewer (#2694)

Author: abrooksv

.changes/next-release/bugfix-967da0c8-b378-43be-8a38-d7728963e781.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix S3 bucket viewer actions being triggered by short cuts even if it is not focused"
+}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/objectActions/S3ObjectAction.kt

@@ -18,6 +18,13 @@ abstract class S3ObjectAction(title: String, icon: Icon? = null) : DumbAwareActi
     protected abstract fun performAction(dataContext: DataContext, nodes: List<S3TreeNode>)
 
     final override fun update(e: AnActionEvent) {
+        val bucketViewer = e.dataContext.getData(S3EditorDataKeys.BUCKET_TABLE)
+        // Disable the action if the bucket viewer is not in our UI hierarchy
+        if (bucketViewer == null) {
+            e.presentation.isEnabledAndVisible = false
+            return
+        }
+
         val selected = selected(e.dataContext)
         e.presentation.isEnabled = selected.none { it is S3TreeContinuationNode<*> || it is S3TreeErrorNode } && enabled(selected)
     }

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/s3/objectActions/CopyPathActionTest.kt

@@ -15,7 +15,7 @@ import java.awt.datatransfer.DataFlavor
 import java.time.Instant
 
 class CopyPathActionTest : ObjectActionTestBase() {
-    private val sut = CopyPathAction()
+    override val sut = CopyPathAction()
 
     @Test
     fun `copy path disabled with no nodes`() {

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/s3/objectActions/CopyUriActionTest.kt

@@ -15,7 +15,7 @@ import java.awt.datatransfer.DataFlavor
 import java.time.Instant
 
 class CopyUriActionTest : ObjectActionTestBase() {
-    private val sut = CopyUriAction()
+    override val sut = CopyUriAction()
 
     @Test
     fun `copy uri disabled with no nodes`() {

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/s3/objectActions/CopyUrlActionTest.kt

@@ -31,7 +31,7 @@ class CopyUrlActionTest : ObjectActionTestBase() {
     @JvmField
     val disposableRule = DisposableRule()
 
-    private val sut = CopyUrlAction()
+    override val sut = CopyUrlAction()
 
     @Before
     fun setUpMock() {

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/s3/objectActions/DeleteObjectActionTest.kt

@@ -23,7 +23,7 @@ import software.aws.toolkits.jetbrains.ui.TestDialogService
 import java.time.Instant
 
 class DeleteObjectActionTest : ObjectActionTestBase() {
-    private val sut = DeleteObjectAction()
+    override val sut = DeleteObjectAction()
 
     @After
     fun tearDown() {

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/s3/objectActions/DownloadObjectActionTest.kt

@@ -44,7 +44,7 @@ class DownloadObjectActionTest : ObjectActionTestBase() {
     @JvmField
     val testDisposable = DisposableRule()
 
-    private val sut = DownloadObjectAction()
+    override val sut = DownloadObjectAction()
 
     @After
     fun tearDown() {

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/s3/objectActions/NewFolderActionTest.kt

@@ -23,7 +23,7 @@ import software.aws.toolkits.jetbrains.ui.TestDialogService
 import java.time.Instant
 
 class NewFolderActionTest : ObjectActionTestBase() {
-    private val sut = NewFolderAction()
+    override val sut = NewFolderAction()
 
     @After
     fun tearDown() {

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/s3/objectActions/ObjectActionTestBase.kt

@@ -10,8 +10,10 @@ import com.intellij.openapi.actionSystem.Presentation
 import com.intellij.openapi.actionSystem.impl.SimpleDataContext
 import com.intellij.testFramework.ProjectRule
 import com.intellij.ui.treeStructure.treetable.TreeTableTree
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Rule
+import org.junit.Test
 import org.mockito.kotlin.mock
 import software.aws.toolkits.core.utils.test.aString
 import software.aws.toolkits.jetbrains.services.s3.editor.S3EditorDataKeys
@@ -21,11 +23,13 @@ import software.aws.toolkits.jetbrains.services.s3.editor.S3TreeTable
 import software.aws.toolkits.jetbrains.services.s3.editor.S3TreeTableModel
 import software.aws.toolkits.jetbrains.services.s3.editor.S3VirtualBucket
 
-open class ObjectActionTestBase {
+abstract class ObjectActionTestBase {
     @Rule
     @JvmField
     val projectRule = ProjectRule()
 
+    protected abstract val sut: S3ObjectAction
+
     protected val bucketName = aString()
     protected lateinit var treeTable: S3TreeTable
     protected lateinit var s3Bucket: S3VirtualBucket
@@ -45,6 +49,22 @@ open class ObjectActionTestBase {
         }
     }
 
+    @Test
+    fun `action is disabled when UI element is not present`() {
+        val projectContext = SimpleDataContext.getProjectContext(projectRule.project)
+        val dc = SimpleDataContext.getSimpleContext(
+            mapOf(
+                S3EditorDataKeys.BUCKET_TABLE.name to null
+            ),
+            projectContext
+        )
+        val actionEvent = AnActionEvent.createFromAnAction(sut, null, ActionPlaces.UNKNOWN, dc)
+
+        sut.update(actionEvent)
+
+        assertThat(actionEvent.presentation.isEnabled).isFalse
+    }
+
     protected fun AnAction.executeAction(nodes: List<S3TreeNode>) {
         val event = createEventFor(this, nodes)
         actionPerformed(event)

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/s3/objectActions/RefreshTreeActionTest.kt

@@ -16,7 +16,7 @@ import software.aws.toolkits.jetbrains.services.s3.editor.S3TreeObjectVersionNod
 import java.time.Instant
 
 class RefreshTreeActionTest : ObjectActionTestBase() {
-    private val sut = RefreshTreeAction()
+    override val sut = RefreshTreeAction()
 
     @Test
     fun `refresh tree action is enabled on empty selection`() {