Skip to content

Commit 5c31806

Browse files
authored
Merge branch 'main' into patch-1
2 parents bf1bd83 + a03783d commit 5c31806

File tree

55 files changed

+1158
-326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1158
-326
lines changed

.changeset/angry-files-yawn.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/beige-flies-fail.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/serious-doors-call.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/seven-taxis-glow.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changeset/sharp-cheetahs-end.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changeset/soft-candles-grow.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

apps/supervisor/src/workloadServer/index.ts

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
125125
}
126126

127127
private createHttpServer({ host, port }: { host: string; port: number }) {
128-
return new HttpServer({
128+
const httpServer = new HttpServer({
129129
port,
130130
host,
131131
metrics: {
@@ -346,23 +346,6 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
346346
},
347347
}
348348
)
349-
.route("/api/v1/workload-actions/runs/:runFriendlyId/logs/debug", "POST", {
350-
paramsSchema: WorkloadActionParams.pick({ runFriendlyId: true }),
351-
bodySchema: WorkloadDebugLogRequestBody,
352-
handler: async ({ req, reply, params, body }) => {
353-
reply.empty(204);
354-
355-
if (!env.SEND_RUN_DEBUG_LOGS) {
356-
return;
357-
}
358-
359-
await this.workerClient.sendDebugLog(
360-
params.runFriendlyId,
361-
body,
362-
this.runnerIdFromRequest(req)
363-
);
364-
},
365-
})
366349
.route("/api/v1/workload-actions/deployments/:deploymentId/dequeue", "GET", {
367350
paramsSchema: z.object({
368351
deploymentId: z.string(),
@@ -387,6 +370,31 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
387370
reply.json(dequeueResponse.data satisfies WorkloadDequeueFromVersionResponseBody);
388371
},
389372
});
373+
374+
if (env.SEND_RUN_DEBUG_LOGS) {
375+
httpServer.route("/api/v1/workload-actions/runs/:runFriendlyId/logs/debug", "POST", {
376+
paramsSchema: WorkloadActionParams.pick({ runFriendlyId: true }),
377+
bodySchema: WorkloadDebugLogRequestBody,
378+
handler: async ({ req, reply, params, body }) => {
379+
reply.empty(204);
380+
381+
await this.workerClient.sendDebugLog(
382+
params.runFriendlyId,
383+
body,
384+
this.runnerIdFromRequest(req)
385+
);
386+
},
387+
});
388+
} else {
389+
// Lightweight mock route without schemas
390+
httpServer.route("/api/v1/workload-actions/runs/:runFriendlyId/logs/debug", "POST", {
391+
handler: async ({ reply }) => {
392+
reply.empty(204);
393+
},
394+
});
395+
}
396+
397+
return httpServer;
390398
}
391399

392400
private createWebsocketServer() {
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
export function MoveToTopIcon({ className }: { className?: string }) {
2+
return (
3+
<svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
4+
<g clipPath="url(#clip0_17186_103975)">
5+
<path
6+
d="M12 21L12 9"
7+
stroke="currentColor"
8+
strokeWidth="2"
9+
strokeLinecap="round"
10+
strokeLinejoin="round"
11+
/>
12+
<path
13+
d="M3 3L21 3"
14+
stroke="currentColor"
15+
strokeWidth="2"
16+
strokeLinecap="round"
17+
strokeLinejoin="round"
18+
/>
19+
<path
20+
d="M16.5 11.5L12 7L7.5 11.5"
21+
stroke="currentColor"
22+
strokeWidth="2"
23+
strokeLinecap="round"
24+
strokeLinejoin="round"
25+
/>
26+
</g>
27+
<defs>
28+
<clipPath id="clip0_17186_103975">
29+
<rect width="24" height="24" fill="currentColor" />
30+
</clipPath>
31+
</defs>
32+
</svg>
33+
);
34+
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
export function MoveUpIcon({ className }: { className?: string }) {
2+
return (
3+
<svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
4+
<g clipPath="url(#clip0_17177_110851)">
5+
<path
6+
d="M12 21L12 13"
7+
stroke="currentColor"
8+
strokeWidth="2"
9+
strokeLinecap="round"
10+
strokeLinejoin="round"
11+
/>
12+
<path
13+
d="M3 3L21 3"
14+
stroke="currentColor"
15+
strokeWidth="2"
16+
strokeLinecap="round"
17+
strokeLinejoin="round"
18+
/>
19+
<path
20+
d="M3 7L21 7"
21+
stroke="currentColor"
22+
strokeWidth="2"
23+
strokeLinecap="round"
24+
strokeLinejoin="round"
25+
/>
26+
<path
27+
d="M16.5 15.5L12 11L7.5 15.5"
28+
stroke="currentColor"
29+
strokeWidth="2"
30+
strokeLinecap="round"
31+
strokeLinejoin="round"
32+
/>
33+
</g>
34+
<defs>
35+
<clipPath id="clip0_17177_110851">
36+
<rect width="24" height="24" fill="currentColor" />
37+
</clipPath>
38+
</defs>
39+
</svg>
40+
);
41+
}

apps/webapp/app/components/DefinitionTooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function DefinitionTip({
1414
return (
1515
<TooltipProvider>
1616
<Tooltip disableHoverableContent>
17-
<TooltipTrigger>
17+
<TooltipTrigger className="text-left">
1818
<span className="cursor-default underline decoration-charcoal-500 decoration-dashed underline-offset-4 transition hover:decoration-charcoal-400">
1919
{children}
2020
</span>

0 commit comments

Comments
 (0)