Skip to content

Commit 102fdab

Browse files
fioan89fioan89
committed
impl: update class usages (2)
- to reflect the new toolbox api
1 parent aa60ea8 commit 102fdab

File tree

8 files changed

+33
-27
lines changed

8 files changed

+33
-27
lines changed

‎src/main/kotlin/com/coder/gateway/models/WorkspaceAndAgentStatus.kt

+14-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ import com.coder.gateway.sdk.v2.models.WorkspaceAgent
55
import com.coder.gateway.sdk.v2.models.WorkspaceAgentLifecycleState
66
import com.coder.gateway.sdk.v2.models.WorkspaceAgentStatus
77
import com.coder.gateway.sdk.v2.models.WorkspaceStatus
8-
import com.jetbrains.toolbox.gateway.states.Color
9-
import com.jetbrains.toolbox.gateway.states.CustomRemoteEnvironmentState
8+
import com.jetbrains.toolbox.api.core.ui.color.Color
9+
import com.jetbrains.toolbox.api.core.ui.color.StateColor
10+
import com.jetbrains.toolbox.api.core.ui.color.ThemeColor
11+
import com.jetbrains.toolbox.api.remoteDev.states.CustomRemoteEnvironmentState
1012

1113
/**
1214
* WorkspaceAndAgentStatus represents the combined status of a single agent and
@@ -60,10 +62,16 @@ enum class WorkspaceAndAgentStatus(val label: String, val description: String) {
6062
// TODO@JB: Is there a set of default colors we could use?
6163
return CustomRemoteEnvironmentState(
6264
label,
63-
Color(200, 200, 200, 200), // darkThemeColor
64-
Color(104, 112, 128, 255), // lightThemeColor
65-
Color(224, 224, 240, 26), // darkThemeBackgroundColor
66-
Color(224, 224, 245, 250), // lightThemeBackgroundColor
65+
StateColor(
66+
ThemeColor(
67+
Color(0.407f, 0.439f, 0.502f, 1.0f), // lightThemeColor
68+
Color(0.784f, 0.784f, 0.784f, 0.784f), // darkThemeColor
69+
),
70+
ThemeColor(
71+
Color(0.878f, 0.878f, 0.941f, 0.102f), // darkThemeBackgroundColor
72+
Color(0.878f, 0.878f, 0.961f, 0.980f), // lightThemeBackgroundColor
73+
)
74+
),
6775
ready(), // reachable
6876
// TODO@JB: How does this work? Would like a spinner for pending states.
6977
null, // iconId

‎src/main/kotlin/com/coder/gateway/services/CoderSettingsService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.coder.gateway.services
22

33
import com.coder.gateway.settings.CoderSettingsState
4-
import com.jetbrains.toolbox.gateway.PluginSettingsStore
4+
import com.jetbrains.toolbox.api.core.PluginSettingsStore
55

66
/**
77
* Provides Coder settings backed by the settings state service.

‎src/main/kotlin/com/coder/gateway/util/Dialogs.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.coder.gateway.util
22

33
import com.coder.gateway.settings.CoderSettings
44
import com.coder.gateway.settings.Source
5-
import com.jetbrains.toolbox.gateway.ui.TextType
6-
import com.jetbrains.toolbox.gateway.ui.ToolboxUi
5+
import com.jetbrains.toolbox.api.ui.ToolboxUi
6+
import com.jetbrains.toolbox.api.ui.components.TextType
77
import java.net.URL
88

99
/**
@@ -34,7 +34,8 @@ class DialogUi(
3434
}
3535

3636
private fun openUrl(url: URL) {
37-
ui.openUrl(url.toString())
37+
// TODO - check this later
38+
// ui.openUrl(url.toString())
3839
}
3940

4041
/**

‎src/main/kotlin/com/coder/gateway/views/ConnectPage.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import com.coder.gateway.cli.ensureCLI
55
import com.coder.gateway.sdk.CoderRestClient
66
import com.coder.gateway.settings.CoderSettings
77
import com.coder.gateway.util.humanizeConnectionError
8-
import com.jetbrains.toolbox.gateway.ui.LabelField
9-
import com.jetbrains.toolbox.gateway.ui.RunnableActionDescription
10-
import com.jetbrains.toolbox.gateway.ui.UiField
8+
import com.jetbrains.toolbox.api.ui.actions.RunnableActionDescription
9+
import com.jetbrains.toolbox.api.ui.components.LabelField
10+
import com.jetbrains.toolbox.api.ui.components.UiField
1111
import kotlinx.coroutines.CoroutineScope
1212
import kotlinx.coroutines.Job
1313
import kotlinx.coroutines.launch

‎src/main/kotlin/com/coder/gateway/views/EnvironmentView.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.coder.gateway.views
33
import com.coder.gateway.cli.CoderCLIManager
44
import com.coder.gateway.sdk.v2.models.Workspace
55
import com.coder.gateway.sdk.v2.models.WorkspaceAgent
6-
import com.jetbrains.toolbox.gateway.environments.SshEnvironmentContentsView
7-
import com.jetbrains.toolbox.gateway.ssh.SshConnectionInfo
6+
import com.jetbrains.toolbox.api.remoteDev.environments.SshEnvironmentContentsView
7+
import com.jetbrains.toolbox.api.remoteDev.ssh.SshConnectionInfo
88
import java.net.URL
99
import java.util.concurrent.CompletableFuture
1010

‎src/main/kotlin/com/coder/gateway/views/NewEnvironmentPage.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.coder.gateway.views
22

3-
import com.jetbrains.toolbox.gateway.ui.UiField
3+
import com.jetbrains.toolbox.api.ui.components.UiField
4+
45

56
/**
67
* A page for creating new environments. It displays at the top of the

‎src/main/kotlin/com/coder/gateway/views/SignInPage.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.coder.gateway.views
22

33
import com.coder.gateway.settings.Source
4-
import com.jetbrains.toolbox.gateway.ui.LabelField
5-
import com.jetbrains.toolbox.gateway.ui.RunnableActionDescription
6-
import com.jetbrains.toolbox.gateway.ui.TextField
7-
import com.jetbrains.toolbox.gateway.ui.TextType
8-
import com.jetbrains.toolbox.gateway.ui.UiField
4+
import com.jetbrains.toolbox.api.ui.actions.RunnableActionDescription
5+
import com.jetbrains.toolbox.api.ui.components.LabelField
6+
import com.jetbrains.toolbox.api.ui.components.TextField
7+
import com.jetbrains.toolbox.api.ui.components.TextType
8+
import com.jetbrains.toolbox.api.ui.components.UiField
99
import java.net.URL
1010

1111
/**

‎src/main/kotlin/com/coder/gateway/views/TokenPage.kt

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ package com.coder.gateway.views
22

33
import com.coder.gateway.settings.Source
44
import com.coder.gateway.util.withPath
5-
import com.jetbrains.toolbox.gateway.ui.LabelField
6-
import com.jetbrains.toolbox.gateway.ui.LinkField
7-
import com.jetbrains.toolbox.gateway.ui.RunnableActionDescription
8-
import com.jetbrains.toolbox.gateway.ui.TextField
9-
import com.jetbrains.toolbox.gateway.ui.TextType
10-
import com.jetbrains.toolbox.gateway.ui.UiField
5+
import com.jetbrains.toolbox.api.ui.actions.RunnableActionDescription
6+
import com.jetbrains.toolbox.api.ui.components.*
117
import java.net.URL
128

139
/**

0 commit comments

Comments
 (0)