Merge branch 'main' into impl-support-gw-2022

Author: fioan89

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

@@ -1,15 +1,14 @@
 package com.coder.gateway.views.steps
 
 import com.coder.gateway.icons.CoderIcons
-import com.coder.gateway.icons.CoderIcons.GRAY_CIRCLE
-import com.coder.gateway.icons.CoderIcons.GREEN_CIRCLE
-import com.coder.gateway.icons.CoderIcons.RED_CIRCLE
 import com.coder.gateway.models.WorkspaceAgentModel
 import com.coder.gateway.sdk.OS
 import com.coder.gateway.sdk.v2.models.ProvisionerJobStatus
 import com.coder.gateway.sdk.v2.models.WorkspaceBuildTransition
 import com.intellij.ui.dsl.builder.panel
+import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import com.intellij.util.ui.JBFont
+import java.awt.Color
 import java.awt.Component
 import javax.swing.JList
 import javax.swing.ListCellRenderer
@@ -20,14 +19,17 @@ class WorkspaceCellRenderer : ListCellRenderer<WorkspaceAgentModel> {
         return panel {
             indent {
                 row {
-                    icon(iconForImageTag(workspace))
+                    icon(workspace.icon())
                     label(workspace.name).applyToComponent {
                         font = JBFont.h3()
-                    }
+                    }.resizableColumn().horizontalAlign(HorizontalAlign.FILL)
                     panel {
                         row {
-                            icon(iconForStatus(workspace))
-                            label(labelForStatus(workspace))
+                            label(workspace.statusLabel()).applyToComponent {
+                                font = JBFont.h3()
+                                foreground = workspace.statusColor()
+                            }
+                            cell()
                         }
                     }
                 }
@@ -43,31 +45,31 @@ class WorkspaceCellRenderer : ListCellRenderer<WorkspaceAgentModel> {
         }
     }
 
-    private fun iconForImageTag(workspace: WorkspaceAgentModel) = when (workspace?.agentOS) {
+    private fun WorkspaceAgentModel.icon() = when (this.agentOS) {
         OS.LINUX -> CoderIcons.LINUX
         OS.WINDOWS -> CoderIcons.WINDOWS
         OS.MAC -> CoderIcons.MACOS
         else -> CoderIcons.UNKNOWN
     }
 
-    private fun iconForStatus(workspace: WorkspaceAgentModel) = when (workspace.jobStatus) {
-        ProvisionerJobStatus.SUCCEEDED -> if (workspace.buildTransition == WorkspaceBuildTransition.START) GREEN_CIRCLE else RED_CIRCLE
-        ProvisionerJobStatus.RUNNING -> when (workspace.buildTransition) {
-            WorkspaceBuildTransition.START, WorkspaceBuildTransition.STOP, WorkspaceBuildTransition.DELETE -> GRAY_CIRCLE
+    private fun WorkspaceAgentModel.statusColor() = when (this.jobStatus) {
+        ProvisionerJobStatus.SUCCEEDED -> if (this.buildTransition == WorkspaceBuildTransition.START) Color.GREEN else Color.RED
+        ProvisionerJobStatus.RUNNING -> when (this.buildTransition) {
+            WorkspaceBuildTransition.START, WorkspaceBuildTransition.STOP, WorkspaceBuildTransition.DELETE -> Color.GRAY
         }
 
-        else -> RED_CIRCLE
+        else -> Color.RED
     }
 
-    private fun labelForStatus(workspace: WorkspaceAgentModel) = when (workspace.jobStatus) {
+    private fun WorkspaceAgentModel.statusLabel() = when (this.jobStatus) {
         ProvisionerJobStatus.PENDING -> "◍ Queued"
-        ProvisionerJobStatus.RUNNING -> when (workspace.buildTransition) {
+        ProvisionerJobStatus.RUNNING -> when (this.buildTransition) {
             WorkspaceBuildTransition.START -> "⦿ Starting"
             WorkspaceBuildTransition.STOP -> "◍ Stopping"
             WorkspaceBuildTransition.DELETE -> "⦸ Deleting"
         }
 
-        ProvisionerJobStatus.SUCCEEDED -> when (workspace.buildTransition) {
+        ProvisionerJobStatus.SUCCEEDED -> when (this.buildTransition) {
             WorkspaceBuildTransition.START -> "⦿ Running"
             WorkspaceBuildTransition.STOP -> "◍ Stopped"
             WorkspaceBuildTransition.DELETE -> "⦸ Deleted"

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

@@ -7,7 +7,10 @@
     <!-- Product and plugin compatibility requirements -->
     <!-- https://plugins.jetbrains.com/docs/intellij/plugin-compatibility.html -->
     <depends>com.intellij.modules.platform</depends>
-    <depends>com.jetbrains.gateway</depends>
+
+    <!-- TODO: enable this when https://youtrack.jetbrains.com/issue/GTW-1528/Plugin-depends-on-unknown-plugin-comjetbrainsgateway is fixed-->
+    <!-- depends>com.jetbrains.gateway</depends>-->
+
     <extensions defaultExtensionNs="com.intellij">
         <applicationService serviceImplementation="com.coder.gateway.sdk.CoderRestClientService"></applicationService>
         <applicationService serviceImplementation="com.coder.gateway.services.CoderRecentWorkspaceConnectionsService"></applicationService>

src/main/resources/META-INF/pluginIcon.svg

@@ -1,5 +1,5 @@
 gateway.connector.title=Coder
-gateway.connector.description=Connects to a dev environment running in Coder Workspaces
+gateway.connector.description=Connects to a Coder Workspace dev environment so that you can develop from anywhere
 gateway.connector.action.text=Connect to Coder Workspaces
 gateway.connector.view.login.header.text=Coder Workspaces
 gateway.connector.view.login.comment.text=Self-hosted developer workspaces in the cloud or on premise. Coder Workspaces empower developers with secure, consistent, and fast developer workspaces.