8000 [pull] main from coder:main by pull[bot] · Pull Request #154 · Klomgor/coder · GitHub
[go: up one dir, main page]
Skip to content

[pull] main from coder:main #154

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 10 commits into from
Jul 1, 2025
Merged

[pull] main from coder:main #154

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
695de6e
chore(coderd/database): optimize AuditLogs queries (#18600)
kacpersaw Jul 1, 2025
0f56f00
chore: add `which-release` script (#18657)
dannykopping Jul 1, 2025
258a839
chore(coderd/database): optimize GetRunningPrebuiltWorkspaces (#18588)
johnstcn Jul 1, 2025
7e372f7
fix(agent/agentcontainers): reset error at start of rebuild (#18686)
DanielleMaywood Jul 1, 2025
3d22e27
fix: handle task sidebar app health check disabled correctly (#18687)
hugodutka Jul 1, 2025
4e95b1d
fix: revert changes to GetRunningPrebuiltWorkspaces (#18688)
johnstcn Jul 1, 2025
57a6d59
docs: add warning about prebuilds incompatibility with certain featur…
ssncferreira Jul 1, 2025
dbfbef6
chore(cli): increase reconciliation interval to 1 minute (#18690)
johnstcn Jul 1, 2025
6f2834f
feat: oauth2 - add authorization server metadata endpoint and PKCE su…
ThomasK33 Jul 1, 2025
1158ca2
fix(dogfood/coder): run go clean cache at workspace shutdown (#18685)
mafredri Jul 1, 2025
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
fix: handle task sidebar app health check disabled correctly (coder#1… 
…8687)

Previously, by mistake, the task sidebar would not display workspace
apps that don't have a health check configured.
  • Loading branch information
@hugodutka
hugodutka authored Jul 1, 2025
commit 3d22e27f4e695c01b6bd3e3d85ab7c42811b1eee
2 changes: 1 addition & 1 deletion site/src/pages/TaskPage/TaskPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const TerminatedBuildWithStatus: Story = {
},
};

export const SidebarAppDisabled: Story = {
export const SidebarAppHealthDisabled: Story = {
beforeEach: () => {
spyOn(data, "fetchTask").mockResolvedValue({
prompt: "Create competitors page",
Expand Down
4 changes: 3 additions & 1 deletion site/src/pages/TaskPage/TaskSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ const getSidebarApp = (task: Task): [WorkspaceApp | null, SidebarAppStatus] => {
// indefinitely if there's a genuine issue, but this is preferable to false error alerts.
return [null, "loading"];
}
// "disabled" means that the health check is disabled, so we assume
// that the app is healthy
if (sidebarApp.health === "disabled") {
return [sidebarApp, "error"];
return [sidebarApp, "healthy"];
}
if (sidebarApp.health === "healthy") {
return [sidebarApp, "healthy"];
Expand Down
0