Commit 14507c7

committed

Break out IDEWithStatus conversions

The available IDE conversion will be used when checking for an update, and installed conversion might eventually be used as well (in case there is a more recent version already installed in the workspace).

1 parent 0d954e7 commit 14507c7Copy full SHA for 14507c7

File tree

2 files changed

+32

-23

lines changed

src/main/kotlin/com/coder/gateway
- models
  - WorkspaceProjectIDE.kt
- views/steps
  - CoderWorkspaceProjectIDEStepView.kt

2 files changed

+32

-23

lines changed

`‎src/main/kotlin/com/coder/gateway/models/WorkspaceProjectIDE.kt‎`

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
`1`	`1`	`package com.coder.gateway.models`
`2`	`2`
`3`	`3`	`import com.intellij.openapi.diagnostic.Logger`
	`4`	`+import com.jetbrains.gateway.ssh.AvailableIde`
	`5`	`+import com.jetbrains.gateway.ssh.IdeStatus`
`4`	`6`	`import com.jetbrains.gateway.ssh.IdeWithStatus`
	`7`	`+import com.jetbrains.gateway.ssh.InstalledIdeUIEx`
`5`	`8`	`import com.jetbrains.gateway.ssh.IntelliJPlatformProduct`
`6`	`9`	`import com.jetbrains.gateway.ssh.deploy.ShellArgument`
`7`	`10`	`import java.net.URL`
`@@ -177,6 +180,32 @@ fun IdeWithStatus.withWorkspaceProject(`
`177`	`180`	`lastOpened = null,`
`178`	`181`	`)`
`179`	`182`
	`183`	`+/**`
	`184`	`+ * Convert an available IDE to an IDE with status.`
	`185`	`+ */`
	`186`	`+fun AvailableIde.toIdeWithStatus(): IdeWithStatus = IdeWithStatus(`
	`187`	`+ product = product,`
	`188`	`+ buildNumber = buildNumber,`
	`189`	`+ status = IdeStatus.DOWNLOAD,`
	`190`	`+ download = download,`
	`191`	`+ pathOnHost = null,`
	`192`	`+ presentableVersion = presentableVersion,`
	`193`	`+ remoteDevType = remoteDevType,`
	`194`	`+)`
	`195`	`+`
	`196`	`+/**`
	`197`	`+ * Convert an installed IDE to an IDE with status.`
	`198`	`+ */`
	`199`	`+fun InstalledIdeUIEx.toIdeWithStatus(): IdeWithStatus = IdeWithStatus(`
	`200`	`+ product = product,`
	`201`	`+ buildNumber = buildNumber,`
	`202`	`+ status = IdeStatus.ALREADY_INSTALLED,`
	`203`	`+ download = null,`
	`204`	`+ pathOnHost = pathToIde,`
	`205`	`+ presentableVersion = presentableVersion,`
	`206`	`+ remoteDevType = remoteDevType,`
	`207`	`+)`
	`208`	`+`
`180`	`209`	`val remotePathRe = Regex("^[^(]+\$(.+)\$$")`
`181`	`210`
`182`	`211`	`fun ShellArgument.RemotePath.toRawString(): String {`

`‎src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspaceProjectIDEStepView.kt‎`

Lines changed: 3 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import com.coder.gateway.CoderGatewayBundle`
`4`	`4`	`import com.coder.gateway.cli.CoderCLIManager`
`5`	`5`	`import com.coder.gateway.icons.CoderIcons`
`6`	`6`	`import com.coder.gateway.models.WorkspaceProjectIDE`
	`7`	`+import com.coder.gateway.models.toIdeWithStatus`
`7`	`8`	`import com.coder.gateway.models.withWorkspaceProject`
`8`	`9`	`import com.coder.gateway.sdk.v2.models.Workspace`
`9`	`10`	`import com.coder.gateway.sdk.v2.models.WorkspaceAgent`
`@@ -351,35 +352,14 @@ class CoderWorkspaceProjectIDEStepView(`
`351`	`352`	`logger.info("Resolved OS and Arch for $name is: $workspaceOS")`
`352`	`353`	`val installedIdesJob =`
`353`	`354`	`cs.async(Dispatchers.IO) {`
`354`		`- executor.getInstalledIDEs().map { ide ->`
`355`		`- IdeWithStatus(`
`356`		`- ide.product,`
`357`		`- ide.buildNumber,`
`358`		`- IdeStatus.ALREADY_INSTALLED,`
`359`		`- null,`
`360`		`- ide.pathToIde,`
`361`		`- ide.presentableVersion,`
`362`		`- ide.remoteDevType,`
`363`		`- )`
`364`		`- }`
	`355`	`+ executor.getInstalledIDEs().map { it.toIdeWithStatus() }`
`365`	`356`	`}`
`366`	`357`	`val idesWithStatusJob =`
`367`	`358`	`cs.async(Dispatchers.IO) {`
`368`	`359`	`IntelliJPlatformProduct.entries`
`369`	`360`	`.filter { it.showInGateway }`
`370`	`361`	`.flatMap { CachingProductsJsonWrapper.getInstance().getAvailableIdes(it, workspaceOS) }`
`371`		`- .map {`
`372`		`- ide ->`
`373`		`- IdeWithStatus(`
`374`		`- ide.product,`
`375`		`- ide.buildNumber,`
`376`		`- IdeStatus.DOWNLOAD,`
`377`		`- ide.download,`
`378`		`- null,`
`379`		`- ide.presentableVersion,`
`380`		`- ide.remoteDevType,`
`381`		`- )`
`382`		`- }`
	`362`	`+ .map { it.toIdeWithStatus() }`
`383`	`363`	`}`
`384`	`364`
`385`	`365`	`val installedIdes = installedIdesJob.await().sorted()`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 14507c7

File tree

2 files changed

2 files changed

`‎src/main/kotlin/com/coder/gateway/models/WorkspaceProjectIDE.kt‎`

`‎src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspaceProjectIDEStepView.kt‎`

0 commit comments