refactor: remove all the props except id, serverid, isloading, and delete function

This commit is contained in:
190km
2024-12-21 23:11:55 +01:00
parent 9d1cf3736b
commit 29ce8908ee
2 changed files with 105 additions and 181 deletions

View File

@@ -1,97 +1,64 @@
import { StatusTooltip } from "@/components/shared/status-tooltip";
import { Badge } from "@/components/ui/badge"; import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Separator } from "@/components/ui/separator"; import { Separator } from "@/components/ui/separator";
import { Clock, GitBranch, GitPullRequest, Pencil } from "lucide-react"; import { Clock, GitBranch, GitPullRequest } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { ShowModalLogs } from "../../settings/web-server/show-modal-logs"; import { ShowModalLogs } from "../../settings/web-server/show-modal-logs";
import { DialogAction } from "@/components/shared/dialog-action"; import { DialogAction } from "@/components/shared/dialog-action";
import { api } from "@/utils/api";
import { ShowPreviewBuilds } from "./show-preview-builds"; import { ShowPreviewBuilds } from "./show-preview-builds";
import { RouterOutputs } from "@/utils/api";
import { AddPreviewDomain } from "./add-preview-domain";
import { DateTooltip } from "@/components/shared/date-tooltip"; import { DateTooltip } from "@/components/shared/date-tooltip";
interface PreviewDeploymentCardProps { interface PreviewDeploymentCardProps {
appName: string; deploymentId: string;
serverId: string; serverId: string;
onDeploymentDelete: (deploymentId: string) => void; onDeploymentDelete: (deploymentId: string) => void;
deploymentId: string;
deploymentUrl: string;
deployments: RouterOutputs["deployment"]["all"];
domainId: string;
domainHost: string;
pullRequestTitle: string;
pullRequestUrl: string;
status: "running" | "error" | "done" | "idle" | undefined | null;
branch: string;
date: string;
isLoading: boolean; isLoading: boolean;
} }
export function PreviewDeploymentCard({ export function PreviewDeploymentCard({
appName,
serverId,
onDeploymentDelete,
deploymentId, deploymentId,
deployments, serverId,
onDeploymentDelete,
domainId,
domainHost,
pullRequestTitle,
pullRequestUrl,
isLoading, isLoading,
status,
branch,
date,
}: PreviewDeploymentCardProps) { }: PreviewDeploymentCardProps) {
const { data: previewDeployment } = api.previewDeployment.one.useQuery({
previewDeploymentId: deploymentId,
});
if (!previewDeployment) return null;
return ( return (
<div className="w-full border rounded-xl"> <div className="w-full border rounded-xl">
<div className="p-6 flex flex-row items-center justify-between"> <div className="p-6 flex flex-row items-center justify-between">
<span className="text-lg font-bold">{pullRequestTitle}</span> <span className="text-lg font-bold">{previewDeployment.pullRequestTitle}</span>
<Badge variant="outline" className="text-sm font-medium gap-x-2"> <Badge variant="outline" className="text-sm font-medium gap-x-2">
<StatusTooltip status={status} className="size-2.5" /> {previewDeployment.previewStatus || "Idle"}
{status
?.replace("running", "Running")
.replace("done", "Done")
.replace("error", "Error")
.replace("idle", "Idle") || "Idle"}
</Badge> </Badge>
</div> </div>
<div className="p-6 pt-0 space-y-4"> <div className="p-6 pt-0 space-y-4">
<div className="flex sm:flex-row flex-col items-center gap-2"> <div className="flex sm:flex-row flex-col items-center gap-2">
<div className="gap-2 flex w-full sm:flex-row flex-col items-center justify-between rounded-lg border p-2"> <Link
<Link href={`http://${domainHost}`} target="_blank" className="text-sm text-blue-500/95 hover:underline"> href={`http://${previewDeployment.domain?.host}`}
{domainHost} target="_blank"
</Link> className="text-sm text-blue-500/95 hover:underline"
</div>
<AddPreviewDomain
previewDeploymentId={deploymentId}
domainId={domainId}
> >
<Button className="sm:w-auto w-full" size="sm" variant="outline"> {previewDeployment.domain?.host}
<Pencil className="mr-2 size-4" /> </Link>
Edit
</Button>
</AddPreviewDomain>
</div> </div>
<div className="flex sm:flex-row text-sm flex-col items-center justify-between"> <div className="flex sm:flex-row text-sm flex-col items-center justify-between">
<div className="flex items-center space-x-2"> <div className="flex items-center space-x-2">
<GitBranch className="h-5 w-5 text-gray-400" /> <GitBranch className="h-5 w-5 text-gray-400" />
<span>Branch:</span> <span>Branch:</span>
<Badge className="p-2" variant={"blank"}> <Badge className="p-2" variant={"blank"}>
{" "} {previewDeployment.branch}
{branch}
</Badge> </Badge>
</div> </div>
<div className="flex items-center space-x-2"> <div className="flex items-center space-x-2">
<Clock className="h-5 w-5 text-gray-400" /> <Clock className="h-5 w-5 text-gray-400" />
<span>Deployed:</span> <span>Deployed:</span>
<Badge className="p-2" variant={"blank"}> <Badge className="p-2" variant={"blank"}>
<DateTooltip date={date} /> <DateTooltip date={previewDeployment.createdAt} />
</Badge> </Badge>
</div> </div>
</div> </div>
@@ -103,23 +70,21 @@ export function PreviewDeploymentCard({
<Link <Link
className="hover:text-blue-500/95 hover:underline" className="hover:text-blue-500/95 hover:underline"
target="_blank" target="_blank"
href={pullRequestUrl} href={previewDeployment.pullRequestURL}
> >
{pullRequestTitle} {previewDeployment.pullRequestTitle}
</Link> </Link>
</div> </div>
</div> </div>
</div> </div>
<div className="justify-center flex-wrap p-6 pt-0"> <div className="justify-center flex-wrap p-6 pt-0">
<div className="flex flex-wrap justify-end gap-2"> <div className="flex flex-wrap justify-end gap-2">
<ShowPreviewBuilds deployments={deployments} serverId={serverId} /> <ShowPreviewBuilds deployments={previewDeployment.deployments || []} serverId={serverId} />
<ShowModalLogs appName={previewDeployment.appName} serverId={serverId}>
<ShowModalLogs appName={appName} serverId={serverId}>
<Button className="sm:w-auto w-full" variant="outline" size="sm"> <Button className="sm:w-auto w-full" variant="outline" size="sm">
View Logs View Logs
</Button> </Button>
</ShowModalLogs> </ShowModalLogs>
<DialogAction <DialogAction
title="Delete Preview" title="Delete Preview"
description="Are you sure you want to delete this preview?" description="Are you sure you want to delete this preview?"

View File

@@ -26,10 +26,9 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
{ applicationId }, { applicationId },
{ {
enabled: !!applicationId, enabled: !!applicationId,
}, }
); );
const handleDeletePreviewDeployment = async (previewDeploymentId: string) => { const handleDeletePreviewDeployment = async (previewDeploymentId: string) => {
deletePreviewDeployment({ deletePreviewDeployment({
previewDeploymentId: previewDeploymentId, previewDeploymentId: previewDeploymentId,
@@ -43,11 +42,6 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
}); });
}; };
// const [url, setUrl] = React.useState("");
// useEffect(() => {
// setUrl(document.location.origin);
// }, []);
return ( return (
<Card className="bg-background"> <Card className="bg-background">
<CardHeader className="flex flex-row items-center justify-between flex-wrap gap-2"> <CardHeader className="flex flex-row items-center justify-between flex-wrap gap-2">
@@ -62,13 +56,6 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
<CardContent className="flex flex-col gap-4"> <CardContent className="flex flex-col gap-4">
{data?.isPreviewDeploymentsActive ? ( {data?.isPreviewDeploymentsActive ? (
<> <>
<div className="flex flex-col gap-2 text-sm">
<span>
Preview deployments are a way to test your application before it
is deployed to production. It will create a new deployment for
each pull request you create.
</span>
</div>
{data?.previewDeployments?.length === 0 ? ( {data?.previewDeployments?.length === 0 ? (
<div className="flex w-full flex-col items-center justify-center gap-3 pt-10"> <div className="flex w-full flex-col items-center justify-center gap-3 pt-10">
<RocketIcon className="size-8 text-muted-foreground" /> <RocketIcon className="size-8 text-muted-foreground" />
@@ -78,43 +65,15 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
</div> </div>
) : ( ) : (
<div className="flex flex-col gap-4"> <div className="flex flex-col gap-4">
{previewDeployments?.map((previewDeployment) => { {previewDeployments?.map((previewDeployment) => (
const { deployments, domain } = previewDeployment;
return (
<div className="flex justify-between gap-2 w-full">
<div className="flex w-full flex-col gap-2">
{deployments?.length === 0 ? (
<div>
<span className="text-sm text-muted-foreground">
No deployments found
</span>
</div>
) : (
<PreviewDeploymentCard <PreviewDeploymentCard
key={previewDeployment?.previewDeploymentId || ""} key={previewDeployment.previewDeploymentId}
appName={previewDeployment.appName} deploymentId={previewDeployment.previewDeploymentId}
serverId={data?.serverId || ""} serverId={data?.serverId || ""}
onDeploymentDelete={handleDeletePreviewDeployment} onDeploymentDelete={handleDeletePreviewDeployment}
deploymentId={previewDeployment.previewDeploymentId}
deploymentUrl={`http://${domain?.host}`}
deployments={previewDeployment?.deployments || []}
domainId={domain?.domainId || ""}
domainHost={domain?.host || ""}
pullRequestTitle={
previewDeployment?.pullRequestTitle || ""
}
pullRequestUrl={previewDeployment?.pullRequestURL || ""}
status={previewDeployment.previewStatus}
branch={previewDeployment?.branch || ""}
date={previewDeployment?.createdAt || ""}
isLoading={isLoading} isLoading={isLoading}
/> />
)} ))}
</div>
</div>
);
})}
</div> </div>
)} )}
</> </>