Fix overlaping components in the Connections view

fioan89 · fioan89 · commit cfeace1a4bfc · 2022-08-02T23:59:56.000+03:00
- `Recent Coder Workspaces` overlaps with the search bar. - reworked the first row to workaround the DSL limitations. - resolves #44
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,20 +1,22 @@
 <!-- Keep a Changelog guide -> https://keepachangelog.com -->
 
-# coder-gateway Changelog
-
-## [Unreleased]
-
-## [2.0.0]
+# coder-gateway Changelog
+
+## [Unreleased]
+### Fixed
+- `Recent Coder Workspaces` label overlaps with the search bar in the `Connections` view
+
+## [2.0.0]
 ### Added
 - support for Gateway 2022.2
-
-
+
+
 ### Changed
 - Java 17 is now required to run the plugin
-- adapted the code to the new SSH API provided by Gateway
-
-## [1.0.0]
-### Added
+- adapted the code to the new SSH API provided by Gateway
+
+## [1.0.0]
+### Added
 - initial scaffold for Gateway plugin
 - browser based authentication on Coder environments
 - REST client for Coder V2 public API
diff --git a/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt b/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt
@@ -39,6 +39,7 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import java.awt.Dimension
 import javax.swing.JComponent
+import javax.swing.JLabel
 import javax.swing.event.DocumentEvent
 
 class CoderGatewayRecentWorkspaceConnectionsView : GatewayRecentConnections, Disposable {
@@ -62,36 +63,42 @@ class CoderGatewayRecentWorkspaceConnectionsView : GatewayRecentConnections, Dis
                     label(CoderGatewayBundle.message("gateway.connector.recentconnections.title")).applyToComponent {
                         font = JBFont.h3().asBold()
                     }
-                    label("").resizableColumn().horizontalAlign(HorizontalAlign.FILL)
-                    searchBar = cell(SearchTextField(false)).applyToComponent {
-                        minimumSize = Dimension(350, -1)
-                        textEditor.border = JBUI.Borders.empty(2, 5, 2, 0)
-                        addDocumentListener(object : DocumentAdapter() {
-                            override fun textChanged(e: DocumentEvent) {
-                                val toSearchFor = this@applyToComponent.text
-                                val filteredConnections = recentConnectionsService.getAllRecentConnections().filter { it.coderWorkspaceHostname?.toLowerCase()?.contains(toSearchFor) ?: false || it.projectPath?.toLowerCase()?.contains(toSearchFor) ?: false }
-                                updateContentView(filteredConnections.groupBy { it.coderWorkspaceHostname })
-                            }
-                        })
-                    }.component
+                    panel {
+                        indent {
+                            row {
+                                cell(JLabel()).resizableColumn().horizontalAlign(HorizontalAlign.FILL)
+                                searchBar = cell(SearchTextField(false)).resizableColumn().horizontalAlign(HorizontalAlign.FILL).applyToComponent {
+                                    minimumSize = Dimension(350, -1)
+                                    textEditor.border = JBUI.Borders.empty(2, 5, 2, 0)
+                                    addDocumentListener(object : DocumentAdapter() {
+                                        override fun textChanged(e: DocumentEvent) {
+                                            val toSearchFor = this@applyToComponent.text
+                                            val filteredConnections = recentConnectionsService.getAllRecentConnections().filter { it.coderWorkspaceHostname?.toLowerCase()?.contains(toSearchFor) ?: false || it.projectPath?.toLowerCase()?.contains(toSearchFor) ?: false }
+                                            updateContentView(filteredConnections.groupBy { it.coderWorkspaceHostname })
+                                        }
+                                    })
+                                }.component
 
-                    actionButton(
-                        object : DumbAwareAction(CoderGatewayBundle.message("gateway.connector.recentconnections.new.wizard.button.tooltip"), null, AllIcons.General.Add) {
-                            override fun actionPerformed(e: AnActionEvent) {
-                                rootPanel.apply {
-                                    removeAll()
-                                    addToCenter(CoderGatewayConnectorWizardWrapperView {
-                                        rootPanel.apply {
-                                            removeAll()
-                                            addToCenter(contentPanel)
-                                            updateUI()
+                                actionButton(
+                                    object : DumbAwareAction(CoderGatewayBundle.message("gateway.connector.recentconnections.new.wizard.button.tooltip"), null, AllIcons.General.Add) {
+                                        override fun actionPerformed(e: AnActionEvent) {
+                                            rootPanel.apply {
+                                                removeAll()
+                                                addToCenter(CoderGatewayConnectorWizardWrapperView {
+                                                    rootPanel.apply {
+                                                        removeAll()
+                                                        addToCenter(contentPanel)
+                                                        updateUI()
+                                                    }
+                                                }.component)
+                                                updateUI()
+                                            }
                                         }
-                                    }.component)
-                                    updateUI()
-                                }
+                                    },
+                                ).gap(RightGap.SMALL)
                             }
-                        },
-                    ).gap(RightGap.SMALL)
+                        }
+                    }
                 }.bottomGap(BottomGap.MEDIUM)
                 separator(background = WelcomeScreenUIManager.getSeparatorColor())
                 row {
