Skip to content

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.

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 11 commits into from
Aug 19, 2024
+48 −89
Merged

revise recent projects flow to be less confusing #464

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a51beea
revise recent projects flow to be less confusing
bcpeinhardt Aug 14, 2024
c704fa5
swap hourglass for spinner
bcpeinhardt Aug 14, 2024
6aeb88d
make the link just start the workspace
bcpeinhardt Aug 15, 2024
7cd80fb
disable link when appropriate and show loading states
bcpeinhardt Aug 16, 2024
9c876af
remove underline for disabled link
bcpeinhardt Aug 16, 2024
cc07fac
re-add wrapping to description label
bcpeinhardt Aug 16, 2024
93101b3
add back status icon in error case
bcpeinhardt Aug 19, 2024
901c2c3
run linter
bcpeinhardt Aug 19, 2024
a6b196b
update changelog
bcpeinhardt Aug 19, 2024
3202bb8
decide icon in one place
bcpeinhardt Aug 19, 2024
3020473
use let instead of git add .
bcpeinhardt Aug 19, 2024
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
Prev Previous commit
Next Next commit
re-add wrapping to description label
  • Loading branch information
@bcpeinhardt
bcpeinhardt committed Aug 16, 2024
commit cc07facc8e84d27bcfd4d4e7674fe4a6e141fbe8
11 changes: 6 additions & 5 deletions src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,14 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
val workspaceWithAgent = deployment?.items?.firstOrNull { it.workspace.name == workspaceName }
val status =
if (deploymentError != null) {
Triple(UIUtil.getBalloonErrorIcon(), UIUtil.getErrorForeground(), deploymentError)
Pair(UIUtil.getErrorForeground(), deploymentError)
} else if (workspaceWithAgent != null) {
Triple(
workspaceWithAgent.status.icon,
Pair(
workspaceWithAgent.status.statusColor(),
workspaceWithAgent.status.description,
)
} else {
Triple(AnimatedIcon.Default.INSTANCE, UIUtil.getContextHelpForeground(), "Querying workspace status...")
Pair(UIUtil.getContextHelpForeground(), "Querying workspace status...")
}
val gap =
if (top) {
Expand Down Expand Up @@ -210,7 +209,9 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
if (inLoadingState) {
icon(AnimatedIcon.Default())
}
label(workspaceWithAgent?.status?.description.orEmpty())
label("<html><body style='width:350px;'>" + status.second + "</html>").applyToComponent {
foreground = status.first
}
}

row {
Expand Down
Loading