Skip to content

Revert "[jb] enable connect button only when JetBrains Client not activated" #10279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2022
Merged

Revert "[jb] enable connect button only when JetBrains Client not activated" #10279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions ...ns/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.databind.PropertyNamingStrategies
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.intellij.ide.BrowserUtil
import com.intellij.openapi.Disposable
import com.intellij.openapi.components.service
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.diagnostic.thisLogger
import com.intellij.remote.RemoteCredentialsHolder
import com.intellij.ssh.AskAboutHostKey
Expand All @@ -22,7 +20,6 @@ import com.intellij.ui.components.JBTextArea
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.gridLayout.HorizontalAlign
import com.intellij.ui.dsl.gridLayout.VerticalAlign
import com.intellij.util.EventDispatcher
import com.intellij.util.application
import com.intellij.util.io.DigestUtil
import com.intellij.util.ui.JBFont
Expand All @@ -35,8 +32,6 @@ import com.jetbrains.gateway.ssh.ClientOverSshTunnelConnector
import com.jetbrains.gateway.thinClientLink.ThinClientHandle
import com.jetbrains.rd.util.URI
import com.jetbrains.rd.util.lifetime.Lifetime
import com.jetbrains.rd.util.lifetime.isAlive
import com.jetbrains.rd.util.lifetime.onTermination
import io.gitpod.gitpodprotocol.api.entities.WorkspaceInstance
import io.gitpod.jetbrains.icons.GitpodIcons
import kotlinx.coroutines.*
Expand All @@ -57,26 +52,6 @@ class GitpodConnectionProvider : GatewayConnectionProvider {

private val gitpod = service<GitpodConnectionService>()

companion object {
var jetbrainsClientMap: MutableMap<String, ThinClientHandle> = mutableMapOf()

private val dispatcher = EventDispatcher.create(Listener::class.java)

private interface Listener : EventListener {
fun didChange()
}

fun addListener(listener: () -> Unit): Disposable {
val internalListener = object : Listener {
override fun didChange() {
listener()
}
}
dispatcher.addListener(internalListener);
return Disposable { dispatcher.removeListener(internalListener) }
}
}

private val httpClient = HttpClient.newBuilder()
.followRedirects(HttpClient.Redirect.ALWAYS)
.build()
Expand Down Expand Up @@ -259,27 +234,18 @@ class GitpodConnectionProvider : GatewayConnectionProvider {
)
val client = connector.connect()
client.clientClosed.advise(connectionLifetime) {
thisLogger().d("clientClosed, ${client.prettyPrint()}")
application.invokeLater {
connectionLifetime.onTermination {
thisLogger().d("clientTermination, clientClosed didChange fired, ${client.prettyPrint()}")
dispatcher.multicaster.didChange()
}
connectionLifetime.terminate()
}
}
client.onClientPresenceChanged.advise(connectionLifetime) {
thisLogger().d("presenceChanged, ${client.prettyPrint()}")
application.invokeLater {
thisLogger().d("clientPresenceChanged didChange fired, ${client.prettyPrint()}")
dispatcher.multicaster.didChange()
if (client.clientPresent) {
statusMessage.text = ""
}
}
}
thinClient = client
jetbrainsClientMap[update.workspaceId] = client
} catch (t: Throwable) {
if (t is CancellationException) {
throw t
Expand Down Expand Up @@ -478,11 +444,3 @@ class GitpodConnectionProvider : GatewayConnectionProvider {
private data class SSHHostKey(val type: String, val hostKey: String)

}

fun ThinClientHandle.prettyPrint(): String {
return "uid=${uid}, clientPresent=${clientPresent}, lifeTime={status=${lifetime.status}, alive=${lifetime.isAlive}}"
}

fun Logger.d(message: String) {
thisLogger().info("[jb-gw] $message")
}
14 changes: 2 additions & 12 deletions ...brains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodWorkspacesView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,6 @@ class GitpodWorkspacesView(
init {
refresh()
loggedIn.addListener { refresh() }
GitpodConnectionProvider.addListener {
thisLogger().d("WorkspaceView refresh, " +
GitpodConnectionProvider.jetbrainsClientMap
.map { "[wsId=${it.key}, ${it.value.prettyPrint()}]" }
.joinToString("; "))
refresh()
}
}

private fun startUpdateLoop(lifetime: Lifetime, workspacesPane: JBScrollPane): () -> Unit {
Expand Down Expand Up @@ -300,10 +293,7 @@ class GitpodWorkspacesView(
)
}
label(getRelativeTimeSpan(info.latestInstance.creationTime))
val jbClientConnected = GitpodConnectionProvider.jetbrainsClientMap[info.workspace.id]
?.lifetime?.isAlive ?: false
val btnText = if (jbClientConnected) "Connected" else "Connect"
button(btnText) {
button("Connect") {
if (!canConnect) {
BrowserUtil.browse(info.latestInstance.ideUrl)
} else {
Expand All @@ -314,7 +304,7 @@ class GitpodWorkspacesView(
)
)
}
}.enabled(!jbClientConnected)
}
cell()
}.layout(RowLayout.PARENT_GRID)
}
Expand Down