chore: update @dokploy/trpc-openapi to version 0.0.14 and swagger-ui-react to version 5.31.2; refactor OpenAPI document handling in swagger.tsx and settings.ts for improved compatibility and clarity

This commit is contained in:
Mauricio Siu
2026-02-24 01:07:23 -06:00
parent 7c534d62b6
commit 331b12c7d8
31 changed files with 718 additions and 721 deletions
+2 -2
View File
@@ -55,7 +55,7 @@
"@codemirror/legacy-modes": "6.4.0", "@codemirror/legacy-modes": "6.4.0",
"@codemirror/view": "6.29.0", "@codemirror/view": "6.29.0",
"@dokploy/server": "workspace:*", "@dokploy/server": "workspace:*",
"@dokploy/trpc-openapi": "0.0.13", "@dokploy/trpc-openapi": "0.0.14",
"@faker-js/faker": "^8.4.1", "@faker-js/faker": "^8.4.1",
"@hookform/resolvers": "^5.2.2", "@hookform/resolvers": "^5.2.2",
"@octokit/auth-app": "^6.1.3", "@octokit/auth-app": "^6.1.3",
@@ -144,7 +144,7 @@
"ssh2": "1.15.0", "ssh2": "1.15.0",
"stripe": "17.2.0", "stripe": "17.2.0",
"superjson": "^2.2.2", "superjson": "^2.2.2",
"swagger-ui-react": "^5.31.1", "swagger-ui-react": "^5.31.2",
"tailwind-merge": "^2.6.0", "tailwind-merge": "^2.6.0",
"tailwindcss-animate": "^1.0.7", "tailwindcss-animate": "^1.0.7",
"toml": "3.0.0", "toml": "3.0.0",
+7 -1
View File
@@ -17,13 +17,19 @@ const Home: NextPage = () => {
useEffect(() => { useEffect(() => {
if (data) { if (data) {
const protocolAndHost = `${window.location.protocol}//${window.location.host}/api`; const protocolAndHost = `${window.location.protocol}//${window.location.host}/api`;
// Force OpenAPI 3.0 so Swagger UI uses the 3.0 parser (avoids ApiDOM 3.1 refract bug)
const newSpec = { const newSpec = {
...data, ...data,
openapi: "3.0.3",
servers: [{ url: protocolAndHost }], servers: [{ url: protocolAndHost }],
externalDocs: { externalDocs: {
url: `${protocolAndHost}/settings.getOpenApiDocument`, url: `${protocolAndHost}/trpc/settings.getOpenApiDocument`,
}, },
}; };
// Remove 3.1-only fields that could confuse the 3.0 parser
if ("jsonSchemaDialect" in newSpec) {
delete (newSpec as Record<string, unknown>).jsonSchemaDialect;
}
setSpec(newSpec); setSpec(newSpec);
} }
}, [data]); }, [data]);
+4 -4
View File
@@ -530,12 +530,12 @@ export const settingsRouter = createTRPCRouter({
getOpenApiDocument: protectedProcedure.query( getOpenApiDocument: protectedProcedure.query(
async ({ ctx }): Promise<unknown> => { async ({ ctx }): Promise<unknown> => {
const protocol = ctx.req.headers["x-forwarded-proto"]; const protocol = ctx.req.headers["x-forwarded-proto"];
const url = `${protocol}://${ctx.req.headers.host}/api`; const url = `${protocol}://${ctx.req.headers.host}/api/trpc`;
const openApiDocument = generateOpenApiDocument(appRouter, { const openApiDocument = generateOpenApiDocument(appRouter, {
title: "tRPC OpenAPI", title: "tRPC OpenAPI",
version: "1.0.0", version: packageInfo.version,
baseUrl: url, baseUrl: url,
docsUrl: `${url}/settings.getOpenApiDocument`, docsUrl: `${url}/trpc/settings.getOpenApiDocument`,
tags: [ tags: [
"admin", "admin",
"docker", "docker",
@@ -572,7 +572,7 @@ export const settingsRouter = createTRPCRouter({
openApiDocument.info = { openApiDocument.info = {
title: "Dokploy API", title: "Dokploy API",
description: "Endpoints for dokploy", description: "Endpoints for dokploy",
version: "1.0.0", version: packageInfo.version,
}; };
// Add security schemes configuration // Add security schemes configuration
+15 -15
View File
@@ -37,22 +37,22 @@ const createSchema = createInsertSchema(ai, {
isEnabled: z.boolean().optional(), isEnabled: z.boolean().optional(),
}); });
export const apiCreateAi = createSchema export const apiCreateAi = z.object({
.pick({ name: z.string().min(1, { message: "Name is required" }),
name: true, apiUrl: z.string().url({ message: "Please enter a valid URL" }),
apiUrl: true, apiKey: z.string(),
apiKey: true, model: z.string().min(1, { message: "Model is required" }),
model: true, isEnabled: z.boolean().optional(),
isEnabled: true, });
})
.required();
export const apiUpdateAi = createSchema export const apiUpdateAi = z.object({
.partial() aiId: z.string().min(1),
.extend({ name: z.string().min(1, { message: "Name is required" }).optional(),
aiId: z.string().min(1), apiUrl: z.string().url({ message: "Please enter a valid URL" }).optional(),
}) apiKey: z.string().optional(),
.omit({ organizationId: true }); model: z.string().min(1, { message: "Model is required" }).optional(),
isEnabled: z.boolean().optional(),
});
export const deploySuggestionSchema = z.object({ export const deploySuggestionSchema = z.object({
environmentId: z.string().min(1), environmentId: z.string().min(1),
+69 -6
View File
@@ -524,9 +524,72 @@ export const apiFindMonitoringStats = z.object({
appName: z.string().min(1), appName: z.string().min(1),
}); });
export const apiUpdateApplication = createSchema export const apiUpdateApplication = z.object({
.partial() applicationId: z.string().min(1),
.extend({ name: z.string().min(1).optional(),
applicationId: z.string().min(1), appName: z.string().optional(),
}) description: z.string().optional(),
.omit({ serverId: true }); env: z.string().optional(),
environmentId: z.string().optional(),
title: z.string().optional(),
subtitle: z.string().optional(),
enabled: z.boolean().optional(),
command: z.string().optional(),
args: z.array(z.string()).optional(),
memoryReservation: z.string().optional(),
memoryLimit: z.string().optional(),
cpuReservation: z.string().optional(),
cpuLimit: z.string().optional(),
buildArgs: z.string().optional(),
buildSecrets: z.string().optional(),
watchPaths: z.array(z.string()).optional(),
previewEnv: z.string().optional(),
previewBuildArgs: z.string().optional(),
previewBuildSecrets: z.string().optional(),
previewLabels: z.array(z.string()).optional(),
previewWildcard: z.string().optional(),
previewPort: z.number().optional(),
previewHttps: z.boolean().optional(),
previewPath: z.string().optional(),
previewLimit: z.number().optional(),
isPreviewDeploymentsActive: z.boolean().optional(),
previewRequireCollaboratorPermissions: z.boolean().optional(),
rollbackActive: z.boolean().optional(),
sourceType: z.enum(["docker", "git", "github", "gitlab", "bitbucket", "gitea", "drop"]).optional(),
cleanCache: z.boolean().optional(),
repository: z.string().optional(),
owner: z.string().optional(),
branch: z.string().optional(),
buildPath: z.string().optional(),
triggerType: z.enum(["push", "tag"]).optional(),
autoDeploy: z.boolean().optional(),
gitlabProjectId: z.number().optional(),
gitlabRepository: z.string().optional(),
gitlabOwner: z.string().optional(),
gitlabBranch: z.string().optional(),
gitlabBuildPath: z.string().optional(),
giteaRepository: z.string().optional(),
giteaOwner: z.string().optional(),
giteaBranch: z.string().optional(),
giteaBuildPath: z.string().optional(),
bitbucketRepository: z.string().optional(),
bitbucketRepositorySlug: z.string().optional(),
bitbucketOwner: z.string().optional(),
bitbucketBranch: z.string().optional(),
bitbucketBuildPath: z.string().optional(),
dockerImage: z.string().optional(),
username: z.string().optional(),
password: z.string().optional(),
registryUrl: z.string().optional(),
customGitUrl: z.string().optional(),
customGitBranch: z.string().optional(),
customGitBuildPath: z.string().optional(),
customGitSSHKeyId: z.string().optional(),
dockerfile: z.string().optional(),
dockerContextPath: z.string().optional(),
dockerBuildStage: z.string().optional(),
buildType: z.enum(["dockerfile", "heroku_buildpacks", "paketo_buildpacks", "nixpacks", "static", "railpack"]).optional(),
publishDirectory: z.string().optional(),
isStaticSpa: z.boolean().optional(),
createEnvFile: z.boolean().optional(),
});
+39 -32
View File
@@ -172,24 +172,26 @@ const createSchema = createInsertSchema(compose, {
watchPaths: z.array(z.string()).optional(), watchPaths: z.array(z.string()).optional(),
}); });
export const apiCreateCompose = createSchema.pick({ export const apiCreateCompose = z.object({
name: true, name: z.string().min(1),
description: true, description: z.string().optional(),
environmentId: true, environmentId: z.string().min(1),
composeType: true, composeType: z.enum(["docker-compose", "stack"]).optional(),
appName: true, appName: z
serverId: true, .string()
composeFile: true, .min(1)
.max(63)
.regex(APP_NAME_REGEX, APP_NAME_MESSAGE)
.optional(),
serverId: z.string().optional(),
composeFile: z.string().optional(),
}); });
export const apiCreateComposeByTemplate = createSchema export const apiCreateComposeByTemplate = z.object({
.pick({ environmentId: z.string().min(1),
environmentId: true, id: z.string().min(1),
}) serverId: z.string().optional(),
.extend({ });
id: z.string().min(1),
serverId: z.string().optional(),
});
export const apiFindCompose = z.object({ export const apiFindCompose = z.object({
composeId: z.string().min(1), composeId: z.string().min(1),
@@ -217,20 +219,25 @@ export const apiFetchServices = z.object({
type: z.enum(["fetch", "cache"]).optional().default("cache"), type: z.enum(["fetch", "cache"]).optional().default("cache"),
}); });
export const apiUpdateCompose = createSchema export const apiUpdateCompose = z.object({
.partial() composeId: z.string().min(1),
.extend({ composeFile: z.string().optional(),
composeId: z.string(), command: z.string().optional(),
composeFile: z.string().optional(), name: z.string().min(1).optional(),
command: z.string().optional(), description: z.string().optional(),
}) env: z.string().optional(),
.omit({ serverId: true }); appName: z.string().optional(),
environmentId: z.string().optional(),
composeType: z.enum(["docker-compose", "stack"]).optional(),
sourceType: z
.enum(["git", "github", "gitlab", "bitbucket", "gitea", "raw"])
.optional(),
triggerType: z.enum(["push", "tag"]).optional(),
watchPaths: z.array(z.string()).optional(),
composePath: z.string().min(1).optional(),
});
export const apiRandomizeCompose = createSchema export const apiRandomizeCompose = z.object({
.pick({ composeId: z.string().min(1),
composeId: true, suffix: z.string().optional(),
}) });
.extend({
suffix: z.string().optional(),
composeId: z.string().min(1),
});
+68 -106
View File
@@ -126,122 +126,84 @@ const schema = createInsertSchema(deployments, {
previewDeploymentId: z.string(), previewDeploymentId: z.string(),
buildServerId: z.string(), buildServerId: z.string(),
}); });
export const apiCreateDeployment = schema export const apiCreateDeployment = z.object({
.pick({ title: z.string().min(1),
title: true, status: z.string().default("running"),
status: true, logPath: z.string().min(1),
logPath: true, applicationId: z.string().min(1),
applicationId: true, description: z.string().optional(),
description: true, previewDeploymentId: z.string().optional(),
previewDeploymentId: true, });
})
.extend({
applicationId: z.string().min(1),
});
export const apiCreateDeploymentPreview = schema export const apiCreateDeploymentPreview = z.object({
.pick({ title: z.string().min(1),
title: true, status: z.string().default("running"),
status: true, logPath: z.string().min(1),
logPath: true, description: z.string().optional(),
description: true, previewDeploymentId: z.string().min(1),
previewDeploymentId: true, });
})
.extend({
previewDeploymentId: z.string().min(1),
});
export const apiCreateDeploymentCompose = schema export const apiCreateDeploymentCompose = z.object({
.pick({ title: z.string().min(1),
title: true, status: z.string().default("running"),
status: true, logPath: z.string().min(1),
logPath: true, composeId: z.string().min(1),
composeId: true, description: z.string().optional(),
description: true, });
})
.extend({
composeId: z.string().min(1),
});
export const apiCreateDeploymentBackup = schema export const apiCreateDeploymentBackup = z.object({
.pick({ title: z.string().min(1),
title: true, status: z.string().default("running"),
status: true, logPath: z.string().min(1),
logPath: true, backupId: z.string().min(1),
backupId: true, description: z.string().optional(),
description: true, });
})
.extend({
backupId: z.string().min(1),
});
export const apiCreateDeploymentServer = schema export const apiCreateDeploymentServer = z.object({
.pick({ title: z.string().min(1),
title: true, status: z.string().default("running"),
status: true, logPath: z.string().min(1),
logPath: true, serverId: z.string().min(1),
serverId: true, description: z.string().optional(),
description: true, });
})
.extend({
serverId: z.string().min(1),
});
export const apiCreateDeploymentSchedule = schema export const apiCreateDeploymentSchedule = z.object({
.pick({ title: z.string().min(1),
title: true, status: z.string().default("running"),
status: true, logPath: z.string().min(1),
logPath: true, description: z.string().optional(),
description: true, scheduleId: z.string().min(1),
}) });
.extend({
scheduleId: z.string().min(1),
});
export const apiCreateDeploymentVolumeBackup = schema export const apiCreateDeploymentVolumeBackup = z.object({
.pick({ title: z.string().min(1),
title: true, status: z.string().default("running"),
status: true, logPath: z.string().min(1),
logPath: true, description: z.string().optional(),
description: true, volumeBackupId: z.string().min(1),
}) });
.extend({
volumeBackupId: z.string().min(1),
});
export const apiFindAllByApplication = z.object({ export const apiFindAllByApplication = z.object({
applicationId: z.string().min(1), applicationId: z.string().min(1),
}); });
export const apiFindAllByCompose = schema export const apiFindAllByCompose = z.object({
.pick({ composeId: z.string().min(1),
composeId: true, });
})
.extend({
composeId: z.string().min(1),
})
.required();
export const apiFindAllByServer = schema export const apiFindAllByServer = z.object({
.pick({ serverId: z.string().min(1),
serverId: true, });
})
.extend({
serverId: z.string().min(1),
})
.required();
export const apiFindAllByType = z export const apiFindAllByType = z.object({
.object({ id: z.string().min(1),
id: z.string().min(1), type: z.enum([
type: z.enum([ "application",
"application", "compose",
"compose", "server",
"server", "schedule",
"schedule", "previewDeployment",
"previewDeployment", "backup",
"backup", "volumeBackup",
"volumeBackup", ]),
]), });
})
.required();
+24 -34
View File
@@ -46,43 +46,33 @@ const createSchema = createInsertSchema(destinations, {
region: z.string(), region: z.string(),
}); });
export const apiCreateDestination = createSchema export const apiCreateDestination = z.object({
.pick({ name: z.string().min(1),
name: true, provider: z.string(),
provider: true, accessKey: z.string(),
accessKey: true, bucket: z.string(),
bucket: true, region: z.string(),
region: true, endpoint: z.string(),
endpoint: true, secretAccessKey: z.string(),
secretAccessKey: true, serverId: z.string().optional(),
}) });
.required()
.extend({
serverId: z.string().optional(),
});
export const apiFindOneDestination = z.object({ export const apiFindOneDestination = z.object({
destinationId: z.string().min(1), destinationId: z.string().min(1),
}); });
export const apiRemoveDestination = createSchema export const apiRemoveDestination = z.object({
.pick({ destinationId: z.string().min(1),
destinationId: true, });
})
.required();
export const apiUpdateDestination = createSchema export const apiUpdateDestination = z.object({
.pick({ destinationId: z.string().min(1),
name: true, name: z.string().min(1).optional(),
accessKey: true, accessKey: z.string().optional(),
bucket: true, bucket: z.string().optional(),
region: true, region: z.string().optional(),
endpoint: true, endpoint: z.string().optional(),
secretAccessKey: true, provider: z.string().optional(),
destinationId: true, secretAccessKey: z.string().optional(),
provider: true, serverId: z.string().optional(),
}) });
.required()
.extend({
serverId: z.string().optional(),
});
+23 -40
View File
@@ -1,6 +1,5 @@
import { relations } from "drizzle-orm"; import { relations } from "drizzle-orm";
import { boolean, pgTable, text } from "drizzle-orm/pg-core"; import { boolean, pgTable, text } from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
import { applications } from "./application"; import { applications } from "./application";
@@ -46,46 +45,30 @@ export const environmentRelations = relations(
}), }),
); );
const createSchema = createInsertSchema(environments, { export const apiCreateEnvironment = z.object({
name: z.string().min(1),
description: z.string().optional(),
projectId: z.string().min(1),
});
export const apiFindOneEnvironment = z.object({
environmentId: z.string().min(1),
});
export const apiRemoveEnvironment = z.object({
environmentId: z.string().min(1),
});
export const apiUpdateEnvironment = z.object({
environmentId: z.string().min(1),
name: z.string().min(1).optional(),
description: z.string().optional(),
projectId: z.string().optional(),
env: z.string().optional(),
});
export const apiDuplicateEnvironment = z.object({
environmentId: z.string().min(1), environmentId: z.string().min(1),
name: z.string().min(1), name: z.string().min(1),
description: z.string().optional(), description: z.string().optional(),
}); });
export const apiCreateEnvironment = createSchema.pick({
name: true,
description: true,
projectId: true,
});
export const apiFindOneEnvironment = createSchema
.pick({
environmentId: true,
})
.required();
export const apiRemoveEnvironment = createSchema
.pick({
environmentId: true,
})
.required();
export const apiUpdateEnvironment = createSchema
.partial()
.extend({
environmentId: z.string().min(1),
})
.omit({
isDefault: true,
});
export const apiDuplicateEnvironment = createSchema
.pick({
environmentId: true,
name: true,
description: true,
})
.required({
environmentId: true,
name: true,
});
@@ -1,6 +1,5 @@
import { relations } from "drizzle-orm"; import { relations } from "drizzle-orm";
import { pgEnum, pgTable, text } from "drizzle-orm/pg-core"; import { pgEnum, pgTable, text } from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
import { organization } from "./account"; import { organization } from "./account";
@@ -62,10 +61,6 @@ export const gitProviderRelations = relations(gitProvider, ({ one }) => ({
}), }),
})); }));
const createSchema = createInsertSchema(gitProvider); export const apiRemoveGitProvider = z.object({
gitProviderId: z.string().min(1),
export const apiRemoveGitProvider = createSchema });
.extend({
gitProviderId: z.string().min(1),
})
.pick({ gitProviderId: true });
+5 -9
View File
@@ -1,6 +1,5 @@
import { relations } from "drizzle-orm"; import { relations } from "drizzle-orm";
import { integer, pgTable, text } from "drizzle-orm/pg-core"; import { integer, pgTable, text } from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
import { gitProvider } from "./git-provider"; import { gitProvider } from "./git-provider";
@@ -29,8 +28,7 @@ export const githubProviderRelations = relations(github, ({ one }) => ({
}), }),
})); }));
const createSchema = createInsertSchema(github); export const apiCreateGithub = z.object({
export const apiCreateGithub = createSchema.extend({
githubAppName: z.string().optional(), githubAppName: z.string().optional(),
githubAppId: z.number().optional(), githubAppId: z.number().optional(),
githubClientId: z.string().optional(), githubClientId: z.string().optional(),
@@ -48,13 +46,11 @@ export const apiFindGithubBranches = z.object({
githubId: z.string().optional(), githubId: z.string().optional(),
}); });
export const apiFindOneGithub = createSchema export const apiFindOneGithub = z.object({
.extend({ githubId: z.string().min(1),
githubId: z.string().min(1), });
})
.pick({ githubId: true });
export const apiUpdateGithub = createSchema.extend({ export const apiUpdateGithub = z.object({
githubId: z.string().min(1), githubId: z.string().min(1),
name: z.string().min(1), name: z.string().min(1),
gitProviderId: z.string().min(1), gitProviderId: z.string().min(1),
+9 -15
View File
@@ -1,6 +1,5 @@
import { relations } from "drizzle-orm"; import { relations } from "drizzle-orm";
import { integer, pgTable, text } from "drizzle-orm/pg-core"; import { integer, pgTable, text } from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
import { gitProvider } from "./git-provider"; import { gitProvider } from "./git-provider";
@@ -31,9 +30,7 @@ export const gitlabProviderRelations = relations(gitlab, ({ one }) => ({
}), }),
})); }));
const createSchema = createInsertSchema(gitlab); export const apiCreateGitlab = z.object({
export const apiCreateGitlab = createSchema.extend({
applicationId: z.string().optional(), applicationId: z.string().optional(),
secret: z.string().optional(), secret: z.string().optional(),
groupName: z.string().optional(), groupName: z.string().optional(),
@@ -45,17 +42,14 @@ export const apiCreateGitlab = createSchema.extend({
gitlabInternalUrl: z.string().optional().nullable(), gitlabInternalUrl: z.string().optional().nullable(),
}); });
export const apiFindOneGitlab = createSchema export const apiFindOneGitlab = z.object({
.extend({ gitlabId: z.string().min(1),
gitlabId: z.string().min(1), });
})
.pick({ gitlabId: true });
export const apiGitlabTestConnection = createSchema export const apiGitlabTestConnection = z.object({
.extend({ gitlabId: z.string().min(1),
groupName: z.string().optional(), groupName: z.string().optional(),
}) });
.pick({ gitlabId: true, groupName: true });
export const apiFindGitlabBranches = z.object({ export const apiFindGitlabBranches = z.object({
id: z.number().optional(), id: z.number().optional(),
@@ -64,7 +58,7 @@ export const apiFindGitlabBranches = z.object({
gitlabId: z.string().optional(), gitlabId: z.string().optional(),
}); });
export const apiUpdateGitlab = createSchema.extend({ export const apiUpdateGitlab = z.object({
applicationId: z.string().optional(), applicationId: z.string().optional(),
secret: z.string().optional(), secret: z.string().optional(),
groupName: z.string().optional(), groupName: z.string().optional(),
+21 -6
View File
@@ -198,12 +198,27 @@ export const apiResetMariadb = createSchema
}) })
.required(); .required();
export const apiUpdateMariaDB = createSchema export const apiUpdateMariaDB = z.object({
.partial() mariadbId: z.string().min(1),
.extend({ name: z.string().min(1).optional(),
mariadbId: z.string().min(1), appName: z.string().optional(),
}) description: z.string().optional(),
.omit({ serverId: true }); dockerImage: z.string().optional(),
command: z.string().optional(),
args: z.array(z.string()).optional(),
env: z.string().optional(),
databaseName: z.string().min(1).optional(),
databaseUser: z.string().min(1).optional(),
databasePassword: z.string().optional(),
databaseRootPassword: z.string().optional(),
memoryReservation: z.string().optional(),
memoryLimit: z.string().optional(),
cpuReservation: z.string().optional(),
cpuLimit: z.string().optional(),
externalPort: z.number().optional(),
applicationStatus: z.enum(["idle", "running", "done", "error"]).optional(),
environmentId: z.string().optional(),
});
export const apiRebuildMariadb = createSchema export const apiRebuildMariadb = createSchema
.pick({ .pick({
+64 -50
View File
@@ -144,65 +144,79 @@ const createSchema = createInsertSchema(mongo, {
ulimitsSwarm: UlimitsSwarmSchema.nullable(), ulimitsSwarm: UlimitsSwarmSchema.nullable(),
}); });
export const apiCreateMongo = createSchema.pick({ const mongoPasswordSchema = z
name: true, .string()
appName: true, .regex(/^[a-zA-Z0-9@#%^&*()_+\-=[\]{}|;:,.<>?~`]*$/, {
dockerImage: true, message:
environmentId: true, "Password contains invalid characters. Please avoid: $ ! ' \" \\ / and space characters for database compatibility",
description: true, });
databaseUser: true,
databasePassword: true, export const apiCreateMongo = z.object({
serverId: true, name: z.string().min(1),
replicaSets: true, appName: z
.string()
.min(1)
.max(63)
.regex(APP_NAME_REGEX, APP_NAME_MESSAGE)
.optional(),
dockerImage: z.string().default("mongo:15"),
environmentId: z.string().min(1),
description: z.string().optional(),
databaseUser: z.string().min(1),
databasePassword: mongoPasswordSchema,
serverId: z.string().optional(),
replicaSets: z.boolean().default(false),
}); });
export const apiFindOneMongo = z.object({ export const apiFindOneMongo = z.object({
mongoId: z.string().min(1), mongoId: z.string().min(1),
}); });
export const apiChangeMongoStatus = createSchema export const apiChangeMongoStatus = z.object({
.pick({ mongoId: z.string().min(1),
mongoId: true, applicationStatus: z.enum(["idle", "running", "done", "error"]),
applicationStatus: true, });
})
.required();
export const apiSaveEnvironmentVariablesMongo = createSchema export const apiSaveEnvironmentVariablesMongo = z.object({
.pick({ mongoId: z.string().min(1),
mongoId: true, env: z.string().optional(),
env: true, });
})
.required();
export const apiSaveExternalPortMongo = createSchema export const apiSaveExternalPortMongo = z.object({
.pick({ mongoId: z.string().min(1),
mongoId: true, externalPort: z.number(),
externalPort: true, });
})
.required();
export const apiDeployMongo = createSchema export const apiDeployMongo = z.object({
.pick({ mongoId: z.string().min(1),
mongoId: true, });
})
.required();
export const apiUpdateMongo = createSchema export const apiUpdateMongo = z.object({
.partial() mongoId: z.string().min(1),
.extend({ name: z.string().min(1).optional(),
mongoId: z.string().min(1), appName: z.string().optional(),
}) description: z.string().optional(),
.omit({ serverId: true }); dockerImage: z.string().optional(),
command: z.string().optional(),
args: z.array(z.string()).optional(),
env: z.string().optional(),
databaseUser: z.string().min(1).optional(),
databasePassword: mongoPasswordSchema.optional(),
memoryReservation: z.string().optional(),
memoryLimit: z.string().optional(),
cpuReservation: z.string().optional(),
cpuLimit: z.string().optional(),
externalPort: z.number().optional(),
applicationStatus: z.enum(["idle", "running", "done", "error"]).optional(),
environmentId: z.string().optional(),
replicaSets: z.boolean().optional(),
});
export const apiResetMongo = createSchema export const apiResetMongo = z.object({
.pick({ mongoId: z.string().min(1),
mongoId: true, appName: z.string().min(1),
appName: true, });
})
.required();
export const apiRebuildMongo = createSchema export const apiRebuildMongo = z.object({
.pick({ mongoId: z.string().min(1),
mongoId: true, });
})
.required();
+47 -38
View File
@@ -116,45 +116,54 @@ export type ServiceType = NonNullable<
z.infer<typeof createSchema>["serviceType"] z.infer<typeof createSchema>["serviceType"]
>; >;
export const apiCreateMount = createSchema const serviceTypeEnum = z.enum([
.pick({ "application",
type: true, "postgres",
hostPath: true, "mysql",
volumeName: true, "mariadb",
content: true, "mongo",
mountPath: true, "redis",
serviceType: true, "compose",
filePath: true, ]);
})
.extend({
serviceId: z.string().min(1),
});
export const apiFindOneMount = createSchema export const apiCreateMount = z.object({
.pick({ type: z.enum(["bind", "volume", "file"]),
mountId: true, hostPath: z.string().optional(),
}) volumeName: z.string().optional(),
.required(); content: z.string().optional(),
mountPath: z.string().min(1),
serviceType: serviceTypeEnum.default("application"),
filePath: z.string().optional(),
serviceId: z.string().min(1),
});
export const apiRemoveMount = createSchema export const apiFindOneMount = z.object({
.pick({
mountId: true,
})
// .extend({
// appName: z.string().min(1),
// })
.required();
export const apiFindMountByApplicationId = createSchema
.extend({
serviceId: z.string().min(1),
})
.pick({
serviceId: true,
serviceType: true,
})
.required();
export const apiUpdateMount = createSchema.partial().extend({
mountId: z.string().min(1), mountId: z.string().min(1),
}); });
export const apiRemoveMount = z.object({
mountId: z.string().min(1),
});
export const apiFindMountByApplicationId = z.object({
serviceId: z.string().min(1),
serviceType: serviceTypeEnum,
});
export const apiUpdateMount = z.object({
mountId: z.string().min(1),
type: z.enum(["bind", "volume", "file"]).optional(),
hostPath: z.string().optional(),
volumeName: z.string().optional(),
filePath: z.string().optional(),
content: z.string().optional(),
serviceType: serviceTypeEnum.optional(),
mountPath: z.string().min(1).optional(),
applicationId: z.string().optional(),
postgresId: z.string().optional(),
mariadbId: z.string().optional(),
mongoId: z.string().optional(),
mysqlId: z.string().optional(),
redisId: z.string().optional(),
composeId: z.string().optional(),
});
+66 -51
View File
@@ -144,66 +144,81 @@ const createSchema = createInsertSchema(mysql, {
ulimitsSwarm: UlimitsSwarmSchema.nullable(), ulimitsSwarm: UlimitsSwarmSchema.nullable(),
}); });
export const apiCreateMySql = createSchema.pick({ const mysqlPasswordSchema = z
name: true, .string()
appName: true, .regex(/^[a-zA-Z0-9@#%^&*()_+\-=[\]{}|;:,.<>?~`]*$/, {
dockerImage: true, message:
environmentId: true, "Password contains invalid characters. Please avoid: $ ! ' \" \\ / and space characters for database compatibility",
description: true, });
databaseName: true,
databaseUser: true, export const apiCreateMySql = z.object({
databasePassword: true, name: z.string().min(1),
databaseRootPassword: true, appName: z
serverId: true, .string()
.min(1)
.max(63)
.regex(APP_NAME_REGEX, APP_NAME_MESSAGE)
.optional(),
dockerImage: z.string().default("mysql:8"),
environmentId: z.string().min(1),
description: z.string().optional(),
databaseName: z.string().min(1),
databaseUser: z.string().min(1),
databasePassword: mysqlPasswordSchema,
databaseRootPassword: mysqlPasswordSchema.optional(),
serverId: z.string().optional(),
}); });
export const apiFindOneMySql = z.object({ export const apiFindOneMySql = z.object({
mysqlId: z.string().min(1), mysqlId: z.string().min(1),
}); });
export const apiChangeMySqlStatus = createSchema export const apiChangeMySqlStatus = z.object({
.pick({ mysqlId: z.string().min(1),
mysqlId: true, applicationStatus: z.enum(["idle", "running", "done", "error"]),
applicationStatus: true, });
})
.required();
export const apiSaveEnvironmentVariablesMySql = createSchema export const apiSaveEnvironmentVariablesMySql = z.object({
.pick({ mysqlId: z.string().min(1),
mysqlId: true, env: z.string().optional(),
env: true, });
})
.required();
export const apiSaveExternalPortMySql = createSchema export const apiSaveExternalPortMySql = z.object({
.pick({ mysqlId: z.string().min(1),
mysqlId: true, externalPort: z.number(),
externalPort: true, });
})
.required();
export const apiResetMysql = createSchema export const apiResetMysql = z.object({
.pick({ mysqlId: z.string().min(1),
mysqlId: true, appName: z.string().min(1),
appName: true, });
})
.required();
export const apiDeployMySql = createSchema export const apiDeployMySql = z.object({
.pick({ mysqlId: z.string().min(1),
mysqlId: true, });
})
.required();
export const apiUpdateMySql = createSchema export const apiUpdateMySql = z.object({
.partial() mysqlId: z.string().min(1),
.extend({ name: z.string().min(1).optional(),
mysqlId: z.string().min(1), appName: z.string().optional(),
}) description: z.string().optional(),
.omit({ serverId: true }); dockerImage: z.string().optional(),
command: z.string().optional(),
args: z.array(z.string()).optional(),
env: z.string().optional(),
databaseName: z.string().min(1).optional(),
databaseUser: z.string().min(1).optional(),
databasePassword: mysqlPasswordSchema.optional(),
databaseRootPassword: mysqlPasswordSchema.optional(),
memoryReservation: z.string().optional(),
memoryLimit: z.string().optional(),
cpuReservation: z.string().optional(),
cpuLimit: z.string().optional(),
externalPort: z.number().optional(),
applicationStatus: z.enum(["idle", "running", "done", "error"]).optional(),
environmentId: z.string().optional(),
});
export const apiRebuildMysql = createSchema export const apiRebuildMysql = z.object({
.pick({ mysqlId: z.string().min(1),
mysqlId: true, });
})
.required();
@@ -464,11 +464,9 @@ export const apiTestNtfyConnection = apiCreateNtfy.pick({
priority: true, priority: true,
}); });
export const apiFindOneNotification = notificationsSchema export const apiFindOneNotification = z.object({
.pick({ notificationId: z.string().min(1),
notificationId: true, });
})
.required();
export const apiCreateCustom = notificationsSchema export const apiCreateCustom = notificationsSchema
.pick({ .pick({
+14 -13
View File
@@ -62,13 +62,13 @@ const createSchema = createInsertSchema(patch, {
composeId: z.string().optional(), composeId: z.string().optional(),
}); });
export const apiCreatePatch = createSchema.pick({ export const apiCreatePatch = z.object({
filePath: true, filePath: z.string().min(1),
content: true, content: z.string(),
type: true, type: z.enum(["create", "update", "delete"]).optional(),
enabled: true, enabled: z.boolean().optional(),
applicationId: true, applicationId: z.string().optional(),
composeId: true, composeId: z.string().optional(),
}); });
export const apiFindPatch = z.object({ export const apiFindPatch = z.object({
@@ -83,12 +83,13 @@ export const apiFindPatchesByComposeId = z.object({
composeId: z.string().min(1), composeId: z.string().min(1),
}); });
export const apiUpdatePatch = createSchema export const apiUpdatePatch = z.object({
.partial() patchId: z.string().min(1),
.extend({ filePath: z.string().min(1).optional(),
patchId: z.string().min(1), content: z.string().optional(),
}) type: z.enum(["create", "update", "delete"]).optional(),
.omit({ applicationId: true, composeId: true }); enabled: z.boolean().optional(),
});
export const apiDeletePatch = z.object({ export const apiDeletePatch = z.object({
patchId: z.string().min(1), patchId: z.string().min(1),
+17 -23
View File
@@ -39,28 +39,22 @@ const createSchema = createInsertSchema(ports, {
protocol: z.enum(["tcp", "udp"]).default("tcp"), protocol: z.enum(["tcp", "udp"]).default("tcp"),
}); });
export const apiCreatePort = createSchema export const apiCreatePort = z.object({
.pick({ publishedPort: z.number(),
publishedPort: true, publishMode: z.enum(["ingress", "host"]).default("ingress"),
publishMode: true, targetPort: z.number(),
targetPort: true, protocol: z.enum(["tcp", "udp"]).default("tcp"),
protocol: true, applicationId: z.string().min(1),
applicationId: true, });
})
.required();
export const apiFindOnePort = createSchema export const apiFindOnePort = z.object({
.pick({ portId: z.string().min(1),
portId: true, });
})
.required();
export const apiUpdatePort = createSchema export const apiUpdatePort = z.object({
.pick({ portId: z.string().min(1),
portId: true, publishedPort: z.number(),
publishedPort: true, publishMode: z.enum(["ingress", "host"]),
publishMode: true, targetPort: z.number(),
targetPort: true, protocol: z.enum(["tcp", "udp"]),
protocol: true, });
})
.required();
+20 -6
View File
@@ -188,12 +188,26 @@ export const apiResetPostgres = createSchema
}) })
.required(); .required();
export const apiUpdatePostgres = createSchema export const apiUpdatePostgres = z.object({
.partial() postgresId: z.string().min(1),
.extend({ name: z.string().min(1).optional(),
postgresId: z.string().min(1), appName: z.string().optional(),
}) description: z.string().optional(),
.omit({ serverId: true }); dockerImage: z.string().optional(),
command: z.string().optional(),
args: z.array(z.string()).optional(),
env: z.string().optional(),
databaseName: z.string().min(1).optional(),
databaseUser: z.string().min(1).optional(),
databasePassword: z.string().optional(),
memoryReservation: z.string().optional(),
memoryLimit: z.string().optional(),
cpuReservation: z.string().optional(),
cpuLimit: z.string().optional(),
externalPort: z.number().optional(),
applicationStatus: z.enum(["idle", "running", "done", "error"]).optional(),
environmentId: z.string().optional(),
});
export const apiRebuildPostgres = createSchema export const apiRebuildPostgres = createSchema
.pick({ .pick({
@@ -58,17 +58,12 @@ export const createSchema = createInsertSchema(previewDeployments, {
applicationId: z.string(), applicationId: z.string(),
}); });
export const apiCreatePreviewDeployment = createSchema export const apiCreatePreviewDeployment = z.object({
.pick({ applicationId: z.string().min(1),
applicationId: true, domainId: z.string().optional(),
domainId: true, branch: z.string().min(1),
branch: true, pullRequestId: z.string().min(1),
pullRequestId: true, pullRequestNumber: z.string().min(1),
pullRequestNumber: true, pullRequestURL: z.string().min(1),
pullRequestURL: true, pullRequestTitle: z.string().min(1),
pullRequestTitle: true, });
})
.extend({
applicationId: z.string().min(1),
// deploymentId: z.string().min(1),
});
+12 -21
View File
@@ -37,32 +37,23 @@ const createSchema = createInsertSchema(projects, {
description: z.string().optional(), description: z.string().optional(),
}); });
export const apiCreateProject = createSchema.pick({ export const apiCreateProject = z.object({
name: true, name: z.string().min(1),
description: true, description: z.string().optional(),
env: true, env: z.string(),
}); });
export const apiFindOneProject = z.object({ export const apiFindOneProject = z.object({
projectId: z.string().min(1), projectId: z.string().min(1),
}); });
export const apiRemoveProject = createSchema export const apiRemoveProject = z.object({
.pick({
projectId: true,
})
.required();
// export const apiUpdateProject = createSchema
// .pick({
// name: true,
// description: true,
// projectId: true,
// env: true,
// })
// .required();
export const apiUpdateProject = createSchema.partial().extend({
projectId: z.string().min(1), projectId: z.string().min(1),
}); });
// .omit({ serverId: true });
export const apiUpdateProject = z.object({
projectId: z.string().min(1),
name: z.string().min(1).optional(),
description: z.string().optional(),
env: z.string().optional(),
});
+3 -5
View File
@@ -35,11 +35,9 @@ const createSchema = createInsertSchema(redirects, {
permanent: z.boolean().optional(), permanent: z.boolean().optional(),
}); });
export const apiFindOneRedirect = createSchema export const apiFindOneRedirect = z.object({
.pick({ redirectId: z.string().min(1),
redirectId: true, });
})
.required();
export const apiCreateRedirect = createSchema export const apiCreateRedirect = createSchema
.pick({ .pick({
+18 -6
View File
@@ -174,12 +174,24 @@ export const apiResetRedis = createSchema
}) })
.required(); .required();
export const apiUpdateRedis = createSchema export const apiUpdateRedis = z.object({
.partial() redisId: z.string().min(1),
.extend({ name: z.string().min(1).optional(),
redisId: z.string().min(1), appName: z.string().optional(),
}) description: z.string().optional(),
.omit({ serverId: true }); dockerImage: z.string().optional(),
command: z.string().optional(),
args: z.array(z.string()).optional(),
env: z.string().optional(),
databasePassword: z.string().optional(),
memoryReservation: z.string().optional(),
memoryLimit: z.string().optional(),
cpuReservation: z.string().optional(),
cpuLimit: z.string().optional(),
externalPort: z.number().optional(),
applicationStatus: z.enum(["idle", "running", "done", "error"]).optional(),
environmentId: z.string().optional(),
});
export const apiRebuildRedis = createSchema export const apiRebuildRedis = createSchema
.pick({ .pick({
+3 -5
View File
@@ -94,11 +94,9 @@ export const apiRemoveRegistry = createSchema
}) })
.required(); .required();
export const apiFindOneRegistry = createSchema export const apiFindOneRegistry = z.object({
.pick({ registryId: z.string().min(1),
registryId: true, });
})
.required();
export const apiUpdateRegistry = createSchema.partial().extend({ export const apiUpdateRegistry = createSchema.partial().extend({
registryId: z.string().min(1), registryId: z.string().min(1),
+13 -19
View File
@@ -38,24 +38,18 @@ const createSchema = createInsertSchema(security, {
password: z.string().min(1), password: z.string().min(1),
}); });
export const apiFindOneSecurity = createSchema export const apiFindOneSecurity = z.object({
.pick({ securityId: z.string().min(1),
securityId: true, });
})
.required();
export const apiCreateSecurity = createSchema export const apiCreateSecurity = z.object({
.pick({ applicationId: z.string().min(1),
applicationId: true, username: z.string().min(1),
username: true, password: z.string().min(1),
password: true, });
})
.required();
export const apiUpdateSecurity = createSchema export const apiUpdateSecurity = z.object({
.pick({ securityId: z.string().min(1),
securityId: true, username: z.string().min(1),
username: true, password: z.string().min(1),
password: true, });
})
.required();
+47 -71
View File
@@ -7,7 +7,6 @@ import {
pgTable, pgTable,
text, text,
} from "drizzle-orm/pg-core"; } from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
import { organization } from "./account"; import { organization } from "./account";
@@ -129,82 +128,59 @@ export const serverRelations = relations(server, ({ one, many }) => ({
schedules: many(schedules), schedules: many(schedules),
})); }));
const createSchema = createInsertSchema(server, { export const apiCreateServer = z.object({
serverId: z.string().min(1),
name: z.string().min(1), name: z.string().min(1),
description: z.string().optional(), description: z.string().optional(),
// Override pgEnums so Zod 4 infers only string literals, not numeric enum indices ipAddress: z.string().min(1),
port: z.number(),
username: z.string().min(1),
sshKeyId: z.string().optional(),
serverType: z.enum(["deploy", "build"]).optional(), serverType: z.enum(["deploy", "build"]).optional(),
serverStatus: z.enum(["active", "inactive"]).optional(),
}); });
export const apiCreateServer = createSchema export const apiFindOneServer = z.object({
.pick({ serverId: z.string().min(1),
name: true, });
description: true,
ipAddress: true,
port: true,
username: true,
sshKeyId: true,
serverType: true,
})
.required();
export const apiFindOneServer = createSchema export const apiRemoveServer = z.object({
.pick({ serverId: z.string().min(1),
serverId: true, });
})
.required();
export const apiRemoveServer = createSchema export const apiUpdateServer = z.object({
.pick({ serverId: z.string().min(1),
serverId: true, name: z.string().min(1).optional(),
}) description: z.string().optional(),
.required(); ipAddress: z.string().min(1).optional(),
port: z.number().optional(),
username: z.string().min(1).optional(),
sshKeyId: z.string().optional(),
serverType: z.enum(["deploy", "build"]).optional(),
command: z.string().optional(),
});
export const apiUpdateServer = createSchema const metricsConfigSchema = z.object({
.pick({ server: z.object({
name: true, refreshRate: z.number().min(2),
description: true, port: z.number().min(1),
serverId: true, token: z.string(),
ipAddress: true, urlCallback: z.string().url(),
port: true, retentionDays: z.number().min(1),
username: true, cronJob: z.string().min(1),
sshKeyId: true, thresholds: z.object({
}) cpu: z.number().min(0),
.required() memory: z.number().min(0),
.extend({ }),
serverType: z.enum(["deploy", "build"]), }),
command: z.string().optional(), containers: z.object({
}); refreshRate: z.number().min(2),
services: z.object({
include: z.array(z.string()).optional(),
exclude: z.array(z.string()).optional(),
}),
}),
});
export const apiUpdateServerMonitoring = createSchema export const apiUpdateServerMonitoring = z.object({
.pick({ serverId: z.string().min(1),
serverId: true, metricsConfig: metricsConfigSchema,
}) });
.required()
.extend({
metricsConfig: z
.object({
server: z.object({
refreshRate: z.number().min(2),
port: z.number().min(1),
token: z.string(),
urlCallback: z.string().url(),
retentionDays: z.number().min(1),
cronJob: z.string().min(1),
thresholds: z.object({
cpu: z.number().min(0),
memory: z.number().min(0),
}),
}),
containers: z.object({
refreshRate: z.number().min(2),
services: z.object({
include: z.array(z.string()).optional(),
exclude: z.array(z.string()).optional(),
}),
}),
})
.required(),
});
+21 -40
View File
@@ -1,7 +1,7 @@
import { relations } from "drizzle-orm"; import { relations } from "drizzle-orm";
import { pgTable, text } from "drizzle-orm/pg-core"; import { pgTable, text } from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod";
import { sshKeyCreate, sshKeyType } from "../validations"; import { sshKeyCreate, sshKeyType } from "../validations";
import { organization } from "./account"; import { organization } from "./account";
import { applications } from "./application"; import { applications } from "./application";
@@ -36,47 +36,28 @@ export const sshKeysRelations = relations(sshKeys, ({ many, one }) => ({
}), }),
})); }));
const createSchema = createInsertSchema( export const apiCreateSshKey = z
sshKeys, .object({
/* Private key is not stored in the DB */ name: z.string().min(1),
sshKeyCreate.omit({ privateKey: true }).shape, description: z.string().optional(),
); organizationId: z.string().min(1),
publicKey: sshKeyCreate.shape.publicKey,
privateKey: sshKeyCreate.shape.privateKey,
});
export const apiCreateSshKey = createSchema export const apiFindOneSshKey = z.object({
.pick({ sshKeyId: z.string().min(1),
name: true, });
description: true,
privateKey: true,
publicKey: true,
organizationId: true,
})
.merge(sshKeyCreate.pick({ privateKey: true }));
export const apiFindOneSshKey = createSchema
.pick({
sshKeyId: true,
})
.required();
export const apiGenerateSSHKey = sshKeyType; export const apiGenerateSSHKey = sshKeyType;
export const apiRemoveSshKey = createSchema export const apiRemoveSshKey = z.object({
.pick({ sshKeyId: z.string().min(1),
sshKeyId: true, });
})
.required();
export const apiUpdateSshKey = createSchema export const apiUpdateSshKey = z.object({
.pick({ sshKeyId: z.string().min(1),
name: true, name: z.string().optional(),
description: true, description: z.string().optional(),
lastUsedAt: true, lastUsedAt: z.string().optional(),
}) });
.partial()
.merge(
createSchema
.pick({
sshKeyId: true,
})
.required(),
);
+29 -65
View File
@@ -7,7 +7,6 @@ import {
text, text,
timestamp, timestamp,
} from "drizzle-orm/pg-core"; } from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
import { account, apikey, organization } from "./account"; import { account, apikey, organization } from "./account";
@@ -81,76 +80,41 @@ export const usersRelations = relations(user, ({ one, many }) => ({
schedules: many(schedules), schedules: many(schedules),
})); }));
const createSchema = createInsertSchema(user, { export const apiCreateUserInvitation = z.object({
id: z.string().min(1),
isRegistered: z.boolean().optional(),
}).omit({
role: true,
trustedOrigins: true,
isValidEnterpriseLicense: true,
});
export const apiCreateUserInvitation = createSchema.pick({}).extend({
email: z.string().email(), email: z.string().email(),
}); });
export const apiRemoveUser = createSchema export const apiRemoveUser = z.object({
.pick({ id: z.string().min(1),
id: true, });
})
.required();
export const apiFindOneToken = createSchema export const apiFindOneToken = z.object({
.pick({}) token: z.string().min(1),
.required() });
.extend({
token: z.string().min(1),
});
export const apiAssignPermissions = createSchema export const apiAssignPermissions = z.object({
.pick({ id: z.string().min(1),
id: true, accessedProjects: z.array(z.string()).optional(),
// canCreateProjects: true, accessedEnvironments: z.array(z.string()).optional(),
// canCreateServices: true, accessedServices: z.array(z.string()).optional(),
// canDeleteProjects: true, canCreateProjects: z.boolean().optional(),
// canDeleteServices: true, canCreateServices: z.boolean().optional(),
// accessedProjects: true, canDeleteProjects: z.boolean().optional(),
// accessedServices: true, canDeleteServices: z.boolean().optional(),
// canAccessToTraefikFiles: true, canAccessToDocker: z.boolean().optional(),
// canAccessToDocker: true, canAccessToTraefikFiles: z.boolean().optional(),
// canAccessToAPI: true, canAccessToAPI: z.boolean().optional(),
// canAccessToSSHKeys: true, canAccessToSSHKeys: z.boolean().optional(),
// canAccessToGitProviders: true, canAccessToGitProviders: z.boolean().optional(),
}) canDeleteEnvironments: z.boolean().optional(),
.extend({ canCreateEnvironments: z.boolean().optional(),
accessedProjects: z.array(z.string()).optional(), });
accessedEnvironments: z.array(z.string()).optional(),
accessedServices: z.array(z.string()).optional(),
canCreateProjects: z.boolean().optional(),
canCreateServices: z.boolean().optional(),
canDeleteProjects: z.boolean().optional(),
canDeleteServices: z.boolean().optional(),
canAccessToDocker: z.boolean().optional(),
canAccessToTraefikFiles: z.boolean().optional(),
canAccessToAPI: z.boolean().optional(),
canAccessToSSHKeys: z.boolean().optional(),
canAccessToGitProviders: z.boolean().optional(),
canDeleteEnvironments: z.boolean().optional(),
canCreateEnvironments: z.boolean().optional(),
})
.required();
export const apiFindOneUser = createSchema export const apiFindOneUser = z.object({
.pick({ id: z.string().min(1),
id: true, });
})
.required();
export const apiFindOneUserByAuth = createSchema export const apiFindOneUserByAuth = z.object({});
.pick({
// authId: true,
})
.required();
export const apiTraefikConfig = z.object({ export const apiTraefikConfig = z.object({
traefikConfig: z.string().min(1), traefikConfig: z.string().min(1),
@@ -219,7 +183,7 @@ export const apiReadStatsLogs = z.object({
.optional(), .optional(),
}); });
export const apiUpdateUser = createSchema.partial().extend({ export const apiUpdateUser = z.object({
email: z email: z
.string() .string()
.email("Please enter a valid email address") .email("Please enter a valid email address")
@@ -1,6 +1,5 @@
import { relations } from "drizzle-orm"; import { relations } from "drizzle-orm";
import { boolean, integer, pgTable, text } from "drizzle-orm/pg-core"; import { boolean, integer, pgTable, text } from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
import { applications } from "./application"; import { applications } from "./application";
@@ -105,12 +104,45 @@ export const volumeBackupsRelations = relations(
}), }),
); );
export const createVolumeBackupSchema = createInsertSchema(volumeBackups).omit({ const serviceTypeEnum = z.enum([
volumeBackupId: true, "application",
"postgres",
"mysql",
"mariadb",
"mongo",
"redis",
"compose",
]);
export const createVolumeBackupSchema = z.object({
name: z.string().min(1),
volumeName: z.string().min(1),
prefix: z.string().min(1),
serviceType: serviceTypeEnum.default("application"),
appName: z.string().min(1).optional(),
serviceName: z.string().optional(),
turnOff: z.boolean().default(false),
cronExpression: z.string().min(1),
keepLatestCount: z.number().optional(),
enabled: z.boolean().optional(),
applicationId: z.string().optional(),
postgresId: z.string().optional(),
mariadbId: z.string().optional(),
mongoId: z.string().optional(),
mysqlId: z.string().optional(),
redisId: z.string().optional(),
composeId: z.string().optional(),
destinationId: z.string().min(1),
}); });
export const updateVolumeBackupSchema = createVolumeBackupSchema.extend({ export const updateVolumeBackupSchema = z.object({
volumeBackupId: z.string().min(1), volumeBackupId: z.string().min(1),
name: z.string().min(1).optional(),
destinationId: z.string().optional(),
cronExpression: z.string().optional(),
keepLatestCount: z.number().optional(),
enabled: z.boolean().optional(),
turnOff: z.boolean().optional(),
}); });
export const apiFindOneVolumeBackup = z.object({ export const apiFindOneVolumeBackup = z.object({
+7 -7
View File
@@ -135,8 +135,8 @@ importers:
specifier: workspace:* specifier: workspace:*
version: link:../../packages/server version: link:../../packages/server
'@dokploy/trpc-openapi': '@dokploy/trpc-openapi':
specifier: 0.0.13 specifier: 0.0.14
version: 0.0.13(@trpc/[email protected]([email protected]))([email protected]([email protected]))([email protected]) version: 0.0.14(@trpc/[email protected]([email protected]))([email protected]([email protected]))([email protected])
'@faker-js/faker': '@faker-js/faker':
specifier: ^8.4.1 specifier: ^8.4.1
version: 8.4.1 version: 8.4.1
@@ -408,7 +408,7 @@ importers:
specifier: ^2.2.2 specifier: ^2.2.2
version: 2.2.6 version: 2.2.6
swagger-ui-react: swagger-ui-react:
specifier: ^5.31.1 specifier: ^5.31.2
version: 5.31.2(@types/[email protected])([email protected]([email protected]))([email protected]) version: 5.31.2(@types/[email protected])([email protected]([email protected]))([email protected])
tailwind-merge: tailwind-merge:
specifier: ^2.6.0 specifier: ^2.6.0
@@ -1282,11 +1282,11 @@ packages:
'@codemirror/[email protected]': '@codemirror/[email protected]':
resolution: {integrity: sha512-aCWjgweIIXLBHh7bY6cACvXuyrZ0xGafjQ2VInjp4RM4gMfscK5uESiNdrH0pE+e1lZr2B4ONGsjchl2KsKZzg==} resolution: {integrity: sha512-aCWjgweIIXLBHh7bY6cACvXuyrZ0xGafjQ2VInjp4RM4gMfscK5uESiNdrH0pE+e1lZr2B4ONGsjchl2KsKZzg==}
'@dokploy/[email protected]3': '@dokploy/[email protected]4':
resolution: {integrity: sha512-oDQtYgQUGHy3u6NNzeaM1nSY34/bEhpmxKHups+0XkSbdTmfcA3lioaffTWX6cCgqMX+/pK5oO747Rn8pHOOVg==} resolution: {integrity: sha512-Kg5XIObHWk2v8PeHJcD0l9AJk8iukpYiUVvcaLgITylWGokkMGmyupfr1FZY/U3DZtBfmIsGKtP41dVOQ9XD9A==}
peerDependencies: peerDependencies:
'@trpc/server': ^11.1.0 '@trpc/server': ^11.1.0
zod: ^4.0.0 zod: ^4.3.6
zod-openapi: ^5.0.1 zod-openapi: ^5.0.1
'@drizzle-team/[email protected]': '@drizzle-team/[email protected]':
@@ -8802,7 +8802,7 @@ snapshots:
style-mod: 4.1.3 style-mod: 4.1.3
w3c-keyname: 2.2.8 w3c-keyname: 2.2.8
'@dokploy/[email protected]3(@trpc/[email protected]([email protected]))([email protected]([email protected]))([email protected])': '@dokploy/[email protected]4(@trpc/[email protected]([email protected]))([email protected]([email protected]))([email protected])':
dependencies: dependencies:
'@trpc/server': 11.10.0([email protected]) '@trpc/server': 11.10.0([email protected])
co-body: 6.2.0 co-body: 6.2.0