mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-21 11:28:47 +00:00
refactor: remove projectId references from service components, streamlining navigation and enhancing clarity in environment context
This commit is contained in:
@@ -1,303 +0,0 @@
|
|||||||
import type { findEnvironmentById, findProjectById } from "@dokploy/server";
|
|
||||||
import { validateRequest } from "@dokploy/server/lib/auth";
|
|
||||||
import { createServerSideHelpers } from "@trpc/react-query/server";
|
|
||||||
import { FolderInput, Loader2, PlusIcon } from "lucide-react";
|
|
||||||
import type {
|
|
||||||
GetServerSidePropsContext,
|
|
||||||
InferGetServerSidePropsType,
|
|
||||||
} from "next";
|
|
||||||
import Head from "next/head";
|
|
||||||
import { useRouter } from "next/router";
|
|
||||||
import { type ReactElement, useEffect } from "react";
|
|
||||||
import superjson from "superjson";
|
|
||||||
import { ProjectEnvironment } from "@/components/dashboard/projects/project-environment";
|
|
||||||
import { DashboardLayout } from "@/components/layouts/dashboard-layout";
|
|
||||||
import { BreadcrumbSidebar } from "@/components/shared/breadcrumb-sidebar";
|
|
||||||
|
|
||||||
import { Button } from "@/components/ui/button";
|
|
||||||
import {
|
|
||||||
Card,
|
|
||||||
CardContent,
|
|
||||||
CardDescription,
|
|
||||||
CardHeader,
|
|
||||||
CardTitle,
|
|
||||||
} from "@/components/ui/card";
|
|
||||||
|
|
||||||
import { appRouter } from "@/server/api/root";
|
|
||||||
import { api } from "@/utils/api";
|
|
||||||
|
|
||||||
type Project = Awaited<ReturnType<typeof findProjectById>>;
|
|
||||||
|
|
||||||
type Environment = Omit<
|
|
||||||
Awaited<ReturnType<typeof findEnvironmentById>>,
|
|
||||||
"project"
|
|
||||||
>;
|
|
||||||
|
|
||||||
export type Services = {
|
|
||||||
appName: string;
|
|
||||||
serverId?: string | null;
|
|
||||||
name: string;
|
|
||||||
type:
|
|
||||||
| "mariadb"
|
|
||||||
| "application"
|
|
||||||
| "postgres"
|
|
||||||
| "mysql"
|
|
||||||
| "mongo"
|
|
||||||
| "redis"
|
|
||||||
| "compose";
|
|
||||||
description?: string | null;
|
|
||||||
id: string;
|
|
||||||
createdAt: string;
|
|
||||||
status?: "idle" | "running" | "done" | "error";
|
|
||||||
};
|
|
||||||
|
|
||||||
export const extractServices = (data: Environment | undefined) => {
|
|
||||||
const applications: Services[] =
|
|
||||||
data?.applications.map((item) => ({
|
|
||||||
appName: item.appName,
|
|
||||||
name: item.name,
|
|
||||||
type: "application",
|
|
||||||
id: item.applicationId,
|
|
||||||
createdAt: item.createdAt,
|
|
||||||
status: item.applicationStatus,
|
|
||||||
description: item.description,
|
|
||||||
serverId: item.serverId,
|
|
||||||
})) || [];
|
|
||||||
|
|
||||||
const mariadb: Services[] =
|
|
||||||
data?.mariadb.map((item) => ({
|
|
||||||
appName: item.appName,
|
|
||||||
name: item.name,
|
|
||||||
type: "mariadb",
|
|
||||||
id: item.mariadbId,
|
|
||||||
createdAt: item.createdAt,
|
|
||||||
status: item.applicationStatus,
|
|
||||||
description: item.description,
|
|
||||||
serverId: item.serverId,
|
|
||||||
})) || [];
|
|
||||||
|
|
||||||
const postgres: Services[] =
|
|
||||||
data?.postgres.map((item) => ({
|
|
||||||
appName: item.appName,
|
|
||||||
name: item.name,
|
|
||||||
type: "postgres",
|
|
||||||
id: item.postgresId,
|
|
||||||
createdAt: item.createdAt,
|
|
||||||
status: item.applicationStatus,
|
|
||||||
description: item.description,
|
|
||||||
serverId: item.serverId,
|
|
||||||
})) || [];
|
|
||||||
|
|
||||||
const mongo: Services[] =
|
|
||||||
data?.mongo.map((item) => ({
|
|
||||||
appName: item.appName,
|
|
||||||
name: item.name,
|
|
||||||
type: "mongo",
|
|
||||||
id: item.mongoId,
|
|
||||||
createdAt: item.createdAt,
|
|
||||||
status: item.applicationStatus,
|
|
||||||
description: item.description,
|
|
||||||
serverId: item.serverId,
|
|
||||||
})) || [];
|
|
||||||
|
|
||||||
const redis: Services[] =
|
|
||||||
data?.redis.map((item) => ({
|
|
||||||
appName: item.appName,
|
|
||||||
name: item.name,
|
|
||||||
type: "redis",
|
|
||||||
id: item.redisId,
|
|
||||||
createdAt: item.createdAt,
|
|
||||||
status: item.applicationStatus,
|
|
||||||
description: item.description,
|
|
||||||
serverId: item.serverId,
|
|
||||||
})) || [];
|
|
||||||
|
|
||||||
const mysql: Services[] =
|
|
||||||
data?.mysql.map((item) => ({
|
|
||||||
appName: item.appName,
|
|
||||||
name: item.name,
|
|
||||||
type: "mysql",
|
|
||||||
id: item.mysqlId,
|
|
||||||
createdAt: item.createdAt,
|
|
||||||
status: item.applicationStatus,
|
|
||||||
description: item.description,
|
|
||||||
serverId: item.serverId,
|
|
||||||
})) || [];
|
|
||||||
|
|
||||||
const compose: Services[] =
|
|
||||||
data?.compose.map((item) => ({
|
|
||||||
appName: item.appName,
|
|
||||||
name: item.name,
|
|
||||||
type: "compose",
|
|
||||||
id: item.composeId,
|
|
||||||
createdAt: item.createdAt,
|
|
||||||
status: item.composeStatus,
|
|
||||||
description: item.description,
|
|
||||||
serverId: item.serverId,
|
|
||||||
})) || [];
|
|
||||||
|
|
||||||
applications.push(
|
|
||||||
...mysql,
|
|
||||||
...redis,
|
|
||||||
...mongo,
|
|
||||||
...postgres,
|
|
||||||
...mariadb,
|
|
||||||
...compose,
|
|
||||||
);
|
|
||||||
|
|
||||||
applications.sort((a, b) => {
|
|
||||||
return new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime();
|
|
||||||
});
|
|
||||||
|
|
||||||
return applications;
|
|
||||||
};
|
|
||||||
|
|
||||||
const Project = (
|
|
||||||
props: InferGetServerSidePropsType<typeof getServerSideProps>,
|
|
||||||
) => {
|
|
||||||
const { projectId } = props;
|
|
||||||
const { data, isLoading } = api.project.one.useQuery({ projectId });
|
|
||||||
const router = useRouter();
|
|
||||||
|
|
||||||
// Redirigir automáticamente al ambiente de producción por defecto
|
|
||||||
useEffect(() => {
|
|
||||||
if (data?.environments && data.environments.length > 0) {
|
|
||||||
const productionEnv = data.environments.find(
|
|
||||||
(env) => env.name === "production",
|
|
||||||
);
|
|
||||||
const defaultEnv = productionEnv || data.environments[0];
|
|
||||||
|
|
||||||
// Redirigir al ambiente por defecto
|
|
||||||
if (defaultEnv) {
|
|
||||||
router.push(
|
|
||||||
`/dashboard/project/${projectId}/environment/${defaultEnv.environmentId}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, [data?.environments, projectId, router]);
|
|
||||||
|
|
||||||
const emptyEnvironments =
|
|
||||||
!data?.environments || data.environments.length === 0;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<BreadcrumbSidebar
|
|
||||||
list={[
|
|
||||||
{ name: "Projects", href: "/dashboard/projects" },
|
|
||||||
{ name: data?.name || "", href: `/dashboard/project/${projectId}` },
|
|
||||||
]}
|
|
||||||
/>
|
|
||||||
<Head>
|
|
||||||
<title>Project: {data?.name} | Dokploy</title>
|
|
||||||
</Head>
|
|
||||||
<div className="w-full">
|
|
||||||
<Card className="h-full bg-sidebar p-2.5 rounded-xl">
|
|
||||||
<div className="rounded-xl bg-background shadow-md">
|
|
||||||
<div className="flex justify-between gap-4 w-full items-center flex-wrap p-6">
|
|
||||||
<CardHeader className="p-0">
|
|
||||||
<CardTitle className="text-xl flex flex-row gap-2">
|
|
||||||
<FolderInput className="size-6 text-muted-foreground self-center" />
|
|
||||||
{data?.name}
|
|
||||||
</CardTitle>
|
|
||||||
<CardDescription>{data?.description}</CardDescription>
|
|
||||||
</CardHeader>
|
|
||||||
<div className="flex flex-row gap-4 flex-wrap justify-between items-center">
|
|
||||||
<div className="flex flex-row gap-4 flex-wrap">
|
|
||||||
<ProjectEnvironment projectId={projectId}>
|
|
||||||
<Button variant="outline">Project Environment</Button>
|
|
||||||
</ProjectEnvironment>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<CardContent className="space-y-2 py-8 border-t gap-4 flex flex-col min-h-[60vh]">
|
|
||||||
{isLoading ? (
|
|
||||||
<div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground min-h-[60vh]">
|
|
||||||
<span>Loading...</span>
|
|
||||||
<Loader2 className="animate-spin size-4" />
|
|
||||||
</div>
|
|
||||||
) : emptyEnvironments ? (
|
|
||||||
<div className="flex h-[70vh] w-full flex-col items-center justify-center">
|
|
||||||
<FolderInput className="size-8 self-center text-muted-foreground" />
|
|
||||||
<span className="text-center font-medium text-muted-foreground">
|
|
||||||
No environments created yet. Click on Environments to create
|
|
||||||
one.
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="flex h-[70vh] w-full flex-col items-center justify-center">
|
|
||||||
<FolderInput className="size-8 self-center text-muted-foreground" />
|
|
||||||
<span className="text-center font-medium text-muted-foreground">
|
|
||||||
Redirecting to environment...
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</CardContent>
|
|
||||||
</div>
|
|
||||||
</Card>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Project;
|
|
||||||
Project.getLayout = (page: ReactElement) => {
|
|
||||||
return <DashboardLayout>{page}</DashboardLayout>;
|
|
||||||
};
|
|
||||||
|
|
||||||
export async function getServerSideProps(
|
|
||||||
ctx: GetServerSidePropsContext<{ projectId: string }>,
|
|
||||||
) {
|
|
||||||
const { params } = ctx;
|
|
||||||
|
|
||||||
const { req, res } = ctx;
|
|
||||||
const { user, session } = await validateRequest(req);
|
|
||||||
if (!user) {
|
|
||||||
return {
|
|
||||||
redirect: {
|
|
||||||
permanent: true,
|
|
||||||
destination: "/",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
// Fetch data from external API
|
|
||||||
const helpers = createServerSideHelpers({
|
|
||||||
router: appRouter,
|
|
||||||
ctx: {
|
|
||||||
req: req as any,
|
|
||||||
res: res as any,
|
|
||||||
db: null as any,
|
|
||||||
session: session as any,
|
|
||||||
user: user as any,
|
|
||||||
},
|
|
||||||
transformer: superjson,
|
|
||||||
});
|
|
||||||
|
|
||||||
// Valid project, if not return to initial homepage....
|
|
||||||
if (typeof params?.projectId === "string") {
|
|
||||||
try {
|
|
||||||
await helpers.project.one.fetch({
|
|
||||||
projectId: params?.projectId,
|
|
||||||
});
|
|
||||||
return {
|
|
||||||
props: {
|
|
||||||
trpcState: helpers.dehydrate(),
|
|
||||||
projectId: params?.projectId,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
} catch {
|
|
||||||
return {
|
|
||||||
redirect: {
|
|
||||||
permanent: false,
|
|
||||||
destination: "/",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
redirect: {
|
|
||||||
permanent: false,
|
|
||||||
destination: "/",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -754,7 +754,6 @@ const EnvironmentPage = (
|
|||||||
{ name: "Projects", href: "/dashboard/projects" },
|
{ name: "Projects", href: "/dashboard/projects" },
|
||||||
{
|
{
|
||||||
name: projectData?.name || "",
|
name: projectData?.name || "",
|
||||||
href: `/dashboard/project/${projectId}`,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: currentEnvironment.name,
|
name: currentEnvironment.name,
|
||||||
|
|||||||
-1
@@ -98,7 +98,6 @@ const Service = (
|
|||||||
{ name: "Projects", href: "/dashboard/projects" },
|
{ name: "Projects", href: "/dashboard/projects" },
|
||||||
{
|
{
|
||||||
name: data?.environment.project.name || "",
|
name: data?.environment.project.name || "",
|
||||||
href: `/dashboard/project/${projectId}`,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: data?.environment?.name || "",
|
name: data?.environment?.name || "",
|
||||||
|
|||||||
-1
@@ -89,7 +89,6 @@ const Service = (
|
|||||||
{ name: "Projects", href: "/dashboard/projects" },
|
{ name: "Projects", href: "/dashboard/projects" },
|
||||||
{
|
{
|
||||||
name: data?.environment?.project?.name || "",
|
name: data?.environment?.project?.name || "",
|
||||||
href: `/dashboard/project/${projectId}`,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: data?.environment?.name || "",
|
name: data?.environment?.name || "",
|
||||||
|
|||||||
-1
@@ -70,7 +70,6 @@ const Mariadb = (
|
|||||||
{ name: "Projects", href: "/dashboard/projects" },
|
{ name: "Projects", href: "/dashboard/projects" },
|
||||||
{
|
{
|
||||||
name: data?.environment?.project?.name || "",
|
name: data?.environment?.project?.name || "",
|
||||||
href: `/dashboard/project/${projectId}`,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: data?.environment?.name || "",
|
name: data?.environment?.name || "",
|
||||||
|
|||||||
-1
@@ -70,7 +70,6 @@ const Mongo = (
|
|||||||
{ name: "Projects", href: "/dashboard/projects" },
|
{ name: "Projects", href: "/dashboard/projects" },
|
||||||
{
|
{
|
||||||
name: data?.environment?.project?.name || "",
|
name: data?.environment?.project?.name || "",
|
||||||
href: `/dashboard/project/${projectId}`,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: data?.environment?.name || "",
|
name: data?.environment?.name || "",
|
||||||
|
|||||||
-1
@@ -69,7 +69,6 @@ const MySql = (
|
|||||||
{ name: "Projects", href: "/dashboard/projects" },
|
{ name: "Projects", href: "/dashboard/projects" },
|
||||||
{
|
{
|
||||||
name: data?.environment?.project?.name || "",
|
name: data?.environment?.project?.name || "",
|
||||||
href: `/dashboard/project/${projectId}`,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: data?.environment?.name || "",
|
name: data?.environment?.name || "",
|
||||||
|
|||||||
-1
@@ -69,7 +69,6 @@ const Postgresql = (
|
|||||||
{ name: "Projects", href: "/dashboard/projects" },
|
{ name: "Projects", href: "/dashboard/projects" },
|
||||||
{
|
{
|
||||||
name: data?.environment?.project?.name || "",
|
name: data?.environment?.project?.name || "",
|
||||||
href: `/dashboard/project/${projectId}`,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: data?.environment?.name || "",
|
name: data?.environment?.name || "",
|
||||||
|
|||||||
-1
@@ -69,7 +69,6 @@ const Redis = (
|
|||||||
{ name: "Projects", href: "/dashboard/projects" },
|
{ name: "Projects", href: "/dashboard/projects" },
|
||||||
{
|
{
|
||||||
name: data?.environment?.project?.name || "",
|
name: data?.environment?.project?.name || "",
|
||||||
href: `/dashboard/project/${projectId}`,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: data?.environment?.name || "",
|
name: data?.environment?.name || "",
|
||||||
|
|||||||
Reference in New Issue
Block a user