Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

revise recent projects flow to be less confusing#464

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.

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

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
9 changes: 9 additions & 0 deletionsCHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,15 @@

## Unreleased

- The "Recents" view has been updated to have a new flow.
Before, there were separate controls for managing the workspace and then you
could click a link to launch a project (clicking a link would also start a stopped workspace automatically).
Now, there are no workspace controls, just links which start the workspace automatically when needed.
The links are enabled when the workspace is STOPPED, CANCELED, FAILED, STARTING, RUNNING. These states represent
valid times to start a workspace and connect, or to simply connect to a running one or one that's already starting.
We also use a spinner icon when workspaces are in a transition state (STARTING, CANCELING, DELETING, STOPPING)
to give context for why a link might be disabled or a connection might take longer than usual to establish.

## 2.13.1 - 2024-07-19

### Changed
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,10 +17,8 @@
import com.coder.gateway.services.CoderSettingsService
import com.coder.gateway.util.humanizeConnectionError
import com.coder.gateway.util.toURL
import com.coder.gateway.util.withPath
import com.coder.gateway.util.withoutNull
import com.intellij.icons.AllIcons
import com.intellij.ide.BrowserUtil
import com.intellij.openapi.Disposable
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.application.ModalityState
Expand DownExpand Up@@ -56,6 +54,7 @@
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.awt.Color
import java.awt.Component
import java.awt.Dimension
import java.util.Locale
Expand DownExpand Up@@ -175,15 +174,21 @@
val workspaceWithAgent = deployment?.items?.firstOrNull { it.workspace.name == workspaceName }
val status =
if (deploymentError != null) {
Triple(UIUtil.getBalloonErrorIcon(), UIUtil.getErrorForeground(), deploymentError)
Triple(UIUtil.getErrorForeground(),deploymentError,UIUtil.getBalloonErrorIcon())
} else if (workspaceWithAgent != null) {
val inLoadingState = listOf(WorkspaceStatus.STARTING, WorkspaceStatus.CANCELING, WorkspaceStatus.DELETING, WorkspaceStatus.STOPPING).contains(workspaceWithAgent?.workspace?.latestBuild?.status)

Check warning on line 179 in src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt

View workflow job for this annotation

GitHub Actions/ Qodana Community for JVM

Usage of redundant or deprecated syntax or deprecated symbols

Unnecessary safe call on a non-null receiver of type WorkspaceAgentListModel?

Triple(
workspaceWithAgent.status.icon,
workspaceWithAgent.status.statusColor(),
workspaceWithAgent.status.description,
if (inLoadingState) {
AnimatedIcon.Default()
} else {
null
},
)
} else {
Triple(AnimatedIcon.Default.INSTANCE,UIUtil.getContextHelpForeground(), "Querying workspace status...")
Triple(UIUtil.getContextHelpForeground(), "Querying workspace status...", AnimatedIcon.Default())
}
val gap =
if (top) {
Expand All@@ -193,11 +198,6 @@
TopGap.MEDIUM
}
row {
icon(status.first).applyToComponent {
foreground = status.second
}.align(AlignX.LEFT).gap(RightGap.SMALL).applyToComponent {
size = Dimension(JBUI.scale(16), JBUI.scale(16))
}
label(workspaceName).applyToComponent {
font = JBFont.h3().asBold()
}.align(AlignX.LEFT).gap(RightGap.SMALL)
Expand All@@ -206,94 +206,44 @@
font = ComponentPanelBuilder.getCommentFont(font)
}
label("").resizableColumn().align(AlignX.FILL)
actionButton(
object : DumbAwareAction(
CoderGatewayBundle.message("gateway.connector.recent-connections.start.button.tooltip"),
"",
CoderIcons.RUN,
) {
override fun actionPerformed(e: AnActionEvent) {
withoutNull(workspaceWithAgent?.workspace, deployment?.client) { workspace, client ->
jobs[workspace.id]?.cancel()
jobs[workspace.id] =
cs.launch(ModalityState.current().asContextElement()) {
withContext(Dispatchers.IO) {
try {
client.startWorkspace(workspace)
fetchWorkspaces()
} catch (e: Exception) {
logger.error("Could not start workspace ${workspace.name}", e)
}
}
}
}
}
},
).applyToComponent {
isEnabled =
listOf(
WorkspaceStatus.STOPPED,
WorkspaceStatus.FAILED,
).contains(workspaceWithAgent?.workspace?.latestBuild?.status)
}
.gap(RightGap.SMALL)
actionButton(
object : DumbAwareAction(
CoderGatewayBundle.message("gateway.connector.recent-connections.stop.button.tooltip"),
"",
CoderIcons.STOP,
) {
override fun actionPerformed(e: AnActionEvent) {
withoutNull(workspaceWithAgent?.workspace, deployment?.client) { workspace, client ->
jobs[workspace.id]?.cancel()
jobs[workspace.id] =
cs.launch(ModalityState.current().asContextElement()) {
withContext(Dispatchers.IO) {
try {
client.stopWorkspace(workspace)
fetchWorkspaces()
} catch (e: Exception) {
logger.error("Could not stop workspace ${workspace.name}", e)
}
}
}
}
}
},
).applyToComponent { isEnabled = workspaceWithAgent?.workspace?.latestBuild?.status == WorkspaceStatus.RUNNING }
.gap(RightGap.SMALL)
actionButton(
object : DumbAwareAction(
CoderGatewayBundle.message("gateway.connector.recent-connections.terminal.button.tooltip"),
"",
CoderIcons.OPEN_TERMINAL,
) {
override fun actionPerformed(e: AnActionEvent) {
withoutNull(workspaceWithAgent, deployment?.client) { ws, client ->
val link = client.url.withPath("/me/${ws.name}/terminal")
BrowserUtil.browse(link.toString())
}
}
},
)
}.topGap(gap)

val enableLinks = listOf(WorkspaceStatus.STOPPED, WorkspaceStatus.CANCELED, WorkspaceStatus.FAILED, WorkspaceStatus.STARTING, WorkspaceStatus.RUNNING).contains(workspaceWithAgent?.workspace?.latestBuild?.status)

// We only display an API error on the first workspace rather than duplicating it on each workspace.
if (deploymentError == null || showError) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I think we might want to add this check back or something similar to it. It is poorly named but basically it was making sure we only display an API error on the first workspace rather than duplicating it on each workspace (it was pretty noisy, especially since the API errors can get long).

For example, say you have 5 workspaces and your token expires, you see a message about being unauthorized and to check your token 5 times on the page.

Or we could group workspaces under a deployment heading and show the API error under the deployment heading, but that might be out of scope for this PR.

Copy link
CollaboratorAuthor

@bcpeinhardtbcpeinhardtAug 19, 2024•
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

It looks like atm the moment I actually have this inside the connections.foEach loop (which makes me think with multiple WorkpaceProjectIDE combos it would render multiple times). I didn't notice because I was visually testing with one recent connection.
I'll pull it out of the loop and add the check.

^^^ My adhd is going to quickly become a driving force for building out E2E suites.

code-asher reacted with rocket emoji
row {
// There must be a way to make this properly wrap?
label("<html><body style='width:350px;'>" + status.third + "</html>").applyToComponent {
foreground = status.second
status.third?.let {
icon(it)
}
label("<html><body style='width:350px;'>" + status.second + "</html>").applyToComponent {
foreground = status.first
}
}
}

connections.forEach { workspaceProjectIDE ->
row {
icon(workspaceProjectIDE.ideProduct.icon)
cell(
ActionLink(workspaceProjectIDE.projectPathDisplay) {
CoderRemoteConnectionHandle().connect { workspaceProjectIDE }
GatewayUI.getInstance().reset()
},
)
if (enableLinks) {
cell(
ActionLink(workspaceProjectIDE.projectPathDisplay) {
withoutNull(deployment?.client, workspaceWithAgent?.workspace) { client, workspace ->
CoderRemoteConnectionHandle().connect {
if (listOf(WorkspaceStatus.STOPPED, WorkspaceStatus.CANCELED, WorkspaceStatus.FAILED).contains(workspace.latestBuild.status)) {
client.startWorkspace(workspace)
Comment on lines +233 to +234
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I opened#465 for future improvement

bcpeinhardt reacted with rocket emoji
}
workspaceProjectIDE
}
GatewayUI.getInstance().reset()
}
},
)
} else {
label(workspaceProjectIDE.projectPathDisplay).applyToComponent {
foreground = Color.GRAY
}
}
label("").resizableColumn().align(AlignX.FILL)
label(workspaceProjectIDE.ideName).applyToComponent {
foreground = JBUI.CurrentTheme.ContextHelp.FOREGROUND
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp