Merge branch 'main' into eap

Author: fioan89

.github/workflows/build.yml

@@ -105,7 +105,7 @@ jobs:
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2022.2.4
+        uses: JetBrains/qodana-action@v2022.3.0
 
       # Prepare plugin archive content for creating artifact
       - name: Prepare Plugin Artifact

CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ## Unreleased
 
+### Added
+- ability to open a template in the Dashboard
+
+### Changed
+- renamed the plugin from `Coder Gateway` to `Gateway`
+- workspaces and agents are now resolved and displayed progressively
+
+### Fixed
+- icon rendering on macO
+
 ## 2.1.3-eap.0 - 2022-12-12
 Bug fixes and enhancements included in `2.1.3` release:
 

README.md

@@ -7,24 +7,30 @@ Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=soc
 [![Coder Gateway Plugin Build](https://github.com/coder/coder-jetbrains/actions/workflows/build.yml/badge.svg)](https://github.com/coder/coder-jetbrains/actions/workflows/build.yml)
 
 <!-- Plugin description -->
-**Coder Gateway** connects your JetBrains IDE to your [Coder Workspaces](https://coder.com/docs/coder-oss/latest/workspaces) so that you can develop from anywhere.
+**Coder Gateway** connects your JetBrains IDE to [Coder](https://coder.com/docs/coder-oss/) workspaces so that you can develop from anywhere.
 
 **Manage less**
 
 - Ensure your entire team is using the same tools and resources
+  - Rollout critical updates to your developers with one command
+- Automatically shut down expensive cloud resources
 - Keep your source code and data behind your firewall
 
 **Code more**
 
 - Build and test faster
-    - Leveraging cloud CPUs, RAM, network speeds, etc.
-- Access your environment from any place
+  - Leveraging cloud CPUs, RAM, network speeds, etc.
+- Access your environment from any place on any client (even an iPad)
 - Onboard instantly then stay up to date continuously
 
 <!-- Plugin description end -->
 
 ## Getting Started
 
+![Install this plugin from the JetBrains Marketplace](https://plugins.jetbrains.com/plugin/19620-coder-gateway)
+
+## Manually Building
+
 To manually install a local build:
 
 1. Install [Jetbrains Gateway](https://www.jetbrains.com/help/phpstorm/remote-development-a.html#gateway)

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
     // Kotlin support
     id("org.jetbrains.kotlin.jvm") version "1.7.22"
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.10.0"
+    id("org.jetbrains.intellij") version "1.10.1"
     // Gradle Changelog Plugin
     id("org.jetbrains.changelog") version "2.0.0"
     // Gradle Qodana Plugin

src/main/kotlin/com/coder/gateway/models/WorkspaceAgentModel.kt

@@ -19,4 +19,28 @@ data class WorkspaceAgentModel(
     val agentOS: OS?,
     val agentArch: Arch?,
     val homeDirectory: String?
-)
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as WorkspaceAgentModel
+
+        if (workspaceID != other.workspaceID) return false
+        if (workspaceName != other.workspaceName) return false
+        if (name != other.name) return false
+        if (templateID != other.templateID) return false
+        if (templateName != other.templateName) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = workspaceID.hashCode()
+        result = 31 * result + workspaceName.hashCode()
+        result = 31 * result + name.hashCode()
+        result = 31 * result + templateID.hashCode()
+        result = 31 * result + templateName.hashCode()
+        return result
+    }
+}

src/main/kotlin/com/coder/gateway/sdk/TemplateIconDownloader.kt

@@ -3,12 +3,12 @@ package com.coder.gateway.sdk
 import com.coder.gateway.icons.CoderIcons
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
-import com.intellij.ui.scale.ScaleContext
+import com.intellij.util.IconUtil
 import com.intellij.util.ImageLoader
 import com.intellij.util.ui.ImageUtil
+import org.imgscalr.Scalr
 import java.net.URL
 import javax.swing.Icon
-import javax.swing.ImageIcon
 
 @Service(Service.Level.APP)
 class TemplateIconDownloader {
@@ -25,10 +25,7 @@ class TemplateIconDownloader {
         if (url != null) {
             var img = ImageLoader.loadFromUrl(url)
             if (img != null) {
-                if (ImageUtil.getRealHeight(img) > 32 && ImageUtil.getRealWidth(img) > 32) {
-                    img = ImageUtil.resize(img, 32, ScaleContext.create())
-                }
-                return ImageIcon(img)
+                return IconUtil.toRetinaAwareIcon(Scalr.resize(ImageUtil.toBufferedImage(img), Scalr.Method.ULTRA_QUALITY, 32))
             }
         }
 

src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt

@@ -64,10 +64,16 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.zeroturnaround.exec.ProcessExecutor
 import java.awt.Component
 import java.awt.Dimension
+import java.awt.event.MouseEvent
+import java.awt.event.MouseListener
+import java.awt.event.MouseMotionListener
+import java.awt.font.TextAttribute
+import java.awt.font.TextAttribute.UNDERLINE_ON
 import javax.swing.Icon
 import javax.swing.JTable
 import javax.swing.JTextField
@@ -80,6 +86,8 @@ private const val CODER_URL_KEY = "coder-url"
 
 private const val SESSION_TOKEN = "session-token"
 
+private const val MOUSE_OVER_TEMPLATE_NAME_COLUMN_ON_ROW = "MOUSE_OVER_TEMPLATE_NAME_COLUMN_ON_ROW"
+
 class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) : CoderWorkspacesWizardStep, Disposable {
     private val cs = CoroutineScope(Dispatchers.Main)
     private var localWizardModel = CoderWorkspacesWizardModel()
@@ -123,6 +131,49 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
             }
             updateWorkspaceActions()
         }
+
+        addMouseListener(object : MouseListener {
+            override fun mouseClicked(e: MouseEvent?) {
+                if (e?.source is TableView<*>) {
+                    val tblView = e.source as TableView<WorkspaceAgentModel>
+                    val col = tblView.selectedColumn
+                    val workspace = tblView.selectedObject
+
+                    if (col == 2 && workspace != null) {
+                        BrowserUtil.browse(coderClient.coderURL.toURI().resolve("/templates/${workspace.templateName}"))
+                    }
+                }
+            }
+
+            override fun mousePressed(e: MouseEvent?) {
+            }
+
+            override fun mouseReleased(e: MouseEvent?) {
+            }
+
+            override fun mouseEntered(e: MouseEvent?) {
+            }
+
+            override fun mouseExited(e: MouseEvent?) {
+            }
+        })
+        addMouseMotionListener(object : MouseMotionListener {
+            override fun mouseMoved(e: MouseEvent?) {
+                if (e?.source is TableView<*>) {
+                    val tblView = e.source as TableView<WorkspaceAgentModel>
+                    val row = tblView.rowAtPoint(e.point)
+                    if (tblView.columnAtPoint(e.point) == 2 && row in 0 until tblView.listTableModel.rowCount) {
+                        tblView.putClientProperty(MOUSE_OVER_TEMPLATE_NAME_COLUMN_ON_ROW, row)
+                    } else {
+                        tblView.putClientProperty(MOUSE_OVER_TEMPLATE_NAME_COLUMN_ON_ROW, -1)
+                    }
+                }
+
+            }
+
+            override fun mouseDragged(e: MouseEvent?) {
+            }
+        })
     }
 
     private val goToDashboardAction = GoToDashboardAction()
@@ -349,12 +400,20 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
 
         val authTask = object : Task.Modal(null, CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.cli.downloader.dialog.title"), false) {
             override fun run(pi: ProgressIndicator) {
-
                 pi.apply {
                     isIndeterminate = false
-                    text = "Downloading coder cli..."
+                    text = "Retrieving Workspaces..."
                     fraction = 0.1
                 }
+                runBlocking {
+                    loadWorkspaces()
+                }
+
+                pi.apply {
+                    isIndeterminate = false
+                    text = "Downloading Coder CLI..."
+                    fraction = 0.3
+                }
 
                 cliManager.downloadCLI()
                 if (getOS() != OS.WINDOWS) {
@@ -363,7 +422,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
                     logger.info("chmod +x ${cliManager.localCli.toAbsolutePath()} $chmodOutput")
                 }
                 pi.apply {
-                    text = "Configuring coder cli..."
+                    text = "Configuring Coder CLI..."
                     fraction = 0.5
                 }
 
@@ -374,7 +433,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
                 logger.info("Result of `${localWizardModel.localCliPath} config-ssh --yes --use-previous-options`: $sshConfigOutput")
 
                 pi.apply {
-                    text = "Remove old coder cli versions..."
+                    text = "Remove old Coder CLI versions..."
                     fraction = 0.9
                 }
                 cliManager.removeOldCli()
@@ -417,35 +476,50 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
 
         poller = cs.launch {
             while (isActive) {
-                loadWorkspaces()
                 delay(5000)
+                loadWorkspaces()
             }
         }
     }
 
     private suspend fun loadWorkspaces() {
-        val workspaceList = withContext(Dispatchers.IO) {
+        withContext(Dispatchers.IO) {
+            val timeBeforeRequestingWorkspaces = System.currentTimeMillis()
             try {
-                return@withContext coderClient.workspaces().collectAgents()
+                val ws = coderClient.workspaces()
+                val timeAfterRequestingWorkspaces = System.currentTimeMillis()
+                logger.info("Retrieving the workspaces took: ${timeAfterRequestingWorkspaces - timeBeforeRequestingWorkspaces} millis")
+                ws.resolveAndDisplayAgents()
             } catch (e: Exception) {
                 logger.error("Could not retrieve workspaces for ${coderClient.me.username} on ${coderClient.coderURL}. Reason: $e")
-                emptyList()
             }
         }
+    }
 
-        withContext(Dispatchers.Main) {
-            val selectedWorkspace = tableOfWorkspaces.selectedObject?.name
-            listTableModelOfWorkspaces.items = workspaceList
-            if (selectedWorkspace != null) {
-                tableOfWorkspaces.selectItem(selectedWorkspace)
+    private fun List<Workspace>.resolveAndDisplayAgents() {
+        this.forEach { workspace ->
+            cs.launch(Dispatchers.IO) {
+                val timeBeforeRequestingAgents = System.currentTimeMillis()
+                workspace.agentModels().forEach { am ->
+                    withContext(Dispatchers.Main) {
+                        val selectedWorkspace = tableOfWorkspaces.selectedObject?.name
+                        if (listTableModelOfWorkspaces.indexOf(am) >= 0) {
+                            val index = listTableModelOfWorkspaces.indexOf(am)
+                            listTableModelOfWorkspaces.setItem(index, am)
+                        } else {
+                            listTableModelOfWorkspaces.addRow(am)
+                        }
+                        if (selectedWorkspace != null) {
+                            tableOfWorkspaces.selectItem(selectedWorkspace)
+                        }
+                    }
+                }
+                val timeAfterRequestingAgents = System.currentTimeMillis()
+                logger.info("Retrieving the agents for ${workspace.name} took: ${timeAfterRequestingAgents - timeBeforeRequestingAgents} millis")
             }
         }
     }
 
-    private fun List<Workspace>.collectAgents(): List<WorkspaceAgentModel> {
-        return this.flatMap { it.agentModels() }.toList()
-    }
-
     private fun Workspace.agentModels(): List<WorkspaceAgentModel> {
         return try {
             val agents = coderClient.workspaceAgentsByTemplate(this)
@@ -569,9 +643,10 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
                 override fun isCenterAlignment() = true
 
                 override fun getTableCellRendererComponent(table: JTable?, value: Any?, selected: Boolean, focus: Boolean, row: Int, column: Int): Component {
-                    return super.getTableCellRendererComponent(table, value, selected, focus, row, column).apply {
-                        border = JBUI.Borders.empty(10, 10)
+                    super.getTableCellRendererComponent(table, value, selected, focus, row, column).apply {
+                        border = JBUI.Borders.empty(10)
                     }
+                    return this
                 }
             }
         }
@@ -590,6 +665,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
                         text = value
                     }
                     font = JBFont.h3().asBold()
+                    border = JBUI.Borders.empty()
                     return this
                 }
             }
@@ -602,13 +678,27 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
         }
 
         override fun getRenderer(item: WorkspaceAgentModel?): TableCellRenderer {
+            val simpleH3 = JBFont.h3()
+
+            val h3AttributesWithUnderlining = simpleH3.attributes as MutableMap<TextAttribute, Any>
+            h3AttributesWithUnderlining[TextAttribute.UNDERLINE] = UNDERLINE_ON
+            val underlinedH3 = JBFont.h3().deriveFont(h3AttributesWithUnderlining)
             return object : 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)
                     if (value is String) {
                         text = value
                     }
-                    font = JBFont.h3()
+                    border = JBUI.Borders.empty()
+
+                    if (table.getClientProperty(MOUSE_OVER_TEMPLATE_NAME_COLUMN_ON_ROW) != null) {
+                        val mouseOverRow = table.getClientProperty(MOUSE_OVER_TEMPLATE_NAME_COLUMN_ON_ROW) as Int
+                        if (mouseOverRow >= 0 && mouseOverRow == row) {
+                            font = underlinedH3
+                            return this
+                        }
+                    }
+                    font = simpleH3
                     return this
                 }
             }
@@ -628,6 +718,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
                         text = value
                     }
                     font = JBFont.h3()
+                    border = JBUI.Borders.empty()
                     return this
                 }
             }
@@ -647,6 +738,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
                         text = value
                     }
                     font = JBFont.h3()
+                    border = JBUI.Borders.empty()
                     foreground = (table.model as ListTableModel<WorkspaceAgentModel>).getRowValue(row).statusColor()
                     return this
                 }

src/main/resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <!-- Plugin Configuration File. Read more: https://plugins.jetbrains.com/docs/intellij/plugin-configuration-file.html -->
 <idea-plugin>
     <id>com.coder.gateway</id>
-    <name>Coder Gateway</name>
+    <name>Coder</name>
     <vendor>Coder</vendor>
 
     <!-- Product and plugin compatibility requirements -->

src/main/resources/version/CoderSupportedVersions.properties

@@ -1,2 +1,2 @@
 minCompatibleCoderVersion=0.12.9
-maxCompatibleCoderVersion=0.13.1
+maxCompatibleCoderVersion=0.13.5