Skip to content

Commit 2bc3f11

Browse files
authored
Merge branch 'main' into samejr/fullscreen-error-page
2 parents b689d12 + 8947c07 commit 2bc3f11

5 files changed

Lines changed: 20 additions & 3 deletions

File tree

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
area: webapp
3+
type: fix
4+
---
5+
6+
Fixed manually paused environments not being resumable. Resuming incorrectly failed with a billing-limit error even when no billing limit was in effect.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
area: webapp
3+
type: fix
4+
---
5+
6+
Truncate long task names in the task landing page side menu so they no longer push the Test button off the edge.

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.agents.$agentParam/route.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ function AgentDetailSidebar({
431431

432432
return (
433433
<div className="grid h-full grid-rows-[auto_1fr] overflow-hidden bg-background-bright">
434-
<div className="flex items-center gap-2 border-b border-grid-dimmed py-2 pl-3 pr-2">
434+
<div className="flex min-w-0 items-center gap-2 border-b border-grid-dimmed py-2 pl-3 pr-2">
435435
<Header2 className="flex min-w-0 flex-1 items-center gap-1.5">
436436
<CubeSparkleIcon className="size-4.5 shrink-0 text-agents" />
437437
<span className="truncate">{agent.slug}</span>

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.tasks.standard.$taskParam/route.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ function TaskDetailSidebar({
247247

248248
return (
249249
<div className="grid h-full grid-rows-[auto_1fr] overflow-hidden bg-background-bright">
250-
<div className="flex items-center gap-2 border-b border-grid-dimmed py-2 pl-3 pr-2">
250+
<div className="flex min-w-0 items-center gap-2 border-b border-grid-dimmed py-2 pl-3 pr-2">
251251
<Header2 className="flex min-w-0 flex-1 items-center gap-1.5">
252252
<TaskIcon className="size-4.5 shrink-0 text-tasks" />
253253
<span className="truncate">{task.slug}</span>

apps/webapp/app/v3/services/pauseEnvironment.server.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,12 @@ export class PauseEnvironmentService extends WithRunEngine {
7878
const resumed = await this._prisma.runtimeEnvironment.updateMany({
7979
where: {
8080
id: environment.id,
81-
NOT: { pauseSource: EnvironmentPauseSource.BILLING_LIMIT },
81+
// NOT on a nullable field excludes NULL rows in Prisma, which made
82+
// user-paused envs (pauseSource null) unresumable.
83+
OR: [
84+
{ pauseSource: null },
85+
{ NOT: { pauseSource: EnvironmentPauseSource.BILLING_LIMIT } },
86+
],
8287
},
8388
data: {
8489
paused: false,

0 commit comments

Comments
 (0)