Merge branch 'canary' into fix/layout

This commit is contained in:
Mauricio Siu
2026-05-08 18:47:39 -06:00
6 changed files with 28 additions and 9 deletions
@@ -288,7 +288,6 @@ export const RestoreBackup = ({
toast.error("Please select a database type"); toast.error("Please select a database type");
return; return;
} }
console.log({ data });
setIsDeploying(true); setIsDeploying(true);
}; };
@@ -1,5 +1,6 @@
"use client"; "use client";
import { Bot, Loader2, RotateCcw, Settings, X } from "lucide-react"; import copy from "copy-to-clipboard";
import { Bot, Check, Copy, Loader2, RotateCcw, Settings, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useState } from "react"; import { useState } from "react";
import ReactMarkdown from "react-markdown"; import ReactMarkdown from "react-markdown";
@@ -30,6 +31,7 @@ const MAX_LOG_LINES = 200;
export function AnalyzeLogs({ logs, context }: Props) { export function AnalyzeLogs({ logs, context }: Props) {
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const [aiId, setAiId] = useState<string>(""); const [aiId, setAiId] = useState<string>("");
const [copied, setCopied] = useState(false);
const { data: providers } = api.ai.getEnabledProviders.useQuery(undefined, { const { data: providers } = api.ai.getEnabledProviders.useQuery(undefined, {
enabled: open, enabled: open,
}); });
@@ -52,6 +54,15 @@ export function AnalyzeLogs({ logs, context }: Props) {
mutate({ aiId, logs: logsText, context }); mutate({ aiId, logs: logsText, context });
}; };
const handleCopy = () => {
if (!data?.analysis) return;
const success = copy(data.analysis);
if (success) {
setCopied(true);
setTimeout(() => setCopied(false), 2000);
}
};
return ( return (
<Popover <Popover
open={open} open={open}
@@ -168,6 +179,18 @@ export function AnalyzeLogs({ logs, context }: Props) {
)} )}
Re-analyze Re-analyze
</Button> </Button>
<Button
size="sm"
variant="outline"
onClick={handleCopy}
title="Copy analysis to clipboard"
>
{copied ? (
<Check className="h-3.5 w-3.5" />
) : (
<Copy className="h-3.5 w-3.5" />
)}
</Button>
<Button <Button
size="sm" size="sm"
variant="ghost" variant="ghost"
@@ -632,7 +632,6 @@ export const AddDatabase = ({ environmentId, projectName }: Props) => {
control={form.control} control={form.control}
name="enableNamespaces" name="enableNamespaces"
render={({ field }) => { render={({ field }) => {
console.log(field.value);
return ( return (
<FormItem> <FormItem>
<FormLabel>Enable Namespaces</FormLabel> <FormLabel>Enable Namespaces</FormLabel>
@@ -344,7 +344,7 @@ export const ShowProjects = () => {
} }
}} }}
> >
<Card className="group relative w-full h-full bg-transparent transition-colors hover:bg-border"> <Card className="group relative w-full h-full bg-transparent transition-colors hover:bg-border flex flex-col">
<CardHeader> <CardHeader>
<CardTitle className="flex items-center justify-between gap-2 overflow-clip"> <CardTitle className="flex items-center justify-between gap-2 overflow-clip">
<span className="flex flex-col gap-1.5 "> <span className="flex flex-col gap-1.5 ">
@@ -491,7 +491,7 @@ export const ShowProjects = () => {
</div> </div>
</CardTitle> </CardTitle>
</CardHeader> </CardHeader>
<CardFooter className="pt-4"> <CardFooter className="pt-4 mt-auto">
<div className="space-y-1 text-xs flex flex-row justify-between max-sm:flex-wrap w-full gap-2 sm:gap-4"> <div className="space-y-1 text-xs flex flex-row justify-between max-sm:flex-wrap w-full gap-2 sm:gap-4">
<DateTooltip date={project.createdAt}> <DateTooltip date={project.createdAt}>
Created Created
@@ -1620,9 +1620,9 @@ const EnvironmentPage = (
<ContextMenuTrigger asChild> <ContextMenuTrigger asChild>
<Link <Link
href={`/dashboard/project/${projectId}/environment/${environmentId}/services/${service.type}/${service.id}`} href={`/dashboard/project/${projectId}/environment/${environmentId}/services/${service.type}/${service.id}`}
className="block" className="block h-full"
> >
<Card className="flex flex-col group relative cursor-pointer bg-transparent transition-colors hover:bg-border"> <Card className="flex flex-col h-full group relative cursor-pointer bg-transparent transition-colors hover:bg-border">
{service.serverId && ( {service.serverId && (
<div className="absolute -left-1 -top-2"> <div className="absolute -left-1 -top-2">
<ServerIcon className="size-4 text-muted-foreground" /> <ServerIcon className="size-4 text-muted-foreground" />
@@ -856,8 +856,6 @@ export const projectRouter = createTRPCRouter({
ctx.session.activeOrganizationId, ctx.session.activeOrganizationId,
).then((value) => value.environment); ).then((value) => value.environment);
console.log("targetProject", targetProject);
if (input.includeServices) { if (input.includeServices) {
const servicesToDuplicate = input.selectedServices || []; const servicesToDuplicate = input.selectedServices || [];