8000 chore: pull in cherry picks for v2.24 by stirby · Pull Request #18674 · coder/coder · GitHub
[go: up one dir, main page]

Skip to content

chore: pull in cherry picks for v2.24 #18674

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 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 33 commits into from
Jul 1, 2025
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
73ffb71
chore: remove chats experiment (#18535)
dannykopping Jun 25, 2025
cc51308
feat: allow new immutable parameters for existing workspaces (#18579)
Emyrk Jun 25, 2025
fac6263
chore: upgrade aisdk-go lib, remove vestigial code (#18577)
dannykopping Jun 25, 2025
4c938c0
refactor: remove beta label from 'select a preset' menu (#18538)
BrunoQuaresma Jun 25, 2025
19d8a40
fix: hide the preset parameter visibility switch when it has no effec…
SasSwart Jun 26, 2025
a4a5892
feat: graduate prebuilds to general availability (#18607)
SasSwart Jun 26, 2025
8e6417a
fix(agent): start devcontainers through agentcontainers package (#18471)
DanielleMaywood Jun 25, 2025
63b619c
fix(agent/agentcontainers): filter out "is test run" devcontainers (#…
mafredri Jun 25, 2025
03d1570
feat(agent/agentcontainers): add feature options as envs (#18576)
mafredri Jun 25, 2025
5be5bf3
fix(coderd/agentapi): make sub agent slugs more unique (#18581)
DanielleMaywood Jun 25, 2025
cf6d208
feat(agent/agentcontainers): add more envs to readconfig for app URL …
mafredri Jun 26, 2025
226aec1
fix!: use devcontainer ID when rebuilding a devcontainer (#18604)
DanielleMaywood Jun 26, 2025
766fc4c
fix(agent/agentcontainers): chown coder binary (#18611)
DanielleMaywood Jun 26, 2025
07d749c
fix(agent/agentcontainers): stop logging empty lines (#18605)
DanielleMaywood Jun 26, 2025
aab5059
chore: parse app status link (#18439)
code-asher Jun 26, 2025
cbc97de
fix(agent): delay containerAPI init to ensure startup scripts run bef…
mafredri Jun 27, 2025
5058d1b
feat: add task link in the workspace page when it is running a task (…
BrunoQuaresma Jun 27, 2025
b7c7d1a
refactor: move required external auth buttons to the submit side (#18…
BrunoQuaresma Jun 27, 2025
b8930ec
fix(agent): fix script filtering for devcontainers (#18635)
mafredri Jun 27, 2025
1891c6f
refactor: show the apps as soon as possible (#18625)
BrunoQuaresma Jun 27, 2025
99f3664
feat: redirect to the task page after creation (#18626)
BrunoQuaresma Jun 27, 2025
19089ad
fix: use default preset when creating a workspace for task (#18623)
BrunoQuaresma Jun 27, 2025
47f813e
fix(agent/agentcontainers): ensure proper channel closure for updateT…
mafredri Jun 27, 2025
2a68b01
fix(agent/agentcontainers): split Init into Init and Start for early …
mafredri Jun 27, 2025
2daec01
feat: make task panels resizable (#18590)
BrunoQuaresma Jun 27, 2025
9e923f9
fix: use only template version ID to create task workspace (#18642)
BrunoQuaresma Jun 27, 2025
830a9ed
chore: add beta badge to tasks (#18656)
dannykopping Jun 30, 2025
da71915
fix(agent/agentcontainers): always derive devcontainer name from work…
mafredri Jun 30, 2025
9a9dd5d
fix: handle health status when displaying task apps (#18675)
hugodutka Jun 30, 2025
4bcbc96
fix: improve reliability of app statuses (#18622)
code-asher Jun 30, 2025
2d210aa
chore: fix idle state icon when disabled (#18554)
code-asher Jun 25, 2025
459b9d9
docs: add warning about prebuilds incompatibility with certain featur…
ssncferreira Jul 1, 2025
b975443
Merge branch 'release/2.24' into cherry-picks-2.24
stirby 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
feat: add task link in the workspace page when it is running a task (#…
  • Loading branch information
BrunoQuaresma authored and stirby committed Jun 30, 2025
commit 5058d1b4ca7f37c8e42d3a90021df5d2dabad141
65 changes: 39 additions & 26 deletions site/src/pages/WorkspacePage/AppStatuses.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,19 @@ import {
import capitalize from "lodash/capitalize";
import { timeFrom } from "utils/time";

import { ScrollArea } from "components/ScrollArea/ScrollArea";
import {
ChevronDownIcon,
ChevronUpIcon,
ExternalLinkIcon,
FileIcon,
LayoutGridIcon,
SquareCheckBigIcon,
} from "lucide-react";
import { AppStatusStateIcon } from "modules/apps/AppStatusStateIcon";
import { useAppLink } from "modules/apps/useAppLink";
import { type FC, useState } from "react";
import { Link as RouterLink } from "react-router-dom";
import { truncateURI } from "utils/uri";

interface AppStatusesProps {
Expand Down Expand Up @@ -81,9 +84,9 @@ export const AppStatuses: FC<AppStatusesProps> = ({
{latestStatus.message || capitalize(latestStatus.state)}
</span>
</div>
<span className="text-xs text-content-secondary first-letter:uppercase block pl-[26px]">
<time className="text-xs text-content-secondary first-letter:uppercase block pl-[26px]">
{timeFrom(new Date(latestStatus.created_at), comparisonDate)}
</span>
</time>
</div>

<div className="flex items-center gap-2">
Expand Down Expand Up @@ -119,6 +122,13 @@ export const AppStatuses: FC<AppStatusesProps> = ({
</Button>
))}

<Button asChild size="sm" variant="outline">
<RouterLink to={`/tasks/${workspace.owner_name}/${workspace.name}`}>
<SquareCheckBigIcon />
View task
</RouterLink>
</Button>

<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
Expand All @@ -141,35 +151,38 @@ export const AppStatuses: FC<AppStatusesProps> = ({
</div>
</div>

{displayStatuses &&
otherStatuses.map((status) => {
const statusTime = new Date(status.created_at);
const formattedTimestamp = timeFrom(statusTime, comparisonDate);
{displayStatuses && (
<ScrollArea className="h-[200px]">
{otherStatuses.map((status) => {
const statusTime = new Date(status.created_at);
const formattedTimestamp = timeFrom(statusTime, comparisonDate);

return (
<div
key={status.id}
className={`
return (
<div
key={status.id}
className={`
flex items-center justify-between px-4 py-3
border-0 [&:not(:last-child)]:border-b border-solid border-border
`}
>
<div className="flex items-center justify-between w-full text-content-secondary">
<span className="text-xs flex items-center gap-2">
<AppStatusStateIcon
state={status.state}
latest={false}
className="size-icon-xs w-[18px]"
/>
{status.message || capitalize(status.state)}
</span>
<span className="text-2xs text-content-secondary first-letter:uppercase block pl-[26px]">
{formattedTimestamp}
</span>
>
<div className="flex items-center justify-between w-full text-content-secondary">
<span className="text-xs flex items-center gap-2">
<AppStatusStateIcon
state={status.state}
latest={false}
className="size-icon-xs w-[18px]"
/>
{status.message || capitalize(status.state)}
</span>
<span className="text-2xs text-content-secondary first-letter:uppercase block pl-[26px]">
{formattedTimestamp}
</span>
</div>
</div>
</div>
);
})}
);
})}
</ScrollArea>
)}
</div>
);
};
Expand Down
0