Skip to content

Commit f392f43

Browse files
committed
wip
1 parent 29a7c79 commit f392f43

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/gateway/GitpodRemoteEnvironment.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ package io.gitpod.toolbox.gateway
77
import com.jetbrains.toolbox.api.remoteDev.AbstractRemoteProviderEnvironment
88
import com.jetbrains.toolbox.api.remoteDev.EnvironmentVisibilityState
99
import com.jetbrains.toolbox.api.remoteDev.environments.EnvironmentContentsView
10+
import com.jetbrains.toolbox.api.remoteDev.states.CustomRemoteEnvironmentState
1011
import com.jetbrains.toolbox.api.remoteDev.states.EnvironmentStateConsumer
12+
import com.jetbrains.toolbox.api.remoteDev.states.EnvironmentStateIcons
1113
import com.jetbrains.toolbox.api.remoteDev.states.StandardRemoteEnvironmentState
1214
import com.jetbrains.toolbox.api.ui.actions.ActionDescription
1315
import com.jetbrains.toolbox.api.ui.observables.ObservableList
@@ -108,9 +110,9 @@ private class WorkspaceEnvState(val phase: WorkspaceInstanceStatus.Phase) {
108110
WorkspaceInstanceStatus.Phase.PHASE_INITIALIZING to StandardRemoteEnvironmentState.Initializing,
109111
WorkspaceInstanceStatus.Phase.PHASE_RUNNING to StandardRemoteEnvironmentState.Active,
110112
WorkspaceInstanceStatus.Phase.PHASE_INTERRUPTED to StandardRemoteEnvironmentState.Error,
111-
WorkspaceInstanceStatus.Phase.PHASE_STOPPING to StandardRemoteEnvironmentState.Unreachable,
112-
WorkspaceInstanceStatus.Phase.PHASE_STOPPED to StandardRemoteEnvironmentState.Hibernated,
113+
WorkspaceInstanceStatus.Phase.PHASE_STOPPING to CustomRemoteEnvironmentState("Stopping", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Activating), false, EnvironmentStateIcons.Offline),
114+
// WorkspaceInstanceStatus.Phase.PHASE_STOPPED to CustomRemoteEnvironmentState("Stopped", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Error), false, EnvironmentStateIcons.Offline),
115+
WorkspaceInstanceStatus.Phase.PHASE_STOPPED to CustomRemoteEnvironmentState("Stopping", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Restarting), false, EnvironmentStateIcons.Connecting),
113116
)
114117
}
115-
// TODO(hw): add customized state
116-
}
118+
}

components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/service/Utils.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.jetbrains.toolbox.api.core.os.LocalDesktopManager
1010
import com.jetbrains.toolbox.api.remoteDev.connection.ClientHelper
1111
import com.jetbrains.toolbox.api.remoteDev.connection.ToolboxProxySettings
1212
import com.jetbrains.toolbox.api.remoteDev.ssh.validation.SshConnectionValidator
13+
import com.jetbrains.toolbox.api.remoteDev.states.EnvironmentStateColorPalette
1314
import com.jetbrains.toolbox.api.remoteDev.ui.EnvironmentUiPageManager
1415
import com.jetbrains.toolbox.api.ui.ToolboxUi
1516
import com.jetbrains.toolbox.api.ui.observables.ObservablePropertiesFactory
@@ -33,6 +34,7 @@ object Utils {
3334
lateinit var gitpodSettings: GitpodSettings private set
3435

3536
lateinit var toolboxUi: ToolboxUi private set
37+
lateinit var environmentStateColorPalette: EnvironmentStateColorPalette private set
3638
lateinit var localDesktopManager: LocalDesktopManager private set
3739
lateinit var environmentUiPageManager: EnvironmentUiPageManager private set
3840

@@ -45,6 +47,7 @@ object Utils {
4547
coroutineScope = serviceLocator.getService(CoroutineScope::class.java)
4648
toolboxUi = serviceLocator.getService(ToolboxUi::class.java)
4749
localDesktopManager = serviceLocator.getService(LocalDesktopManager::class.java)
50+
environmentStateColorPalette = serviceLocator.getService(EnvironmentStateColorPalette::class.java)
4851
environmentUiPageManager = serviceLocator.getService(EnvironmentUiPageManager::class.java)
4952
settingStore = serviceLocator.getService(PluginSettingsStore::class.java)
5053
sshConnectionValidator = serviceLocator.getService(SshConnectionValidator::class.java)

0 commit comments

Comments
 (0)