Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added watchlist paths for Gitea and some minor typescript fixes.

Browse Source
This commit is contained in:
Jason Parks 2025-03-19 16:48:51 -06:00
parent 997e755b6f
commit 56d8defebe
11 changed files with 814 additions and 690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
apps/dokploy/components/dashboard/application/general/generic/save-gitea-provider.tsx
View File

@ -29,16 +29,22 @@ import {
SelectTrigger, SelectTrigger,
SelectValue, SelectValue,
} from "@/components/ui/select"; } from "@/components/ui/select";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "@/components/ui/tooltip";
import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { CheckIcon, ChevronsUpDown } from "lucide-react"; import { CheckIcon, ChevronsUpDown, HelpCircle, Plus, X } from "lucide-react";
import { useEffect } from "react"; import { useEffect } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
import { z } from "zod"; import { z } from "zod";
// Define types for repository and branch objects
interface GiteaRepository { interface GiteaRepository {
name: string; name: string;
url: string; url: string;
@ -63,6 +69,7 @@ const GiteaProviderSchema = z.object({
owner: z.string().min(1, "Owner is required"), owner: z.string().min(1, "Owner is required"),
giteaPathNamespace: z.string().min(1), giteaPathNamespace: z.string().min(1),
id: z.number().nullable(), id: z.number().nullable(),
watchPaths: z.array(z.string()).default([]),
}) })
.required(), .required(),
branch: z.string().min(1, "Branch is required"), branch: z.string().min(1, "Branch is required"),
@ -90,6 +97,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
repo: "", repo: "",
giteaPathNamespace: "", giteaPathNamespace: "",
id: null, id: null,
watchPaths: [],
}, },
giteaId: "", giteaId: "",
branch: "", branch: "",
@ -138,6 +146,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
owner: data.giteaOwner || "", owner: data.giteaOwner || "",
giteaPathNamespace: data.giteaPathNamespace || "", giteaPathNamespace: data.giteaPathNamespace || "",
id: data.giteaProjectId, id: data.giteaProjectId,
watchPaths: data.watchPaths || [],
}, },
buildPath: data.giteaBuildPath || "/", buildPath: data.giteaBuildPath || "/",
giteaId: data.giteaId || "", giteaId: data.giteaId || "",
@ -155,6 +164,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
applicationId, applicationId,
giteaProjectId: data.repository.id, giteaProjectId: data.repository.id,
giteaPathNamespace: data.repository.giteaPathNamespace, giteaPathNamespace: data.repository.giteaPathNamespace,
watchPaths: data.repository.watchPaths,
}) })
.then(async () => { .then(async () => {
toast.success("Service Provider Saved"); toast.success("Service Provider Saved");
@ -188,6 +198,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
repo: "", repo: "",
id: null, id: null,
giteaPathNamespace: "", giteaPathNamespace: "",
watchPaths: [],
}); });
form.setValue("branch", ""); form.setValue("branch", "");
}} }}
@ -274,6 +285,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
repo: repo.name, repo: repo.name,
id: repo.id, id: repo.id,
giteaPathNamespace: repo.name, giteaPathNamespace: repo.name,
watchPaths: [],
}); });
form.setValue("branch", ""); form.setValue("branch", "");
}} }}
@ -399,6 +411,85 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
</FormItem> </FormItem>
)} )}
/> />
<FormField
control={form.control}
name="repository.watchPaths"
render={({ field }) => (
<FormItem className="md:col-span-2">
<div className="flex items-center gap-2">
<FormLabel>Watch Paths</FormLabel>
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<HelpCircle className="size-4 text-muted-foreground hover:text-foreground transition-colors cursor-pointer" />
</TooltipTrigger>
<TooltipContent>
<p>
Add paths to watch for changes. When files in these
paths change, a new deployment will be triggered.
</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
<div className="flex flex-wrap gap-2 mb-2">
{field.value && field.value.map((path: string, index: number) => (
<Badge
key={index}
variant="secondary"
className="flex items-center gap-1"
>
{path}
<X
className="size-3 cursor-pointer hover:text-destructive"
onClick={() => {
const newPaths = [...field.value];
newPaths.splice(index, 1);
field.onChange(newPaths);
}}
/>
</Badge>
))}
</div>
<div className="flex gap-2">
<FormControl>
<Input
placeholder="Enter a path to watch (e.g., src/*, dist/*)"
onKeyDown={(e) => {
if (e.key === "Enter") {
e.preventDefault();
const input = e.currentTarget;
const path = input.value.trim();
if (path) {
field.onChange([...field.value, path]);
input.value = "";
}
}
}}
/>
</FormControl>
<Button
type="button"
variant="outline"
size="icon"
onClick={() => {
const input = document.querySelector(
'input[placeholder*="Enter a path"]',
) as HTMLInputElement;
const path = input.value.trim();
if (path) {
field.onChange([...field.value, path]);
input.value = "";
}
}}
>
<Plus className="size-4" />
</Button>
</div>
<FormMessage />
</FormItem>
)}
/>
</div> </div>
<div className="flex w-full justify-end"> <div className="flex w-full justify-end">
<Button <Button
@ -413,4 +504,4 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
</Form> </Form>
</div> </div>
); );
}; };

2
apps/dokploy/components/dashboard/compose/general/actions.tsx
View File

@ -8,11 +8,11 @@ import {
TooltipTrigger, TooltipTrigger,
} from "@/components/ui/tooltip"; } from "@/components/ui/tooltip";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import * as TooltipPrimitive from "@radix-ui/react-tooltip";
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react"; import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { toast } from "sonner"; import { toast } from "sonner";
import { DockerTerminalModal } from "../../settings/web-server/docker-terminal-modal"; import { DockerTerminalModal } from "../../settings/web-server/docker-terminal-modal";
import * as TooltipPrimitive from "@radix-ui/react-tooltip";
interface Props { interface Props {
composeId: string; composeId: string;

893
apps/dokploy/components/dashboard/compose/general/generic/save-gitea-provider-compose.tsx
View File

@ -3,39 +3,39 @@ import { AlertBlock } from "@/components/shared/alert-block";
import { Badge } from "@/components/ui/badge"; import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { import {
Command, Command,
CommandEmpty, CommandEmpty,
CommandGroup, CommandGroup,
CommandInput, CommandInput,
CommandItem, CommandItem,
} from "@/components/ui/command"; } from "@/components/ui/command";
import { import {
Form, Form,
FormControl, FormControl,
FormField, FormField,
FormItem, FormItem,
FormLabel, FormLabel,
FormMessage, FormMessage,
} from "@/components/ui/form"; } from "@/components/ui/form";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { import {
Popover, Popover,
PopoverContent, PopoverContent,
PopoverTrigger, PopoverTrigger,
} from "@/components/ui/popover"; } from "@/components/ui/popover";
import { ScrollArea } from "@/components/ui/scroll-area"; import { ScrollArea } from "@/components/ui/scroll-area";
import { import {
Select, Select,
SelectContent, SelectContent,
SelectItem, SelectItem,
SelectTrigger, SelectTrigger,
SelectValue, SelectValue,
} from "@/components/ui/select"; } from "@/components/ui/select";
import { import {
Tooltip, Tooltip,
TooltipContent, TooltipContent,
TooltipProvider, TooltipProvider,
TooltipTrigger, TooltipTrigger,
} from "@/components/ui/tooltip"; } from "@/components/ui/tooltip";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
@ -48,439 +48,466 @@ import { toast } from "sonner";
import { z } from "zod"; import { z } from "zod";
interface Repository { interface Repository {
name: string; name: string;
url: string; url: string;
id: number; id: number;
owner: { owner: {
username: string; username: string;
}; };
} }
interface Branch { interface Branch {
name: string; name: string;
} }
interface GiteaProviderType { interface GiteaProviderType {
giteaId: string; giteaId: string;
gitProvider: { gitProvider: {
name: string; name: string;
gitProviderId: string; gitProviderId: string;
providerType: "github" | "gitlab" | "bitbucket" | "gitea"; providerType: "github" | "gitlab" | "bitbucket" | "gitea";
createdAt: string; createdAt: string;
organizationId: string; organizationId: string;
}; };
name: string; name: string;
} }
const GiteaProviderSchema = z.object({ const GiteaProviderSchema = z.object({
composePath: z.string().min(1), composePath: z.string().min(1),
repository: z repository: z
.object({ .object({
repo: z.string().min(1, "Repo is required"), repo: z.string().min(1, "Repo is required"),
owner: z.string().min(1, "Owner is required"), owner: z.string().min(1, "Owner is required"),
id: z.number().nullable(), id: z.number().nullable(),
giteaPathNamespace: z.string().min(1), giteaPathNamespace: z.string().min(1),
}) })
.required(), .required(),
branch: z.string().min(1, "Branch is required"), branch: z.string().min(1, "Branch is required"),
giteaId: z.string().min(1, "Gitea Provider is required"), giteaId: z.string().min(1, "Gitea Provider is required"),
watchPaths: z.array(z.string()).optional(), watchPaths: z.array(z.string()).optional(),
}); });
type GiteaProvider = z.infer<typeof GiteaProviderSchema>; type GiteaProvider = z.infer<typeof GiteaProviderSchema>;
interface Props { interface Props {
composeId: string; composeId: string;
} }
export const SaveGiteaProviderCompose = ({ composeId }: Props) => { export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
const { data: giteaProviders } = api.gitea.giteaProviders.useQuery<GiteaProviderType[]>(); const { data: giteaProviders } = api.gitea.giteaProviders.useQuery();
const { data, refetch } = api.compose.one.useQuery({ composeId }); const { data, refetch } = api.compose.one.useQuery({ composeId });
const { mutateAsync, isLoading: isSavingGiteaProvider } = api.compose.update.useMutation(); const { mutateAsync, isLoading: isSavingGiteaProvider } =
api.compose.update.useMutation();
const form = useForm<GiteaProvider>({ const form = useForm<GiteaProvider>({
defaultValues: { defaultValues: {
composePath: "./docker-compose.yml", composePath: "./docker-compose.yml",
repository: { repository: {
owner: "", owner: "",
repo: "", repo: "",
giteaPathNamespace: "", giteaPathNamespace: "",
id: null, id: null,
}, },
giteaId: "", giteaId: "",
branch: "", branch: "",
watchPaths: [], watchPaths: [],
}, },
resolver: zodResolver(GiteaProviderSchema), resolver: zodResolver(GiteaProviderSchema),
}); });
const repository = form.watch("repository"); const repository = form.watch("repository");
const giteaId = form.watch("giteaId"); const giteaId = form.watch("giteaId");
const { data: repositories, isLoading: isLoadingRepositories, error } = api.gitea.getGiteaRepositories.useQuery<Repository[]>( const {
{ data: repositories,
giteaId, isLoading: isLoadingRepositories,
}, error,
{ } = api.gitea.getGiteaRepositories.useQuery<Repository[]>(
enabled: !!giteaId, {
} giteaId,
); },
{
enabled: !!giteaId,
},
);
const { data: branches, fetchStatus, status } = api.gitea.getGiteaBranches.useQuery<Branch[]>( const {
{ data: branches,
owner: repository?.owner, fetchStatus,
repositoryName: repository?.repo, status,
id: repository?.id || 0, } = api.gitea.getGiteaBranches.useQuery<Branch[]>(
giteaId: giteaId, {
}, owner: repository?.owner,
{ repositoryName: repository?.repo,
enabled: !!repository?.owner && !!repository?.repo && !!giteaId, id: repository?.id || 0,
} giteaId: giteaId,
); },
{
enabled: !!repository?.owner && !!repository?.repo && !!giteaId,
},
);
useEffect(() => { useEffect(() => {
if (data) { if (data) {
form.reset({ form.reset({
branch: data.giteaBranch || "", branch: data.giteaBranch || "",
repository: { repository: {
repo: data.giteaRepository || "", repo: data.giteaRepository || "",
owner: data.giteaOwner || "", owner: data.giteaOwner || "",
id: null, id: null,
giteaPathNamespace: "", giteaPathNamespace: "",
}, },
composePath: data.composePath, composePath: data.composePath,
giteaId: data.giteaId || "", giteaId: data.giteaId || "",
watchPaths: data.watchPaths || [], watchPaths: data.watchPaths || [],
}); });
} }
}, [form.reset, data, form]); }, [data, form]);
const onSubmit = async (data: GiteaProvider) => { const onSubmit = async (data: GiteaProvider) => {
await mutateAsync({ await mutateAsync({
giteaBranch: data.branch, giteaBranch: data.branch,
giteaRepository: data.repository.repo, giteaRepository: data.repository.repo,
giteaOwner: data.repository.owner, giteaOwner: data.repository.owner,
composePath: data.composePath, composePath: data.composePath,
giteaId: data.giteaId, giteaId: data.giteaId,
composeId, composeId,
sourceType: "gitea", sourceType: "gitea",
composeStatus: "idle", composeStatus: "idle",
watchPaths: data.watchPaths, watchPaths: data.watchPaths,
} as any) } as any)
.then(async () => { .then(async () => {
toast.success("Service Provided Saved"); toast.success("Service Provided Saved");
await refetch(); await refetch();
}) })
.catch(() => { .catch(() => {
toast.error("Error saving the Gitea provider"); toast.error("Error saving the Gitea provider");
}); });
}; };
return ( return (
<div> <div>
<Form {...form}> <Form {...form}>
<form <form
onSubmit={form.handleSubmit(onSubmit)} onSubmit={form.handleSubmit(onSubmit)}
className="grid w-full gap-4 py-3" className="grid w-full gap-4 py-3"
> >
{error && <AlertBlock type="error">{error?.message}</AlertBlock>} {error && <AlertBlock type="error">{error?.message}</AlertBlock>}
<div className="grid md:grid-cols-2 gap-4">
<FormField
control={form.control}
name="giteaId"
render={({ field }) => (
<FormItem className="md:col-span-2 flex flex-col">
<FormLabel>Gitea Account</FormLabel>
<Select
onValueChange={(value) => {
field.onChange(value);
form.setValue("repository", {
owner: "",
repo: "",
giteaPathNamespace: "",
id: null,
});
form.setValue("branch", "");
}}
defaultValue={field.value}
value={field.value}
>
<FormControl>
<SelectTrigger>
<SelectValue placeholder="Select a Gitea Account" />
</SelectTrigger>
</FormControl>
<SelectContent>
{giteaProviders?.map((giteaProvider) => (
<SelectItem
key={giteaProvider.giteaId}
value={giteaProvider.giteaId}
>
{giteaProvider.name}
</SelectItem>
))}
</SelectContent>
</Select>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="repository"
render={({ field }) => (
<FormItem className="md:col-span-2 flex flex-col">
<div className="flex items-center justify-between">
<FormLabel>Repository</FormLabel>
{field.value.owner && field.value.repo && (
<Link
href={`https://gitea.com/${field.value.owner}/${field.value.repo}`}
target="_blank"
rel="noopener noreferrer"
className="flex items-center gap-1 text-sm text-muted-foreground hover:text-primary"
>
<GiteaIcon className="h-4 w-4" />
<span>View Repository</span>
</Link>
)}
</div>
<Popover>
<PopoverTrigger asChild>
<FormControl>
<Button
variant="outline"
className={cn(
"w-full justify-between !bg-input",
!field.value && "text-muted-foreground"
)}
>
{isLoadingRepositories
? "Loading...."
: field.value.owner
? repositories?.find(
(repo: Repository) => repo.name === field.value.repo
)?.name
: "Select repository"}
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" /> <div className="grid md:grid-cols-2 gap-4">
</Button> <FormField
</FormControl> control={form.control}
</PopoverTrigger> name="giteaId"
<PopoverContent className="p-0" align="start"> render={({ field }) => (
<Command> <FormItem className="md:col-span-2 flex flex-col">
<CommandInput placeholder="Search repository..." className="h-9" /> <FormLabel>Gitea Account</FormLabel>
{isLoadingRepositories && ( <Select
<span className="py-6 text-center text-sm">Loading Repositories....</span> onValueChange={(value) => {
)} field.onChange(value);
<CommandEmpty>No repositories found.</CommandEmpty> form.setValue("repository", {
<ScrollArea className="h-96"> owner: "",
<CommandGroup> repo: "",
{repositories?.map((repo: Repository) => { giteaPathNamespace: "",
return ( id: null,
<CommandItem });
value={repo.name} form.setValue("branch", "");
key={repo.url} }}
onSelect={() => { value={field.value}
form.setValue("repository", { >
owner: repo.owner.username as string, <FormControl>
repo: repo.name, <SelectTrigger>
id: repo.id, <SelectValue placeholder="Select a Gitea Account" />
giteaPathNamespace: repo.url, </SelectTrigger>
}); </FormControl>
form.setValue("branch", ""); <SelectContent>
}} {giteaProviders?.map((giteaProvider) => (
> <SelectItem
<span className="flex items-center gap-2"> key={giteaProvider.giteaId}
<span>{repo.name}</span> value={giteaProvider.giteaId}
<span className="text-muted-foreground text-xs"> >
{repo.owner.username} {giteaProvider.gitProvider.name}
</span> </SelectItem>
</span> ))}
<CheckIcon </SelectContent>
className={cn( </Select>
"ml-auto h-4 w-4", <FormMessage />
repo.name === field.value.repo ? "opacity-100" : "opacity-0" </FormItem>
)} )}
/> />
</CommandItem>
); <FormField
})} control={form.control}
</CommandGroup> name="repository"
</ScrollArea> render={({ field }) => (
</Command> <FormItem className="md:col-span-2 flex flex-col">
</PopoverContent> <div className="flex items-center justify-between">
</Popover> <FormLabel>Repository</FormLabel>
{form.formState.errors.repository && ( {field.value.owner && field.value.repo && (
<p className={cn("text-sm font-medium text-destructive")}> <Link
Repository is required href={`https://gitea.com/${field.value.owner}/${field.value.repo}`}
</p> target="_blank"
)} rel="noopener noreferrer"
</FormItem> className="flex items-center gap-1 text-sm text-muted-foreground hover:text-primary"
)} >
/> <GiteaIcon className="h-4 w-4" />
<FormField <span>View Repository</span>
control={form.control} </Link>
name="branch" )}
render={({ field }) => ( </div>
<FormItem className="block w-full"> <Popover>
<FormLabel>Branch</FormLabel> <PopoverTrigger asChild>
<Popover> <FormControl>
<PopoverTrigger asChild> <Button
<FormControl> variant="outline"
<Button className={cn(
variant="outline" "w-full justify-between !bg-input",
className={cn( !field.value && "text-muted-foreground",
"w-full justify-between !bg-input", )}
!field.value && "text-muted-foreground" >
)} {isLoadingRepositories
> ? "Loading...."
{status === "loading" && fetchStatus === "fetching" : field.value.owner
? "Loading...." ? repositories?.find(
: field.value (repo) => repo.name === field.value.repo,
? branches?.find((branch: Branch) => branch.name === field.value)?.name )?.name
: "Select branch"} : "Select repository"}
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" /> <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button> </Button>
</FormControl> </FormControl>
</PopoverTrigger> </PopoverTrigger>
<PopoverContent className="p-0" align="start"> <PopoverContent className="p-0" align="start">
<Command> <Command>
<CommandInput placeholder="Search branches..." className="h-9" /> <CommandInput
<CommandEmpty>No branches found.</CommandEmpty> placeholder="Search repository..."
<ScrollArea className="h-96"> className="h-9"
<CommandGroup> />
{branches?.map((branch: Branch) => ( {isLoadingRepositories && (
<CommandItem <span className="py-6 text-center text-sm">
key={branch.name} Loading Repositories....
value={branch.name} </span>
onSelect={() => form.setValue("branch", branch.name)} )}
> <CommandEmpty>No repositories found.</CommandEmpty>
<span className="flex items-center gap-2"> <ScrollArea className="h-96">
{branch.name} <CommandGroup>
</span> {repositories?.map((repo) => (
<CheckIcon <CommandItem
className={cn( key={repo.url}
"ml-auto h-4 w-4", value={repo.name}
branch.name === field.value ? "opacity-100" : "opacity-0" onSelect={() => {
)} form.setValue("repository", {
/> owner: repo.owner.username,
</CommandItem> repo: repo.name,
))} id: repo.id,
</CommandGroup> giteaPathNamespace: repo.url,
</ScrollArea> });
</Command> form.setValue("branch", "");
</PopoverContent> }}
</Popover> >
{form.formState.errors.branch && ( <span className="flex items-center gap-2">
<p className={cn("text-sm font-medium text-destructive")}> <span>{repo.name}</span>
Branch is required <span className="text-muted-foreground text-xs">
</p> {repo.owner.username}
)} </span>
</FormItem> </span>
)} <CheckIcon
/> className={cn(
<FormField "ml-auto h-4 w-4",
control={form.control} repo.name === field.value.repo
name="composePath" ? "opacity-100"
render={({ field }) => ( : "opacity-0",
<FormItem> )}
<FormLabel>Compose Path</FormLabel> />
<FormControl> </CommandItem>
<Input placeholder="docker-compose.yml" {...field} /> ))}
</FormControl> </CommandGroup>
<FormMessage /> </ScrollArea>
</FormItem> </Command>
)} </PopoverContent>
/> </Popover>
<FormField {form.formState.errors.repository && (
control={form.control} <p className={cn("text-sm font-medium text-destructive")}>
name="watchPaths" Repository is required
render={({ field }) => ( </p>
<FormItem className="md:col-span-2"> )}
<div className="flex items-center gap-2"> </FormItem>
<FormLabel>Watch Paths</FormLabel> )}
<TooltipProvider> />
<Tooltip>
<TooltipTrigger> <FormField
<div className="size-4 rounded-full bg-muted flex items-center justify-center text-[10px] font-bold"> control={form.control}
? name="branch"
</div> render={({ field }) => (
</TooltipTrigger> <FormItem className="block w-full">
<TooltipContent> <FormLabel>Branch</FormLabel>
<p> <Popover>
Add paths to watch for changes. When files in these <PopoverTrigger asChild>
paths change, a new deployment will be triggered. <FormControl>
</p> <Button
</TooltipContent> variant="outline"
</Tooltip> className={cn(
</TooltipProvider> "w-full justify-between !bg-input",
</div> !field.value && "text-muted-foreground",
<div className="flex flex-wrap gap-2 mb-2"> )}
{field.value?.map((path, index) => ( >
<Badge key={index} variant="secondary"> {status === "loading" && fetchStatus === "fetching"
{path} ? "Loading...."
<X : field.value
className="ml-1 size-3 cursor-pointer" ? branches?.find(
onClick={() => { (branch) => branch.name === field.value,
const newPaths = [...(field.value || [])]; )?.name
newPaths.splice(index, 1); : "Select branch"}
form.setValue("watchPaths", newPaths); <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
}} </Button>
/> </FormControl>
</Badge> </PopoverTrigger>
))} <PopoverContent className="p-0" align="start">
</div> <Command>
<FormControl> <CommandInput
<div className="flex gap-2"> placeholder="Search branches..."
<Input className="h-9"
placeholder="Enter a path to watch (e.g., src/*, dist/*)" />
onKeyDown={(e) => { <CommandEmpty>No branches found.</CommandEmpty>
if (e.key === "Enter") { <ScrollArea className="h-96">
e.preventDefault(); <CommandGroup>
const input = e.currentTarget; {branches?.map((branch) => (
const value = input.value.trim(); <CommandItem
if (value) { key={branch.name}
const newPaths = [...(field.value || []), value]; value={branch.name}
form.setValue("watchPaths", newPaths); onSelect={() =>
input.value = ""; form.setValue("branch", branch.name)
} }
} >
}} <span className="flex items-center gap-2">
/> {branch.name}
<Button </span>
type="button" <CheckIcon
variant="secondary" className={cn(
onClick={() => { "ml-auto h-4 w-4",
const input = document.querySelector( branch.name === field.value
'input[placeholder="Enter a path to watch (e.g., src/*, dist/*)"]' ? "opacity-100"
) as HTMLInputElement; : "opacity-0",
const value = input.value.trim(); )}
if (value) { />
const newPaths = [...(field.value || []), value]; </CommandItem>
form.setValue("watchPaths", newPaths); ))}
input.value = ""; </CommandGroup>
} </ScrollArea>
}} </Command>
> </PopoverContent>
Add </Popover>
</Button> {form.formState.errors.branch && (
</div> <p className={cn("text-sm font-medium text-destructive")}>
</FormControl> Branch is required
<FormMessage /> </p>
</FormItem> )}
)} </FormItem>
/> )}
</div> />
<Button
type="submit" <FormField
className="w-full" control={form.control}
disabled={isSavingGiteaProvider || !form.formState.isDirty} name="composePath"
> render={({ field }) => (
{isSavingGiteaProvider ? "Saving..." : "Save Gitea Provider"} <FormItem>
</Button> <FormLabel>Compose Path</FormLabel>
</form> <FormControl>
</Form> <Input placeholder="docker-compose.yml" {...field} />
</div> </FormControl>
); <FormMessage />
}; </FormItem>
)}
/>
<FormField
control={form.control}
name="watchPaths"
render={({ field }) => (
<FormItem className="md:col-span-2">
<div className="flex items-center gap-2">
<FormLabel>Watch Paths</FormLabel>
<TooltipProvider>
<Tooltip>
<TooltipTrigger>
<div className="size-4 rounded-full bg-muted flex items-center justify-center text-[10px] font-bold">
?
</div>
</TooltipTrigger>
<TooltipContent>
<p>
Add paths to watch for changes. When files in these
paths change, a new deployment will be triggered.
</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
<div className="flex flex-wrap gap-2 mb-2">
{field.value?.map((path, index) => (
<Badge key={index} variant="secondary">
{path}
<X
className="ml-1 size-3 cursor-pointer"
onClick={() => {
const newPaths = [...(field.value || [])];
newPaths.splice(index, 1);
form.setValue("watchPaths", newPaths);
}}
/>
</Badge>
))}
</div>
<FormControl>
<div className="flex gap-2">
<Input
placeholder="Enter a path to watch (e.g., src/*, dist/*)"
onKeyDown={(e) => {
if (e.key === "Enter") {
e.preventDefault();
const input = e.currentTarget;
const value = input.value.trim();
if (value) {
const newPaths = [...(field.value || []), value];
form.setValue("watchPaths", newPaths);
input.value = "";
}
}
}}
/>
<Button
type="button"
variant="secondary"
onClick={() => {
const input = document.querySelector(
'input[placeholder="Enter a path to watch (e.g., src/*, dist/*)"]',
) as HTMLInputElement;
const value = input.value.trim();
if (value) {
const newPaths = [...(field.value || []), value];
form.setValue("watchPaths", newPaths);
input.value = "";
}
}}
>
Add
</Button>
</div>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</div>
<Button
type="submit"
className="w-full"
disabled={isSavingGiteaProvider || !form.formState.isDirty}
>
{isSavingGiteaProvider ? "Saving..." : "Save Gitea Provider"}
</Button>
</form>
</Form>
</div>
);
};

96
apps/dokploy/components/dashboard/compose/general/generic/show.tsx
View File

@ -1,26 +1,25 @@
import { import {
BitbucketIcon, BitbucketIcon,
GitIcon, GiteaIcon,
GithubIcon, GithubIcon,
GitlabIcon, GitlabIcon,
GiteaIcon, GitIcon,
} from "@/components/icons/data-tools-icons"; } from "@/components/icons/data-tools-icons";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { CodeIcon, GitBranch } from "lucide-react"; import { CodeIcon, GitBranch } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useState } from "react"; import { useState, useEffect } from "react";
import { ComposeFileEditor } from "../compose-file-editor"; import { ComposeFileEditor } from "../compose-file-editor";
import { ShowConvertedCompose } from "../show-converted-compose"; import { ShowConvertedCompose } from "../show-converted-compose";
import { SaveBitbucketProviderCompose } from "./save-bitbucket-provider-compose"; import { SaveBitbucketProviderCompose } from "./save-bitbucket-provider-compose";
import { SaveGitProviderCompose } from "./save-git-provider-compose"; import { SaveGitProviderCompose } from "./save-git-provider-compose";
import { SaveGiteaProviderCompose } from "./save-gitea-provider-compose";
import { SaveGithubProviderCompose } from "./save-github-provider-compose"; import { SaveGithubProviderCompose } from "./save-github-provider-compose";
import { SaveGitlabProviderCompose } from "./save-gitlab-provider-compose"; import { SaveGitlabProviderCompose } from "./save-gitlab-provider-compose";
import { SaveGiteaProviderCompose } from "./save-gitea-provider-compose";
type TabState = "github" | "git" | "raw" | "gitlab" | "bitbucket" | "gitea"; // Adding gitea to the TabState
type TabState = "github" | "git" | "raw" | "gitlab" | "bitbucket" | "gitea";
interface Props { interface Props {
composeId: string; composeId: string;
} }
@ -29,11 +28,40 @@ import { SaveGiteaProviderCompose } from "./save-gitea-provider-compose";
const { data: githubProviders } = api.github.githubProviders.useQuery(); const { data: githubProviders } = api.github.githubProviders.useQuery();
const { data: gitlabProviders } = api.gitlab.gitlabProviders.useQuery(); const { data: gitlabProviders } = api.gitlab.gitlabProviders.useQuery();
const { data: bitbucketProviders } = api.bitbucket.bitbucketProviders.useQuery(); const { data: bitbucketProviders } = api.bitbucket.bitbucketProviders.useQuery();
const { data: giteaProviders } = api.gitea.giteaProviders.useQuery(); const { data: giteaProviders } = api.gitea.giteaProviders.useQuery(); // Fetching Gitea providers
const { data: compose } = api.compose.one.useQuery({ composeId }); const { data: compose } = api.compose.one.useQuery({ composeId });
const [tab, setSab] = useState<TabState>(compose?.sourceType || "github"); const [tab, setSab] = useState<TabState>(compose?.sourceType || "github");
// Ensure we fall back to empty arrays if the data is undefined
const safeGithubProviders = githubProviders || [];
const safeGitlabProviders = gitlabProviders || [];
const safeBitbucketProviders = bitbucketProviders || [];
const safeGiteaProviders = giteaProviders || [];
const renderProviderContent = (providers: any[], providerType: string, ProviderComponent: React.ComponentType<any>) => {
if (providers.length > 0) {
return <ProviderComponent composeId={composeId} />;
} else {
return (
<div className="flex flex-col items-center gap-3 min-h-[15vh] justify-center">
{providerType === "github" && <GithubIcon className="size-8 text-muted-foreground" />}
{providerType === "gitlab" && <GitlabIcon className="size-8 text-muted-foreground" />}
{providerType === "bitbucket" && <BitbucketIcon className="size-8 text-muted-foreground" />}
{providerType === "gitea" && <GiteaIcon className="size-8 text-muted-foreground" />}
<span className="text-base text-muted-foreground">
To deploy using {providerType.charAt(0).toUpperCase() + providerType.slice(1)}, you need to configure your account first.
Please, go to{" "}
<Link href="/dashboard/settings/git-providers" className="text-foreground">
Settings
</Link>{" "}
to do so.
</span>
</div>
);
}
};
return ( return (
<Card className="group relative w-full bg-transparent"> <Card className="group relative w-full bg-transparent">
<CardHeader> <CardHeader>
@ -82,11 +110,10 @@ import { SaveGiteaProviderCompose } from "./save-gitea-provider-compose";
Bitbucket Bitbucket
</TabsTrigger> </TabsTrigger>
<TabsTrigger <TabsTrigger
value="gitea" value="gitea" // Added Gitea tab
className="rounded-none border-b-2 gap-2 border-b-transparent data-[state=active]:border-b-2 data-[state=active]:border-b-border" className="rounded-none border-b-2 gap-2 border-b-transparent data-[state=active]:border-b-2 data-[state=active]:border-b-border"
> >
<GiteaIcon className="size-4 text-current fill-current" /> {/* Add Gitea Icon */} <GiteaIcon className="size-4 text-current fill-current" /> Gitea
Gitea
</TabsTrigger> </TabsTrigger>
<TabsTrigger <TabsTrigger
value="git" value="git"
@ -104,41 +131,28 @@ import { SaveGiteaProviderCompose } from "./save-gitea-provider-compose";
</TabsTrigger> </TabsTrigger>
</TabsList> </TabsList>
</div> </div>
<TabsContent value="github" className="w-full p-2"> <TabsContent value="github" className="w-full p-2">
{githubProviders && githubProviders?.length > 0 ? ( {renderProviderContent(safeGithubProviders, "github", SaveGithubProviderCompose)}
<SaveGithubProviderCompose composeId={composeId} />
) : (
<div className="flex flex-col items-center gap-3 min-h-[15vh] justify-center">
<GithubIcon className="size-8 text-muted-foreground" />
<span className="text-base text-muted-foreground">
To deploy using GitHub, you need to configure your account first. Please, go to{" "}
<Link href="/dashboard/settings/git-providers" className="text-foreground">
Settings
</Link>{" "}
to do so.
</span>
</div>
)}
</TabsContent> </TabsContent>
<TabsContent value="gitea" className="w-full p-2"> {/* Added Gitea tab */} <TabsContent value="gitea" className="w-full p-2">
{giteaProviders && giteaProviders?.length > 0 ? ( {renderProviderContent(safeGiteaProviders, "gitea", SaveGiteaProviderCompose)}
<SaveGiteaProviderCompose composeId={composeId} /> </TabsContent>
) : ( <TabsContent value="gitlab" className="w-full p-2">
<div className="flex flex-col items-center gap-3 min-h-[15vh] justify-center"> {renderProviderContent(safeGitlabProviders, "gitlab", SaveGitlabProviderCompose)}
<GiteaIcon className="size-8 text-muted-foreground" /> </TabsContent>
<span className="text-base text-muted-foreground"> <TabsContent value="bitbucket" className="w-full p-2">
To deploy using Gitea, you need to configure your account first. Please, go to{" "} {renderProviderContent(safeBitbucketProviders, "bitbucket", SaveBitbucketProviderCompose)}
<Link href="/dashboard/settings/git-providers" className="text-foreground"> </TabsContent>
Settings <TabsContent value="git" className="w-full p-2">
</Link>{" "} <SaveGitProviderCompose composeId={composeId} />
to do so. </TabsContent>
</span>
</div> <TabsContent value="raw" className="w-full p-2 flex flex-col gap-4">
)} <ComposeFileEditor composeId={composeId} />
</TabsContent> </TabsContent>
{/* Other tabs remain unchanged */}
</Tabs> </Tabs>
</CardContent> </CardContent>
</Card> </Card>
); );
}; };

2
apps/dokploy/components/dashboard/settings/cluster/nodes/add-node.tsx
View File

@ -1,3 +1,4 @@
import { AlertBlock } from "@/components/shared/alert-block";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { import {
Dialog, Dialog,
@ -12,7 +13,6 @@ import { ExternalLink, PlusIcon } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { AddManager } from "./manager/add-manager"; import { AddManager } from "./manager/add-manager";
import { AddWorker } from "./workers/add-worker"; import { AddWorker } from "./workers/add-worker";
import { AlertBlock } from "@/components/shared/alert-block";
interface Props { interface Props {
serverId?: string; serverId?: string;

12
apps/dokploy/components/dashboard/settings/git/gitea/add-gitea-provider.tsx
View File

@ -45,7 +45,7 @@ const Schema = z.object({
redirectUri: z.string().min(1, { redirectUri: z.string().min(1, {
message: "Redirect URI is required", message: "Redirect URI is required",
}), }),
organizationName: z.string().optional(), // Added organizationName to the schema organizationName: z.string().optional(),
}); });
type Schema = z.infer<typeof Schema>; type Schema = z.infer<typeof Schema>;
@ -54,8 +54,8 @@ export const AddGiteaProvider = () => {
const utils = api.useUtils(); const utils = api.useUtils();
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const url = useUrl(); const url = useUrl();
const { mutateAsync, error, isError } = api.gitea.create.useMutation(); // Updated API call for Gitea const { mutateAsync, error, isError } = api.gitea.create.useMutation();
const webhookUrl = `${url}/api/providers/gitea/callback`; // Updated webhook URL for Gitea const webhookUrl = `${url}/api/providers/gitea/callback`;
const form = useForm<Schema>({ const form = useForm<Schema>({
defaultValues: { defaultValues: {
@ -86,7 +86,7 @@ export const AddGiteaProvider = () => {
clientSecret: data.clientSecret || "", clientSecret: data.clientSecret || "",
name: data.name || "", name: data.name || "",
redirectUri: data.redirectUri || "", redirectUri: data.redirectUri || "",
giteaUrl: data.giteaUrl || "https://gitea.com", // Use Gitea URL giteaUrl: data.giteaUrl || "https://gitea.com",
}) })
.then(async () => { .then(async () => {
await utils.gitProvider.getAll.invalidate(); await utils.gitProvider.getAll.invalidate();
@ -177,7 +177,7 @@ export const AddGiteaProvider = () => {
<FormField <FormField
control={form.control} control={form.control}
name="giteaUrl" // Ensure consistent name for Gitea URL name="giteaUrl"
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>Gitea URL</FormLabel> <FormLabel>Gitea URL</FormLabel>
@ -240,7 +240,7 @@ export const AddGiteaProvider = () => {
/> />
<Button isLoading={form.formState.isSubmitting}> <Button isLoading={form.formState.isSubmitting}>
Configure Gitea App {/* Ensured consistency with Gitea */} Configure Gitea App
</Button> </Button>
</div> </div>
</CardContent> </CardContent>

12
apps/dokploy/components/dashboard/settings/web-server/manage-traefik-ports.tsx
View File

@ -161,7 +161,11 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
{...field} {...field}
onChange={(e) => { onChange={(e) => {
const value = e.target.value; const value = e.target.value;
field.onChange(value === "" ? undefined : Number(value)); field.onChange(
value === ""
? undefined
: Number(value),
);
}} }}
value={field.value || ""} value={field.value || ""}
className="w-full dark:bg-black" className="w-full dark:bg-black"
@ -189,7 +193,11 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
{...field} {...field}
onChange={(e) => { onChange={(e) => {
const value = e.target.value; const value = e.target.value;
field.onChange(value === "" ? undefined : Number(value)); field.onChange(
value === ""
? undefined
: Number(value),
);
}} }}
value={field.value || ""} value={field.value || ""}
className="w-full dark:bg-black" className="w-full dark:bg-black"

1
apps/dokploy/server/api/routers/application.ts
View File

@ -424,6 +424,7 @@ export const applicationRouter = createTRPCRouter({
giteaId: input.giteaId, giteaId: input.giteaId,
giteaProjectId: input.giteaProjectId, giteaProjectId: input.giteaProjectId,
giteaPathNamespace: input.giteaPathNamespace, giteaPathNamespace: input.giteaPathNamespace,
watchPaths: input.watchPaths,
}); });
return true; return true;

382
apps/dokploy/server/api/routers/gitea.ts
View File

@ -21,220 +21,202 @@ import {
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
// Gitea Router
export const giteaRouter = createTRPCRouter({ export const giteaRouter = createTRPCRouter({
// Create a new Gitea provider // Create a new Gitea provider
create: protectedProcedure create: protectedProcedure
.input(apiCreateGitea) .input(apiCreateGitea)
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }: { input: typeof apiCreateGitea._input; ctx: any }) => {
try { try {
return await createGitea(input, ctx.session.activeOrganizationId); return await createGitea(input, ctx.session.activeOrganizationId);
} catch (error) { } catch (error) {
throw new TRPCError({ throw new TRPCError({
code: "BAD_REQUEST", code: "BAD_REQUEST",
message: "Error creating this Gitea provider", message: "Error creating this Gitea provider",
cause: error, cause: error,
}); });
} }
}), }),
// Fetch a specific Gitea provider by ID // Fetch a specific Gitea provider by ID
one: protectedProcedure one: protectedProcedure
.input(apiFindOneGitea) .input(apiFindOneGitea)
.query(async ({ input, ctx }) => { .query(async ({ input, ctx }: { input: typeof apiFindOneGitea._input; ctx: any }) => {
const giteaProvider = await findGiteaById(input.giteaId); const giteaProvider = await findGiteaById(input.giteaId);
if ( if (
giteaProvider.gitProvider.organizationId !== giteaProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId
ctx.session.activeOrganizationId ) {
) { throw new TRPCError({
throw new TRPCError({ code: "UNAUTHORIZED",
code: "UNAUTHORIZED", message: "You are not allowed to access this Gitea provider",
message: "You are not allowed to access this Gitea provider", });
}); }
} return giteaProvider;
return giteaProvider; }),
}),
// Fetch all Gitea providers for the active organization // Fetch all Gitea providers for the active organization
giteaProviders: protectedProcedure.query(async ({ ctx }) => { giteaProviders: protectedProcedure.query(async ({ ctx }: { ctx: any }) => {
let result = await db.query.gitea.findMany({ let result = await db.query.gitea.findMany({
with: { with: {
gitProvider: true, gitProvider: true,
},
});
// Filter by organization ID
result = result.filter(
(provider) =>
provider.gitProvider.organizationId === ctx.session.activeOrganizationId,
);
// Filter providers that meet the requirements
const filtered = result
.filter((provider) => haveGiteaRequirements(provider))
.map((provider) => {
return {
giteaId: provider.giteaId,
gitProvider: {
...provider.gitProvider,
}, },
};
}); });
// Filter by organization ID return filtered;
result = result.filter(
(provider) =>
provider.gitProvider.organizationId ===
ctx.session.activeOrganizationId,
);
// Filter providers that meet the requirements
const filtered = result
.filter((provider) => haveGiteaRequirements(provider))
.map((provider) => {
return {
giteaId: provider.giteaId,
gitProvider: {
...provider.gitProvider,
},
};
});
return filtered;
}), }),
// Fetch repositories from Gitea provider // Fetch repositories from Gitea provider
getGiteaRepositories: protectedProcedure getGiteaRepositories: protectedProcedure
.input(apiFindOneGitea) .input(apiFindOneGitea)
.query(async ({ input, ctx }) => { .query(async ({ input, ctx }: { input: typeof apiFindOneGitea._input; ctx: any }) => {
const { giteaId } = input; const { giteaId } = input;
if (!giteaId) { if (!giteaId) {
throw new TRPCError({ throw new TRPCError({
code: "BAD_REQUEST", code: "BAD_REQUEST",
message: "Gitea provider ID is required.", message: "Gitea provider ID is required.",
}); });
} }
const giteaProvider = await findGiteaById(giteaId); const giteaProvider = await findGiteaById(giteaId);
if ( if (
giteaProvider.gitProvider.organizationId !== giteaProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId
ctx.session.activeOrganizationId ) {
) { throw new TRPCError({
throw new TRPCError({ code: "UNAUTHORIZED",
code: "UNAUTHORIZED", message: "You are not allowed to access this Gitea provider",
message: "You are not allowed to access this Gitea provider", });
}); }
}
try {
try { return await getGiteaRepositories(giteaId);
// Call the service layer function to get repositories } catch (error) {
console.log("Calling getGiteaRepositories with giteaId:", giteaId); console.error("Error fetching Gitea repositories:", error);
return await getGiteaRepositories(giteaId); throw new TRPCError({
} catch (error) { code: "BAD_REQUEST",
console.error("Error fetching Gitea repositories:", error); message: error instanceof Error ? error.message : String(error),
throw new TRPCError({ });
code: "BAD_REQUEST", }
message: error instanceof Error ? error.message : String(error), }),
});
}
}),
// Fetch branches of a specific Gitea repository // Fetch branches of a specific Gitea repository
getGiteaBranches: protectedProcedure getGiteaBranches: protectedProcedure
.input(apiFindGiteaBranches) .input(apiFindGiteaBranches)
.query(async ({ input, ctx }) => { .query(async ({ input, ctx }: { input: typeof apiFindGiteaBranches._input; ctx: any }) => {
const { giteaId, owner, repositoryName } = input; const { giteaId, owner, repositoryName } = input;
if (!giteaId || !owner || !repositoryName) { if (!giteaId || !owner || !repositoryName) {
throw new TRPCError({ throw new TRPCError({
code: "BAD_REQUEST", code: "BAD_REQUEST",
message: message: "Gitea provider ID, owner, and repository name are required.",
"Gitea provider ID, owner, and repository name are required.", });
}); }
}
const giteaProvider = await findGiteaById(giteaId);
const giteaProvider = await findGiteaById(giteaId); if (
if ( giteaProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId
giteaProvider.gitProvider.organizationId !== ) {
ctx.session.activeOrganizationId throw new TRPCError({
) { code: "UNAUTHORIZED",
throw new TRPCError({ message: "You are not allowed to access this Gitea provider",
code: "UNAUTHORIZED", });
message: "You are not allowed to access this Gitea provider", }
});
} try {
return await getGiteaBranches({
try { giteaId,
// Call the service layer function with the required parameters owner,
console.log("Calling getGiteaBranches with:", { repo: repositoryName,
giteaId, id: 0, // Provide a default value for the optional id
owner, });
repo: repositoryName, } catch (error) {
}); console.error("Error fetching Gitea branches:", error);
throw new TRPCError({
return await getGiteaBranches({ code: "BAD_REQUEST",
giteaId, message: error instanceof Error ? error.message : String(error),
owner, });
repo: repositoryName, }
id: 0, // Provide a default value for the optional id }),
});
} catch (error) {
console.error("Error fetching Gitea branches:", error);
throw new TRPCError({
code: "BAD_REQUEST",
message: error instanceof Error ? error.message : String(error),
});
}
}),
// Test connection to Gitea provider // Test connection to Gitea provider
testConnection: protectedProcedure testConnection: protectedProcedure
.input(apiGiteaTestConnection) .input(apiGiteaTestConnection)
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }: { input: typeof apiGiteaTestConnection._input; ctx: any }) => {
// Ensure giteaId is always a non-empty string const giteaId = input.giteaId ?? "";
const giteaId = input.giteaId ?? "";
try {
try { const giteaProvider = await findGiteaById(giteaId);
const giteaProvider = await findGiteaById(giteaId); if (
if ( giteaProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId
giteaProvider.gitProvider.organizationId !== ) {
ctx.session.activeOrganizationId throw new TRPCError({
) { code: "UNAUTHORIZED",
throw new TRPCError({ message: "You are not allowed to access this Gitea provider",
code: "UNAUTHORIZED", });
message: "You are not allowed to access this Gitea provider", }
});
} const result = await testGiteaConnection({
giteaId,
const result = await testGiteaConnection({ });
giteaId,
}); return `Found ${result} repositories`;
} catch (error) {
return `Found ${result} repositories`; console.error("Gitea connection test error:", error);
} catch (error) { throw new TRPCError({
console.error("Gitea connection test error:", error); code: "BAD_REQUEST",
throw new TRPCError({ message: error instanceof Error ? error.message : String(error),
code: "BAD_REQUEST", });
message: error instanceof Error ? error.message : String(error), }
}); }),
}
}),
// Update an existing Gitea provider // Update an existing Gitea provider
update: protectedProcedure update: protectedProcedure
.input(apiUpdateGitea) .input(apiUpdateGitea)
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }: { input: typeof apiUpdateGitea._input; ctx: any }) => {
const giteaProvider = await findGiteaById(input.giteaId); const giteaProvider = await findGiteaById(input.giteaId);
if ( if (
giteaProvider.gitProvider.organizationId !== giteaProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId
ctx.session.activeOrganizationId ) {
) { throw new TRPCError({
throw new TRPCError({ code: "UNAUTHORIZED",
code: "UNAUTHORIZED", message: "You are not allowed to access this Gitea provider",
message: "You are not allowed to access this Gitea provider", });
}); }
}
console.log("Updating Gitea provider:", input);
console.log("Updating Gitea provider:", input);
if (input.name) {
if (input.name) { await updateGitProvider(input.gitProviderId, {
await updateGitProvider(input.gitProviderId, { name: input.name,
name: input.name, organizationId: ctx.session.activeOrganizationId,
organizationId: ctx.session.activeOrganizationId, });
});
await updateGitea(input.giteaId, {
await updateGitea(input.giteaId, { ...input,
...input, });
}); } else {
} else { await updateGitea(input.giteaId, {
await updateGitea(input.giteaId, { ...input,
...input, });
}); }
}
return { success: true };
return { success: true }; }),
}), });
});

1
packages/server/src/db/schema/application.ts
View File

@ -511,6 +511,7 @@ export const apiSaveGiteaProvider = createSchema
giteaId: true, giteaId: true,
giteaProjectId: true, giteaProjectId: true,
giteaPathNamespace: true, giteaPathNamespace: true,
watchPaths: true,
}) })
.required(); .required();

6
packages/server/src/services/gitea.ts
View File

@ -23,7 +23,7 @@ export const createGitea = async (
name: input.name, name: input.name,
}) })
.returning() .returning()
.then((response: typeof gitProvider.$inferSelect[]) => response[0]); .then((response: (typeof gitProvider.$inferSelect)[]) => response[0]);
if (!newGitProvider) { if (!newGitProvider) {
throw new TRPCError({ throw new TRPCError({
@ -39,7 +39,7 @@ export const createGitea = async (
gitProviderId: newGitProvider?.gitProviderId, gitProviderId: newGitProvider?.gitProviderId,
}) })
.returning() .returning()
.then((response: typeof gitea.$inferSelect[]) => response[0]); .then((response: (typeof gitea.$inferSelect)[]) => response[0]);
}); });
}; };
@ -96,4 +96,4 @@ export const updateGitea = async (giteaId: string, input: Partial<Gitea>) => {
console.error("Error updating Gitea provider:", error); console.error("Error updating Gitea provider:", error);
throw error; throw error;
} }
}; };