Rename ideProductCode to ideProduct

code-asher · code-asher · commit 388d47e42de4 · 2024-07-15T14:09:19.000-08:00
For example, ideProductCode.productCode is a bit weird.  This object
contains more than just the product code.

It is still ideProductCode in the recent connections file because there
we do indeed only store the product code, but also we cannot change the
name there anyway to avoid breaking backwards compatibility.
diff --git a/src/main/kotlin/com/coder/gateway/CoderRemoteConnectionHandle.kt b/src/main/kotlin/com/coder/gateway/CoderRemoteConnectionHandle.kt
@@ -161,7 +161,7 @@ class CoderRemoteConnectionHandle {
         indicator.text = "Waiting for ${workspace.ideName} backend..."
         var status: UnattendedHostStatus? = null
         val remoteProjectPath = accessor.makeRemotePath(ShellArgument.PlainText(workspace.projectPath))
-        val logsDir = accessor.getLogsDir(workspace.ideProductCode.productCode, remoteProjectPath)
+        val logsDir = accessor.getLogsDir(workspace.ideProduct.productCode, remoteProjectPath)
         while (lifetime.status == LifetimeStatus.Alive) {
             status = ensureIDEBackend(workspace, accessor, ideDir, remoteProjectPath, logsDir, lifetime, null)
             if (!status?.joinLink.isNullOrBlank()) {
@@ -262,7 +262,7 @@ class CoderRemoteConnectionHandle {
         logger.info("Searching for ${workspace.ideName} on ${workspace.hostname}")
         val installed =
             accessor.getInstalledIDEs().find {
-                it.product == workspace.ideProductCode && it.buildNumber == workspace.ideBuildNumber
+                it.product == workspace.ideProduct && it.buildNumber == workspace.ideBuildNumber
             }
         if (installed != null) {
             logger.info("${workspace.ideName} found at ${workspace.hostname}:${installed.pathToIde}")
diff --git a/src/main/kotlin/com/coder/gateway/models/WorkspaceProjectIDE.kt b/src/main/kotlin/com/coder/gateway/models/WorkspaceProjectIDE.kt
@@ -16,7 +16,7 @@ class WorkspaceProjectIDE(
     val name: String,
     val hostname: String,
     val projectPath: String,
-    val ideProductCode: IntelliJPlatformProduct,
+    val ideProduct: IntelliJPlatformProduct,
     val ideBuildNumber: String,
     // One of these must exist; enforced by the constructor.
     var idePathOnHost: String?,
@@ -25,7 +25,7 @@ class WorkspaceProjectIDE(
     val deploymentURL: URL,
     var lastOpened: String?, // Null if never opened.
 ) {
-    val ideName = "${ideProductCode.productCode}-$ideBuildNumber"
+    val ideName = "${ideProduct.productCode}-$ideBuildNumber"
 
     private val maxDisplayLength = 35
 
@@ -53,7 +53,7 @@ class WorkspaceProjectIDE(
             name = name,
             coderWorkspaceHostname = hostname,
             projectPath = projectPath,
-            ideProductCode = ideProductCode.productCode,
+            ideProductCode = ideProduct.productCode,
             ideBuildNumber = ideBuildNumber,
             downloadSource = downloadSource,
             idePathOnHost = idePathOnHost,
@@ -98,7 +98,7 @@ class WorkspaceProjectIDE(
                 name = name,
                 hostname = hostname,
                 projectPath = projectPath,
-                ideProductCode = IntelliJPlatformProduct.fromProductCode(ideProductCode) ?: throw Exception("invalid product code"),
+                ideProduct = IntelliJPlatformProduct.fromProductCode(ideProductCode) ?: throw Exception("invalid product code"),
                 ideBuildNumber = ideBuildNumber,
                 idePathOnHost = idePathOnHost,
                 downloadSource = downloadSource,
@@ -172,7 +172,7 @@ fun IdeWithStatus.withWorkspaceProject(
         name = name,
         hostname = hostname,
         projectPath = projectPath,
-        ideProductCode = this.product,
+        ideProduct = this.product,
         ideBuildNumber = this.buildNumber,
         downloadSource = this.download?.link,
         idePathOnHost = this.pathOnHost,
diff --git a/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt b/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt
@@ -287,7 +287,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
                         }
                         connections.forEach { workspaceProjectIDE ->
                             row {
-                                icon(workspaceProjectIDE.ideProductCode.icon)
+                                icon(workspaceProjectIDE.ideProduct.icon)
                                 cell(
                                     ActionLink(workspaceProjectIDE.projectPathDisplay) {
                                         CoderRemoteConnectionHandle().connect { workspaceProjectIDE }

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:`
`287`	`287`	`}`
`288`	`288`	`connections.forEach { workspaceProjectIDE ->`
`289`	`289`	`row {`
`290`		`- icon(workspaceProjectIDE.ideProductCode.icon)`
	`290`	`+ icon(workspaceProjectIDE.ideProduct.icon)`
`291`	`291`	`cell(`
`292`	`292`	`ActionLink(workspaceProjectIDE.projectPathDisplay) {`
`293`	`293`	`CoderRemoteConnectionHandle().connect { workspaceProjectIDE }`