From f47335efe51c84c6ef1adb89330be964cad44bd4 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sat, 7 Dec 2024 16:47:39 -0600 Subject: [PATCH 01/64] refactor: wip --- .../git/gitlab/add-gitlab-provider.tsx | 26 +- .../git/gitlab/edit-gitlab-provider.tsx | 22 +- .../settings/git/show-git-providers.tsx | 9 +- .../dokploy/drizzle/0049_fluffy_expediter.sql | 1 + apps/dokploy/drizzle/meta/0049_snapshot.json | 4001 +++++++++++++++++ apps/dokploy/drizzle/meta/_journal.json | 7 + apps/dokploy/server/api/routers/gitlab.ts | 4 + packages/server/src/db/schema/gitlab.ts | 3 + packages/server/src/utils/providers/gitlab.ts | 2 +- 9 files changed, 4070 insertions(+), 5 deletions(-) create mode 100644 apps/dokploy/drizzle/0049_fluffy_expediter.sql create mode 100644 apps/dokploy/drizzle/meta/0049_snapshot.json diff --git a/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx b/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx index f2b706d0..a5eafd0d 100644 --- a/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx +++ b/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx @@ -33,6 +33,9 @@ const Schema = z.object({ name: z.string().min(1, { message: "Name is required", }), + gitlabUrl: z.string().min(1, { + message: "GitLab URL is required", + }), applicationId: z.string().min(1, { message: "Application ID is required", }), @@ -62,16 +65,22 @@ export const AddGitlabProvider = () => { applicationSecret: "", groupName: "", redirectUri: webhookUrl, + name: "", + gitlabUrl: "https://gitlab.com", }, resolver: zodResolver(Schema), }); + const gitlabUrl = form.watch("gitlabUrl"); + useEffect(() => { form.reset({ applicationId: "", applicationSecret: "", groupName: "", redirectUri: webhookUrl, + name: "", + gitlabUrl: "https://gitlab.com", }); }, [form, isOpen]); @@ -83,6 +92,7 @@ export const AddGitlabProvider = () => { authId: auth?.id || "", name: data.name || "", redirectUri: data.redirectUri || "", + gitlabUrl: data.gitlabUrl || "https://gitlab.com", }) .then(async () => { await utils.gitProvider.getAll.invalidate(); @@ -129,7 +139,7 @@ export const AddGitlabProvider = () => {
  • Go to your GitLab profile settings{" "} @@ -169,6 +179,20 @@ export const AddGitlabProvider = () => { )} /> + ( + + Gitlab URL + + + + + + )} + /> + { - const { data: gitlab } = api.gitlab.one.useQuery( + const { data: gitlab, refetch } = api.gitlab.one.useQuery( { gitlabId, }, @@ -57,6 +60,7 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => { defaultValues: { groupName: "", name: "", + gitlabUrl: "https://gitlab.com", }, resolver: zodResolver(Schema), }); @@ -67,6 +71,7 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => { form.reset({ groupName: gitlab?.groupName || "", name: gitlab?.gitProvider.name || "", + gitlabUrl: gitlab?.gitlabUrl || "", }); }, [form, isOpen]); @@ -76,11 +81,13 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => { gitProviderId: gitlab?.gitProviderId || "", groupName: data.groupName || "", name: data.name || "", + gitlabUrl: data.gitlabUrl || "", }) .then(async () => { await utils.gitProvider.getAll.invalidate(); toast.success("Gitlab updated successfully"); setIsOpen(false); + refetch(); }) .catch(() => { toast.error("Error to update Gitlab"); @@ -126,6 +133,19 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => { )} /> + ( + + Gitlab Url + + + + + + )} + /> { const url = useUrl(); - const getGitlabUrl = (clientId: string, gitlabId: string) => { + const getGitlabUrl = ( + clientId: string, + gitlabId: string, + gitlabUrl: string, + ) => { const redirectUri = `${url}/api/providers/gitlab/callback?gitlabId=${gitlabId}`; const scope = "api read_user read_repository"; - const authUrl = `https://gitlab.com/oauth/authorize?client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}&response_type=code&scope=${encodeURIComponent(scope)}`; + const authUrl = `${gitlabUrl}/oauth/authorize?client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}&response_type=code&scope=${encodeURIComponent(scope)}`; return authUrl; }; @@ -142,6 +146,7 @@ export const ShowGitProviders = () => { href={getGitlabUrl( gitProvider.gitlab?.applicationId || "", gitProvider.gitlab?.gitlabId || "", + gitProvider.gitlab?.gitlabUrl, )} target="_blank" className={buttonVariants({ diff --git a/apps/dokploy/drizzle/0049_fluffy_expediter.sql b/apps/dokploy/drizzle/0049_fluffy_expediter.sql new file mode 100644 index 00000000..9a6e0024 --- /dev/null +++ b/apps/dokploy/drizzle/0049_fluffy_expediter.sql @@ -0,0 +1 @@ +ALTER TABLE "gitlab" ADD COLUMN "gitlabUrl" text DEFAULT 'https://gitlab.com' NOT NULL; \ No newline at end of file diff --git a/apps/dokploy/drizzle/meta/0049_snapshot.json b/apps/dokploy/drizzle/meta/0049_snapshot.json new file mode 100644 index 00000000..d03b2b90 --- /dev/null +++ b/apps/dokploy/drizzle/meta/0049_snapshot.json @@ -0,0 +1,4001 @@ +{ + "id": "47638eb6-3fb5-4a1e-a0d1-911eb3256976", + "prevId": "928417c8-2e7b-43ba-bc19-44b4d70107f1", + "version": "6", + "dialect": "postgresql", + "tables": { + "public.application": { + "name": "application", + "schema": "", + "columns": { + "applicationId": { + "name": "applicationId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "appName": { + "name": "appName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "env": { + "name": "env", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "buildArgs": { + "name": "buildArgs", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "memoryReservation": { + "name": "memoryReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "memoryLimit": { + "name": "memoryLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuReservation": { + "name": "cpuReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuLimit": { + "name": "cpuLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "title": { + "name": "title", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false + }, + "subtitle": { + "name": "subtitle", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "command": { + "name": "command", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refreshToken": { + "name": "refreshToken", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sourceType": { + "name": "sourceType", + "type": "sourceType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'github'" + }, + "repository": { + "name": "repository", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "owner": { + "name": "owner", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "branch": { + "name": "branch", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "buildPath": { + "name": "buildPath", + "type": "text", + "primaryKey": false, + "notNull": false, + "default": "'/'" + }, + "autoDeploy": { + "name": "autoDeploy", + "type": "boolean", + "primaryKey": false, + "notNull": false + }, + "gitlabProjectId": { + "name": "gitlabProjectId", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "gitlabRepository": { + "name": "gitlabRepository", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "gitlabOwner": { + "name": "gitlabOwner", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "gitlabBranch": { + "name": "gitlabBranch", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "gitlabBuildPath": { + "name": "gitlabBuildPath", + "type": "text", + "primaryKey": false, + "notNull": false, + "default": "'/'" + }, + "gitlabPathNamespace": { + "name": "gitlabPathNamespace", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "bitbucketRepository": { + "name": "bitbucketRepository", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "bitbucketOwner": { + "name": "bitbucketOwner", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "bitbucketBranch": { + "name": "bitbucketBranch", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "bitbucketBuildPath": { + "name": "bitbucketBuildPath", + "type": "text", + "primaryKey": false, + "notNull": false, + "default": "'/'" + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "dockerImage": { + "name": "dockerImage", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "registryUrl": { + "name": "registryUrl", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "customGitUrl": { + "name": "customGitUrl", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "customGitBranch": { + "name": "customGitBranch", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "customGitBuildPath": { + "name": "customGitBuildPath", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "customGitSSHKeyId": { + "name": "customGitSSHKeyId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "dockerfile": { + "name": "dockerfile", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "dockerContextPath": { + "name": "dockerContextPath", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "dockerBuildStage": { + "name": "dockerBuildStage", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "dropBuildPath": { + "name": "dropBuildPath", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "healthCheckSwarm": { + "name": "healthCheckSwarm", + "type": "json", + "primaryKey": false, + "notNull": false + }, + "restartPolicySwarm": { + "name": "restartPolicySwarm", + "type": "json", + "primaryKey": false, + "notNull": false + }, + "placementSwarm": { + "name": "placementSwarm", + "type": "json", + "primaryKey": false, + "notNull": false + }, + "updateConfigSwarm": { + "name": "updateConfigSwarm", + "type": "json", + "primaryKey": false, + "notNull": false + }, + "rollbackConfigSwarm": { + "name": "rollbackConfigSwarm", + "type": "json", + "primaryKey": false, + "notNull": false + }, + "modeSwarm": { + "name": "modeSwarm", + "type": "json", + "primaryKey": false, + "notNull": false + }, + "labelsSwarm": { + "name": "labelsSwarm", + "type": "json", + "primaryKey": false, + "notNull": false + }, + "networkSwarm": { + "name": "networkSwarm", + "type": "json", + "primaryKey": false, + "notNull": false + }, + "replicas": { + "name": "replicas", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 1 + }, + "applicationStatus": { + "name": "applicationStatus", + "type": "applicationStatus", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "buildType": { + "name": "buildType", + "type": "buildType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'nixpacks'" + }, + "herokuVersion": { + "name": "herokuVersion", + "type": "text", + "primaryKey": false, + "notNull": false, + "default": "'24'" + }, + "publishDirectory": { + "name": "publishDirectory", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "registryId": { + "name": "registryId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "projectId": { + "name": "projectId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "githubId": { + "name": "githubId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "gitlabId": { + "name": "gitlabId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "bitbucketId": { + "name": "bitbucketId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "serverId": { + "name": "serverId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "application_customGitSSHKeyId_ssh-key_sshKeyId_fk": { + "name": "application_customGitSSHKeyId_ssh-key_sshKeyId_fk", + "tableFrom": "application", + "tableTo": "ssh-key", + "columnsFrom": [ + "customGitSSHKeyId" + ], + "columnsTo": [ + "sshKeyId" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "application_registryId_registry_registryId_fk": { + "name": "application_registryId_registry_registryId_fk", + "tableFrom": "application", + "tableTo": "registry", + "columnsFrom": [ + "registryId" + ], + "columnsTo": [ + "registryId" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "application_projectId_project_projectId_fk": { + "name": "application_projectId_project_projectId_fk", + "tableFrom": "application", + "tableTo": "project", + "columnsFrom": [ + "projectId" + ], + "columnsTo": [ + "projectId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "application_githubId_github_githubId_fk": { + "name": "application_githubId_github_githubId_fk", + "tableFrom": "application", + "tableTo": "github", + "columnsFrom": [ + "githubId" + ], + "columnsTo": [ + "githubId" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "application_gitlabId_gitlab_gitlabId_fk": { + "name": "application_gitlabId_gitlab_gitlabId_fk", + "tableFrom": "application", + "tableTo": "gitlab", + "columnsFrom": [ + "gitlabId" + ], + "columnsTo": [ + "gitlabId" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "application_bitbucketId_bitbucket_bitbucketId_fk": { + "name": "application_bitbucketId_bitbucket_bitbucketId_fk", + "tableFrom": "application", + "tableTo": "bitbucket", + "columnsFrom": [ + "bitbucketId" + ], + "columnsTo": [ + "bitbucketId" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "application_serverId_server_serverId_fk": { + "name": "application_serverId_server_serverId_fk", + "tableFrom": "application", + "tableTo": "server", + "columnsFrom": [ + "serverId" + ], + "columnsTo": [ + "serverId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "application_appName_unique": { + "name": "application_appName_unique", + "nullsNotDistinct": false, + "columns": [ + "appName" + ] + } + } + }, + "public.postgres": { + "name": "postgres", + "schema": "", + "columns": { + "postgresId": { + "name": "postgresId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "appName": { + "name": "appName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "databaseName": { + "name": "databaseName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "databaseUser": { + "name": "databaseUser", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "databasePassword": { + "name": "databasePassword", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "dockerImage": { + "name": "dockerImage", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "command": { + "name": "command", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "env": { + "name": "env", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "memoryReservation": { + "name": "memoryReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "externalPort": { + "name": "externalPort", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "memoryLimit": { + "name": "memoryLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuReservation": { + "name": "cpuReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuLimit": { + "name": "cpuLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "applicationStatus": { + "name": "applicationStatus", + "type": "applicationStatus", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "projectId": { + "name": "projectId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "serverId": { + "name": "serverId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "postgres_projectId_project_projectId_fk": { + "name": "postgres_projectId_project_projectId_fk", + "tableFrom": "postgres", + "tableTo": "project", + "columnsFrom": [ + "projectId" + ], + "columnsTo": [ + "projectId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "postgres_serverId_server_serverId_fk": { + "name": "postgres_serverId_server_serverId_fk", + "tableFrom": "postgres", + "tableTo": "server", + "columnsFrom": [ + "serverId" + ], + "columnsTo": [ + "serverId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "postgres_appName_unique": { + "name": "postgres_appName_unique", + "nullsNotDistinct": false, + "columns": [ + "appName" + ] + } + } + }, + "public.user": { + "name": "user", + "schema": "", + "columns": { + "userId": { + "name": "userId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "isRegistered": { + "name": "isRegistered", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "expirationDate": { + "name": "expirationDate", + "type": "timestamp(3)", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "canCreateProjects": { + "name": "canCreateProjects", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "canAccessToSSHKeys": { + "name": "canAccessToSSHKeys", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "canCreateServices": { + "name": "canCreateServices", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "canDeleteProjects": { + "name": "canDeleteProjects", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "canDeleteServices": { + "name": "canDeleteServices", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "canAccessToDocker": { + "name": "canAccessToDocker", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "canAccessToAPI": { + "name": "canAccessToAPI", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "canAccessToGitProviders": { + "name": "canAccessToGitProviders", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "canAccessToTraefikFiles": { + "name": "canAccessToTraefikFiles", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "accesedProjects": { + "name": "accesedProjects", + "type": "text[]", + "primaryKey": false, + "notNull": true, + "default": "ARRAY[]::text[]" + }, + "accesedServices": { + "name": "accesedServices", + "type": "text[]", + "primaryKey": false, + "notNull": true, + "default": "ARRAY[]::text[]" + }, + "adminId": { + "name": "adminId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "authId": { + "name": "authId", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "user_adminId_admin_adminId_fk": { + "name": "user_adminId_admin_adminId_fk", + "tableFrom": "user", + "tableTo": "admin", + "columnsFrom": [ + "adminId" + ], + "columnsTo": [ + "adminId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "user_authId_auth_id_fk": { + "name": "user_authId_auth_id_fk", + "tableFrom": "user", + "tableTo": "auth", + "columnsFrom": [ + "authId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.admin": { + "name": "admin", + "schema": "", + "columns": { + "adminId": { + "name": "adminId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "serverIp": { + "name": "serverIp", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "certificateType": { + "name": "certificateType", + "type": "certificateType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'none'" + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "letsEncryptEmail": { + "name": "letsEncryptEmail", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sshPrivateKey": { + "name": "sshPrivateKey", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "enableDockerCleanup": { + "name": "enableDockerCleanup", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "enableLogRotation": { + "name": "enableLogRotation", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "authId": { + "name": "authId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "stripeCustomerId": { + "name": "stripeCustomerId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "stripeSubscriptionId": { + "name": "stripeSubscriptionId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "serversQuantity": { + "name": "serversQuantity", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": { + "admin_authId_auth_id_fk": { + "name": "admin_authId_auth_id_fk", + "tableFrom": "admin", + "tableTo": "auth", + "columnsFrom": [ + "authId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.auth": { + "name": "auth", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "rol": { + "name": "rol", + "type": "Roles", + "typeSchema": "public", + "primaryKey": false, + "notNull": true + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "is2FAEnabled": { + "name": "is2FAEnabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "resetPasswordToken": { + "name": "resetPasswordToken", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "resetPasswordExpiresAt": { + "name": "resetPasswordExpiresAt", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "confirmationToken": { + "name": "confirmationToken", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "confirmationExpiresAt": { + "name": "confirmationExpiresAt", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "auth_email_unique": { + "name": "auth_email_unique", + "nullsNotDistinct": false, + "columns": [ + "email" + ] + } + } + }, + "public.project": { + "name": "project", + "schema": "", + "columns": { + "projectId": { + "name": "projectId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "adminId": { + "name": "adminId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "env": { + "name": "env", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": {}, + "foreignKeys": { + "project_adminId_admin_adminId_fk": { + "name": "project_adminId_admin_adminId_fk", + "tableFrom": "project", + "tableTo": "admin", + "columnsFrom": [ + "adminId" + ], + "columnsTo": [ + "adminId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.domain": { + "name": "domain", + "schema": "", + "columns": { + "domainId": { + "name": "domainId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "https": { + "name": "https", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": false, + "default": 3000 + }, + "path": { + "name": "path", + "type": "text", + "primaryKey": false, + "notNull": false, + "default": "'/'" + }, + "serviceName": { + "name": "serviceName", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "domainType": { + "name": "domainType", + "type": "domainType", + "typeSchema": "public", + "primaryKey": false, + "notNull": false, + "default": "'application'" + }, + "uniqueConfigKey": { + "name": "uniqueConfigKey", + "type": "serial", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "composeId": { + "name": "composeId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "applicationId": { + "name": "applicationId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "certificateType": { + "name": "certificateType", + "type": "certificateType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'none'" + } + }, + "indexes": {}, + "foreignKeys": { + "domain_composeId_compose_composeId_fk": { + "name": "domain_composeId_compose_composeId_fk", + "tableFrom": "domain", + "tableTo": "compose", + "columnsFrom": [ + "composeId" + ], + "columnsTo": [ + "composeId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "domain_applicationId_application_applicationId_fk": { + "name": "domain_applicationId_application_applicationId_fk", + "tableFrom": "domain", + "tableTo": "application", + "columnsFrom": [ + "applicationId" + ], + "columnsTo": [ + "applicationId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.mariadb": { + "name": "mariadb", + "schema": "", + "columns": { + "mariadbId": { + "name": "mariadbId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "appName": { + "name": "appName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "databaseName": { + "name": "databaseName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "databaseUser": { + "name": "databaseUser", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "databasePassword": { + "name": "databasePassword", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "rootPassword": { + "name": "rootPassword", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "dockerImage": { + "name": "dockerImage", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "command": { + "name": "command", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "env": { + "name": "env", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "memoryReservation": { + "name": "memoryReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "memoryLimit": { + "name": "memoryLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuReservation": { + "name": "cpuReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuLimit": { + "name": "cpuLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "externalPort": { + "name": "externalPort", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "applicationStatus": { + "name": "applicationStatus", + "type": "applicationStatus", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "projectId": { + "name": "projectId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "serverId": { + "name": "serverId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "mariadb_projectId_project_projectId_fk": { + "name": "mariadb_projectId_project_projectId_fk", + "tableFrom": "mariadb", + "tableTo": "project", + "columnsFrom": [ + "projectId" + ], + "columnsTo": [ + "projectId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "mariadb_serverId_server_serverId_fk": { + "name": "mariadb_serverId_server_serverId_fk", + "tableFrom": "mariadb", + "tableTo": "server", + "columnsFrom": [ + "serverId" + ], + "columnsTo": [ + "serverId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "mariadb_appName_unique": { + "name": "mariadb_appName_unique", + "nullsNotDistinct": false, + "columns": [ + "appName" + ] + } + } + }, + "public.mongo": { + "name": "mongo", + "schema": "", + "columns": { + "mongoId": { + "name": "mongoId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "appName": { + "name": "appName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "databaseUser": { + "name": "databaseUser", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "databasePassword": { + "name": "databasePassword", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "dockerImage": { + "name": "dockerImage", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "command": { + "name": "command", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "env": { + "name": "env", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "memoryReservation": { + "name": "memoryReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "memoryLimit": { + "name": "memoryLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuReservation": { + "name": "cpuReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuLimit": { + "name": "cpuLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "externalPort": { + "name": "externalPort", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "applicationStatus": { + "name": "applicationStatus", + "type": "applicationStatus", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "projectId": { + "name": "projectId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "serverId": { + "name": "serverId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "mongo_projectId_project_projectId_fk": { + "name": "mongo_projectId_project_projectId_fk", + "tableFrom": "mongo", + "tableTo": "project", + "columnsFrom": [ + "projectId" + ], + "columnsTo": [ + "projectId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "mongo_serverId_server_serverId_fk": { + "name": "mongo_serverId_server_serverId_fk", + "tableFrom": "mongo", + "tableTo": "server", + "columnsFrom": [ + "serverId" + ], + "columnsTo": [ + "serverId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "mongo_appName_unique": { + "name": "mongo_appName_unique", + "nullsNotDistinct": false, + "columns": [ + "appName" + ] + } + } + }, + "public.mysql": { + "name": "mysql", + "schema": "", + "columns": { + "mysqlId": { + "name": "mysqlId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "appName": { + "name": "appName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "databaseName": { + "name": "databaseName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "databaseUser": { + "name": "databaseUser", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "databasePassword": { + "name": "databasePassword", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "rootPassword": { + "name": "rootPassword", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "dockerImage": { + "name": "dockerImage", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "command": { + "name": "command", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "env": { + "name": "env", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "memoryReservation": { + "name": "memoryReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "memoryLimit": { + "name": "memoryLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuReservation": { + "name": "cpuReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuLimit": { + "name": "cpuLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "externalPort": { + "name": "externalPort", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "applicationStatus": { + "name": "applicationStatus", + "type": "applicationStatus", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "projectId": { + "name": "projectId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "serverId": { + "name": "serverId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "mysql_projectId_project_projectId_fk": { + "name": "mysql_projectId_project_projectId_fk", + "tableFrom": "mysql", + "tableTo": "project", + "columnsFrom": [ + "projectId" + ], + "columnsTo": [ + "projectId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "mysql_serverId_server_serverId_fk": { + "name": "mysql_serverId_server_serverId_fk", + "tableFrom": "mysql", + "tableTo": "server", + "columnsFrom": [ + "serverId" + ], + "columnsTo": [ + "serverId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "mysql_appName_unique": { + "name": "mysql_appName_unique", + "nullsNotDistinct": false, + "columns": [ + "appName" + ] + } + } + }, + "public.backup": { + "name": "backup", + "schema": "", + "columns": { + "backupId": { + "name": "backupId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "schedule": { + "name": "schedule", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false + }, + "database": { + "name": "database", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "prefix": { + "name": "prefix", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "destinationId": { + "name": "destinationId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "databaseType": { + "name": "databaseType", + "type": "databaseType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true + }, + "postgresId": { + "name": "postgresId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "mariadbId": { + "name": "mariadbId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "mysqlId": { + "name": "mysqlId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "mongoId": { + "name": "mongoId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "backup_destinationId_destination_destinationId_fk": { + "name": "backup_destinationId_destination_destinationId_fk", + "tableFrom": "backup", + "tableTo": "destination", + "columnsFrom": [ + "destinationId" + ], + "columnsTo": [ + "destinationId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "backup_postgresId_postgres_postgresId_fk": { + "name": "backup_postgresId_postgres_postgresId_fk", + "tableFrom": "backup", + "tableTo": "postgres", + "columnsFrom": [ + "postgresId" + ], + "columnsTo": [ + "postgresId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "backup_mariadbId_mariadb_mariadbId_fk": { + "name": "backup_mariadbId_mariadb_mariadbId_fk", + "tableFrom": "backup", + "tableTo": "mariadb", + "columnsFrom": [ + "mariadbId" + ], + "columnsTo": [ + "mariadbId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "backup_mysqlId_mysql_mysqlId_fk": { + "name": "backup_mysqlId_mysql_mysqlId_fk", + "tableFrom": "backup", + "tableTo": "mysql", + "columnsFrom": [ + "mysqlId" + ], + "columnsTo": [ + "mysqlId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "backup_mongoId_mongo_mongoId_fk": { + "name": "backup_mongoId_mongo_mongoId_fk", + "tableFrom": "backup", + "tableTo": "mongo", + "columnsFrom": [ + "mongoId" + ], + "columnsTo": [ + "mongoId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.destination": { + "name": "destination", + "schema": "", + "columns": { + "destinationId": { + "name": "destinationId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider": { + "name": "provider", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "accessKey": { + "name": "accessKey", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "secretAccessKey": { + "name": "secretAccessKey", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "region": { + "name": "region", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "endpoint": { + "name": "endpoint", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "adminId": { + "name": "adminId", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "destination_adminId_admin_adminId_fk": { + "name": "destination_adminId_admin_adminId_fk", + "tableFrom": "destination", + "tableTo": "admin", + "columnsFrom": [ + "adminId" + ], + "columnsTo": [ + "adminId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.deployment": { + "name": "deployment", + "schema": "", + "columns": { + "deploymentId": { + "name": "deploymentId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "title": { + "name": "title", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "deploymentStatus", + "typeSchema": "public", + "primaryKey": false, + "notNull": false, + "default": "'running'" + }, + "logPath": { + "name": "logPath", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "applicationId": { + "name": "applicationId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "composeId": { + "name": "composeId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "serverId": { + "name": "serverId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "deployment_applicationId_application_applicationId_fk": { + "name": "deployment_applicationId_application_applicationId_fk", + "tableFrom": "deployment", + "tableTo": "application", + "columnsFrom": [ + "applicationId" + ], + "columnsTo": [ + "applicationId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "deployment_composeId_compose_composeId_fk": { + "name": "deployment_composeId_compose_composeId_fk", + "tableFrom": "deployment", + "tableTo": "compose", + "columnsFrom": [ + "composeId" + ], + "columnsTo": [ + "composeId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "deployment_serverId_server_serverId_fk": { + "name": "deployment_serverId_server_serverId_fk", + "tableFrom": "deployment", + "tableTo": "server", + "columnsFrom": [ + "serverId" + ], + "columnsTo": [ + "serverId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.mount": { + "name": "mount", + "schema": "", + "columns": { + "mountId": { + "name": "mountId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "type": { + "name": "type", + "type": "mountType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true + }, + "hostPath": { + "name": "hostPath", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "volumeName": { + "name": "volumeName", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "filePath": { + "name": "filePath", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "content": { + "name": "content", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "serviceType": { + "name": "serviceType", + "type": "serviceType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'application'" + }, + "mountPath": { + "name": "mountPath", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "applicationId": { + "name": "applicationId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "postgresId": { + "name": "postgresId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "mariadbId": { + "name": "mariadbId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "mongoId": { + "name": "mongoId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "mysqlId": { + "name": "mysqlId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "redisId": { + "name": "redisId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "composeId": { + "name": "composeId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "mount_applicationId_application_applicationId_fk": { + "name": "mount_applicationId_application_applicationId_fk", + "tableFrom": "mount", + "tableTo": "application", + "columnsFrom": [ + "applicationId" + ], + "columnsTo": [ + "applicationId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "mount_postgresId_postgres_postgresId_fk": { + "name": "mount_postgresId_postgres_postgresId_fk", + "tableFrom": "mount", + "tableTo": "postgres", + "columnsFrom": [ + "postgresId" + ], + "columnsTo": [ + "postgresId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "mount_mariadbId_mariadb_mariadbId_fk": { + "name": "mount_mariadbId_mariadb_mariadbId_fk", + "tableFrom": "mount", + "tableTo": "mariadb", + "columnsFrom": [ + "mariadbId" + ], + "columnsTo": [ + "mariadbId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "mount_mongoId_mongo_mongoId_fk": { + "name": "mount_mongoId_mongo_mongoId_fk", + "tableFrom": "mount", + "tableTo": "mongo", + "columnsFrom": [ + "mongoId" + ], + "columnsTo": [ + "mongoId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "mount_mysqlId_mysql_mysqlId_fk": { + "name": "mount_mysqlId_mysql_mysqlId_fk", + "tableFrom": "mount", + "tableTo": "mysql", + "columnsFrom": [ + "mysqlId" + ], + "columnsTo": [ + "mysqlId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "mount_redisId_redis_redisId_fk": { + "name": "mount_redisId_redis_redisId_fk", + "tableFrom": "mount", + "tableTo": "redis", + "columnsFrom": [ + "redisId" + ], + "columnsTo": [ + "redisId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "mount_composeId_compose_composeId_fk": { + "name": "mount_composeId_compose_composeId_fk", + "tableFrom": "mount", + "tableTo": "compose", + "columnsFrom": [ + "composeId" + ], + "columnsTo": [ + "composeId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.certificate": { + "name": "certificate", + "schema": "", + "columns": { + "certificateId": { + "name": "certificateId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "certificateData": { + "name": "certificateData", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "privateKey": { + "name": "privateKey", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "certificatePath": { + "name": "certificatePath", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "autoRenew": { + "name": "autoRenew", + "type": "boolean", + "primaryKey": false, + "notNull": false + }, + "adminId": { + "name": "adminId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "serverId": { + "name": "serverId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "certificate_adminId_admin_adminId_fk": { + "name": "certificate_adminId_admin_adminId_fk", + "tableFrom": "certificate", + "tableTo": "admin", + "columnsFrom": [ + "adminId" + ], + "columnsTo": [ + "adminId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "certificate_serverId_server_serverId_fk": { + "name": "certificate_serverId_server_serverId_fk", + "tableFrom": "certificate", + "tableTo": "server", + "columnsFrom": [ + "serverId" + ], + "columnsTo": [ + "serverId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "certificate_certificatePath_unique": { + "name": "certificate_certificatePath_unique", + "nullsNotDistinct": false, + "columns": [ + "certificatePath" + ] + } + } + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "session_user_id_auth_id_fk": { + "name": "session_user_id_auth_id_fk", + "tableFrom": "session", + "tableTo": "auth", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.redirect": { + "name": "redirect", + "schema": "", + "columns": { + "redirectId": { + "name": "redirectId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "regex": { + "name": "regex", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "replacement": { + "name": "replacement", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "permanent": { + "name": "permanent", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "uniqueConfigKey": { + "name": "uniqueConfigKey", + "type": "serial", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "applicationId": { + "name": "applicationId", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "redirect_applicationId_application_applicationId_fk": { + "name": "redirect_applicationId_application_applicationId_fk", + "tableFrom": "redirect", + "tableTo": "application", + "columnsFrom": [ + "applicationId" + ], + "columnsTo": [ + "applicationId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.security": { + "name": "security", + "schema": "", + "columns": { + "securityId": { + "name": "securityId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "applicationId": { + "name": "applicationId", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "security_applicationId_application_applicationId_fk": { + "name": "security_applicationId_application_applicationId_fk", + "tableFrom": "security", + "tableTo": "application", + "columnsFrom": [ + "applicationId" + ], + "columnsTo": [ + "applicationId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "security_username_applicationId_unique": { + "name": "security_username_applicationId_unique", + "nullsNotDistinct": false, + "columns": [ + "username", + "applicationId" + ] + } + } + }, + "public.port": { + "name": "port", + "schema": "", + "columns": { + "portId": { + "name": "portId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "publishedPort": { + "name": "publishedPort", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "targetPort": { + "name": "targetPort", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "protocol": { + "name": "protocol", + "type": "protocolType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true + }, + "applicationId": { + "name": "applicationId", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "port_applicationId_application_applicationId_fk": { + "name": "port_applicationId_application_applicationId_fk", + "tableFrom": "port", + "tableTo": "application", + "columnsFrom": [ + "applicationId" + ], + "columnsTo": [ + "applicationId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.redis": { + "name": "redis", + "schema": "", + "columns": { + "redisId": { + "name": "redisId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "appName": { + "name": "appName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "dockerImage": { + "name": "dockerImage", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "command": { + "name": "command", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "env": { + "name": "env", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "memoryReservation": { + "name": "memoryReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "memoryLimit": { + "name": "memoryLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuReservation": { + "name": "cpuReservation", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "cpuLimit": { + "name": "cpuLimit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "externalPort": { + "name": "externalPort", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "applicationStatus": { + "name": "applicationStatus", + "type": "applicationStatus", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "projectId": { + "name": "projectId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "serverId": { + "name": "serverId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "redis_projectId_project_projectId_fk": { + "name": "redis_projectId_project_projectId_fk", + "tableFrom": "redis", + "tableTo": "project", + "columnsFrom": [ + "projectId" + ], + "columnsTo": [ + "projectId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "redis_serverId_server_serverId_fk": { + "name": "redis_serverId_server_serverId_fk", + "tableFrom": "redis", + "tableTo": "server", + "columnsFrom": [ + "serverId" + ], + "columnsTo": [ + "serverId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "redis_appName_unique": { + "name": "redis_appName_unique", + "nullsNotDistinct": false, + "columns": [ + "appName" + ] + } + } + }, + "public.compose": { + "name": "compose", + "schema": "", + "columns": { + "composeId": { + "name": "composeId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "appName": { + "name": "appName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "env": { + "name": "env", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "composeFile": { + "name": "composeFile", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "refreshToken": { + "name": "refreshToken", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sourceType": { + "name": "sourceType", + "type": "sourceTypeCompose", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'github'" + }, + "composeType": { + "name": "composeType", + "type": "composeType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'docker-compose'" + }, + "repository": { + "name": "repository", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "owner": { + "name": "owner", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "branch": { + "name": "branch", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "autoDeploy": { + "name": "autoDeploy", + "type": "boolean", + "primaryKey": false, + "notNull": false + }, + "gitlabProjectId": { + "name": "gitlabProjectId", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "gitlabRepository": { + "name": "gitlabRepository", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "gitlabOwner": { + "name": "gitlabOwner", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "gitlabBranch": { + "name": "gitlabBranch", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "gitlabPathNamespace": { + "name": "gitlabPathNamespace", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "bitbucketRepository": { + "name": "bitbucketRepository", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "bitbucketOwner": { + "name": "bitbucketOwner", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "bitbucketBranch": { + "name": "bitbucketBranch", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "customGitUrl": { + "name": "customGitUrl", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "customGitBranch": { + "name": "customGitBranch", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "customGitSSHKeyId": { + "name": "customGitSSHKeyId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "command": { + "name": "command", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "composePath": { + "name": "composePath", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'./docker-compose.yml'" + }, + "suffix": { + "name": "suffix", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "randomize": { + "name": "randomize", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "composeStatus": { + "name": "composeStatus", + "type": "applicationStatus", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "projectId": { + "name": "projectId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "githubId": { + "name": "githubId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "gitlabId": { + "name": "gitlabId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "bitbucketId": { + "name": "bitbucketId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "serverId": { + "name": "serverId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "compose_customGitSSHKeyId_ssh-key_sshKeyId_fk": { + "name": "compose_customGitSSHKeyId_ssh-key_sshKeyId_fk", + "tableFrom": "compose", + "tableTo": "ssh-key", + "columnsFrom": [ + "customGitSSHKeyId" + ], + "columnsTo": [ + "sshKeyId" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "compose_projectId_project_projectId_fk": { + "name": "compose_projectId_project_projectId_fk", + "tableFrom": "compose", + "tableTo": "project", + "columnsFrom": [ + "projectId" + ], + "columnsTo": [ + "projectId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "compose_githubId_github_githubId_fk": { + "name": "compose_githubId_github_githubId_fk", + "tableFrom": "compose", + "tableTo": "github", + "columnsFrom": [ + "githubId" + ], + "columnsTo": [ + "githubId" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "compose_gitlabId_gitlab_gitlabId_fk": { + "name": "compose_gitlabId_gitlab_gitlabId_fk", + "tableFrom": "compose", + "tableTo": "gitlab", + "columnsFrom": [ + "gitlabId" + ], + "columnsTo": [ + "gitlabId" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "compose_bitbucketId_bitbucket_bitbucketId_fk": { + "name": "compose_bitbucketId_bitbucket_bitbucketId_fk", + "tableFrom": "compose", + "tableTo": "bitbucket", + "columnsFrom": [ + "bitbucketId" + ], + "columnsTo": [ + "bitbucketId" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "compose_serverId_server_serverId_fk": { + "name": "compose_serverId_server_serverId_fk", + "tableFrom": "compose", + "tableTo": "server", + "columnsFrom": [ + "serverId" + ], + "columnsTo": [ + "serverId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.registry": { + "name": "registry", + "schema": "", + "columns": { + "registryId": { + "name": "registryId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "registryName": { + "name": "registryName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "imagePrefix": { + "name": "imagePrefix", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "registryUrl": { + "name": "registryUrl", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "selfHosted": { + "name": "selfHosted", + "type": "RegistryType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'cloud'" + }, + "adminId": { + "name": "adminId", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "registry_adminId_admin_adminId_fk": { + "name": "registry_adminId_admin_adminId_fk", + "tableFrom": "registry", + "tableTo": "admin", + "columnsFrom": [ + "adminId" + ], + "columnsTo": [ + "adminId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.discord": { + "name": "discord", + "schema": "", + "columns": { + "discordId": { + "name": "discordId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "webhookUrl": { + "name": "webhookUrl", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.email": { + "name": "email", + "schema": "", + "columns": { + "emailId": { + "name": "emailId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "smtpServer": { + "name": "smtpServer", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "smtpPort": { + "name": "smtpPort", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "fromAddress": { + "name": "fromAddress", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "toAddress": { + "name": "toAddress", + "type": "text[]", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.notification": { + "name": "notification", + "schema": "", + "columns": { + "notificationId": { + "name": "notificationId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "appDeploy": { + "name": "appDeploy", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "appBuildError": { + "name": "appBuildError", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "databaseBackup": { + "name": "databaseBackup", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "dokployRestart": { + "name": "dokployRestart", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "dockerCleanup": { + "name": "dockerCleanup", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "notificationType": { + "name": "notificationType", + "type": "notificationType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "slackId": { + "name": "slackId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "telegramId": { + "name": "telegramId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "discordId": { + "name": "discordId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "emailId": { + "name": "emailId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "adminId": { + "name": "adminId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "notification_slackId_slack_slackId_fk": { + "name": "notification_slackId_slack_slackId_fk", + "tableFrom": "notification", + "tableTo": "slack", + "columnsFrom": [ + "slackId" + ], + "columnsTo": [ + "slackId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "notification_telegramId_telegram_telegramId_fk": { + "name": "notification_telegramId_telegram_telegramId_fk", + "tableFrom": "notification", + "tableTo": "telegram", + "columnsFrom": [ + "telegramId" + ], + "columnsTo": [ + "telegramId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "notification_discordId_discord_discordId_fk": { + "name": "notification_discordId_discord_discordId_fk", + "tableFrom": "notification", + "tableTo": "discord", + "columnsFrom": [ + "discordId" + ], + "columnsTo": [ + "discordId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "notification_emailId_email_emailId_fk": { + "name": "notification_emailId_email_emailId_fk", + "tableFrom": "notification", + "tableTo": "email", + "columnsFrom": [ + "emailId" + ], + "columnsTo": [ + "emailId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "notification_adminId_admin_adminId_fk": { + "name": "notification_adminId_admin_adminId_fk", + "tableFrom": "notification", + "tableTo": "admin", + "columnsFrom": [ + "adminId" + ], + "columnsTo": [ + "adminId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.slack": { + "name": "slack", + "schema": "", + "columns": { + "slackId": { + "name": "slackId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "webhookUrl": { + "name": "webhookUrl", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "channel": { + "name": "channel", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.telegram": { + "name": "telegram", + "schema": "", + "columns": { + "telegramId": { + "name": "telegramId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "botToken": { + "name": "botToken", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "chatId": { + "name": "chatId", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.ssh-key": { + "name": "ssh-key", + "schema": "", + "columns": { + "sshKeyId": { + "name": "sshKeyId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "privateKey": { + "name": "privateKey", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "publicKey": { + "name": "publicKey", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "lastUsedAt": { + "name": "lastUsedAt", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "adminId": { + "name": "adminId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "ssh-key_adminId_admin_adminId_fk": { + "name": "ssh-key_adminId_admin_adminId_fk", + "tableFrom": "ssh-key", + "tableTo": "admin", + "columnsFrom": [ + "adminId" + ], + "columnsTo": [ + "adminId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.git_provider": { + "name": "git_provider", + "schema": "", + "columns": { + "gitProviderId": { + "name": "gitProviderId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "providerType": { + "name": "providerType", + "type": "gitProviderType", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'github'" + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "adminId": { + "name": "adminId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "git_provider_adminId_admin_adminId_fk": { + "name": "git_provider_adminId_admin_adminId_fk", + "tableFrom": "git_provider", + "tableTo": "admin", + "columnsFrom": [ + "adminId" + ], + "columnsTo": [ + "adminId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.bitbucket": { + "name": "bitbucket", + "schema": "", + "columns": { + "bitbucketId": { + "name": "bitbucketId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "bitbucketUsername": { + "name": "bitbucketUsername", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "appPassword": { + "name": "appPassword", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "bitbucketWorkspaceName": { + "name": "bitbucketWorkspaceName", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "gitProviderId": { + "name": "gitProviderId", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "bitbucket_gitProviderId_git_provider_gitProviderId_fk": { + "name": "bitbucket_gitProviderId_git_provider_gitProviderId_fk", + "tableFrom": "bitbucket", + "tableTo": "git_provider", + "columnsFrom": [ + "gitProviderId" + ], + "columnsTo": [ + "gitProviderId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.github": { + "name": "github", + "schema": "", + "columns": { + "githubId": { + "name": "githubId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "githubAppName": { + "name": "githubAppName", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "githubAppId": { + "name": "githubAppId", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "githubClientId": { + "name": "githubClientId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "githubClientSecret": { + "name": "githubClientSecret", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "githubInstallationId": { + "name": "githubInstallationId", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "githubPrivateKey": { + "name": "githubPrivateKey", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "githubWebhookSecret": { + "name": "githubWebhookSecret", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "gitProviderId": { + "name": "gitProviderId", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "github_gitProviderId_git_provider_gitProviderId_fk": { + "name": "github_gitProviderId_git_provider_gitProviderId_fk", + "tableFrom": "github", + "tableTo": "git_provider", + "columnsFrom": [ + "gitProviderId" + ], + "columnsTo": [ + "gitProviderId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.gitlab": { + "name": "gitlab", + "schema": "", + "columns": { + "gitlabId": { + "name": "gitlabId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "gitlabUrl": { + "name": "gitlabUrl", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'https://gitlab.com'" + }, + "application_id": { + "name": "application_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "redirect_uri": { + "name": "redirect_uri", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "group_name": { + "name": "group_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "expires_at": { + "name": "expires_at", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "gitProviderId": { + "name": "gitProviderId", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "gitlab_gitProviderId_git_provider_gitProviderId_fk": { + "name": "gitlab_gitProviderId_git_provider_gitProviderId_fk", + "tableFrom": "gitlab", + "tableTo": "git_provider", + "columnsFrom": [ + "gitProviderId" + ], + "columnsTo": [ + "gitProviderId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.server": { + "name": "server", + "schema": "", + "columns": { + "serverId": { + "name": "serverId", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ipAddress": { + "name": "ipAddress", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'root'" + }, + "appName": { + "name": "appName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enableDockerCleanup": { + "name": "enableDockerCleanup", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "createdAt": { + "name": "createdAt", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "adminId": { + "name": "adminId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "serverStatus": { + "name": "serverStatus", + "type": "serverStatus", + "typeSchema": "public", + "primaryKey": false, + "notNull": true, + "default": "'active'" + }, + "sshKeyId": { + "name": "sshKeyId", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "server_adminId_admin_adminId_fk": { + "name": "server_adminId_admin_adminId_fk", + "tableFrom": "server", + "tableTo": "admin", + "columnsFrom": [ + "adminId" + ], + "columnsTo": [ + "adminId" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_sshKeyId_ssh-key_sshKeyId_fk": { + "name": "server_sshKeyId_ssh-key_sshKeyId_fk", + "tableFrom": "server", + "tableTo": "ssh-key", + "columnsFrom": [ + "sshKeyId" + ], + "columnsTo": [ + "sshKeyId" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + } + }, + "enums": { + "public.buildType": { + "name": "buildType", + "schema": "public", + "values": [ + "dockerfile", + "heroku_buildpacks", + "paketo_buildpacks", + "nixpacks", + "static" + ] + }, + "public.sourceType": { + "name": "sourceType", + "schema": "public", + "values": [ + "docker", + "git", + "github", + "gitlab", + "bitbucket", + "drop" + ] + }, + "public.Roles": { + "name": "Roles", + "schema": "public", + "values": [ + "admin", + "user" + ] + }, + "public.domainType": { + "name": "domainType", + "schema": "public", + "values": [ + "compose", + "application" + ] + }, + "public.databaseType": { + "name": "databaseType", + "schema": "public", + "values": [ + "postgres", + "mariadb", + "mysql", + "mongo" + ] + }, + "public.deploymentStatus": { + "name": "deploymentStatus", + "schema": "public", + "values": [ + "running", + "done", + "error" + ] + }, + "public.mountType": { + "name": "mountType", + "schema": "public", + "values": [ + "bind", + "volume", + "file" + ] + }, + "public.serviceType": { + "name": "serviceType", + "schema": "public", + "values": [ + "application", + "postgres", + "mysql", + "mariadb", + "mongo", + "redis", + "compose" + ] + }, + "public.protocolType": { + "name": "protocolType", + "schema": "public", + "values": [ + "tcp", + "udp" + ] + }, + "public.applicationStatus": { + "name": "applicationStatus", + "schema": "public", + "values": [ + "idle", + "running", + "done", + "error" + ] + }, + "public.certificateType": { + "name": "certificateType", + "schema": "public", + "values": [ + "letsencrypt", + "none" + ] + }, + "public.composeType": { + "name": "composeType", + "schema": "public", + "values": [ + "docker-compose", + "stack" + ] + }, + "public.sourceTypeCompose": { + "name": "sourceTypeCompose", + "schema": "public", + "values": [ + "git", + "github", + "gitlab", + "bitbucket", + "raw" + ] + }, + "public.RegistryType": { + "name": "RegistryType", + "schema": "public", + "values": [ + "selfHosted", + "cloud" + ] + }, + "public.notificationType": { + "name": "notificationType", + "schema": "public", + "values": [ + "slack", + "telegram", + "discord", + "email" + ] + }, + "public.gitProviderType": { + "name": "gitProviderType", + "schema": "public", + "values": [ + "github", + "gitlab", + "bitbucket" + ] + }, + "public.serverStatus": { + "name": "serverStatus", + "schema": "public", + "values": [ + "active", + "inactive" + ] + } + }, + "schemas": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/apps/dokploy/drizzle/meta/_journal.json b/apps/dokploy/drizzle/meta/_journal.json index 385ee369..76263c39 100644 --- a/apps/dokploy/drizzle/meta/_journal.json +++ b/apps/dokploy/drizzle/meta/_journal.json @@ -344,6 +344,13 @@ "when": 1733599163710, "tag": "0048_flat_expediter", "breakpoints": true + }, + { + "idx": 49, + "version": "6", + "when": 1733610324506, + "tag": "0049_fluffy_expediter", + "breakpoints": true } ] } \ No newline at end of file diff --git a/apps/dokploy/server/api/routers/gitlab.ts b/apps/dokploy/server/api/routers/gitlab.ts index f66dcbe3..c057061f 100644 --- a/apps/dokploy/server/api/routers/gitlab.ts +++ b/apps/dokploy/server/api/routers/gitlab.ts @@ -142,6 +142,10 @@ export const gitlabRouter = createTRPCRouter({ name: input.name, adminId: ctx.user.adminId, }); + + await updateGitlab(input.gitlabId, { + ...input, + }); } else { await updateGitlab(input.gitlabId, { ...input, diff --git a/packages/server/src/db/schema/gitlab.ts b/packages/server/src/db/schema/gitlab.ts index 18f83ada..e665b7fa 100644 --- a/packages/server/src/db/schema/gitlab.ts +++ b/packages/server/src/db/schema/gitlab.ts @@ -10,6 +10,7 @@ export const gitlab = pgTable("gitlab", { .notNull() .primaryKey() .$defaultFn(() => nanoid()), + gitlabUrl: text("gitlabUrl").default("https://gitlab.com").notNull(), applicationId: text("application_id"), redirectUri: text("redirect_uri"), secret: text("secret"), @@ -39,6 +40,7 @@ export const apiCreateGitlab = createSchema.extend({ redirectUri: z.string().optional(), authId: z.string().min(1), name: z.string().min(1), + gitlabUrl: z.string().min(1), }); export const apiFindOneGitlab = createSchema @@ -67,4 +69,5 @@ export const apiUpdateGitlab = createSchema.extend({ redirectUri: z.string().optional(), name: z.string().min(1), gitlabId: z.string().min(1), + gitlabUrl: z.string().min(1), }); diff --git a/packages/server/src/utils/providers/gitlab.ts b/packages/server/src/utils/providers/gitlab.ts index 4f9e011a..ff5f66fe 100644 --- a/packages/server/src/utils/providers/gitlab.ts +++ b/packages/server/src/utils/providers/gitlab.ts @@ -417,7 +417,7 @@ export const testGitlabConnection = async ( const gitlabProvider = await findGitlabById(gitlabId); const response = await fetch( - `https://gitlab.com/api/v4/projects?membership=true&owned=true&page=${0}&per_page=${100}`, + `${gitlabProvider.gitlabUrl}/api/v4/projects?membership=true&owned=true&page=${0}&per_page=${100}`, { headers: { Authorization: `Bearer ${gitlabProvider.accessToken}`, From f94ee8c299ecccce18db9316ede1943140124a80 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sat, 7 Dec 2024 16:50:25 -0600 Subject: [PATCH 02/64] refactor: update --- packages/server/src/utils/providers/gitlab.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/server/src/utils/providers/gitlab.ts b/packages/server/src/utils/providers/gitlab.ts index ff5f66fe..b99e64e3 100644 --- a/packages/server/src/utils/providers/gitlab.ts +++ b/packages/server/src/utils/providers/gitlab.ts @@ -350,6 +350,8 @@ export const cloneRawGitlabRepository = async (entity: Compose) => { const basePath = COMPOSE_PATH; const outputPath = join(basePath, appName, "code"); await recreateDirectory(outputPath); + const gitlabUrl = gitlabProvider.gitlabUrl; + // What happen with oauth in self hosted instances? const repoclone = `gitlab.com/${gitlabPathNamespace}.git`; const cloneUrl = `https://oauth2:${gitlabProvider?.accessToken}@${repoclone}`; From bbe72ad584712c8c26f3ceed8a8479f154dabb7f Mon Sep 17 00:00:00 2001 From: minagishl Date: Mon, 9 Dec 2024 15:15:16 +0900 Subject: [PATCH 03/64] feat(i18n): add japanese language support --- apps/dokploy/lib/languages.ts | 1 + apps/dokploy/next-i18next.config.cjs | 1 + apps/dokploy/public/locales/ja/common.json | 1 + apps/dokploy/public/locales/ja/settings.json | 44 ++++++++++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 apps/dokploy/public/locales/ja/common.json create mode 100644 apps/dokploy/public/locales/ja/settings.json diff --git a/apps/dokploy/lib/languages.ts b/apps/dokploy/lib/languages.ts index 59bcc097..692d0e9b 100644 --- a/apps/dokploy/lib/languages.ts +++ b/apps/dokploy/lib/languages.ts @@ -11,6 +11,7 @@ export enum Languages { Persian = "fa", Korean = "ko", Portuguese = "pt-br", + Japanese = "ja", } export type Language = keyof typeof Languages; diff --git a/apps/dokploy/next-i18next.config.cjs b/apps/dokploy/next-i18next.config.cjs index 9f030ecb..aadc7950 100644 --- a/apps/dokploy/next-i18next.config.cjs +++ b/apps/dokploy/next-i18next.config.cjs @@ -17,6 +17,7 @@ module.exports = { "fa", "ko", "pt-br", + "ja", ], localeDetection: false, }, diff --git a/apps/dokploy/public/locales/ja/common.json b/apps/dokploy/public/locales/ja/common.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/apps/dokploy/public/locales/ja/common.json @@ -0,0 +1 @@ +{} diff --git a/apps/dokploy/public/locales/ja/settings.json b/apps/dokploy/public/locales/ja/settings.json new file mode 100644 index 00000000..757586b7 --- /dev/null +++ b/apps/dokploy/public/locales/ja/settings.json @@ -0,0 +1,44 @@ +{ + "settings.common.save": "保存", + "settings.server.domain.title": "サーバードメイン", + "settings.server.domain.description": "サーバーアプリケーションにドメインを追加", + "settings.server.domain.form.domain": "ドメイン", + "settings.server.domain.form.letsEncryptEmail": "Let's Encrypt メールアドレス", + "settings.server.domain.form.certificate.label": "証明書", + "settings.server.domain.form.certificate.placeholder": "証明書を選択", + "settings.server.domain.form.certificateOptions.none": "なし", + "settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (デフォルト)", + + "settings.server.webServer.title": "ウェブサーバー", + "settings.server.webServer.description": "ウェブサーバーをリロードまたはクリーンアップします", + "settings.server.webServer.actions": "アクション", + "settings.server.webServer.reload": "リロード", + "settings.server.webServer.watchLogs": "ログを監視", + "settings.server.webServer.updateServerIp": "サーバーIPを更新", + "settings.server.webServer.server.label": "サーバー", + "settings.server.webServer.traefik.label": "Traefik", + "settings.server.webServer.traefik.modifyEnv": "環境設定を変更", + "settings.server.webServer.storage.label": "ストレージ", + "settings.server.webServer.storage.cleanUnusedImages": "未使用のイメージを削除", + "settings.server.webServer.storage.cleanUnusedVolumes": "未使用のボリュームを削除", + "settings.server.webServer.storage.cleanStoppedContainers": "停止中のコンテナを削除", + "settings.server.webServer.storage.cleanDockerBuilder": "Docker ビルダー＆システムをクリーンアップ", + "settings.server.webServer.storage.cleanMonitoring": "モニタリングをクリーンアップ", + "settings.server.webServer.storage.cleanAll": "すべてをクリーンアップ", + + "settings.profile.title": "アカウント", + "settings.profile.description": "ここでプロフィールの詳細を変更できます", + "settings.profile.email": "メールアドレス", + "settings.profile.password": "パスワード", + "settings.profile.avatar": "アバター", + + "settings.appearance.title": "外観", + "settings.appearance.description": "ダッシュボードのテーマをカスタマイズ", + "settings.appearance.theme": "テーマ", + "settings.appearance.themeDescription": "ダッシュボードのテーマを選択してください", + "settings.appearance.themes.light": "ライト", + "settings.appearance.themes.dark": "ダーク", + "settings.appearance.themes.system": "システム", + "settings.appearance.language": "言語", + "settings.appearance.languageDescription": "ダッシュボードの言語を選択してください" +} From 1c02478688f5edd1f614d87c281ef88849cb68fd Mon Sep 17 00:00:00 2001 From: Nicholas Penree Date: Mon, 9 Dec 2024 22:28:13 -0500 Subject: [PATCH 04/64] feat: add Logto template --- apps/dokploy/public/templates/logto.png | Bin 0 -> 21075 bytes .../templates/logto/docker-compose.yml | 42 ++++++++++++++++++ apps/dokploy/templates/logto/index.ts | 37 +++++++++++++++ apps/dokploy/templates/templates.ts | 23 ++++++++-- 4 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 apps/dokploy/public/templates/logto.png create mode 100644 apps/dokploy/templates/logto/docker-compose.yml create mode 100644 apps/dokploy/templates/logto/index.ts diff --git a/apps/dokploy/public/templates/logto.png b/apps/dokploy/public/templates/logto.png new file mode 100644 index 0000000000000000000000000000000000000000..c7bfec1d855996429a03bca1b152b262937abcb8 GIT binary patch literal 21075 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 AqW}N^ literal 0 HcmV?d00001 diff --git a/apps/dokploy/templates/logto/docker-compose.yml b/apps/dokploy/templates/logto/docker-compose.yml new file mode 100644 index 00000000..e1f7c46a --- /dev/null +++ b/apps/dokploy/templates/logto/docker-compose.yml @@ -0,0 +1,42 @@ +services: + app: + depends_on: + postgres: + condition: service_healthy + image: svhd/logto:1.22.0 + entrypoint: ["sh", "-c", "npm run cli db seed -- --swe && npm start"] + ports: + - 3001 + - 3002 + networks: + - dokploy-network + environment: + TRUST_PROXY_HEADER: 1 + DB_URL: postgres://logto:${LOGTO_POSTGRES_PASSWORD}@postgres:5432/logto + ENDPOINT: ${LOGTO_ENDPOINT} + ADMIN_ENDPOINT: ${LOGTO_ADMIN_ENDPOINT} + volumes: + - logto-connectors:/etc/logto/packages/core/connectors + postgres: + image: postgres:17-alpine + user: postgres + networks: + - dokploy-network + environment: + POSTGRES_USER: logto + POSTGRES_PASSWORD: ${LOGTO_POSTGRES_PASSWORD} + volumes: + - postgres-data:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready"] + interval: 10s + timeout: 5s + retries: 5 + +networks: + dokploy-network: + external: true + +volumes: + logto-connectors: + postgres-data: diff --git a/apps/dokploy/templates/logto/index.ts b/apps/dokploy/templates/logto/index.ts new file mode 100644 index 00000000..09b099d8 --- /dev/null +++ b/apps/dokploy/templates/logto/index.ts @@ -0,0 +1,37 @@ +import { + type DomainSchema, + type Schema, + type Template, + generatePassword, + generateRandomDomain, +} from "../utils"; + +export function generate(schema: Schema): Template { + const mainDomain = generateRandomDomain(schema); + const adminDomain = generateRandomDomain(schema); + const postgresPassword = generatePassword(); + + const domains: DomainSchema[] = [ + { + host: mainDomain, + port: 3001, + serviceName: "app", + }, + { + host: adminDomain, + port: 3002, + serviceName: "app", + }, + ]; + + const envs = [ + `LOGTO_ENDPOINT=http://${adminDomain}`, + `LOGTO_ADMIN_ENDPOINT=http://${adminDomain}`, + `LOGTO_POSTGRES_PASSWORD=${postgresPassword}`, + ]; + + return { + domains, + envs, + }; +} diff --git a/apps/dokploy/templates/templates.ts b/apps/dokploy/templates/templates.ts index 79d0b479..d268d6f9 100644 --- a/apps/dokploy/templates/templates.ts +++ b/apps/dokploy/templates/templates.ts @@ -1016,8 +1016,8 @@ export const templates: TemplateData[] = [ }, tags: ["browser", "automation"], load: () => import("./browserless/index").then((m) => m.generate), - }, - { + }, + { id: "drawio", name: "draw.io", version: "24.7.17", @@ -1031,8 +1031,8 @@ export const templates: TemplateData[] = [ }, tags: ["drawing", "diagrams"], load: () => import("./drawio/index").then((m) => m.generate), - }, - { + }, + { id: "kimai", name: "Kimai", version: "2.26.0", @@ -1047,4 +1047,19 @@ export const templates: TemplateData[] = [ tags: ["invoice", "business", "finance"], load: () => import("./kimai/index").then((m) => m.generate), }, + { + id: "logto", + name: "Logto", + version: "1.22.0", + description: + "Logto is an open-source Identity and Access Management (IAM) platform designed to streamline Customer Identity and Access Management (CIAM) and Workforce Identity Management.", + logo: "logto.png", + links: { + github: "https://github.com/logto-io/logto", + website: "https://logto.io/", + docs: "https://docs.logto.io/introduction", + }, + tags: ["identity", "auth"], + load: () => import("./logto/index").then((m) => m.generate), + }, ]; From 6a9690fe3c4e26d3b2a805f1ab29010b9fd8de4d Mon Sep 17 00:00:00 2001 From: Nicholas Penree Date: Mon, 9 Dec 2024 22:57:32 -0500 Subject: [PATCH 05/64] chore: update n8n template to 1.70.3 --- apps/dokploy/templates/n8n/docker-compose.yml | 2 +- apps/dokploy/templates/templates.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dokploy/templates/n8n/docker-compose.yml b/apps/dokploy/templates/n8n/docker-compose.yml index f8fb1f16..d810fa33 100644 --- a/apps/dokploy/templates/n8n/docker-compose.yml +++ b/apps/dokploy/templates/n8n/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: n8n: - image: docker.n8n.io/n8nio/n8n:1.48.1 + image: docker.n8n.io/n8nio/n8n:1.70.3 restart: always environment: - N8N_HOST=${N8N_HOST} diff --git a/apps/dokploy/templates/templates.ts b/apps/dokploy/templates/templates.ts index 79d0b479..84a6df24 100644 --- a/apps/dokploy/templates/templates.ts +++ b/apps/dokploy/templates/templates.ts @@ -155,7 +155,7 @@ export const templates: TemplateData[] = [ { id: "n8n", name: "n8n", - version: "1.48.1", + version: "1.70.3", description: "n8n is an open source low-code platform for automating workflows and integrations.", logo: "n8n.png", From 22e6d07f60f1de98642f69a222b652049e21a4c9 Mon Sep 17 00:00:00 2001 From: djknaeckebrot Date: Tue, 10 Dec 2024 08:37:55 +0100 Subject: [PATCH 06/64] fix: hardcoded gitlab.com to gitlabUrl --- apps/dokploy/pages/api/providers/gitlab/callback.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/dokploy/pages/api/providers/gitlab/callback.ts b/apps/dokploy/pages/api/providers/gitlab/callback.ts index 8de9b7fa..547de357 100644 --- a/apps/dokploy/pages/api/providers/gitlab/callback.ts +++ b/apps/dokploy/pages/api/providers/gitlab/callback.ts @@ -7,13 +7,15 @@ export default async function handler( ) { const { code, gitlabId } = req.query; + console.log("DEBUG: res.query: ", res); + if (!code || Array.isArray(code)) { return res.status(400).json({ error: "Missing or invalid code" }); } const gitlab = await findGitlabById(gitlabId as string); - const response = await fetch("https://gitlab.com/oauth/token", { + const response = await fetch(`${gitlab.gitlabUrl}/oauth/token`, { method: "POST", headers: { "Content-Type": "application/x-www-form-urlencoded", From 7ced6840fa2b5f38f5fded6354a31d34e22aa96a Mon Sep 17 00:00:00 2001 From: djknaeckebrot Date: Tue, 10 Dec 2024 08:53:53 +0100 Subject: [PATCH 07/64] fix: change hardcoded gitlab.com to gitlabUrl --- apps/dokploy/server/api/routers/gitlab.ts | 1 + packages/server/src/utils/providers/gitlab.ts | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/dokploy/server/api/routers/gitlab.ts b/apps/dokploy/server/api/routers/gitlab.ts index c057061f..6b96b647 100644 --- a/apps/dokploy/server/api/routers/gitlab.ts +++ b/apps/dokploy/server/api/routers/gitlab.ts @@ -78,6 +78,7 @@ export const gitlabRouter = createTRPCRouter({ .input(apiFindOneGitlab) .query(async ({ input, ctx }) => { const gitlabProvider = await findGitlabById(input.gitlabId); + console.log("DEBUG: gitlabProvider: ", gitlabProvider); if (IS_CLOUD && gitlabProvider.gitProvider.adminId !== ctx.user.adminId) { //TODO: Remove this line when the cloud version is ready throw new TRPCError({ diff --git a/packages/server/src/utils/providers/gitlab.ts b/packages/server/src/utils/providers/gitlab.ts index b99e64e3..504ff841 100644 --- a/packages/server/src/utils/providers/gitlab.ts +++ b/packages/server/src/utils/providers/gitlab.ts @@ -244,7 +244,7 @@ export const getGitlabRepositories = async (gitlabId?: string) => { const gitlabProvider = await findGitlabById(gitlabId); const response = await fetch( - `https://gitlab.com/api/v4/projects?membership=true&owned=true&page=${0}&per_page=${100}`, + `${gitlabProvider.gitlabUrl}/api/v4/projects?membership=true&owned=true&page=${0}&per_page=${100}`, { headers: { Authorization: `Bearer ${gitlabProvider.accessToken}`, @@ -304,7 +304,7 @@ export const getGitlabBranches = async (input: { const gitlabProvider = await findGitlabById(input.gitlabId); const branchesResponse = await fetch( - `https://gitlab.com/api/v4/projects/${input.id}/repository/branches`, + `${gitlabProvider.gitlabUrl}/api/v4/projects/${input.id}/repository/branches`, { headers: { Authorization: `Bearer ${gitlabProvider.accessToken}`, @@ -352,7 +352,7 @@ export const cloneRawGitlabRepository = async (entity: Compose) => { await recreateDirectory(outputPath); const gitlabUrl = gitlabProvider.gitlabUrl; // What happen with oauth in self hosted instances? - const repoclone = `gitlab.com/${gitlabPathNamespace}.git`; + const repoclone = `${gitlabProvider.gitlabUrl}/${gitlabPathNamespace}.git`; const cloneUrl = `https://oauth2:${gitlabProvider?.accessToken}@${repoclone}`; try { @@ -392,7 +392,7 @@ export const cloneRawGitlabRepositoryRemote = async (compose: Compose) => { await refreshGitlabToken(gitlabId); const basePath = COMPOSE_PATH; const outputPath = join(basePath, appName, "code"); - const repoclone = `gitlab.com/${gitlabPathNamespace}.git`; + const repoclone = `${gitlabProvider.gitlabUrl}/${gitlabPathNamespace}.git`; const cloneUrl = `https://oauth2:${gitlabProvider?.accessToken}@${repoclone}`; try { const command = ` From 0698ac831884354942049719a64736cd0eceef6d Mon Sep 17 00:00:00 2001 From: djknaeckebrot Date: Tue, 10 Dec 2024 08:54:22 +0100 Subject: [PATCH 08/64] chore: remove debug output --- apps/dokploy/server/api/routers/gitlab.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/dokploy/server/api/routers/gitlab.ts b/apps/dokploy/server/api/routers/gitlab.ts index 6b96b647..c057061f 100644 --- a/apps/dokploy/server/api/routers/gitlab.ts +++ b/apps/dokploy/server/api/routers/gitlab.ts @@ -78,7 +78,6 @@ export const gitlabRouter = createTRPCRouter({ .input(apiFindOneGitlab) .query(async ({ input, ctx }) => { const gitlabProvider = await findGitlabById(input.gitlabId); - console.log("DEBUG: gitlabProvider: ", gitlabProvider); if (IS_CLOUD && gitlabProvider.gitProvider.adminId !== ctx.user.adminId) { //TODO: Remove this line when the cloud version is ready throw new TRPCError({ From 1cb1da8097716eb81bbc6ae3118e932963316cd1 Mon Sep 17 00:00:00 2001 From: djknaeckebrot Date: Tue, 10 Dec 2024 09:19:01 +0100 Subject: [PATCH 09/64] fix: replace hardcoded gitlab.com with dynamic urls --- packages/server/src/utils/providers/gitlab.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/server/src/utils/providers/gitlab.ts b/packages/server/src/utils/providers/gitlab.ts index 504ff841..096f9e28 100644 --- a/packages/server/src/utils/providers/gitlab.ts +++ b/packages/server/src/utils/providers/gitlab.ts @@ -26,7 +26,7 @@ export const refreshGitlabToken = async (gitlabProviderId: string) => { return; } - const response = await fetch("https://gitlab.com/oauth/token", { + const response = await fetch(`${gitlabProvider.gitlabUrl}/oauth/token`, { method: "POST", headers: { "Content-Type": "application/x-www-form-urlencoded", @@ -122,7 +122,7 @@ export const cloneGitlabRepository = async ( const basePath = isCompose ? COMPOSE_PATH : APPLICATIONS_PATH; const outputPath = join(basePath, appName, "code"); await recreateDirectory(outputPath); - const repoclone = `gitlab.com/${gitlabPathNamespace}.git`; + const repoclone = `${gitlab?.gitlabUrl.replace(/^https?:\/\//, "")}/${gitlabPathNamespace}.git`; const cloneUrl = `https://oauth2:${gitlab?.accessToken}@${repoclone}`; try { @@ -218,7 +218,7 @@ export const getGitlabCloneCommand = async ( const basePath = isCompose ? COMPOSE_PATH : APPLICATIONS_PATH; const outputPath = join(basePath, appName, "code"); await recreateDirectory(outputPath); - const repoclone = `gitlab.com/${gitlabPathNamespace}.git`; + const repoclone = `${gitlab?.gitlabUrl.replace(/^https?:\/\//, "")}/${gitlabPathNamespace}.git`; const cloneUrl = `https://oauth2:${gitlab?.accessToken}@${repoclone}`; const cloneCommand = ` @@ -352,7 +352,7 @@ export const cloneRawGitlabRepository = async (entity: Compose) => { await recreateDirectory(outputPath); const gitlabUrl = gitlabProvider.gitlabUrl; // What happen with oauth in self hosted instances? - const repoclone = `${gitlabProvider.gitlabUrl}/${gitlabPathNamespace}.git`; + const repoclone = `${gitlabUrl.replace(/^https?:\/\//, "")}/${gitlabPathNamespace}.git`; const cloneUrl = `https://oauth2:${gitlabProvider?.accessToken}@${repoclone}`; try { @@ -392,7 +392,7 @@ export const cloneRawGitlabRepositoryRemote = async (compose: Compose) => { await refreshGitlabToken(gitlabId); const basePath = COMPOSE_PATH; const outputPath = join(basePath, appName, "code"); - const repoclone = `${gitlabProvider.gitlabUrl}/${gitlabPathNamespace}.git`; + const repoclone = `${gitlabProvider.gitlabUrl.replace(/^https?:\/\//, "")}/${gitlabPathNamespace}.git`; const cloneUrl = `https://oauth2:${gitlabProvider?.accessToken}@${repoclone}`; try { const command = ` From 2c22aa3689854676bfc1a2ed234695cc82171145 Mon Sep 17 00:00:00 2001 From: djknaeckebrot Date: Tue, 10 Dec 2024 10:25:48 +0100 Subject: [PATCH 10/64] chore: remove debug logs --- apps/dokploy/pages/api/providers/gitlab/callback.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/dokploy/pages/api/providers/gitlab/callback.ts b/apps/dokploy/pages/api/providers/gitlab/callback.ts index 547de357..e32e0a7a 100644 --- a/apps/dokploy/pages/api/providers/gitlab/callback.ts +++ b/apps/dokploy/pages/api/providers/gitlab/callback.ts @@ -7,8 +7,6 @@ export default async function handler( ) { const { code, gitlabId } = req.query; - console.log("DEBUG: res.query: ", res); - if (!code || Array.isArray(code)) { return res.status(400).json({ error: "Missing or invalid code" }); } From cbf0f37a49c165d21f985f280feb8b88aa934b92 Mon Sep 17 00:00:00 2001 From: djknaeckebrot Date: Tue, 10 Dec 2024 13:37:46 +0100 Subject: [PATCH 11/64] feat: add search command dialog with projects and services --- .../dashboard/projects/search-command.tsx | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 apps/dokploy/components/dashboard/projects/search-command.tsx diff --git a/apps/dokploy/components/dashboard/projects/search-command.tsx b/apps/dokploy/components/dashboard/projects/search-command.tsx new file mode 100644 index 00000000..4070d785 --- /dev/null +++ b/apps/dokploy/components/dashboard/projects/search-command.tsx @@ -0,0 +1,114 @@ +"use client" + +import React from "react"; +import {Command, CommandEmpty, CommandList, CommandGroup, CommandInput, CommandItem,CommandDialog, CommandSeparator} from "@/components/ui/command"; +import { useRouter } from 'next/router' +import {extractServices, type Services} from "@/pages/dashboard/project/[projectId]"; +import type {findProjectById} from "@dokploy/server/services/project"; +import {BookIcon, CircuitBoard, GlobeIcon} from "lucide-react"; +import { + MariadbIcon, + MongodbIcon, + MysqlIcon, + PostgresqlIcon, + RedisIcon, +} from "@/components/icons/data-tools-icons"; + +// export type Services = { +// name: string; +// type: +// | "mariadb" +// | "application" +// | "postgres" +// | "mysql" +// | "mongo" +// | "redis" +// | "compose"; +// description?: string | null; +// id: string; +// createdAt: string; +// status?: "idle" | "running" | "done" | "error"; +// }; + +type Project = Awaited>; + +interface Props { + data: Project[]; +} + +export const SearchCommand = ({data}: Props) => { + const router = useRouter() + const [open, setOpen] = React.useState(false) + + React.useEffect(() => { + const down = (e: KeyboardEvent) => { + if (e.key === "j" && (e.metaKey || e.ctrlKey)) { + e.preventDefault() + setOpen((open) => !open) + } + } + + document.addEventListener("keydown", down) + return () => document.removeEventListener("keydown", down) + }, []) + + console.log("DEBUG: data: ", data); + + return ( +
    + + + + No projects added yet. Click on Create project. + + + {data?.map((project) => ( + router.push(project.projectId)}> + + {project.name} + + ))} + + + + + + {data?.map((project) => { + const applications: Services[] = extractServices(project); + return ( + applications.map((application) => ( + router.push(`/dashboard/project/${project.projectId}/services/${application.type}/${application.id}`)}> + {application.type === "postgres" && ( + + )} + {application.type === "redis" && ( + + )} + {application.type === "mariadb" && ( + + )} + {application.type === "mongo" && ( + + )} + {application.type === "mysql" && ( + + )} + {application.type === "application" && ( + + )} + {application.type === "compose" && ( + + )} + {application.name} + + )) + ); + })} + + + + +
    + ) +} \ No newline at end of file From 84bb98c7e6b4181cc1e1125743a78eab77c60bc4 Mon Sep 17 00:00:00 2001 From: djknaeckebrot Date: Tue, 10 Dec 2024 13:37:57 +0100 Subject: [PATCH 12/64] feat: add search command dialog with projects and services --- apps/dokploy/components/dashboard/projects/show.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/dokploy/components/dashboard/projects/show.tsx b/apps/dokploy/components/dashboard/projects/show.tsx index 92fc337f..ee36188e 100644 --- a/apps/dokploy/components/dashboard/projects/show.tsx +++ b/apps/dokploy/components/dashboard/projects/show.tsx @@ -36,6 +36,7 @@ import { Fragment } from "react"; import { toast } from "sonner"; import { ProjectEnviroment } from "./project-enviroment"; import { UpdateProject } from "./update"; +import {SearchCommand} from "@/components/dashboard/projects/search-command"; export const ShowProjects = () => { const utils = api.useUtils(); @@ -51,8 +52,14 @@ export const ShowProjects = () => { ); const { mutateAsync } = api.project.remove.useMutation(); + + return ( <> + + {/*@ts-expect-error Type mismatch*/} + + {data?.length === 0 && (
    From 8a1cba470c350fa27fa868e3993c8afd3f972559 Mon Sep 17 00:00:00 2001 From: hua1995116 <461249104@qq.com> Date: Tue, 10 Dec 2024 20:40:26 +0800 Subject: [PATCH 13/64] fix: error about memoryReservation not set --- packages/server/src/utils/docker/utils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/server/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts index 8402ea2f..c2dce838 100644 --- a/packages/server/src/utils/docker/utils.ts +++ b/packages/server/src/utils/docker/utils.ts @@ -318,13 +318,13 @@ export const calculateResources = ({ return { Limits: { MemoryBytes: memoryLimit ? memoryLimit * 1024 * 1024 : undefined, - NanoCPUs: memoryLimit ? (cpuLimit || 1) * 1000 * 1000 * 1000 : undefined, + NanoCPUs: cpuLimit ? (cpuLimit || 1) * 1000 * 1000 * 1000 : undefined, }, Reservations: { - MemoryBytes: memoryLimit + MemoryBytes: memoryReservation ? (memoryReservation || 1) * 1024 * 1024 : undefined, - NanoCPUs: memoryLimit + NanoCPUs: cpuReservation ? (cpuReservation || 1) * 1000 * 1000 * 1000 : undefined, }, From 029cbf4498329f96b8686cdce2a638fed5c282ce Mon Sep 17 00:00:00 2001 From: djknaeckebrot Date: Tue, 10 Dec 2024 14:09:04 +0100 Subject: [PATCH 14/64] refactor: change location of search-command --- .../dashboard/projects/search-command.tsx | 114 ---- .../components/dashboard/projects/show.tsx | 541 +++++++++--------- .../components/dashboard/search-command.tsx | 169 ++++++ 3 files changed, 440 insertions(+), 384 deletions(-) delete mode 100644 apps/dokploy/components/dashboard/projects/search-command.tsx create mode 100644 apps/dokploy/components/dashboard/search-command.tsx diff --git a/apps/dokploy/components/dashboard/projects/search-command.tsx b/apps/dokploy/components/dashboard/projects/search-command.tsx deleted file mode 100644 index 4070d785..00000000 --- a/apps/dokploy/components/dashboard/projects/search-command.tsx +++ /dev/null @@ -1,114 +0,0 @@ -"use client" - -import React from "react"; -import {Command, CommandEmpty, CommandList, CommandGroup, CommandInput, CommandItem,CommandDialog, CommandSeparator} from "@/components/ui/command"; -import { useRouter } from 'next/router' -import {extractServices, type Services} from "@/pages/dashboard/project/[projectId]"; -import type {findProjectById} from "@dokploy/server/services/project"; -import {BookIcon, CircuitBoard, GlobeIcon} from "lucide-react"; -import { - MariadbIcon, - MongodbIcon, - MysqlIcon, - PostgresqlIcon, - RedisIcon, -} from "@/components/icons/data-tools-icons"; - -// export type Services = { -// name: string; -// type: -// | "mariadb" -// | "application" -// | "postgres" -// | "mysql" -// | "mongo" -// | "redis" -// | "compose"; -// description?: string | null; -// id: string; -// createdAt: string; -// status?: "idle" | "running" | "done" | "error"; -// }; - -type Project = Awaited>; - -interface Props { - data: Project[]; -} - -export const SearchCommand = ({data}: Props) => { - const router = useRouter() - const [open, setOpen] = React.useState(false) - - React.useEffect(() => { - const down = (e: KeyboardEvent) => { - if (e.key === "j" && (e.metaKey || e.ctrlKey)) { - e.preventDefault() - setOpen((open) => !open) - } - } - - document.addEventListener("keydown", down) - return () => document.removeEventListener("keydown", down) - }, []) - - console.log("DEBUG: data: ", data); - - return ( -
    - - - - No projects added yet. Click on Create project. - - - {data?.map((project) => ( - router.push(project.projectId)}> - - {project.name} - - ))} - - - - - - {data?.map((project) => { - const applications: Services[] = extractServices(project); - return ( - applications.map((application) => ( - router.push(`/dashboard/project/${project.projectId}/services/${application.type}/${application.id}`)}> - {application.type === "postgres" && ( - - )} - {application.type === "redis" && ( - - )} - {application.type === "mariadb" && ( - - )} - {application.type === "mongo" && ( - - )} - {application.type === "mysql" && ( - - )} - {application.type === "application" && ( - - )} - {application.type === "compose" && ( - - )} - {application.name} - - )) - ); - })} - - - - -
    - ) -} \ No newline at end of file diff --git a/apps/dokploy/components/dashboard/projects/show.tsx b/apps/dokploy/components/dashboard/projects/show.tsx index ee36188e..b4c86143 100644 --- a/apps/dokploy/components/dashboard/projects/show.tsx +++ b/apps/dokploy/components/dashboard/projects/show.tsx @@ -1,297 +1,298 @@ import { DateTooltip } from "@/components/shared/date-tooltip"; import { - AlertDialog, - AlertDialogAction, - AlertDialogCancel, - AlertDialogContent, - AlertDialogDescription, - AlertDialogFooter, - AlertDialogHeader, - AlertDialogTitle, - AlertDialogTrigger, + AlertDialog, + AlertDialogAction, + AlertDialogCancel, + AlertDialogContent, + AlertDialogDescription, + AlertDialogFooter, + AlertDialogHeader, + AlertDialogTitle, + AlertDialogTrigger, } from "@/components/ui/alert-dialog"; import { Button } from "@/components/ui/button"; import { Card, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"; import { - DropdownMenu, - DropdownMenuContent, - DropdownMenuGroup, - DropdownMenuItem, - DropdownMenuLabel, - DropdownMenuSeparator, - DropdownMenuTrigger, + DropdownMenu, + DropdownMenuContent, + DropdownMenuGroup, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuSeparator, + DropdownMenuTrigger, } from "@/components/ui/dropdown-menu"; import { api } from "@/utils/api"; import { - AlertTriangle, - BookIcon, - ExternalLink, - ExternalLinkIcon, - FolderInput, - MoreHorizontalIcon, - TrashIcon, + AlertTriangle, + BookIcon, + ExternalLink, + ExternalLinkIcon, + FolderInput, + MoreHorizontalIcon, + TrashIcon, } from "lucide-react"; import Link from "next/link"; import { Fragment } from "react"; import { toast } from "sonner"; import { ProjectEnviroment } from "./project-enviroment"; import { UpdateProject } from "./update"; -import {SearchCommand} from "@/components/dashboard/projects/search-command"; +import { SearchCommand } from "@/components/dashboard/search-command"; export const ShowProjects = () => { - const utils = api.useUtils(); - const { data } = api.project.all.useQuery(); - const { data: auth } = api.auth.get.useQuery(); - const { data: user } = api.user.byAuthId.useQuery( - { - authId: auth?.id || "", - }, - { - enabled: !!auth?.id && auth?.rol === "user", - }, - ); - const { mutateAsync } = api.project.remove.useMutation(); + const utils = api.useUtils(); + const { data } = api.project.all.useQuery(); + const { data: auth } = api.auth.get.useQuery(); + const { data: user } = api.user.byAuthId.useQuery( + { + authId: auth?.id || "", + }, + { + enabled: !!auth?.id && auth?.rol === "user", + } + ); + const { mutateAsync } = api.project.remove.useMutation(); + return ( + <> + {/*@ts-expect-error Type mismatch*/} + + {data?.length === 0 && ( +
    + + + No projects added yet. Click on Create project. + +
    + )} +
    + {data?.map((project) => { + const emptyServices = + project?.mariadb.length === 0 && + project?.mongo.length === 0 && + project?.mysql.length === 0 && + project?.postgres.length === 0 && + project?.redis.length === 0 && + project?.applications.length === 0 && + project?.compose.length === 0; - return ( - <> + const totalServices = + project?.mariadb.length + + project?.mongo.length + + project?.mysql.length + + project?.postgres.length + + project?.redis.length + + project?.applications.length + + project?.compose.length; - {/*@ts-expect-error Type mismatch*/} - + const flattedDomains = [ + ...project.applications.flatMap((a) => a.domains), + ...project.compose.flatMap((a) => a.domains), + ]; - {data?.length === 0 && ( -
    - - - No projects added yet. Click on Create project. - -
    - )} -
    - {data?.map((project) => { - const emptyServices = - project?.mariadb.length === 0 && - project?.mongo.length === 0 && - project?.mysql.length === 0 && - project?.postgres.length === 0 && - project?.redis.length === 0 && - project?.applications.length === 0 && - project?.compose.length === 0; + const renderDomainsDropdown = ( + item: typeof project.compose | typeof project.applications + ) => + item[0] ? ( + + + {"applicationId" in item[0] ? "Applications" : "Compose"} + + {item.map((a) => ( + + + + + {a.name} + + + {a.domains.map((domain) => ( + + + {domain.host} + + + + ))} + + + ))} + + ) : null; - const totalServices = - project?.mariadb.length + - project?.mongo.length + - project?.mysql.length + - project?.postgres.length + - project?.redis.length + - project?.applications.length + - project?.compose.length; + return ( +
    + + + {flattedDomains.length > 1 ? ( + + + + + e.stopPropagation()} + > + {renderDomainsDropdown(project.applications)} + {renderDomainsDropdown(project.compose)} + + + ) : flattedDomains[0] ? ( + + ) : null} - const flattedDomains = [ - ...project.applications.flatMap((a) => a.domains), - ...project.compose.flatMap((a) => a.domains), - ]; + + + +
    + + + {project.name} + +
    - const renderDomainsDropdown = ( - item: typeof project.compose | typeof project.applications, - ) => - item[0] ? ( - - - {"applicationId" in item[0] ? "Applications" : "Compose"} - - {item.map((a) => ( - - - - - {a.name} - - - {a.domains.map((domain) => ( - - - {domain.host} - - - - ))} - - - ))} - - ) : null; + + {project.description} + +     +
    + + + + + + + Actions + +
    e.stopPropagation()}> + +
    +
    e.stopPropagation()}> + +
    - return ( -
    - - - {flattedDomains.length > 1 ? ( - - - - - e.stopPropagation()} - > - {renderDomainsDropdown(project.applications)} - {renderDomainsDropdown(project.compose)} - - - ) : flattedDomains[0] ? ( - - ) : null} - - - - -
    - - - {project.name} - -
    - - - {project.description} - -     -
    - - - - - - - Actions - -
    e.stopPropagation()}> - -
    -
    e.stopPropagation()}> - -
    - -
    e.stopPropagation()}> - {(auth?.rol === "admin" || - user?.canDeleteProjects) && ( - - - e.preventDefault()} - > - - Delete - - - - - - Are you sure to delete this project? - - {!emptyServices ? ( -
    - - - You have active services, please - delete them first - -
    - ) : ( - - This action cannot be undone - - )} -     - - - Cancel - - { - await mutateAsync({ - projectId: project.projectId, - }) - .then(() => { - toast.success( - "Project delete succesfully", - ); - }) - .catch(() => { - toast.error( - "Error to delete this project", - ); - }) - .finally(() => { - utils.project.all.invalidate(); - }); - }} - > - Delete - - -     -     - )} -
    -     -     -
    -     -     - -
    - - Created - - - {totalServices}{" "} - {totalServices === 1 ? "service" : "services"} - -
    -     -     - -
    - ); - })} -
    - - ); +
    e.stopPropagation()}> + {(auth?.rol === "admin" || + user?.canDeleteProjects) && ( + + + e.preventDefault()} + > + + Delete + + + + + + Are you sure to delete this project? + + {!emptyServices ? ( +
    + + + You have active services, please + delete them first + +
    + ) : ( + + This action cannot be undone + + )} +     + + + Cancel + + { + await mutateAsync({ + projectId: project.projectId, + }) + .then(() => { + toast.success( + "Project delete succesfully" + ); + }) + .catch(() => { + toast.error( + "Error to delete this project" + ); + }) + .finally(() => { + utils.project.all.invalidate(); + }); + }} + > + Delete + + +     +     + )} +
    + + +
    + + + +
    + + Created + + + {totalServices}{" "} + {totalServices === 1 ? "service" : "services"} + +
    +     + + +
    + ); + })} +
    + + ); }; diff --git a/apps/dokploy/components/dashboard/search-command.tsx b/apps/dokploy/components/dashboard/search-command.tsx new file mode 100644 index 00000000..69813d7f --- /dev/null +++ b/apps/dokploy/components/dashboard/search-command.tsx @@ -0,0 +1,169 @@ +"use client"; + +import React from "react"; +import { + Command, + CommandEmpty, + CommandList, + CommandGroup, + CommandInput, + CommandItem, + CommandDialog, + CommandSeparator, +} from "@/components/ui/command"; +import { useRouter } from "next/router"; +import { + extractServices, + type Services, +} from "@/pages/dashboard/project/[projectId]"; +import type { findProjectById } from "@dokploy/server/services/project"; +import { BookIcon, CircuitBoard, GlobeIcon } from "lucide-react"; +import { + MariadbIcon, + MongodbIcon, + MysqlIcon, + PostgresqlIcon, + RedisIcon, +} from "@/components/icons/data-tools-icons"; + +type Project = Awaited>; + +interface Props { + data: Project[]; +} + +export const SearchCommand = ({ data }: Props) => { + const router = useRouter(); + const [open, setOpen] = React.useState(false); + + React.useEffect(() => { + const down = (e: KeyboardEvent) => { + if (e.key === "j" && (e.metaKey || e.ctrlKey)) { + e.preventDefault(); + setOpen((open) => !open); + } + }; + + document.addEventListener("keydown", down); + return () => document.removeEventListener("keydown", down); + }, []); + + console.log("DEBUG: data: ", data); + + return ( +
    + + + + + No projects added yet. Click on Create project. + + + { + router.push("/dashboard/projects"); + setOpen(false); + }} + > + Projects + + { + router.push("/dashboard/monitoring"); + setOpen(false); + }} + > + Monitoring + + { + router.push("/dashboard/traefik"); + setOpen(false); + }} + > + Treafik + + { + router.push("/dashboard/docker"); + setOpen(false); + }} + > + Docker + + { + router.push("/dashboard/requests"); + setOpen(false); + }} + > + Requests + + { + router.push("/dashboard/profile"); + setOpen(false); + }} + > + Settings + + + + + {data?.map((project) => ( + router.push(project.projectId)} + > + + {project.name} + + ))} + + + + + + {data?.map((project) => { + const applications: Services[] = extractServices(project); + return applications.map((application) => ( + + router.push( + `/dashboard/project/${project.projectId}/services/${application.type}/${application.id}` + ) + } + > + {application.type === "postgres" && ( + + )} + {application.type === "redis" && ( + + )} + {application.type === "mariadb" && ( + + )} + {application.type === "mongo" && ( + + )} + {application.type === "mysql" && ( + + )} + {application.type === "application" && ( + + )} + {application.type === "compose" && ( + + )} + {application.name} + + )); + })} + + + + +
    + ); +}; From 54b6a850b7dece9daeec6205cc361f643cf7c370 Mon Sep 17 00:00:00 2001 From: djknaeckebrot Date: Tue, 10 Dec 2024 14:15:39 +0100 Subject: [PATCH 15/64] refactor: make command globally available --- .../components/dashboard/projects/show.tsx | 4 - .../components/dashboard/search-command.tsx | 113 +++++++++--------- apps/dokploy/pages/_app.tsx | 106 ++++++++-------- 3 files changed, 111 insertions(+), 112 deletions(-) diff --git a/apps/dokploy/components/dashboard/projects/show.tsx b/apps/dokploy/components/dashboard/projects/show.tsx index b4c86143..d05bbba2 100644 --- a/apps/dokploy/components/dashboard/projects/show.tsx +++ b/apps/dokploy/components/dashboard/projects/show.tsx @@ -36,7 +36,6 @@ import { Fragment } from "react"; import { toast } from "sonner"; import { ProjectEnviroment } from "./project-enviroment"; import { UpdateProject } from "./update"; -import { SearchCommand } from "@/components/dashboard/search-command"; export const ShowProjects = () => { const utils = api.useUtils(); @@ -54,9 +53,6 @@ export const ShowProjects = () => { return ( <> - {/*@ts-expect-error Type mismatch*/} - - {data?.length === 0 && (
    diff --git a/apps/dokploy/components/dashboard/search-command.tsx b/apps/dokploy/components/dashboard/search-command.tsx index 69813d7f..3bbacae9 100644 --- a/apps/dokploy/components/dashboard/search-command.tsx +++ b/apps/dokploy/components/dashboard/search-command.tsx @@ -25,17 +25,17 @@ import { PostgresqlIcon, RedisIcon, } from "@/components/icons/data-tools-icons"; +import { api } from "@/utils/api"; +import { truncate } from "lodash"; type Project = Awaited>; -interface Props { - data: Project[]; -} - -export const SearchCommand = ({ data }: Props) => { +export const SearchCommand = () => { const router = useRouter(); const [open, setOpen] = React.useState(false); + const { data } = api.project.all.useQuery(); + React.useEffect(() => { const down = (e: KeyboardEvent) => { if (e.key === "j" && (e.metaKey || e.ctrlKey)) { @@ -53,61 +53,11 @@ export const SearchCommand = ({ data }: Props) => { return (
    - + No projects added yet. Click on Create project. - - { - router.push("/dashboard/projects"); - setOpen(false); - }} - > - Projects - - { - router.push("/dashboard/monitoring"); - setOpen(false); - }} - > - Monitoring - - { - router.push("/dashboard/traefik"); - setOpen(false); - }} - > - Treafik - - { - router.push("/dashboard/docker"); - setOpen(false); - }} - > - Docker - - { - router.push("/dashboard/requests"); - setOpen(false); - }} - > - Requests - - { - router.push("/dashboard/profile"); - setOpen(false); - }} - > - Settings - - {data?.map((project) => ( @@ -162,6 +112,57 @@ export const SearchCommand = ({ data }: Props) => { })} + +
    diff --git a/apps/dokploy/pages/_app.tsx b/apps/dokploy/pages/_app.tsx index e7c0befc..f91f378a 100644 --- a/apps/dokploy/pages/_app.tsx +++ b/apps/dokploy/pages/_app.tsx @@ -11,72 +11,74 @@ import { Inter } from "next/font/google"; import Head from "next/head"; import Script from "next/script"; import type { ReactElement, ReactNode } from "react"; +import { SearchCommand } from "@/components/dashboard/search-command"; const inter = Inter({ subsets: ["latin"] }); export type NextPageWithLayout

    = NextPage & { - getLayout?: (page: ReactElement) => ReactNode; - // session: Session | null; - theme?: string; + getLayout?: (page: ReactElement) => ReactNode; + // session: Session | null; + theme?: string; }; type AppPropsWithLayout = AppProps & { - Component: NextPageWithLayout; + Component: NextPageWithLayout; }; const MyApp = ({ - Component, - pageProps: { ...pageProps }, + Component, + pageProps: { ...pageProps }, }: AppPropsWithLayout) => { - const getLayout = Component.getLayout ?? ((page) => page); + const getLayout = Component.getLayout ?? ((page) => page); - return ( - <> - - - Dokploy - - {process.env.NEXT_PUBLIC_UMAMI_HOST && - process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID && ( -