Add resources tab (#2150)

* Add resources tab

* Adding UI tests

Author: kiiadi

jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/EventsTable.kt

@@ -31,7 +31,7 @@ interface EventsTable : View {
     fun showBusyIcon()
 }
 
-private class StatusCellRenderer : DefaultTableCellRenderer() {
+class StatusCellRenderer : DefaultTableCellRenderer() {
     override fun getTableCellRendererComponent(table: JTable, value: Any, isSelected: Boolean, hasFocus: Boolean, row: Int, column: Int): Component =
         super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column).also {
             it.foreground = StatusType.fromStatusValue(value as String).color

jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/ResourceTableView.kt

@@ -0,0 +1,34 @@
+// Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.cloudformation.stack
+
+import com.intellij.openapi.Disposable
+import com.intellij.util.ui.JBUI
+import software.amazon.awssdk.services.cloudformation.model.StackResource
+import software.aws.toolkits.jetbrains.utils.ui.WrappingCellRenderer
+import software.aws.toolkits.resources.message
+import javax.swing.JComponent
+
+class ResourceTableView : View, ResourceListener, Disposable {
+    private val table = DynamicTableView<StackResource>(
+        DynamicTableView.Field(message("cloudformation.stack.logical_id")) { it.logicalResourceId() },
+        DynamicTableView.Field(message("cloudformation.stack.physical_id")) { it.physicalResourceId() },
+        DynamicTableView.Field(message("cloudformation.stack.type")) { it.resourceType() },
+        DynamicTableView.Field(message("cloudformation.stack.status"), renderer = StatusCellRenderer()) { it.resourceStatusAsString() },
+        DynamicTableView.Field(
+            message("cloudformation.stack.reason"),
+            renderer = WrappingCellRenderer(wrapOnSelection = true, wrapOnToggle = false)
+        ) { it.resourceStatusReason() }
+    ).apply { component.border = JBUI.Borders.empty() }
+
+    override val component: JComponent = table.component
+
+    override fun updatedResources(resources: List<StackResource>) = table.updateItems(resources, clearExisting = true)
+
+    override fun dispose() {}
+}
+
+interface ResourceListener {
+    fun updatedResources(resources: List<StackResource>)
+}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/Stack.kt

@@ -66,6 +66,7 @@ private class StackUI(private val project: Project, private val stackName: Strin
 
     private val eventsTable: EventsTableImpl
     private val outputsTable = OutputsTableView()
+    private val resourcesTable = ResourceTableView()
 
     init {
         val tree = TreeViewImpl(project, stackName)
@@ -119,11 +120,19 @@ private class StackUI(private val project: Project, private val stackName: Strin
                     }
                 )
 
+                this.add(
+                    message("cloudformation.stack.tab_labels.resources"),
+                    JPanel().apply {
+                        layout = BoxLayout(this, BoxLayout.Y_AXIS)
+                        add(resourcesTable.component)
+                    }
+                )
+
                 this.add(
                     message("cloudformation.stack.tab_labels.outputs"),
                     JPanel().apply {
                         layout = BoxLayout(this, BoxLayout.Y_AXIS)
-                        add(outputsTable.component)
+                        add(add(outputsTable.component))
                     }
                 )
             }
@@ -133,6 +142,7 @@ private class StackUI(private val project: Project, private val stackName: Strin
             tree,
             eventsTable = eventsTable,
             outputsTable = outputsTable,
+            resourceListener = resourcesTable,
             stackName = stackName,
             updateEveryMs = UPDATE_STACK_STATUS_INTERVAL,
             listener = this,
@@ -141,7 +151,7 @@ private class StackUI(private val project: Project, private val stackName: Strin
         )
 
         toolWindowTab = toolWindow.addTab(stackName, mainPanel, id = stackId)
-        listOf(tree, updater, animator, eventsTable, outputsTable, pageButtons).forEach { Disposer.register(toolWindowTab, it) }
+        listOf(tree, updater, animator, eventsTable, outputsTable, resourcesTable, pageButtons).forEach { Disposer.register(toolWindowTab, it) }
     }
 
     fun start() {

jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/Updater.kt

@@ -31,6 +31,7 @@ class Updater(
     private val treeView: TreeView,
     private val eventsTable: EventsTable,
     private val outputsTable: OutputsListener,
+    private val resourceListener: ResourceListener,
     private val stackName: String,
     private val updateEveryMs: Int,
     private val listener: UpdateListener,
@@ -96,6 +97,7 @@ class Updater(
 
         app.invokeLater {
             outputsTable.updatedOutputs(stackDetails.outputs)
+            resourceListener.updatedResources(stackDetails.resources)
 
             showData(
                 stackStatus = newStackStatus,

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/stack/UpdaterTest.kt

@@ -47,6 +47,7 @@ class UpdaterTest {
     private val eventsTable = mock(EventsTable::class.java)
     private val outputTable = mock(OutputsListener::class.java)
     private val updateListener = mock(UpdateListener::class.java)
+    private val resourceListener = mock(ResourceListener::class.java)
 
     @Before
     fun setUp() {
@@ -93,6 +94,7 @@ class UpdaterTest {
             Updater(
                 treeView = treeView,
                 eventsTable = eventsTable,
+                resourceListener = resourceListener,
                 outputsTable = outputTable,
                 stackName = "MyStack",
                 updateEveryMs = 1,

resources/resources/software/aws/toolkits/resources/localized_messages.properties

@@ -182,6 +182,7 @@ cloudformation.stack.reason=Status Reason
 cloudformation.stack.status=Status
 cloudformation.stack.tab_labels.events=Events
 cloudformation.stack.tab_labels.outputs=Outputs
+cloudformation.stack.tab_labels.resources=Resources
 cloudformation.stack.type=Type
 cloudformation.stack.view=View Stack Status
 cloudformation.template_index.missing_type=Resource type must not be null for indexing

ui-tests/tst/software/aws/toolkits/jetbrains/uitests/tests/CloudFormationBrowserTest.kt

@@ -73,18 +73,25 @@ class CloudFormationBrowserTest {
                 }
             }
             step("Check events") {
-                clickOnEvents()
+                clickOn("Events")
                 step("Assert that there are two CREATE_COMPLETE events shown") {
                     val createComplete = findAllText("CREATE_COMPLETE")
                     assertThat(createComplete).hasSize(2)
                 }
             }
             step("Check outputs") {
-                clickOnOutputs()
+                clickOn("Outputs")
                 step("Assert that the stack output is there") {
                     findText("Cool description")
                 }
             }
+            step("Check resources") {
+                clickOn("Resources")
+                step("Assert that the stack resource is there") {
+                    val createComplete = findAllText("CREATE_COMPLETE")
+                    assertThat(createComplete).hasSize(1)
+                }
+            }
             step("Delete stack $stack") {
                 showAwsExplorer()
                 awsExplorer {
@@ -116,6 +123,9 @@ class CloudFormationBrowserTest {
         waitForStackDeletion()
     }
 
+    private fun IdeaFrame.clickOn(tab: String) {
+        findAndClick("//div[@accessiblename='$tab' and @class='JLabel' and @text='$tab']")
+    }
     private fun IdeaFrame.clickOnOutputs() {
         findAndClick("//div[@accessiblename='Outputs' and @class='JLabel' and @text='Outputs']")
     }