Initial impl of defaultIde selection setting

bcpeinhardt · bcpeinhardt · commit 1ba763bbd495 · 2025-01-14T13:08:04.000-06:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ To simulate opening a workspace from the dashboard pass the Gateway link via
 `--args`. For example:
 
 ```
-./gradlew clean runIDE --args="jetbrains-gateway://connect#type=coder&workspace=dev&agent=coder&folder=/home/coder&url=https://dev.coder.com&token=<redacted>&ide_product_code=IU&ide_build_number=223.8836.41&ide_download_link=https://download.jetbrains.com/idea/ideaIU-2022.3.3.tar.gz"
+./gradlew clean runIDE --args="jetbrains-gateway://connect#type=coder&workspace=bcpeinhardt&owner=benpeinhardt&agent=dev&folder=/home/coder&url=https://dev.coder.com&token=<redacted>"
 ```
 
 Alternatively, if you have separately built the plugin and already installed it
diff --git a/src/main/kotlin/com/coder/gateway/CoderSettingsConfigurable.kt b/src/main/kotlin/com/coder/gateway/CoderSettingsConfigurable.kt
@@ -149,6 +149,12 @@ class CoderSettingsConfigurable : BoundConfigurable("Coder") {
                     .bindText(state::workspaceFilter)
                     .comment(CoderGatewayBundle.message("gateway.connector.settings.workspace-filter.comment"))
             }.layout(RowLayout.PARENT_GRID)
+            row(CoderGatewayBundle.message("gateway.connector.settings.default-ide")) {
+                textField().resizableColumn().align(AlignX.FILL)
+                .bindText(state::defaultIde)
+                    .comment("The default IDE version to display in the IDE selection dropdown. " +
+                            "Example format: CL 2023.3.6 233.15619.8")
+            }
         }
     }
 
diff --git a/src/main/kotlin/com/coder/gateway/settings/CoderSettings.kt b/src/main/kotlin/com/coder/gateway/settings/CoderSettings.kt
@@ -100,6 +100,8 @@ open class CoderSettingsState(
     open var sshLogDirectory: String = "",
     // Default filter for fetching workspaces
     open var workspaceFilter: String = "owner:me",
+    // Default version of IDE to display in IDE selection dropdown
+    open var defaultIde: String = "",
 )
 
 /**
@@ -174,6 +176,12 @@ open class CoderSettings(
     val setupCommand: String
         get() = state.setupCommand
 
+    /**
+     * The default IDE version to display in the selection menu
+     */
+    val defaultIde: String
+        get() = state.defaultIde
+
     /**
      * Whether to ignore a failed setup command.
      */
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspaceProjectIDEStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspaceProjectIDEStepView.kt
@@ -8,6 +8,7 @@ import com.coder.gateway.models.toIdeWithStatus
 import com.coder.gateway.models.withWorkspaceProject
 import com.coder.gateway.sdk.v2.models.Workspace
 import com.coder.gateway.sdk.v2.models.WorkspaceAgent
+import com.coder.gateway.services.CoderSettingsService
 import com.coder.gateway.util.Arch
 import com.coder.gateway.util.OS
 import com.coder.gateway.util.humanizeDuration
@@ -20,6 +21,7 @@ import com.coder.gateway.views.LazyBrowserLink
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.asContextElement
+import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.ui.ComponentValidator
@@ -54,6 +56,7 @@ import com.jetbrains.gateway.ssh.IdeWithStatus
 import com.jetbrains.gateway.ssh.IntelliJPlatformProduct
 import com.jetbrains.gateway.ssh.deploy.DeployException
 import com.jetbrains.gateway.ssh.util.validateRemotePath
+import com.jetbrains.rd.generator.nova.PredefinedType
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -79,6 +82,13 @@ import javax.swing.ListCellRenderer
 import javax.swing.SwingConstants
 import javax.swing.event.DocumentEvent
 
+// Just extracting the way we display the IDE info into a helper function.
+private fun displayIdeWithStatus(ideWithStatus: IdeWithStatus): String {
+    return "${ideWithStatus.product.productCode} ${ideWithStatus.presentableVersion} ${ideWithStatus.buildNumber} | ${ideWithStatus.status.name.lowercase(
+        Locale.getDefault(),
+    )}"
+}
+
 /**
  * View for a single workspace.  In particular, show available IDEs and a button
  * to select an IDE and project to run on the workspace.
@@ -88,6 +98,8 @@ class CoderWorkspaceProjectIDEStepView(
 ) : CoderWizardStep<WorkspaceProjectIDE>(
     CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.next.text"),
 ) {
+    private val settings: CoderSettingsService = service<CoderSettingsService>()
+
     private val cs = CoroutineScope(Dispatchers.IO)
     private var ideComboBoxModel = DefaultComboBoxModel<IdeWithStatus>()
     private var state: CoderWorkspacesStepSelection? = null
@@ -258,9 +270,24 @@ class CoderWorkspaceProjectIDEStepView(
                                     )
                             },
                         )
+
+                    // Check the provided setting to see if there's a default IDE to set.
+                    val defaultIde = ides.find { it ->
+                        // Using contains on the displayable version of the ide means they can be as specific or as vague as they want
+                        // CL 2023.3.6 233.15619.8 -> a specific Clion build
+                        // CL 2023.3.6 -> a specific Clion version
+                        // 2023.3.6 -> a specific version (some customers will on have one specific IDE in their list anyway)
+                        if (settings.defaultIde.isEmpty()) {
+                            false
+                        } else {
+                            displayIdeWithStatus(it).contains(settings.defaultIde)
+                        }
+                    }
+                    val index = ides.indexOf(defaultIde ?: ides.firstOrNull())
+
                     withContext(Dispatchers.IO) {
                         ideComboBoxModel.addAll(ides)
-                        cbIDE.selectedIndex = 0
+                        cbIDE.selectedIndex = index
                     }
                 } catch (e: Exception) {
                     if (isCancellation(e)) {
@@ -456,10 +483,9 @@ class CoderWorkspaceProjectIDEStepView(
                 layout = FlowLayout(FlowLayout.LEFT)
                 add(JLabel(ideWithStatus.product.ideName, ideWithStatus.product.icon, SwingConstants.LEFT))
                 add(
-                    JLabel(
-                        "${ideWithStatus.product.productCode} ${ideWithStatus.presentableVersion} ${ideWithStatus.buildNumber} | ${ideWithStatus.status.name.lowercase(
-                            Locale.getDefault(),
-                        )}",
+                    JLabel(displayIdeWithStatus(
+                        ideWithStatus
+                    ),
                     ).apply {
                         foreground = UIUtil.getLabelDisabledForeground()
                     },
diff --git a/src/main/resources/messages/CoderGatewayBundle.properties b/src/main/resources/messages/CoderGatewayBundle.properties
@@ -138,3 +138,4 @@ gateway.connector.settings.workspace-filter.comment=The filter to apply when \
   the plugin fetches resources individually for each non-running workspace, \
   which can be slow with many workspaces, and it adds every agent to the SSH \
   config, which can result in a large SSH config with many workspaces.
+gateway.connector.settings.default-ide=Default IDE Selection

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,12 @@ class CoderSettingsConfigurable : BoundConfigurable("Coder") {`
`149`	`149`	`.bindText(state::workspaceFilter)`
`150`	`150`	`.comment(CoderGatewayBundle.message("gateway.connector.settings.workspace-filter.comment"))`
`151`	`151`	`}.layout(RowLayout.PARENT_GRID)`
	`152`	`+ row(CoderGatewayBundle.message("gateway.connector.settings.default-ide")) {`
	`153`	`+ textField().resizableColumn().align(AlignX.FILL)`
	`154`	`+ .bindText(state::defaultIde)`
	`155`	`+ .comment("The default IDE version to display in the IDE selection dropdown. " +`
	`156`	`+ "Example format: CL 2023.3.6 233.15619.8")`
	`157`	`+ }`
`152`	`158`	`}`
`153`	`159`	`}`
`154`	`160`