Merge pull request #3783 from Dokploy/feat/add-support-for-trusted-providers

chore: update @better-auth/sso and better-auth to version 1.5.0-beta.…
This commit is contained in:
Mauricio Siu
2026-02-25 01:01:22 -06:00
committed by GitHub
297 changed files with 10583 additions and 2379 deletions
+4 -3
View File
@@ -4,7 +4,7 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "PORT=4000 tsx watch src/index.ts", "dev": "PORT=4000 tsx watch src/index.ts",
"build": "tsc --project tsconfig.json", "build": "rimraf dist && tsc --project tsconfig.json",
"start": "node dist/index.js", "start": "node dist/index.js",
"typecheck": "tsc --noEmit" "typecheck": "tsc --noEmit"
}, },
@@ -12,7 +12,7 @@
"inngest": "3.40.1", "inngest": "3.40.1",
"@dokploy/server": "workspace:*", "@dokploy/server": "workspace:*",
"@hono/node-server": "^1.14.3", "@hono/node-server": "^1.14.3",
"@hono/zod-validator": "0.3.0", "@hono/zod-validator": "0.7.6",
"dotenv": "^16.4.5", "dotenv": "^16.4.5",
"hono": "^4.11.7", "hono": "^4.11.7",
"pino": "9.4.0", "pino": "9.4.0",
@@ -20,12 +20,13 @@
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"redis": "4.7.0", "redis": "4.7.0",
"zod": "^3.25.76" "zod": "^4.3.6"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^24.4.0", "@types/node": "^24.4.0",
"@types/react": "^18.2.37", "@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15", "@types/react-dom": "^18.2.15",
"rimraf": "6.1.3",
"tsx": "^4.16.2", "tsx": "^4.16.2",
"typescript": "^5.8.3" "typescript": "^5.8.3"
}, },
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { Server } from "lucide-react"; import { Server } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect } from "react"; import { useEffect } from "react";
@@ -73,7 +73,7 @@ export const ShowClusterSettings = ({ id, type }: Props) => {
mongo: () => api.mongo.update.useMutation(), mongo: () => api.mongo.update.useMutation(),
}; };
const { mutateAsync, isLoading } = mutationMap[type] const { mutateAsync, isPending } = mutationMap[type]
? mutationMap[type]() ? mutationMap[type]()
: api.mongo.update.useMutation(); : api.mongo.update.useMutation();
@@ -236,7 +236,7 @@ export const ShowClusterSettings = ({ id, type }: Props) => {
)} )}
<div className="flex justify-end"> <div className="flex justify-end">
<Button isLoading={isLoading} type="submit" className="w-fit"> <Button isLoading={isPending} type="submit" className="w-fit">
Save Save
</Button> </Button>
</div> </div>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useFieldArray, useForm } from "react-hook-form"; import { useFieldArray, useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useFieldArray, useForm } from "react-hook-form"; import { useFieldArray, useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { Plus, Trash2 } from "lucide-react"; import { Plus, Trash2 } from "lucide-react";
import { useEffect } from "react"; import { useEffect } from "react";
import { useFieldArray, useForm } from "react-hook-form"; import { useFieldArray, useForm } from "react-hook-form";
@@ -50,7 +50,7 @@ export const AddCommand = ({ applicationId }: Props) => {
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync, isLoading } = api.application.update.useMutation(); const { mutateAsync, isPending } = api.application.update.useMutation();
const form = useForm<AddCommand>({ const form = useForm<AddCommand>({
defaultValues: { defaultValues: {
@@ -177,7 +177,7 @@ export const AddCommand = ({ applicationId }: Props) => {
</div> </div>
</div> </div>
<div className="flex justify-end"> <div className="flex justify-end">
<Button isLoading={isLoading} type="submit" className="w-fit"> <Button isLoading={isPending} type="submit" className="w-fit">
Save Save
</Button> </Button>
</div> </div>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { Code2, Globe2, HardDrive } from "lucide-react"; import { Code2, Globe2, HardDrive } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -69,11 +69,11 @@ export const ShowImport = ({ composeId }: Props) => {
} | null>(null); } | null>(null);
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync: processTemplate, isLoading: isLoadingTemplate } = const { mutateAsync: processTemplate, isPending: isLoadingTemplate } =
api.compose.processTemplate.useMutation(); api.compose.processTemplate.useMutation();
const { const {
mutateAsync: importTemplate, mutateAsync: importTemplate,
isLoading: isImporting, isPending: isImporting,
isSuccess: isImportSuccess, isSuccess: isImportSuccess,
} = api.compose.import.useMutation(); } = api.compose.import.useMutation();
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PenBoxIcon, PlusIcon } from "lucide-react"; import { PenBoxIcon, PlusIcon } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm, useWatch } from "react-hook-form"; import { useForm, useWatch } from "react-hook-form";
@@ -35,13 +35,9 @@ import { api } from "@/utils/api";
const AddPortSchema = z.object({ const AddPortSchema = z.object({
publishedPort: z.number().int().min(1).max(65535), publishedPort: z.number().int().min(1).max(65535),
publishMode: z.enum(["ingress", "host"], { publishMode: z.enum(["ingress", "host"]),
required_error: "Publish mode is required",
}),
targetPort: z.number().int().min(1).max(65535), targetPort: z.number().int().min(1).max(65535),
protocol: z.enum(["tcp", "udp"], { protocol: z.enum(["tcp", "udp"]),
required_error: "Protocol is required",
}),
}); });
type AddPort = z.infer<typeof AddPortSchema>; type AddPort = z.infer<typeof AddPortSchema>;
@@ -68,7 +64,7 @@ export const HandlePorts = ({
enabled: !!portId, enabled: !!portId,
}, },
); );
const { mutateAsync, isLoading, error, isError } = portId const { mutateAsync, isPending, error, isError } = portId
? api.port.update.useMutation() ? api.port.update.useMutation()
: api.port.create.useMutation(); : api.port.create.useMutation();
@@ -270,7 +266,7 @@ export const HandlePorts = ({
<DialogFooter> <DialogFooter>
<Button <Button
isLoading={isLoading} isLoading={isPending}
form="hook-form-add-port" form="hook-form-add-port"
type="submit" type="submit"
> >
@@ -25,7 +25,7 @@ export const ShowPorts = ({ applicationId }: Props) => {
{ enabled: !!applicationId }, { enabled: !!applicationId },
); );
const { mutateAsync: deletePort, isLoading: isRemoving } = const { mutateAsync: deletePort, isPending: isRemoving } =
api.port.delete.useMutation(); api.port.delete.useMutation();
return ( return (
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PenBoxIcon, PlusIcon } from "lucide-react"; import { PenBoxIcon, PlusIcon } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -100,11 +100,11 @@ export const HandleRedirect = ({
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync, isLoading, error, isError } = redirectId const { mutateAsync, isPending, error, isError } = redirectId
? api.redirects.update.useMutation() ? api.redirects.update.useMutation()
: api.redirects.create.useMutation(); : api.redirects.create.useMutation();
const form = useForm<AddRedirect>({ const form = useForm({
defaultValues: { defaultValues: {
permanent: false, permanent: false,
regex: "", regex: "",
@@ -268,7 +268,7 @@ export const HandleRedirect = ({
<DialogFooter> <DialogFooter>
<Button <Button
isLoading={isLoading} isLoading={isPending}
form="hook-form-add-redirect" form="hook-form-add-redirect"
type="submit" type="submit"
> >
@@ -24,7 +24,7 @@ export const ShowRedirects = ({ applicationId }: Props) => {
{ enabled: !!applicationId }, { enabled: !!applicationId },
); );
const { mutateAsync: deleteRedirect, isLoading: isRemoving } = const { mutateAsync: deleteRedirect, isPending: isRemoving } =
api.redirects.delete.useMutation(); api.redirects.delete.useMutation();
const utils = api.useUtils(); const utils = api.useUtils();
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PenBoxIcon, PlusIcon } from "lucide-react"; import { PenBoxIcon, PlusIcon } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -55,7 +55,7 @@ export const HandleSecurity = ({
}, },
); );
const { mutateAsync, isLoading, error, isError } = securityId const { mutateAsync, isPending, error, isError } = securityId
? api.security.update.useMutation() ? api.security.update.useMutation()
: api.security.create.useMutation(); : api.security.create.useMutation();
@@ -163,7 +163,7 @@ export const HandleSecurity = ({
<DialogFooter> <DialogFooter>
<Button <Button
isLoading={isLoading} isLoading={isPending}
form="hook-form-add-security" form="hook-form-add-security"
type="submit" type="submit"
> >
@@ -27,7 +27,7 @@ export const ShowSecurity = ({ applicationId }: Props) => {
{ enabled: !!applicationId }, { enabled: !!applicationId },
); );
const { mutateAsync: deleteSecurity, isLoading: isRemoving } = const { mutateAsync: deleteSecurity, isPending: isRemoving } =
api.security.delete.useMutation(); api.security.delete.useMutation();
const utils = api.useUtils(); const utils = api.useUtils();
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { Server } from "lucide-react"; import { Server } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect } from "react"; import { useEffect } from "react";
@@ -74,7 +74,7 @@ export const ShowBuildServer = ({ applicationId }: Props) => {
const { data: buildServers } = api.server.buildServers.useQuery(); const { data: buildServers } = api.server.buildServers.useQuery();
const { data: registries } = api.registry.all.useQuery(); const { data: registries } = api.registry.all.useQuery();
const { mutateAsync, isLoading } = api.application.update.useMutation(); const { mutateAsync, isPending } = api.application.update.useMutation();
const form = useForm<Schema>({ const form = useForm<Schema>({
defaultValues: { defaultValues: {
@@ -274,7 +274,7 @@ export const ShowBuildServer = ({ applicationId }: Props) => {
/> />
<div className="flex w-full justify-end"> <div className="flex w-full justify-end">
<Button isLoading={isLoading} type="submit"> <Button isLoading={isPending} type="submit">
Save Save
</Button> </Button>
</div> </div>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { InfoIcon, Plus, Trash2 } from "lucide-react"; import { InfoIcon, Plus, Trash2 } from "lucide-react";
import { useEffect } from "react"; import { useEffect } from "react";
import { useFieldArray, useForm } from "react-hook-form"; import { useFieldArray, useForm } from "react-hook-form";
@@ -128,11 +128,11 @@ export const ShowResources = ({ id, type }: Props) => {
mongo: () => api.mongo.update.useMutation(), mongo: () => api.mongo.update.useMutation(),
}; };
const { mutateAsync, isLoading } = mutationMap[type] const { mutateAsync, isPending } = mutationMap[type]
? mutationMap[type]() ? mutationMap[type]()
: api.mongo.update.useMutation(); : api.mongo.update.useMutation();
const form = useForm<AddResources>({ const form = useForm({
defaultValues: { defaultValues: {
cpuLimit: "", cpuLimit: "",
cpuReservation: "", cpuReservation: "",
@@ -452,6 +452,11 @@ export const ShowResources = ({ id, type }: Props) => {
min={-1} min={-1}
placeholder="65535" placeholder="65535"
{...field} {...field}
value={
typeof field.value === "number"
? field.value
: ""
}
onChange={(e) => onChange={(e) =>
field.onChange(Number(e.target.value)) field.onChange(Number(e.target.value))
} }
@@ -475,6 +480,11 @@ export const ShowResources = ({ id, type }: Props) => {
min={-1} min={-1}
placeholder="65535" placeholder="65535"
{...field} {...field}
value={
typeof field.value === "number"
? field.value
: ""
}
onChange={(e) => onChange={(e) =>
field.onChange(Number(e.target.value)) field.onChange(Number(e.target.value))
} }
@@ -507,7 +517,7 @@ export const ShowResources = ({ id, type }: Props) => {
</div> </div>
<div className="flex w-full justify-end"> <div className="flex w-full justify-end">
<Button isLoading={isLoading} type="submit"> <Button isLoading={isPending} type="submit">
Save Save
</Button> </Button>
</div> </div>
@@ -15,7 +15,7 @@ interface Props {
} }
export const ShowTraefikConfig = ({ applicationId }: Props) => { export const ShowTraefikConfig = ({ applicationId }: Props) => {
const { data, isLoading } = api.application.readTraefikConfig.useQuery( const { data, isPending } = api.application.readTraefikConfig.useQuery(
{ {
applicationId, applicationId,
}, },
@@ -35,7 +35,7 @@ export const ShowTraefikConfig = ({ applicationId }: Props) => {
</div> </div>
</CardHeader> </CardHeader>
<CardContent className="flex flex-col gap-4"> <CardContent className="flex flex-col gap-4">
{isLoading ? ( {isPending ? (
<span className="text-base text-muted-foreground flex flex-row gap-3 items-center justify-center min-h-[10vh]"> <span className="text-base text-muted-foreground flex flex-row gap-3 items-center justify-center min-h-[10vh]">
Loading... Loading...
<Loader2 className="animate-spin" /> <Loader2 className="animate-spin" />
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -7,6 +7,7 @@ import { z } from "zod";
import { AlertBlock } from "@/components/shared/alert-block"; import { AlertBlock } from "@/components/shared/alert-block";
import { CodeEditor } from "@/components/shared/code-editor"; import { CodeEditor } from "@/components/shared/code-editor";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { import {
Dialog, Dialog,
DialogContent, DialogContent,
@@ -24,7 +25,6 @@ import {
FormLabel, FormLabel,
FormMessage, FormMessage,
} from "@/components/ui/form"; } from "@/components/ui/form";
import { Checkbox } from "@/components/ui/checkbox";
import { Label } from "@/components/ui/label"; import { Label } from "@/components/ui/label";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
@@ -69,7 +69,7 @@ export const UpdateTraefikConfig = ({ applicationId }: Props) => {
{ enabled: !!applicationId }, { enabled: !!applicationId },
); );
const { mutateAsync, isLoading, error, isError } = const { mutateAsync, isPending, error, isError } =
api.application.updateTraefikConfig.useMutation(); api.application.updateTraefikConfig.useMutation();
const form = useForm<UpdateTraefikConfig>({ const form = useForm<UpdateTraefikConfig>({
@@ -126,7 +126,7 @@ export const UpdateTraefikConfig = ({ applicationId }: Props) => {
}} }}
> >
<DialogTrigger asChild> <DialogTrigger asChild>
<Button isLoading={isLoading}>Modify</Button> <Button isLoading={isPending}>Modify</Button>
</DialogTrigger> </DialogTrigger>
<DialogContent className="sm:max-w-4xl"> <DialogContent className="sm:max-w-4xl">
<DialogHeader> <DialogHeader>
@@ -198,7 +198,7 @@ routers:
</p> </p>
</div> </div>
<Button <Button
isLoading={isLoading} isLoading={isPending}
form="hook-form-update-traefik-config" form="hook-form-update-traefik-config"
type="submit" type="submit"
> >
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PlusIcon } from "lucide-react"; import { PlusIcon } from "lucide-react";
import type React from "react"; import type React from "react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
@@ -37,7 +37,7 @@ export const ShowVolumes = ({ id, type }: Props) => {
const { data, refetch } = queryMap[type] const { data, refetch } = queryMap[type]
? queryMap[type]() ? queryMap[type]()
: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }); : api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
const { mutateAsync: deleteVolume, isLoading: isRemoving } = const { mutateAsync: deleteVolume, isPending: isRemoving } =
api.mounts.remove.useMutation(); api.mounts.remove.useMutation();
return ( return (
<Card className="bg-background"> <Card className="bg-background">
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PenBoxIcon } from "lucide-react"; import { PenBoxIcon } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -93,7 +93,7 @@ export const UpdateVolume = ({
}, },
); );
const { mutateAsync, isLoading, error, isError } = const { mutateAsync, isPending, error, isError } =
api.mounts.update.useMutation(); api.mounts.update.useMutation();
const form = useForm<UpdateMount>({ const form = useForm<UpdateMount>({
@@ -187,7 +187,7 @@ export const UpdateVolume = ({
variant="ghost" variant="ghost"
size="icon" size="icon"
className="group hover:bg-blue-500/10 " className="group hover:bg-blue-500/10 "
isLoading={isLoading} isLoading={isPending}
> >
<PenBoxIcon className="size-3.5 text-primary group-hover:text-blue-500" /> <PenBoxIcon className="size-3.5 text-primary group-hover:text-blue-500" />
</Button> </Button>
@@ -310,7 +310,7 @@ PORT=3000
</div> </div>
<DialogFooter> <DialogFooter>
<Button <Button
isLoading={isLoading} isLoading={isPending}
// form="hook-form-update-volume" // form="hook-form-update-volume"
type="submit" type="submit"
> >
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { Cog } from "lucide-react"; import { Cog } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -163,14 +163,14 @@ const resetData = (data: ApplicationData): AddTemplate => {
}; };
export const ShowBuildChooseForm = ({ applicationId }: Props) => { export const ShowBuildChooseForm = ({ applicationId }: Props) => {
const { mutateAsync, isLoading } = const { mutateAsync, isPending } =
api.application.saveBuildType.useMutation(); api.application.saveBuildType.useMutation();
const { data, refetch } = api.application.one.useQuery( const { data, refetch } = api.application.one.useQuery(
{ applicationId }, { applicationId },
{ enabled: !!applicationId }, { enabled: !!applicationId },
); );
const form = useForm<AddTemplate>({ const form = useForm({
defaultValues: { defaultValues: {
buildType: BuildType.nixpacks, buildType: BuildType.nixpacks,
}, },
@@ -528,7 +528,7 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
</> </>
)} )}
<div className="flex w-full justify-end"> <div className="flex w-full justify-end">
<Button isLoading={isLoading} type="submit"> <Button isLoading={isPending} type="submit">
Save Save
</Button> </Button>
</div> </div>
@@ -20,7 +20,7 @@ interface Props {
} }
export const CancelQueues = ({ id, type }: Props) => { export const CancelQueues = ({ id, type }: Props) => {
const { mutateAsync, isLoading } = const { mutateAsync, isPending } =
type === "application" type === "application"
? api.application.cleanQueues.useMutation() ? api.application.cleanQueues.useMutation()
: api.compose.cleanQueues.useMutation(); : api.compose.cleanQueues.useMutation();
@@ -33,7 +33,7 @@ export const CancelQueues = ({ id, type }: Props) => {
return ( return (
<AlertDialog> <AlertDialog>
<AlertDialogTrigger asChild> <AlertDialogTrigger asChild>
<Button variant="destructive" className="w-fit" isLoading={isLoading}> <Button variant="destructive" className="w-fit" isLoading={isPending}>
Cancel Queues Cancel Queues
<Ban className="size-4" /> <Ban className="size-4" />
</Button> </Button>
@@ -21,7 +21,7 @@ interface Props {
export const ClearDeployments = ({ id, type }: Props) => { export const ClearDeployments = ({ id, type }: Props) => {
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync, isLoading } = const { mutateAsync, isPending } =
type === "application" type === "application"
? api.application.clearDeployments.useMutation() ? api.application.clearDeployments.useMutation()
: api.compose.clearDeployments.useMutation(); : api.compose.clearDeployments.useMutation();
@@ -29,7 +29,7 @@ export const ClearDeployments = ({ id, type }: Props) => {
return ( return (
<AlertDialog> <AlertDialog>
<AlertDialogTrigger asChild> <AlertDialogTrigger asChild>
<Button variant="outline" className="w-fit" isLoading={isLoading}> <Button variant="outline" className="w-fit" isLoading={isPending}>
Clear deployments Clear deployments
<Paintbrush className="size-4" /> <Paintbrush className="size-4" />
</Button> </Button>
@@ -20,7 +20,7 @@ interface Props {
} }
export const KillBuild = ({ id, type }: Props) => { export const KillBuild = ({ id, type }: Props) => {
const { mutateAsync, isLoading } = const { mutateAsync, isPending } =
type === "application" type === "application"
? api.application.killBuild.useMutation() ? api.application.killBuild.useMutation()
: api.compose.killBuild.useMutation(); : api.compose.killBuild.useMutation();
@@ -28,7 +28,7 @@ export const KillBuild = ({ id, type }: Props) => {
return ( return (
<AlertDialog> <AlertDialog>
<AlertDialogTrigger asChild> <AlertDialogTrigger asChild>
<Button variant="outline" className="w-fit" isLoading={isLoading}> <Button variant="outline" className="w-fit" isLoading={isPending}>
Kill Build Kill Build
<Scissors className="size-4" /> <Scissors className="size-4" />
</Button> </Button>
@@ -61,7 +61,7 @@ export const ShowDeployments = ({
const [activeLog, setActiveLog] = useState< const [activeLog, setActiveLog] = useState<
RouterOutputs["deployment"]["all"][number] | null RouterOutputs["deployment"]["all"][number] | null
>(null); >(null);
const { data: deployments, isLoading: isLoadingDeployments } = const { data: deployments, isPending: isLoadingDeployments } =
api.deployment.allByType.useQuery( api.deployment.allByType.useQuery(
{ {
id, id,
@@ -75,21 +75,21 @@ export const ShowDeployments = ({
const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery();
const { mutateAsync: rollback, isLoading: isRollingBack } = const { mutateAsync: rollback, isPending: isRollingBack } =
api.rollback.rollback.useMutation(); api.rollback.rollback.useMutation();
const { mutateAsync: killProcess, isLoading: isKillingProcess } = const { mutateAsync: killProcess, isPending: isKillingProcess } =
api.deployment.killProcess.useMutation(); api.deployment.killProcess.useMutation();
const { mutateAsync: removeDeployment, isLoading: isRemovingDeployment } = const { mutateAsync: removeDeployment, isPending: isRemovingDeployment } =
api.deployment.removeDeployment.useMutation(); api.deployment.removeDeployment.useMutation();
// Cancel deployment mutations // Cancel deployment mutations
const { const {
mutateAsync: cancelApplicationDeployment, mutateAsync: cancelApplicationDeployment,
isLoading: isCancellingApp, isPending: isCancellingApp,
} = api.application.cancelDeployment.useMutation(); } = api.application.cancelDeployment.useMutation();
const { const {
mutateAsync: cancelComposeDeployment, mutateAsync: cancelComposeDeployment,
isLoading: isCancellingCompose, isPending: isCancellingCompose,
} = api.compose.cancelDeployment.useMutation(); } = api.compose.cancelDeployment.useMutation();
const [url, setUrl] = React.useState(""); const [url, setUrl] = React.useState("");
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { DatabaseZap, Dices, RefreshCw } from "lucide-react"; import { DatabaseZap, Dices, RefreshCw } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
@@ -159,11 +159,11 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
}, },
); );
const { mutateAsync, isError, error, isLoading } = domainId const { mutateAsync, isError, error, isPending } = domainId
? api.domain.update.useMutation() ? api.domain.update.useMutation()
: api.domain.create.useMutation(); : api.domain.create.useMutation();
const { mutateAsync: generateDomain, isLoading: isLoadingGenerate } = const { mutateAsync: generateDomain, isPending: isLoadingGenerate } =
api.domain.generateDomain.useMutation(); api.domain.generateDomain.useMutation();
const { data: canGenerateTraefikMeDomains } = const { data: canGenerateTraefikMeDomains } =
@@ -240,7 +240,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
domainType: type, domainType: type,
}); });
} }
}, [form, data, isLoading, domainId]); }, [form, data, isPending, domainId]);
// Separate effect for handling custom cert resolver validation // Separate effect for handling custom cert resolver validation
useEffect(() => { useEffect(() => {
@@ -730,7 +730,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
</form> </form>
<DialogFooter> <DialogFooter>
<Button isLoading={isLoading} form="hook-form" type="submit"> <Button isLoading={isPending} form="hook-form" type="submit">
{dictionary.submit} {dictionary.submit}
</Button> </Button>
</DialogFooter> </DialogFooter>
@@ -97,7 +97,7 @@ export const ShowDomains = ({ id, type }: Props) => {
const { mutateAsync: validateDomain } = const { mutateAsync: validateDomain } =
api.domain.validateDomain.useMutation(); api.domain.validateDomain.useMutation();
const { mutateAsync: deleteDomain, isLoading: isRemoving } = const { mutateAsync: deleteDomain, isPending: isRemoving } =
api.domain.delete.useMutation(); api.domain.delete.useMutation();
const handleValidateDomain = async (host: string) => { const handleValidateDomain = async (host: string) => {
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { EyeIcon, EyeOffIcon } from "lucide-react"; import { EyeIcon, EyeOffIcon } from "lucide-react";
import { type CSSProperties, useEffect, useState } from "react"; import { type CSSProperties, useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -60,7 +60,7 @@ export const ShowEnvironment = ({ id, type }: Props) => {
mongo: () => api.mongo.update.useMutation(), mongo: () => api.mongo.update.useMutation(),
compose: () => api.compose.update.useMutation(), compose: () => api.compose.update.useMutation(),
}; };
const { mutateAsync, isLoading } = mutationMap[type] const { mutateAsync, isPending } = mutationMap[type]
? mutationMap[type]() ? mutationMap[type]()
: api.mongo.update.useMutation(); : api.mongo.update.useMutation();
@@ -111,7 +111,7 @@ export const ShowEnvironment = ({ id, type }: Props) => {
// Add keyboard shortcut for Ctrl+S/Cmd+S // Add keyboard shortcut for Ctrl+S/Cmd+S
useEffect(() => { useEffect(() => {
const handleKeyDown = (e: KeyboardEvent) => { const handleKeyDown = (e: KeyboardEvent) => {
if ((e.ctrlKey || e.metaKey) && e.key === "s" && !isLoading) { if ((e.ctrlKey || e.metaKey) && e.key === "s" && !isPending) {
e.preventDefault(); e.preventDefault();
form.handleSubmit(onSubmit)(); form.handleSubmit(onSubmit)();
} }
@@ -121,7 +121,7 @@ export const ShowEnvironment = ({ id, type }: Props) => {
return () => { return () => {
document.removeEventListener("keydown", handleKeyDown); document.removeEventListener("keydown", handleKeyDown);
}; };
}, [form, onSubmit, isLoading]); }, [form, onSubmit, isPending]);
return ( return (
<div className="flex w-full flex-col gap-5 "> <div className="flex w-full flex-col gap-5 ">
@@ -196,7 +196,7 @@ PORT=3000
</Button> </Button>
)} )}
<Button <Button
isLoading={isLoading} isLoading={isPending}
className="w-fit" className="w-fit"
type="submit" type="submit"
disabled={!hasChanges} disabled={!hasChanges}
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
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";
@@ -31,7 +31,7 @@ interface Props {
} }
export const ShowEnvironment = ({ applicationId }: Props) => { export const ShowEnvironment = ({ applicationId }: Props) => {
const { mutateAsync, isLoading } = const { mutateAsync, isPending } =
api.application.saveEnvironment.useMutation(); api.application.saveEnvironment.useMutation();
const { data, refetch } = api.application.one.useQuery( const { data, refetch } = api.application.one.useQuery(
@@ -104,7 +104,7 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
// Add keyboard shortcut for Ctrl+S/Cmd+S // Add keyboard shortcut for Ctrl+S/Cmd+S
useEffect(() => { useEffect(() => {
const handleKeyDown = (e: KeyboardEvent) => { const handleKeyDown = (e: KeyboardEvent) => {
if ((e.ctrlKey || e.metaKey) && e.key === "s" && !isLoading) { if ((e.ctrlKey || e.metaKey) && e.key === "s" && !isPending) {
e.preventDefault(); e.preventDefault();
form.handleSubmit(onSubmit)(); form.handleSubmit(onSubmit)();
} }
@@ -114,7 +114,7 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
return () => { return () => {
document.removeEventListener("keydown", handleKeyDown); document.removeEventListener("keydown", handleKeyDown);
}; };
}, [form, onSubmit, isLoading]); }, [form, onSubmit, isPending]);
return ( return (
<Card className="bg-background px-6 pb-6"> <Card className="bg-background px-6 pb-6">
@@ -214,7 +214,7 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
</Button> </Button>
)} )}
<Button <Button
isLoading={isLoading} isLoading={isPending}
className="w-fit" className="w-fit"
type="submit" type="submit"
disabled={!hasChanges} disabled={!hasChanges}
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { CheckIcon, ChevronsUpDown, X } from "lucide-react"; import { CheckIcon, ChevronsUpDown, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect } from "react"; import { useEffect } from "react";
@@ -74,10 +74,10 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
api.bitbucket.bitbucketProviders.useQuery(); api.bitbucket.bitbucketProviders.useQuery();
const { data, refetch } = api.application.one.useQuery({ applicationId }); const { data, refetch } = api.application.one.useQuery({ applicationId });
const { mutateAsync, isLoading: isSavingBitbucketProvider } = const { mutateAsync, isPending: isSavingBitbucketProvider } =
api.application.saveBitbucketProvider.useMutation(); api.application.saveBitbucketProvider.useMutation();
const form = useForm<BitbucketProvider>({ const form = useForm({
defaultValues: { defaultValues: {
buildPath: "/", buildPath: "/",
repository: { repository: {
@@ -333,7 +333,7 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
!field.value && "text-muted-foreground", !field.value && "text-muted-foreground",
)} )}
> >
{status === "loading" && fetchStatus === "fetching" {status === "pending" && fetchStatus === "fetching"
? "Loading...." ? "Loading...."
: field.value : field.value
? branches?.find( ? branches?.find(
@@ -350,7 +350,7 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
placeholder="Search branch..." placeholder="Search branch..."
className="h-9" className="h-9"
/> />
{status === "loading" && fetchStatus === "fetching" && ( {status === "pending" && fetchStatus === "fetching" && (
<span className="py-6 text-center text-sm text-muted-foreground"> <span className="py-6 text-center text-sm text-muted-foreground">
Loading Branches.... Loading Branches....
</span> </span>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
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";
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { TrashIcon } from "lucide-react"; import { TrashIcon } from "lucide-react";
import { useEffect } from "react"; import { useEffect } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -24,10 +24,10 @@ interface Props {
export const SaveDragNDrop = ({ applicationId }: Props) => { export const SaveDragNDrop = ({ applicationId }: Props) => {
const { data, refetch } = api.application.one.useQuery({ applicationId }); const { data, refetch } = api.application.one.useQuery({ applicationId });
const { mutateAsync, isLoading } = const { mutateAsync, isPending } =
api.application.dropDeployment.useMutation(); api.application.dropDeployment.useMutation();
const form = useForm<UploadFile>({ const form = useForm({
defaultValues: {}, defaultValues: {},
resolver: zodResolver(uploadFileSchema), resolver: zodResolver(uploadFileSchema),
}); });
@@ -129,8 +129,8 @@ export const SaveDragNDrop = ({ applicationId }: Props) => {
<Button <Button
type="submit" type="submit"
className="w-fit" className="w-fit"
isLoading={isLoading} isLoading={isPending}
disabled={!zip || isLoading} disabled={!zip || isPending}
> >
Deploy{" "} Deploy{" "}
</Button> </Button>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { KeyRoundIcon, LockIcon, X } from "lucide-react"; import { KeyRoundIcon, LockIcon, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
@@ -58,10 +58,10 @@ export const SaveGitProvider = ({ applicationId }: Props) => {
const { data: sshKeys } = api.sshKey.all.useQuery(); const { data: sshKeys } = api.sshKey.all.useQuery();
const router = useRouter(); const router = useRouter();
const { mutateAsync, isLoading } = const { mutateAsync, isPending } =
api.application.saveGitProvider.useMutation(); api.application.saveGitProvider.useMutation();
const form = useForm<GitProvider>({ const form = useForm({
defaultValues: { defaultValues: {
branch: "", branch: "",
buildPath: "/", buildPath: "/",
@@ -317,7 +317,7 @@ export const SaveGitProvider = ({ applicationId }: Props) => {
</div> </div>
<div className="flex flex-row justify-end"> <div className="flex flex-row justify-end">
<Button type="submit" className="w-fit" isLoading={isLoading}> <Button type="submit" className="w-fit" isLoading={isPending}>
Save Save
</Button> </Button>
</div> </div>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { CheckIcon, ChevronsUpDown, HelpCircle, Plus, X } from "lucide-react"; import { CheckIcon, ChevronsUpDown, HelpCircle, Plus, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect } from "react"; import { useEffect } from "react";
@@ -88,10 +88,10 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
const { data: giteaProviders } = api.gitea.giteaProviders.useQuery(); const { data: giteaProviders } = api.gitea.giteaProviders.useQuery();
const { data, refetch } = api.application.one.useQuery({ applicationId }); const { data, refetch } = api.application.one.useQuery({ applicationId });
const { mutateAsync, isLoading: isSavingGiteaProvider } = const { mutateAsync, isPending: isSavingGiteaProvider } =
api.application.saveGiteaProvider.useMutation(); api.application.saveGiteaProvider.useMutation();
const form = useForm<GiteaProvider>({ const form = useForm({
defaultValues: { defaultValues: {
buildPath: "/", buildPath: "/",
repository: { repository: {
@@ -353,7 +353,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
!field.value && "text-muted-foreground", !field.value && "text-muted-foreground",
)} )}
> >
{status === "loading" && fetchStatus === "fetching" {status === "pending" && fetchStatus === "fetching"
? "Loading...." ? "Loading...."
: field.value : field.value
? branches?.find( ? branches?.find(
@@ -371,7 +371,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
placeholder="Search branch..." placeholder="Search branch..."
className="h-9" className="h-9"
/> />
{status === "loading" && fetchStatus === "fetching" && ( {status === "pending" && fetchStatus === "fetching" && (
<span className="py-6 text-center text-sm text-muted-foreground"> <span className="py-6 text-center text-sm text-muted-foreground">
Loading Branches.... Loading Branches....
</span> </span>
@@ -463,7 +463,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
<X <X
className="size-3 cursor-pointer hover:text-destructive" className="size-3 cursor-pointer hover:text-destructive"
onClick={() => { onClick={() => {
const newPaths = [...field.value]; const newPaths = [...(field.value || [])];
newPaths.splice(index, 1); newPaths.splice(index, 1);
field.onChange(newPaths); field.onChange(newPaths);
}} }}
@@ -481,7 +481,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
const input = e.currentTarget; const input = e.currentTarget;
const path = input.value.trim(); const path = input.value.trim();
if (path) { if (path) {
field.onChange([...field.value, path]); field.onChange([...(field.value || []), path]);
input.value = ""; input.value = "";
} }
} }
@@ -498,7 +498,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
) as HTMLInputElement; ) as HTMLInputElement;
const path = input.value.trim(); const path = input.value.trim();
if (path) { if (path) {
field.onChange([...field.value, path]); field.onChange([...(field.value || []), path]);
input.value = ""; input.value = "";
} }
}} }}
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { CheckIcon, ChevronsUpDown, HelpCircle, Plus, X } from "lucide-react"; import { CheckIcon, ChevronsUpDown, HelpCircle, Plus, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect } from "react"; import { useEffect } from "react";
@@ -72,10 +72,10 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
const { data: githubProviders } = api.github.githubProviders.useQuery(); const { data: githubProviders } = api.github.githubProviders.useQuery();
const { data, refetch } = api.application.one.useQuery({ applicationId }); const { data, refetch } = api.application.one.useQuery({ applicationId });
const { mutateAsync, isLoading: isSavingGithubProvider } = const { mutateAsync, isPending: isSavingGithubProvider } =
api.application.saveGithubProvider.useMutation(); api.application.saveGithubProvider.useMutation();
const form = useForm<GithubProvider>({ const form = useForm({
defaultValues: { defaultValues: {
buildPath: "/", buildPath: "/",
repository: { repository: {
@@ -94,7 +94,7 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
const githubId = form.watch("githubId"); const githubId = form.watch("githubId");
const triggerType = form.watch("triggerType"); const triggerType = form.watch("triggerType");
const { data: repositories, isLoading: isLoadingRepositories } = const { data: repositories, isPending: isLoadingRepositories } =
api.github.getGithubRepositories.useQuery( api.github.getGithubRepositories.useQuery(
{ {
githubId, githubId,
@@ -320,7 +320,7 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
!field.value && "text-muted-foreground", !field.value && "text-muted-foreground",
)} )}
> >
{status === "loading" && fetchStatus === "fetching" {status === "pending" && fetchStatus === "fetching"
? "Loading...." ? "Loading...."
: field.value : field.value
? branches?.find( ? branches?.find(
@@ -337,7 +337,7 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
placeholder="Search branch..." placeholder="Search branch..."
className="h-9" className="h-9"
/> />
{status === "loading" && fetchStatus === "fetching" && ( {status === "pending" && fetchStatus === "fetching" && (
<span className="py-6 text-center text-sm text-muted-foreground"> <span className="py-6 text-center text-sm text-muted-foreground">
Loading Branches.... Loading Branches....
</span> </span>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { CheckIcon, ChevronsUpDown, HelpCircle, Plus, X } from "lucide-react"; import { CheckIcon, ChevronsUpDown, HelpCircle, Plus, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect, useMemo } from "react"; import { useEffect, useMemo } from "react";
@@ -74,10 +74,10 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
const { data: gitlabProviders } = api.gitlab.gitlabProviders.useQuery(); const { data: gitlabProviders } = api.gitlab.gitlabProviders.useQuery();
const { data, refetch } = api.application.one.useQuery({ applicationId }); const { data, refetch } = api.application.one.useQuery({ applicationId });
const { mutateAsync, isLoading: isSavingGitlabProvider } = const { mutateAsync, isPending: isSavingGitlabProvider } =
api.application.saveGitlabProvider.useMutation(); api.application.saveGitlabProvider.useMutation();
const form = useForm<GitlabProvider>({ const form = useForm({
defaultValues: { defaultValues: {
buildPath: "/", buildPath: "/",
repository: { repository: {
@@ -351,7 +351,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
!field.value && "text-muted-foreground", !field.value && "text-muted-foreground",
)} )}
> >
{status === "loading" && fetchStatus === "fetching" {status === "pending" && fetchStatus === "fetching"
? "Loading...." ? "Loading...."
: field.value : field.value
? branches?.find( ? branches?.find(
@@ -368,7 +368,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
placeholder="Search branch..." placeholder="Search branch..."
className="h-9" className="h-9"
/> />
{status === "loading" && fetchStatus === "fetching" && ( {status === "pending" && fetchStatus === "fetching" && (
<span className="py-6 text-center text-sm text-muted-foreground"> <span className="py-6 text-center text-sm text-muted-foreground">
Loading Branches.... Loading Branches....
</span> </span>
@@ -36,13 +36,13 @@ interface Props {
} }
export const ShowProviderForm = ({ applicationId }: Props) => { export const ShowProviderForm = ({ applicationId }: Props) => {
const { data: githubProviders, isLoading: isLoadingGithub } = const { data: githubProviders, isPending: isLoadingGithub } =
api.github.githubProviders.useQuery(); api.github.githubProviders.useQuery();
const { data: gitlabProviders, isLoading: isLoadingGitlab } = const { data: gitlabProviders, isPending: isLoadingGitlab } =
api.gitlab.gitlabProviders.useQuery(); api.gitlab.gitlabProviders.useQuery();
const { data: bitbucketProviders, isLoading: isLoadingBitbucket } = const { data: bitbucketProviders, isPending: isLoadingBitbucket } =
api.bitbucket.bitbucketProviders.useQuery(); api.bitbucket.bitbucketProviders.useQuery();
const { data: giteaProviders, isLoading: isLoadingGitea } = const { data: giteaProviders, isPending: isLoadingGitea } =
api.gitea.giteaProviders.useQuery(); api.gitea.giteaProviders.useQuery();
const { data: application, refetch } = api.application.one.useQuery({ const { data: application, refetch } = api.application.one.useQuery({
@@ -37,14 +37,14 @@ export const ShowGeneralApplication = ({ applicationId }: Props) => {
{ enabled: !!applicationId }, { enabled: !!applicationId },
); );
const { mutateAsync: update } = api.application.update.useMutation(); const { mutateAsync: update } = api.application.update.useMutation();
const { mutateAsync: start, isLoading: isStarting } = const { mutateAsync: start, isPending: isStarting } =
api.application.start.useMutation(); api.application.start.useMutation();
const { mutateAsync: stop, isLoading: isStopping } = const { mutateAsync: stop, isPending: isStopping } =
api.application.stop.useMutation(); api.application.stop.useMutation();
const { mutateAsync: deploy } = api.application.deploy.useMutation(); const { mutateAsync: deploy } = api.application.deploy.useMutation();
const { mutateAsync: reload, isLoading: isReloading } = const { mutateAsync: reload, isPending: isReloading } =
api.application.reload.useMutation(); api.application.reload.useMutation();
const { mutateAsync: redeploy } = api.application.redeploy.useMutation(); const { mutateAsync: redeploy } = api.application.redeploy.useMutation();
@@ -56,7 +56,7 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => {
const [containerId, setContainerId] = useState<string | undefined>(); const [containerId, setContainerId] = useState<string | undefined>();
const [option, setOption] = useState<"swarm" | "native">("native"); const [option, setOption] = useState<"swarm" | "native">("native");
const { data: services, isLoading: servicesLoading } = const { data: services, isPending: servicesLoading } =
api.docker.getServiceContainersByAppName.useQuery( api.docker.getServiceContainersByAppName.useQuery(
{ {
appName, appName,
@@ -67,7 +67,7 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => {
}, },
); );
const { data: containers, isLoading: containersLoading } = const { data: containers, isPending: containersLoading } =
api.docker.getContainersByAppNameMatch.useQuery( api.docker.getContainersByAppNameMatch.useQuery(
{ {
appName, appName,
@@ -28,7 +28,7 @@ export const EditPatchDialog = ({
type, type,
onSuccess, onSuccess,
}: Props) => { }: Props) => {
const { data: patch, isLoading: isPatchLoading } = api.patch.one.useQuery( const { data: patch, isPending: isPatchLoading } = api.patch.one.useQuery(
{ patchId }, { patchId },
{ enabled: !!patchId }, { enabled: !!patchId },
); );
@@ -89,7 +89,7 @@ export const EditPatchDialog = ({
<DialogClose asChild> <DialogClose asChild>
<Button variant="outline">Cancel</Button> <Button variant="outline">Cancel</Button>
</DialogClose> </DialogClose>
<Button onClick={handleSave} isLoading={updatePatch.isLoading}> <Button onClick={handleSave} isLoading={updatePatch.isPending}>
{updatePatch.isPending && ( {updatePatch.isPending && (
<Loader2 className="mr-2 h-4 w-4 animate-spin" /> <Loader2 className="mr-2 h-4 w-4 animate-spin" />
)} )}
@@ -45,7 +45,7 @@ export const PatchEditor = ({ id, type, repoPath, onClose }: Props) => {
); );
const utils = api.useUtils(); const utils = api.useUtils();
const { data: directories, isLoading: isDirLoading } = const { data: directories, isPending: isDirLoading } =
api.patch.readRepoDirectories.useQuery( api.patch.readRepoDirectories.useQuery(
{ id: id, type, repoPath }, { id: id, type, repoPath },
{ enabled: !!repoPath }, { enabled: !!repoPath },
@@ -56,10 +56,10 @@ export const PatchEditor = ({ id, type, repoPath, onClose }: Props) => {
{ enabled: !!id }, { enabled: !!id },
); );
const { mutateAsync: saveAsPatch, isLoading: isSavingPatch } = const { mutateAsync: saveAsPatch, isPending: isSavingPatch } =
api.patch.saveFileAsPatch.useMutation(); api.patch.saveFileAsPatch.useMutation();
const { mutateAsync: markForDeletion, isLoading: isMarkingDeletion } = const { mutateAsync: markForDeletion, isPending: isMarkingDeletion } =
api.patch.markFileForDeletion.useMutation(); api.patch.markFileForDeletion.useMutation();
const updatePatch = api.patch.update.useMutation(); const updatePatch = api.patch.update.useMutation();
@@ -1,6 +1,7 @@
import { File, FilePlus2, Loader2, Trash2 } from "lucide-react"; import { File, FilePlus2, Loader2, Trash2 } from "lucide-react";
import { useState } from "react"; import { useState } from "react";
import { toast } from "sonner"; import { toast } from "sonner";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { import {
Card, Card,
@@ -9,7 +10,6 @@ import {
CardHeader, CardHeader,
CardTitle, CardTitle,
} from "@/components/ui/card"; } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
import { Switch } from "@/components/ui/switch"; import { Switch } from "@/components/ui/switch";
import { import {
Table, Table,
@@ -35,7 +35,7 @@ export const ShowPatches = ({ id, type }: Props) => {
const utils = api.useUtils(); const utils = api.useUtils();
const { data: patches, isLoading: isPatchesLoading } = const { data: patches, isPending: isPatchesLoading } =
api.patch.byEntityId.useQuery({ id, type }, { enabled: !!id }); api.patch.byEntityId.useQuery({ id, type }, { enabled: !!id });
const mutationMap = { const mutationMap = {
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { Dices } from "lucide-react"; import { Dices } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -75,11 +75,11 @@ export const AddPreviewDomain = ({
}, },
); );
const { mutateAsync, isError, error, isLoading } = domainId const { mutateAsync, isError, error, isPending } = domainId
? api.domain.update.useMutation() ? api.domain.update.useMutation()
: api.domain.create.useMutation(); : api.domain.create.useMutation();
const { mutateAsync: generateDomain, isLoading: isLoadingGenerate } = const { mutateAsync: generateDomain, isPending: isLoadingGenerate } =
api.domain.generateDomain.useMutation(); api.domain.generateDomain.useMutation();
const form = useForm<Domain>({ const form = useForm<Domain>({
@@ -103,7 +103,7 @@ export const AddPreviewDomain = ({
if (!domainId) { if (!domainId) {
form.reset({}); form.reset({});
} }
}, [form, form.reset, data, isLoading]); }, [form, form.reset, data, isPending]);
const dictionary = { const dictionary = {
success: domainId ? "Domain Updated" : "Domain Created", success: domainId ? "Domain Updated" : "Domain Created",
@@ -301,7 +301,7 @@ export const AddPreviewDomain = ({
</form> </form>
<DialogFooter> <DialogFooter>
<Button isLoading={isLoading} form="hook-form" type="submit"> <Button isLoading={isPending} form="hook-form" type="submit">
{dictionary.submit} {dictionary.submit}
</Button> </Button>
</DialogFooter> </DialogFooter>
@@ -43,7 +43,7 @@ interface Props {
export const ShowPreviewDeployments = ({ applicationId }: Props) => { export const ShowPreviewDeployments = ({ applicationId }: Props) => {
const { data } = api.application.one.useQuery({ applicationId }); const { data } = api.application.one.useQuery({ applicationId });
const { mutateAsync: deletePreviewDeployment, isLoading } = const { mutateAsync: deletePreviewDeployment, isPending } =
api.previewDeployment.delete.useMutation(); api.previewDeployment.delete.useMutation();
const { mutateAsync: redeployPreviewDeployment } = const { mutateAsync: redeployPreviewDeployment } =
@@ -57,8 +57,7 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
{ applicationId }, { applicationId },
{ {
enabled: !!applicationId, enabled: !!applicationId,
refetchInterval: (data) => refetchInterval: 2000,
data?.some((d) => d.previewStatus === "running") ? 2000 : false,
}, },
); );
@@ -282,7 +281,7 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
<Button <Button
variant="ghost" variant="ghost"
size="sm" size="sm"
isLoading={isLoading} isLoading={isPending}
className="text-red-600 hover:text-red-700 hover:bg-red-50" className="text-red-600 hover:text-red-700 hover:bg-red-50"
> >
<Trash2 className="size-4" /> <Trash2 className="size-4" />
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { HelpCircle, Plus, Settings2, X } from "lucide-react"; import { HelpCircle, Plus, Settings2, X } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -80,7 +80,7 @@ interface Props {
export const ShowPreviewSettings = ({ applicationId }: Props) => { export const ShowPreviewSettings = ({ applicationId }: Props) => {
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const [isEnabled, setIsEnabled] = useState(false); const [isEnabled, setIsEnabled] = useState(false);
const { mutateAsync: updateApplication, isLoading } = const { mutateAsync: updateApplication, isPending } =
api.application.update.useMutation(); api.application.update.useMutation();
const { data, refetch } = api.application.one.useQuery({ applicationId }); const { data, refetch } = api.application.one.useQuery({ applicationId });
@@ -535,7 +535,7 @@ export const ShowPreviewSettings = ({ applicationId }: Props) => {
Cancel Cancel
</Button> </Button>
<Button <Button
isLoading={isLoading} isLoading={isPending}
form="hook-form-delete-application" form="hook-form-delete-application"
type="submit" type="submit"
> >
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import Link from "next/link"; import Link from "next/link";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -71,7 +71,7 @@ export const ShowRollbackSettings = ({ applicationId, children }: Props) => {
}, },
); );
const { mutateAsync: updateApplication, isLoading } = const { mutateAsync: updateApplication, isPending } =
api.application.update.useMutation(); api.application.update.useMutation();
const { data: registries } = api.registry.all.useQuery(); const { data: registries } = api.registry.all.useQuery();
@@ -212,7 +212,7 @@ export const ShowRollbackSettings = ({ applicationId, children }: Props) => {
/> />
)} )}
<Button type="submit" className="w-full" isLoading={isLoading}> <Button type="submit" className="w-full" isLoading={isPending}>
Save Settings Save Settings
</Button> </Button>
</form> </form>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
import { import {
CheckIcon, CheckIcon,
ChevronsUpDown, ChevronsUpDown,
@@ -220,8 +220,8 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const [cacheType, setCacheType] = useState<CacheType>("cache"); const [cacheType, setCacheType] = useState<CacheType>("cache");
const utils = api.useUtils(); const utils = api.useUtils();
const form = useForm<z.infer<typeof formSchema>>({ const form = useForm({
resolver: zodResolver(formSchema), resolver: standardSchemaResolver(formSchema),
defaultValues: { defaultValues: {
name: "", name: "",
cronExpression: "", cronExpression: "",
@@ -275,11 +275,11 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
} }
}, [form, schedule, scheduleId]); }, [form, schedule, scheduleId]);
const { mutateAsync, isLoading } = scheduleId const { mutateAsync, isPending } = scheduleId
? api.schedule.update.useMutation() ? api.schedule.update.useMutation()
: api.schedule.create.useMutation(); : api.schedule.create.useMutation();
const onSubmit = async (values: z.infer<typeof formSchema>) => { const onSubmit = async (values: z.output<typeof formSchema>) => {
if (!id && !scheduleId) return; if (!id && !scheduleId) return;
await mutateAsync({ await mutateAsync({
@@ -662,7 +662,7 @@ echo "Hello, world!"
)} )}
/> />
<Button type="submit" isLoading={isLoading} className="w-full"> <Button type="submit" isLoading={isPending} className="w-full">
{scheduleId ? "Update" : "Create"} Schedule {scheduleId ? "Update" : "Create"} Schedule
</Button> </Button>
</form> </form>
@@ -51,7 +51,7 @@ export const ShowSchedules = ({ id, scheduleType = "application" }: Props) => {
}, },
); );
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync: deleteSchedule, isLoading: isDeleting } = const { mutateAsync: deleteSchedule, isPending: isDeleting } =
api.schedule.delete.useMutation(); api.schedule.delete.useMutation();
const { mutateAsync: runManually } = api.schedule.runManually.useMutation(); const { mutateAsync: runManually } = api.schedule.runManually.useMutation();
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PenBoxIcon } from "lucide-react"; import { PenBoxIcon } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -43,7 +43,7 @@ interface Props {
export const UpdateApplication = ({ applicationId }: Props) => { export const UpdateApplication = ({ applicationId }: Props) => {
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync, error, isError, isLoading } = const { mutateAsync, error, isError, isPending } =
api.application.update.useMutation(); api.application.update.useMutation();
const { data } = api.application.one.useQuery( const { data } = api.application.one.useQuery(
{ {
@@ -148,7 +148,7 @@ export const UpdateApplication = ({ applicationId }: Props) => {
/> />
<DialogFooter> <DialogFooter>
<Button <Button
isLoading={isLoading} isLoading={isPending}
form="hook-form-update-application" form="hook-form-update-application"
type="submit" type="submit"
> >
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { DatabaseZap, PenBoxIcon, PlusCircle, RefreshCw } from "lucide-react"; import { DatabaseZap, PenBoxIcon, PlusCircle, RefreshCw } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -116,7 +116,7 @@ export const HandleVolumeBackups = ({
const [keepLatestCountInput, setKeepLatestCountInput] = useState(""); const [keepLatestCountInput, setKeepLatestCountInput] = useState("");
const utils = api.useUtils(); const utils = api.useUtils();
const form = useForm<z.infer<typeof formSchema>>({ const form = useForm({
resolver: zodResolver(formSchema), resolver: zodResolver(formSchema),
defaultValues: { defaultValues: {
name: "", name: "",
@@ -195,7 +195,7 @@ export const HandleVolumeBackups = ({
} }
}, [form, volumeBackup, volumeBackupId]); }, [form, volumeBackup, volumeBackupId]);
const { mutateAsync, isLoading } = volumeBackupId const { mutateAsync, isPending } = volumeBackupId
? api.volumeBackups.update.useMutation() ? api.volumeBackups.update.useMutation()
: api.volumeBackups.create.useMutation(); : api.volumeBackups.create.useMutation();
@@ -207,7 +207,7 @@ export const HandleVolumeBackups = ({
await mutateAsync({ await mutateAsync({
...values, ...values,
keepLatestCount: preparedKeepLatestCount, keepLatestCount: preparedKeepLatestCount ?? undefined,
destinationId: values.destinationId, destinationId: values.destinationId,
volumeBackupId: volumeBackupId || "", volumeBackupId: volumeBackupId || "",
serviceType: volumeBackupType, serviceType: volumeBackupType,
@@ -630,7 +630,7 @@ export const HandleVolumeBackups = ({
)} )}
/> />
<Button type="submit" isLoading={isLoading} className="w-full"> <Button type="submit" isLoading={isPending} className="w-full">
{volumeBackupId ? "Update" : "Create"} Volume Backup {volumeBackupId ? "Update" : "Create"} Volume Backup
</Button> </Button>
</form> </form>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import copy from "copy-to-clipboard"; import copy from "copy-to-clipboard";
import { debounce } from "lodash"; import { debounce } from "lodash";
import { CheckIcon, ChevronsUpDown, Copy, RotateCcw } from "lucide-react"; import { CheckIcon, ChevronsUpDown, Copy, RotateCcw } from "lucide-react";
@@ -53,27 +53,15 @@ interface Props {
} }
const RestoreBackupSchema = z.object({ const RestoreBackupSchema = z.object({
destinationId: z destinationId: z.string().min(1, {
.string({ message: "Destination is required",
required_error: "Please select a destination", }),
}) backupFile: z.string().min(1, {
.min(1, { message: "Backup file is required",
message: "Destination is required", }),
}), volumeName: z.string().min(1, {
backupFile: z message: "Volume name is required",
.string({ }),
required_error: "Please select a backup file",
})
.min(1, {
message: "Backup file is required",
}),
volumeName: z
.string({
required_error: "Please enter a volume name",
})
.min(1, {
message: "Volume name is required",
}),
}); });
export const RestoreVolumeBackups = ({ id, type, serverId }: Props) => { export const RestoreVolumeBackups = ({ id, type, serverId }: Props) => {
@@ -83,7 +71,7 @@ export const RestoreVolumeBackups = ({ id, type, serverId }: Props) => {
const { data: destinations = [] } = api.destination.all.useQuery(); const { data: destinations = [] } = api.destination.all.useQuery();
const form = useForm<z.infer<typeof RestoreBackupSchema>>({ const form = useForm({
defaultValues: { defaultValues: {
destinationId: "", destinationId: "",
backupFile: "", backupFile: "",
@@ -105,7 +93,7 @@ export const RestoreVolumeBackups = ({ id, type, serverId }: Props) => {
debouncedSetSearch(value); debouncedSetSearch(value);
}; };
const { data: files = [], isLoading } = api.backup.listBackupFiles.useQuery( const { data: files = [], isPending } = api.backup.listBackupFiles.useQuery(
{ {
destinationId: destinationId, destinationId: destinationId,
search: debouncedSearchTerm, search: debouncedSearchTerm,
@@ -294,7 +282,7 @@ export const RestoreVolumeBackups = ({ id, type, serverId }: Props) => {
onValueChange={handleSearchChange} onValueChange={handleSearchChange}
className="h-9" className="h-9"
/> />
{isLoading ? ( {isPending ? (
<div className="py-6 text-center text-sm"> <div className="py-6 text-center text-sm">
Loading backup files... Loading backup files...
</div> </div>
@@ -54,7 +54,7 @@ export const ShowVolumeBackups = ({
}, },
); );
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync: deleteVolumeBackup, isLoading: isDeleting } = const { mutateAsync: deleteVolumeBackup, isPending: isDeleting } =
api.volumeBackups.delete.useMutation(); api.volumeBackups.delete.useMutation();
const { mutateAsync: runManually } = const { mutateAsync: runManually } =
api.volumeBackups.runManually.useMutation(); api.volumeBackups.runManually.useMutation();
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
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";
@@ -52,7 +52,7 @@ export const AddCommandCompose = ({ composeId }: Props) => {
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync, isLoading } = api.compose.update.useMutation(); const { mutateAsync, isPending } = api.compose.update.useMutation();
const form = useForm<AddCommand>({ const form = useForm<AddCommand>({
defaultValues: { defaultValues: {
@@ -128,7 +128,7 @@ export const AddCommandCompose = ({ composeId }: Props) => {
/> />
</div> </div>
<div className="flex justify-end"> <div className="flex justify-end">
<Button isLoading={isLoading} type="submit" className="w-fit"> <Button isLoading={isPending} type="submit" className="w-fit">
Save Save
</Button> </Button>
</div> </div>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { AlertTriangle, Loader2 } from "lucide-react"; import { AlertTriangle, Loader2 } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -1,5 +1,5 @@
import type { ServiceType } from "@dokploy/server/db/schema"; import type { ServiceType } from "@dokploy/server/db/schema";
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import copy from "copy-to-clipboard"; import copy from "copy-to-clipboard";
import { Copy, Trash2 } from "lucide-react"; import { Copy, Trash2 } from "lucide-react";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
@@ -74,7 +74,7 @@ export const DeleteService = ({ id, type }: Props) => {
mongo: () => api.mongo.remove.useMutation(), mongo: () => api.mongo.remove.useMutation(),
compose: () => api.compose.delete.useMutation(), compose: () => api.compose.delete.useMutation(),
}; };
const { mutateAsync, isLoading } = mutationMap[type] const { mutateAsync, isPending } = mutationMap[type]
? mutationMap[type]() ? mutationMap[type]()
: api.mongo.remove.useMutation(); : api.mongo.remove.useMutation();
const { push } = useRouter(); const { push } = useRouter();
@@ -130,7 +130,7 @@ export const DeleteService = ({ id, type }: Props) => {
variant="ghost" variant="ghost"
size="icon" size="icon"
className="group hover:bg-red-500/10 " className="group hover:bg-red-500/10 "
isLoading={isLoading} isLoading={isPending}
> >
<Trash2 className="size-4 text-primary group-hover:text-red-500" /> <Trash2 className="size-4 text-primary group-hover:text-red-500" />
</Button> </Button>
@@ -228,7 +228,7 @@ export const DeleteService = ({ id, type }: Props) => {
</Button> </Button>
<Button <Button
isLoading={isLoading} isLoading={isPending}
disabled={isDisabled} disabled={isDisabled}
form="hook-form-delete-compose" form="hook-form-delete-compose"
type="submit" type="submit"
@@ -28,9 +28,9 @@ export const ComposeActions = ({ composeId }: Props) => {
const { mutateAsync: update } = api.compose.update.useMutation(); const { mutateAsync: update } = api.compose.update.useMutation();
const { mutateAsync: deploy } = api.compose.deploy.useMutation(); const { mutateAsync: deploy } = api.compose.deploy.useMutation();
const { mutateAsync: redeploy } = api.compose.redeploy.useMutation(); const { mutateAsync: redeploy } = api.compose.redeploy.useMutation();
const { mutateAsync: start, isLoading: isStarting } = const { mutateAsync: start, isPending: isStarting } =
api.compose.start.useMutation(); api.compose.start.useMutation();
const { mutateAsync: stop, isLoading: isStopping } = const { mutateAsync: stop, isPending: isStopping } =
api.compose.stop.useMutation(); api.compose.stop.useMutation();
return ( return (
<div className="flex flex-row gap-4 w-full flex-wrap "> <div className="flex flex-row gap-4 w-full flex-wrap ">
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -34,7 +34,7 @@ export const ComposeFileEditor = ({ composeId }: Props) => {
{ enabled: !!composeId }, { enabled: !!composeId },
); );
const { mutateAsync, isLoading } = api.compose.update.useMutation(); const { mutateAsync, isPending } = api.compose.update.useMutation();
const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false); const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
const form = useForm<AddComposeFile>({ const form = useForm<AddComposeFile>({
@@ -93,7 +93,7 @@ export const ComposeFileEditor = ({ composeId }: Props) => {
// Add keyboard shortcut for Ctrl+S/Cmd+S // Add keyboard shortcut for Ctrl+S/Cmd+S
useEffect(() => { useEffect(() => {
const handleKeyDown = (e: KeyboardEvent) => { const handleKeyDown = (e: KeyboardEvent) => {
if ((e.ctrlKey || e.metaKey) && e.key === "s" && !isLoading) { if ((e.ctrlKey || e.metaKey) && e.key === "s" && !isPending) {
e.preventDefault(); e.preventDefault();
form.handleSubmit(onSubmit)(); form.handleSubmit(onSubmit)();
} }
@@ -103,7 +103,7 @@ export const ComposeFileEditor = ({ composeId }: Props) => {
return () => { return () => {
document.removeEventListener("keydown", handleKeyDown); document.removeEventListener("keydown", handleKeyDown);
}; };
}, [form, onSubmit, isLoading]); }, [form, onSubmit, isPending]);
return ( return (
<> <>
@@ -167,7 +167,7 @@ services:
<Button <Button
type="submit" type="submit"
form="hook-form-save-compose-file" form="hook-form-save-compose-file"
isLoading={isLoading} isLoading={isPending}
className="lg:w-fit w-full" className="lg:w-fit w-full"
> >
Save Save
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { CheckIcon, ChevronsUpDown, X } from "lucide-react"; import { CheckIcon, ChevronsUpDown, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect } from "react"; import { useEffect } from "react";
@@ -74,10 +74,10 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
api.bitbucket.bitbucketProviders.useQuery(); api.bitbucket.bitbucketProviders.useQuery();
const { data, refetch } = api.compose.one.useQuery({ composeId }); const { data, refetch } = api.compose.one.useQuery({ composeId });
const { mutateAsync, isLoading: isSavingBitbucketProvider } = const { mutateAsync, isPending: isSavingBitbucketProvider } =
api.compose.update.useMutation(); api.compose.update.useMutation();
const form = useForm<BitbucketProvider>({ const form = useForm({
defaultValues: { defaultValues: {
composePath: "./docker-compose.yml", composePath: "./docker-compose.yml",
repository: { repository: {
@@ -335,7 +335,7 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
!field.value && "text-muted-foreground", !field.value && "text-muted-foreground",
)} )}
> >
{status === "loading" && fetchStatus === "fetching" {status === "pending" && fetchStatus === "fetching"
? "Loading...." ? "Loading...."
: field.value : field.value
? branches?.find( ? branches?.find(
@@ -352,7 +352,7 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
placeholder="Search branch..." placeholder="Search branch..."
className="h-9" className="h-9"
/> />
{status === "loading" && fetchStatus === "fetching" && ( {status === "pending" && fetchStatus === "fetching" && (
<span className="py-6 text-center text-sm text-muted-foreground"> <span className="py-6 text-center text-sm text-muted-foreground">
Loading Branches.... Loading Branches....
</span> </span>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { KeyRoundIcon, LockIcon, X } from "lucide-react"; import { KeyRoundIcon, LockIcon, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
@@ -58,9 +58,9 @@ export const SaveGitProviderCompose = ({ composeId }: Props) => {
const { data: sshKeys } = api.sshKey.all.useQuery(); const { data: sshKeys } = api.sshKey.all.useQuery();
const router = useRouter(); const router = useRouter();
const { mutateAsync, isLoading } = api.compose.update.useMutation(); const { mutateAsync, isPending } = api.compose.update.useMutation();
const form = useForm<GitProvider>({ const form = useForm({
defaultValues: { defaultValues: {
branch: "", branch: "",
repositoryURL: "", repositoryURL: "",
@@ -318,7 +318,7 @@ export const SaveGitProviderCompose = ({ composeId }: Props) => {
</div> </div>
<div className="flex flex-row justify-end"> <div className="flex flex-row justify-end">
<Button type="submit" className="w-fit" isLoading={isLoading}> <Button type="submit" className="w-fit" isLoading={isPending}>
Save{" "} Save{" "}
</Button> </Button>
</div> </div>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { CheckIcon, ChevronsUpDown, Plus, X } from "lucide-react"; import { CheckIcon, ChevronsUpDown, Plus, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect } from "react"; import { useEffect } from "react";
@@ -72,10 +72,10 @@ interface Props {
export const SaveGiteaProviderCompose = ({ composeId }: Props) => { export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
const { data: giteaProviders } = api.gitea.giteaProviders.useQuery(); 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 } = const { mutateAsync, isPending: isSavingGiteaProvider } =
api.compose.update.useMutation(); api.compose.update.useMutation();
const form = useForm<GiteaProvider>({ const form = useForm({
defaultValues: { defaultValues: {
composePath: "./docker-compose.yml", composePath: "./docker-compose.yml",
repository: { repository: {
@@ -331,7 +331,7 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
!field.value && "text-muted-foreground", !field.value && "text-muted-foreground",
)} )}
> >
{status === "loading" && fetchStatus === "fetching" {status === "pending" && fetchStatus === "fetching"
? "Loading...." ? "Loading...."
: field.value : field.value
? branches?.find( ? branches?.find(
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { CheckIcon, ChevronsUpDown, HelpCircle, X } from "lucide-react"; import { CheckIcon, ChevronsUpDown, HelpCircle, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect } from "react"; import { useEffect } from "react";
@@ -72,10 +72,10 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
const { data: githubProviders } = api.github.githubProviders.useQuery(); const { data: githubProviders } = api.github.githubProviders.useQuery();
const { data, refetch } = api.compose.one.useQuery({ composeId }); const { data, refetch } = api.compose.one.useQuery({ composeId });
const { mutateAsync, isLoading: isSavingGithubProvider } = const { mutateAsync, isPending: isSavingGithubProvider } =
api.compose.update.useMutation(); api.compose.update.useMutation();
const form = useForm<GithubProvider>({ const form = useForm({
defaultValues: { defaultValues: {
composePath: "./docker-compose.yml", composePath: "./docker-compose.yml",
repository: { repository: {
@@ -94,7 +94,7 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
const repository = form.watch("repository"); const repository = form.watch("repository");
const githubId = form.watch("githubId"); const githubId = form.watch("githubId");
const triggerType = form.watch("triggerType"); const triggerType = form.watch("triggerType");
const { data: repositories, isLoading: isLoadingRepositories } = const { data: repositories, isPending: isLoadingRepositories } =
api.github.getGithubRepositories.useQuery( api.github.getGithubRepositories.useQuery(
{ {
githubId, githubId,
@@ -321,7 +321,7 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
!field.value && "text-muted-foreground", !field.value && "text-muted-foreground",
)} )}
> >
{status === "loading" && fetchStatus === "fetching" {status === "pending" && fetchStatus === "fetching"
? "Loading...." ? "Loading...."
: field.value : field.value
? branches?.find( ? branches?.find(
@@ -338,7 +338,7 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
placeholder="Search branch..." placeholder="Search branch..."
className="h-9" className="h-9"
/> />
{status === "loading" && fetchStatus === "fetching" && ( {status === "pending" && fetchStatus === "fetching" && (
<span className="py-6 text-center text-sm text-muted-foreground"> <span className="py-6 text-center text-sm text-muted-foreground">
Loading Branches.... Loading Branches....
</span> </span>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { CheckIcon, ChevronsUpDown, X } from "lucide-react"; import { CheckIcon, ChevronsUpDown, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect, useMemo } from "react"; import { useEffect, useMemo } from "react";
@@ -74,10 +74,10 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
const { data: gitlabProviders } = api.gitlab.gitlabProviders.useQuery(); const { data: gitlabProviders } = api.gitlab.gitlabProviders.useQuery();
const { data, refetch } = api.compose.one.useQuery({ composeId }); const { data, refetch } = api.compose.one.useQuery({ composeId });
const { mutateAsync, isLoading: isSavingGitlabProvider } = const { mutateAsync, isPending: isSavingGitlabProvider } =
api.compose.update.useMutation(); api.compose.update.useMutation();
const form = useForm<GitlabProvider>({ const form = useForm({
defaultValues: { defaultValues: {
composePath: "./docker-compose.yml", composePath: "./docker-compose.yml",
repository: { repository: {
@@ -353,7 +353,7 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
!field.value && "text-muted-foreground", !field.value && "text-muted-foreground",
)} )}
> >
{status === "loading" && fetchStatus === "fetching" {status === "pending" && fetchStatus === "fetching"
? "Loading...." ? "Loading...."
: field.value : field.value
? branches?.find( ? branches?.find(
@@ -370,7 +370,7 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
placeholder="Search branch..." placeholder="Search branch..."
className="h-9" className="h-9"
/> />
{status === "loading" && fetchStatus === "fetching" && ( {status === "pending" && fetchStatus === "fetching" && (
<span className="py-6 text-center text-sm text-muted-foreground"> <span className="py-6 text-center text-sm text-muted-foreground">
Loading Branches.... Loading Branches....
</span> </span>
@@ -27,13 +27,13 @@ interface Props {
} }
export const ShowProviderFormCompose = ({ composeId }: Props) => { export const ShowProviderFormCompose = ({ composeId }: Props) => {
const { data: githubProviders, isLoading: isLoadingGithub } = const { data: githubProviders, isPending: isLoadingGithub } =
api.github.githubProviders.useQuery(); api.github.githubProviders.useQuery();
const { data: gitlabProviders, isLoading: isLoadingGitlab } = const { data: gitlabProviders, isPending: isLoadingGitlab } =
api.gitlab.gitlabProviders.useQuery(); api.gitlab.gitlabProviders.useQuery();
const { data: bitbucketProviders, isLoading: isLoadingBitbucket } = const { data: bitbucketProviders, isPending: isLoadingBitbucket } =
api.bitbucket.bitbucketProviders.useQuery(); api.bitbucket.bitbucketProviders.useQuery();
const { data: giteaProviders, isLoading: isLoadingGitea } = const { data: giteaProviders, isPending: isLoadingGitea } =
api.gitea.giteaProviders.useQuery(); api.gitea.giteaProviders.useQuery();
const { mutateAsync: disconnectGitProvider } = const { mutateAsync: disconnectGitProvider } =
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { AlertTriangle } from "lucide-react"; import { AlertTriangle } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -32,7 +32,7 @@ export const ShowConvertedCompose = ({ composeId }: Props) => {
}, },
); );
const { mutateAsync, isLoading } = api.compose.fetchSourceType.useMutation(); const { mutateAsync, isPending } = api.compose.fetchSourceType.useMutation();
useEffect(() => { useEffect(() => {
if (isOpen) { if (isOpen) {
@@ -66,7 +66,7 @@ export const ShowConvertedCompose = ({ composeId }: Props) => {
Preview your docker-compose file with added domains. Note: At least Preview your docker-compose file with added domains. Note: At least
one domain must be specified for this conversion to take effect. one domain must be specified for this conversion to take effect.
</AlertBlock> </AlertBlock>
{isLoading ? ( {isPending ? (
<div className="flex flex-row items-center justify-center min-h-[25rem] border p-4 rounded-md"> <div className="flex flex-row items-center justify-center min-h-[25rem] border p-4 rounded-md">
<Loader2 className="h-8 w-8 text-muted-foreground mb-2 animate-spin" /> <Loader2 className="h-8 w-8 text-muted-foreground mb-2 animate-spin" />
</div> </div>
@@ -82,7 +82,7 @@ export const ShowConvertedCompose = ({ composeId }: Props) => {
<div className="flex flex-row gap-2 justify-end my-4"> <div className="flex flex-row gap-2 justify-end my-4">
<Button <Button
variant="secondary" variant="secondary"
isLoading={isLoading} isLoading={isPending}
onClick={() => { onClick={() => {
mutateAsync({ composeId }) mutateAsync({ composeId })
.then(() => { .then(() => {
@@ -41,7 +41,7 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => {
const [option, setOption] = useState<"swarm" | "native">("native"); const [option, setOption] = useState<"swarm" | "native">("native");
const [containerId, setContainerId] = useState<string | undefined>(); const [containerId, setContainerId] = useState<string | undefined>();
const { data: services, isLoading: servicesLoading } = const { data: services, isPending: servicesLoading } =
api.docker.getStackContainersByAppName.useQuery( api.docker.getStackContainersByAppName.useQuery(
{ {
appName, appName,
@@ -52,7 +52,7 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => {
}, },
); );
const { data: containers, isLoading: containersLoading } = const { data: containers, isPending: containersLoading } =
api.docker.getContainersByAppNameMatch.useQuery( api.docker.getContainersByAppNameMatch.useQuery(
{ {
appName, appName,
@@ -1,8 +1,8 @@
import { Loader2 } from "lucide-react"; import { Loader2 } from "lucide-react";
import { badgeStateColor } from "@/components/dashboard/application/logs/show";
import { Badge } from "@/components/ui/badge";
import dynamic from "next/dynamic"; import dynamic from "next/dynamic";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { badgeStateColor } from "@/components/dashboard/application/logs/show";
import { Badge } from "@/components/ui/badge";
import { import {
Card, Card,
CardContent, CardContent,
@@ -42,7 +42,7 @@ export const ShowDockerLogsCompose = ({
appType, appType,
serverId, serverId,
}: Props) => { }: Props) => {
const { data, isLoading } = api.docker.getContainersByAppNameMatch.useQuery( const { data, isPending } = api.docker.getContainersByAppNameMatch.useQuery(
{ {
appName, appName,
appType, appType,
@@ -73,7 +73,7 @@ export const ShowDockerLogsCompose = ({
<Label>Select a container to view logs</Label> <Label>Select a container to view logs</Label>
<Select onValueChange={setContainerId} value={containerId}> <Select onValueChange={setContainerId} value={containerId}>
<SelectTrigger> <SelectTrigger>
{isLoading ? ( {isPending ? (
<div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground"> <div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground">
<span>Loading...</span> <span>Loading...</span>
<Loader2 className="animate-spin size-4" /> <Loader2 className="animate-spin size-4" />
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PenBoxIcon } from "lucide-react"; import { PenBoxIcon } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -43,7 +43,7 @@ interface Props {
export const UpdateCompose = ({ composeId }: Props) => { export const UpdateCompose = ({ composeId }: Props) => {
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync, error, isError, isLoading } = const { mutateAsync, error, isError, isPending } =
api.compose.update.useMutation(); api.compose.update.useMutation();
const { data } = api.compose.one.useQuery( const { data } = api.compose.one.useQuery(
{ {
@@ -148,7 +148,7 @@ export const UpdateCompose = ({ composeId }: Props) => {
/> />
<DialogFooter> <DialogFooter>
<Button <Button
isLoading={isLoading} isLoading={isPending}
form="hook-form-update-compose" form="hook-form-update-compose"
type="submit" type="submit"
> >
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { import {
CheckIcon, CheckIcon,
ChevronsUpDown, ChevronsUpDown,
@@ -192,7 +192,7 @@ export const HandleBackup = ({
}: Props) => { }: Props) => {
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const { data, isLoading } = api.destination.all.useQuery(); const { data, isPending } = api.destination.all.useQuery();
const { data: backup } = api.backup.one.useQuery( const { data: backup } = api.backup.one.useQuery(
{ {
backupId: backupId ?? "", backupId: backupId ?? "",
@@ -202,12 +202,12 @@ export const HandleBackup = ({
}, },
); );
const [cacheType, setCacheType] = useState<CacheType>("cache"); const [cacheType, setCacheType] = useState<CacheType>("cache");
const { mutateAsync: createBackup, isLoading: isCreatingPostgresBackup } = const { mutateAsync: createBackup, isPending: isCreatingPostgresBackup } =
backupId backupId
? api.backup.update.useMutation() ? api.backup.update.useMutation()
: api.backup.create.useMutation(); : api.backup.create.useMutation();
const form = useForm<z.infer<typeof Schema>>({ const form = useForm({
defaultValues: { defaultValues: {
database: databaseType === "web-server" ? "dokploy" : "", database: databaseType === "web-server" ? "dokploy" : "",
destinationId: "", destinationId: "",
@@ -396,7 +396,7 @@ export const HandleBackup = ({
!field.value && "text-muted-foreground", !field.value && "text-muted-foreground",
)} )}
> >
{isLoading {isPending
? "Loading...." ? "Loading...."
: field.value : field.value
? data?.find( ? data?.find(
@@ -415,7 +415,7 @@ export const HandleBackup = ({
placeholder="Search Destination..." placeholder="Search Destination..."
className="h-9" className="h-9"
/> />
{isLoading && ( {isPending && (
<span className="py-6 text-center text-sm"> <span className="py-6 text-center text-sm">
Loading Destinations.... Loading Destinations....
</span> </span>
@@ -613,6 +613,7 @@ export const HandleBackup = ({
type="number" type="number"
placeholder={"keeps all the backups if left empty"} placeholder={"keeps all the backups if left empty"}
{...field} {...field}
value={field.value as string}
/> />
</FormControl> </FormControl>
<FormDescription> <FormDescription>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import copy from "copy-to-clipboard"; import copy from "copy-to-clipboard";
import _ from "lodash"; import _ from "lodash";
import { import {
@@ -78,27 +78,15 @@ interface Props {
const RestoreBackupSchema = z const RestoreBackupSchema = z
.object({ .object({
destinationId: z destinationId: z.string().min(1, {
.string({ message: "Destination is required",
required_error: "Please select a destination", }),
}) backupFile: z.string().min(1, {
.min(1, { message: "Backup file is required",
message: "Destination is required", }),
}), databaseName: z.string().min(1, {
backupFile: z message: "Database name is required",
.string({ }),
required_error: "Please select a backup file",
})
.min(1, {
message: "Backup file is required",
}),
databaseName: z
.string({
required_error: "Please enter a database name",
})
.min(1, {
message: "Database name is required",
}),
databaseType: z databaseType: z
.enum(["postgres", "mariadb", "mysql", "mongo", "web-server"]) .enum(["postgres", "mariadb", "mysql", "mongo", "web-server"])
.optional(), .optional(),
@@ -219,7 +207,7 @@ export const RestoreBackup = ({
const { data: destinations = [] } = api.destination.all.useQuery(); const { data: destinations = [] } = api.destination.all.useQuery();
const form = useForm<z.infer<typeof RestoreBackupSchema>>({ const form = useForm({
defaultValues: { defaultValues: {
destinationId: "", destinationId: "",
backupFile: "", backupFile: "",
@@ -245,7 +233,7 @@ export const RestoreBackup = ({
debouncedSetSearch(value); debouncedSetSearch(value);
}; };
const { data: files = [], isLoading } = api.backup.listBackupFiles.useQuery( const { data: files = [], isPending } = api.backup.listBackupFiles.useQuery(
{ {
destinationId: destionationId, destinationId: destionationId,
search: debouncedSearchTerm, search: debouncedSearchTerm,
@@ -454,7 +442,7 @@ export const RestoreBackup = ({
onValueChange={handleSearchChange} onValueChange={handleSearchChange}
className="h-9" className="h-9"
/> />
{isLoading ? ( {isPending ? (
<div className="py-6 text-center text-sm"> <div className="py-6 text-center text-sm">
Loading backup files... Loading backup files...
</div> </div>
@@ -89,11 +89,11 @@ export const ShowBackups = ({
const mutation = mutationMap[key as keyof typeof mutationMap]; const mutation = mutationMap[key as keyof typeof mutationMap];
const { mutateAsync: manualBackup, isLoading: isManualBackup } = mutation const { mutateAsync: manualBackup, isPending: isManualBackup } = mutation
? mutation ? mutation
: api.backup.manualBackupMongo.useMutation(); : api.backup.manualBackupMongo.useMutation();
const { mutateAsync: deleteBackup, isLoading: isRemoving } = const { mutateAsync: deleteBackup, isPending: isRemoving } =
api.backup.remove.useMutation(); api.backup.remove.useMutation();
return ( return (
@@ -45,7 +45,7 @@ interface Props {
} }
export const ShowContainers = ({ serverId }: Props) => { export const ShowContainers = ({ serverId }: Props) => {
const { data, isLoading } = api.docker.getContainers.useQuery({ const { data, isPending } = api.docker.getContainers.useQuery({
serverId, serverId,
}); });
@@ -137,7 +137,7 @@ export const ShowContainers = ({ serverId }: Props) => {
</DropdownMenu> </DropdownMenu>
</div> </div>
<div className="rounded-md border"> <div className="rounded-md border">
{isLoading ? ( {isPending ? (
<div className="w-full flex-col gap-2 flex items-center justify-center h-[55vh]"> <div className="w-full flex-col gap-2 flex items-center justify-center h-[55vh]">
<span className="text-muted-foreground text-lg font-medium"> <span className="text-muted-foreground text-lg font-medium">
Loading... Loading...
@@ -192,7 +192,7 @@ export const ShowContainers = ({ serverId }: Props) => {
colSpan={columns.length} colSpan={columns.length}
className="h-24 text-center" className="h-24 text-center"
> >
{isLoading ? ( {isPending ? (
<div className="w-full flex-col gap-2 flex items-center justify-center h-[55vh]"> <div className="w-full flex-col gap-2 flex items-center justify-center h-[55vh]">
<span className="text-muted-foreground text-lg font-medium"> <span className="text-muted-foreground text-lg font-medium">
Loading... Loading...
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { Loader2 } from "lucide-react"; import { Loader2 } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -51,7 +51,7 @@ export const ShowTraefikFile = ({ path, serverId }: Props) => {
const [canEdit, setCanEdit] = useState(true); const [canEdit, setCanEdit] = useState(true);
const [skipYamlValidation, setSkipYamlValidation] = useState(false); const [skipYamlValidation, setSkipYamlValidation] = useState(false);
const { mutateAsync, isLoading, error, isError } = const { mutateAsync, isPending, error, isError } =
api.settings.updateTraefikFile.useMutation(); api.settings.updateTraefikFile.useMutation();
const form = useForm<UpdateServerMiddlewareConfig>({ const form = useForm<UpdateServerMiddlewareConfig>({
@@ -182,8 +182,8 @@ routers:
</p> </p>
<div className="flex justify-end"> <div className="flex justify-end">
<Button <Button
isLoading={isLoading} isLoading={isPending}
disabled={canEdit || isLoading} disabled={canEdit || isLoadingFile}
type="submit" type="submit"
> >
Update Update
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import Link from "next/link"; import Link from "next/link";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -48,10 +48,10 @@ interface Props {
export const ShowExternalMariadbCredentials = ({ mariadbId }: Props) => { export const ShowExternalMariadbCredentials = ({ mariadbId }: Props) => {
const { data: ip } = api.settings.getIp.useQuery(); const { data: ip } = api.settings.getIp.useQuery();
const { data, refetch } = api.mariadb.one.useQuery({ mariadbId }); const { data, refetch } = api.mariadb.one.useQuery({ mariadbId });
const { mutateAsync, isLoading } = api.mariadb.saveExternalPort.useMutation(); const { mutateAsync, isPending } = api.mariadb.saveExternalPort.useMutation();
const [connectionUrl, setConnectionUrl] = useState(""); const [connectionUrl, setConnectionUrl] = useState("");
const getIp = data?.server?.ipAddress || ip; const getIp = data?.server?.ipAddress || ip;
const form = useForm<DockerProvider>({ const form = useForm({
defaultValues: {}, defaultValues: {},
resolver: zodResolver(DockerProviderSchema), resolver: zodResolver(DockerProviderSchema),
}); });
@@ -140,7 +140,7 @@ export const ShowExternalMariadbCredentials = ({ mariadbId }: Props) => {
<Input <Input
placeholder="3306" placeholder="3306"
{...field} {...field}
value={field.value || ""} value={field.value as string}
/> />
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
@@ -161,7 +161,7 @@ export const ShowExternalMariadbCredentials = ({ mariadbId }: Props) => {
)} )}
<div className="flex justify-end"> <div className="flex justify-end">
<Button type="submit" isLoading={isLoading}> <Button type="submit" isLoading={isPending}>
Save Save
</Button> </Button>
</div> </div>
@@ -28,13 +28,13 @@ export const ShowGeneralMariadb = ({ mariadbId }: Props) => {
{ enabled: !!mariadbId }, { enabled: !!mariadbId },
); );
const { mutateAsync: reload, isLoading: isReloading } = const { mutateAsync: reload, isPending: isReloading } =
api.mariadb.reload.useMutation(); api.mariadb.reload.useMutation();
const { mutateAsync: start, isLoading: isStarting } = const { mutateAsync: start, isPending: isStarting } =
api.mariadb.start.useMutation(); api.mariadb.start.useMutation();
const { mutateAsync: stop, isLoading: isStopping } = const { mutateAsync: stop, isPending: isStopping } =
api.mariadb.stop.useMutation(); api.mariadb.stop.useMutation();
const [isDrawerOpen, setIsDrawerOpen] = useState(false); const [isDrawerOpen, setIsDrawerOpen] = useState(false);
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PenBoxIcon } from "lucide-react"; import { PenBoxIcon } from "lucide-react";
import { useEffect } from "react"; import { useEffect } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -42,7 +42,7 @@ interface Props {
export const UpdateMariadb = ({ mariadbId }: Props) => { export const UpdateMariadb = ({ mariadbId }: Props) => {
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync, error, isError, isLoading } = const { mutateAsync, error, isError, isPending } =
api.mariadb.update.useMutation(); api.mariadb.update.useMutation();
const { data } = api.mariadb.one.useQuery( const { data } = api.mariadb.one.useQuery(
{ {
@@ -146,7 +146,7 @@ export const UpdateMariadb = ({ mariadbId }: Props) => {
/> />
<DialogFooter> <DialogFooter>
<Button <Button
isLoading={isLoading} isLoading={isPending}
form="hook-form-update-mariadb" form="hook-form-update-mariadb"
type="submit" type="submit"
> >
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import Link from "next/link"; import Link from "next/link";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -48,10 +48,10 @@ interface Props {
export const ShowExternalMongoCredentials = ({ mongoId }: Props) => { export const ShowExternalMongoCredentials = ({ mongoId }: Props) => {
const { data: ip } = api.settings.getIp.useQuery(); const { data: ip } = api.settings.getIp.useQuery();
const { data, refetch } = api.mongo.one.useQuery({ mongoId }); const { data, refetch } = api.mongo.one.useQuery({ mongoId });
const { mutateAsync, isLoading } = api.mongo.saveExternalPort.useMutation(); const { mutateAsync, isPending } = api.mongo.saveExternalPort.useMutation();
const [connectionUrl, setConnectionUrl] = useState(""); const [connectionUrl, setConnectionUrl] = useState("");
const getIp = data?.server?.ipAddress || ip; const getIp = data?.server?.ipAddress || ip;
const form = useForm<DockerProvider>({ const form = useForm({
defaultValues: {}, defaultValues: {},
resolver: zodResolver(DockerProviderSchema), resolver: zodResolver(DockerProviderSchema),
}); });
@@ -140,7 +140,7 @@ export const ShowExternalMongoCredentials = ({ mongoId }: Props) => {
<Input <Input
placeholder="27017" placeholder="27017"
{...field} {...field}
value={field.value || ""} value={field.value as string}
/> />
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
@@ -160,7 +160,7 @@ export const ShowExternalMongoCredentials = ({ mongoId }: Props) => {
)} )}
<div className="flex justify-end"> <div className="flex justify-end">
<Button type="submit" isLoading={isLoading}> <Button type="submit" isLoading={isPending}>
Save Save
</Button> </Button>
</div> </div>
@@ -28,13 +28,13 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
{ enabled: !!mongoId }, { enabled: !!mongoId },
); );
const { mutateAsync: reload, isLoading: isReloading } = const { mutateAsync: reload, isPending: isReloading } =
api.mongo.reload.useMutation(); api.mongo.reload.useMutation();
const { mutateAsync: start, isLoading: isStarting } = const { mutateAsync: start, isPending: isStarting } =
api.mongo.start.useMutation(); api.mongo.start.useMutation();
const { mutateAsync: stop, isLoading: isStopping } = const { mutateAsync: stop, isPending: isStopping } =
api.mongo.stop.useMutation(); api.mongo.stop.useMutation();
const [isDrawerOpen, setIsDrawerOpen] = useState(false); const [isDrawerOpen, setIsDrawerOpen] = useState(false);
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PenBoxIcon } from "lucide-react"; import { PenBoxIcon } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -43,7 +43,7 @@ interface Props {
export const UpdateMongo = ({ mongoId }: Props) => { export const UpdateMongo = ({ mongoId }: Props) => {
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync, error, isError, isLoading } = const { mutateAsync, error, isError, isPending } =
api.mongo.update.useMutation(); api.mongo.update.useMutation();
const { data } = api.mongo.one.useQuery( const { data } = api.mongo.one.useQuery(
{ {
@@ -148,7 +148,7 @@ export const UpdateMongo = ({ mongoId }: Props) => {
/> />
<DialogFooter> <DialogFooter>
<Button <Button
isLoading={isLoading} isLoading={isPending}
form="hook-form-update-mongo" form="hook-form-update-mongo"
type="submit" type="submit"
> >
@@ -34,7 +34,7 @@ export const ComposeFreeMonitoring = ({
appType = "stack", appType = "stack",
serverId, serverId,
}: Props) => { }: Props) => {
const { data, isLoading } = api.docker.getContainersByAppNameMatch.useQuery( const { data, isPending } = api.docker.getContainersByAppNameMatch.useQuery(
{ {
appName: appName, appName: appName,
appType, appType,
@@ -51,7 +51,7 @@ export const ComposeFreeMonitoring = ({
const [containerId, setContainerId] = useState<string | undefined>(); const [containerId, setContainerId] = useState<string | undefined>();
const { mutateAsync: restart, isLoading: isRestarting } = const { mutateAsync: restart, isPending: isRestarting } =
api.docker.restartContainer.useMutation(); api.docker.restartContainer.useMutation();
useEffect(() => { useEffect(() => {
@@ -81,7 +81,7 @@ export const ComposeFreeMonitoring = ({
value={containerAppName} value={containerAppName}
> >
<SelectTrigger> <SelectTrigger>
{isLoading ? ( {isPending ? (
<div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground"> <div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground">
<span>Loading...</span> <span>Loading...</span>
<Loader2 className="animate-spin size-4" /> <Loader2 className="animate-spin size-4" />
@@ -39,7 +39,7 @@ export const ComposePaidMonitoring = ({
baseUrl, baseUrl,
token, token,
}: Props) => { }: Props) => {
const { data, isLoading } = api.docker.getContainersByAppNameMatch.useQuery( const { data, isPending } = api.docker.getContainersByAppNameMatch.useQuery(
{ {
appName: appName, appName: appName,
appType, appType,
@@ -56,7 +56,7 @@ export const ComposePaidMonitoring = ({
const [containerId, setContainerId] = useState<string | undefined>(); const [containerId, setContainerId] = useState<string | undefined>();
const { mutateAsync: restart, isLoading: isRestarting } = const { mutateAsync: restart, isPending: isRestarting } =
api.docker.restartContainer.useMutation(); api.docker.restartContainer.useMutation();
useEffect(() => { useEffect(() => {
@@ -87,7 +87,7 @@ export const ComposePaidMonitoring = ({
value={containerAppName} value={containerAppName}
> >
<SelectTrigger> <SelectTrigger>
{isLoading ? ( {isPending ? (
<div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground"> <div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground">
<span>Loading...</span> <span>Loading...</span>
<Loader2 className="animate-spin size-4" /> <Loader2 className="animate-spin size-4" />
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import Link from "next/link"; import Link from "next/link";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -48,10 +48,10 @@ interface Props {
export const ShowExternalMysqlCredentials = ({ mysqlId }: Props) => { export const ShowExternalMysqlCredentials = ({ mysqlId }: Props) => {
const { data: ip } = api.settings.getIp.useQuery(); const { data: ip } = api.settings.getIp.useQuery();
const { data, refetch } = api.mysql.one.useQuery({ mysqlId }); const { data, refetch } = api.mysql.one.useQuery({ mysqlId });
const { mutateAsync, isLoading } = api.mysql.saveExternalPort.useMutation(); const { mutateAsync, isPending } = api.mysql.saveExternalPort.useMutation();
const [connectionUrl, setConnectionUrl] = useState(""); const [connectionUrl, setConnectionUrl] = useState("");
const getIp = data?.server?.ipAddress || ip; const getIp = data?.server?.ipAddress || ip;
const form = useForm<DockerProvider>({ const form = useForm({
defaultValues: {}, defaultValues: {},
resolver: zodResolver(DockerProviderSchema), resolver: zodResolver(DockerProviderSchema),
}); });
@@ -140,7 +140,7 @@ export const ShowExternalMysqlCredentials = ({ mysqlId }: Props) => {
<Input <Input
placeholder="3306" placeholder="3306"
{...field} {...field}
value={field.value || ""} value={field.value as string}
/> />
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
@@ -160,7 +160,7 @@ export const ShowExternalMysqlCredentials = ({ mysqlId }: Props) => {
)} )}
<div className="flex justify-end"> <div className="flex justify-end">
<Button type="submit" isLoading={isLoading}> <Button type="submit" isLoading={isPending}>
Save Save
</Button> </Button>
</div> </div>
@@ -28,12 +28,12 @@ export const ShowGeneralMysql = ({ mysqlId }: Props) => {
{ enabled: !!mysqlId }, { enabled: !!mysqlId },
); );
const { mutateAsync: reload, isLoading: isReloading } = const { mutateAsync: reload, isPending: isReloading } =
api.mysql.reload.useMutation(); api.mysql.reload.useMutation();
const { mutateAsync: start, isLoading: isStarting } = const { mutateAsync: start, isPending: isStarting } =
api.mysql.start.useMutation(); api.mysql.start.useMutation();
const { mutateAsync: stop, isLoading: isStopping } = const { mutateAsync: stop, isPending: isStopping } =
api.mysql.stop.useMutation(); api.mysql.stop.useMutation();
const [isDrawerOpen, setIsDrawerOpen] = useState(false); const [isDrawerOpen, setIsDrawerOpen] = useState(false);
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PenBoxIcon } from "lucide-react"; import { PenBoxIcon } from "lucide-react";
import { useEffect } from "react"; import { useEffect } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -42,7 +42,7 @@ interface Props {
export const UpdateMysql = ({ mysqlId }: Props) => { export const UpdateMysql = ({ mysqlId }: Props) => {
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync, error, isError, isLoading } = const { mutateAsync, error, isError, isPending } =
api.mysql.update.useMutation(); api.mysql.update.useMutation();
const { data } = api.mysql.one.useQuery( const { data } = api.mysql.one.useQuery(
{ {
@@ -146,7 +146,7 @@ export const UpdateMysql = ({ mysqlId }: Props) => {
/> />
<DialogFooter> <DialogFooter>
<Button <Button
isLoading={isLoading} isLoading={isPending}
form="hook-form-mysql-update" form="hook-form-mysql-update"
type="submit" type="submit"
> >
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PenBoxIcon, Plus } from "lucide-react"; import { PenBoxIcon, Plus } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -52,7 +52,7 @@ export function AddOrganization({ organizationId }: Props) {
enabled: !!organizationId, enabled: !!organizationId,
}, },
); );
const { mutateAsync, isLoading } = organizationId const { mutateAsync, isPending } = organizationId
? api.organization.update.useMutation() ? api.organization.update.useMutation()
: api.organization.create.useMutation(); : api.organization.create.useMutation();
const { refetch: refetchActiveOrganization } = const { refetch: refetchActiveOrganization } =
@@ -177,7 +177,7 @@ export function AddOrganization({ organizationId }: Props) {
)} )}
/> />
<DialogFooter> <DialogFooter>
<Button type="submit" isLoading={isLoading}> <Button type="submit" isLoading={isPending}>
{organizationId ? "Update organization" : "Create organization"} {organizationId ? "Update organization" : "Create organization"}
</Button> </Button>
</DialogFooter> </DialogFooter>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { Plus, Trash2 } from "lucide-react"; import { Plus, Trash2 } from "lucide-react";
import { useEffect } from "react"; import { useEffect } from "react";
import { useFieldArray, useForm } from "react-hook-form"; import { useFieldArray, useForm } from "react-hook-form";
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import Link from "next/link"; import Link from "next/link";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -48,12 +48,12 @@ interface Props {
export const ShowExternalPostgresCredentials = ({ postgresId }: Props) => { export const ShowExternalPostgresCredentials = ({ postgresId }: Props) => {
const { data: ip } = api.settings.getIp.useQuery(); const { data: ip } = api.settings.getIp.useQuery();
const { data, refetch } = api.postgres.one.useQuery({ postgresId }); const { data, refetch } = api.postgres.one.useQuery({ postgresId });
const { mutateAsync, isLoading } = const { mutateAsync, isPending } =
api.postgres.saveExternalPort.useMutation(); api.postgres.saveExternalPort.useMutation();
const getIp = data?.server?.ipAddress || ip; const getIp = data?.server?.ipAddress || ip;
const [connectionUrl, setConnectionUrl] = useState(""); const [connectionUrl, setConnectionUrl] = useState("");
const form = useForm<DockerProvider>({ const form = useForm({
defaultValues: {}, defaultValues: {},
resolver: zodResolver(DockerProviderSchema), resolver: zodResolver(DockerProviderSchema),
}); });
@@ -142,7 +142,7 @@ export const ShowExternalPostgresCredentials = ({ postgresId }: Props) => {
<Input <Input
placeholder="5432" placeholder="5432"
{...field} {...field}
value={field.value || ""} value={field.value as string}
/> />
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
@@ -162,7 +162,7 @@ export const ShowExternalPostgresCredentials = ({ postgresId }: Props) => {
)} )}
<div className="flex justify-end"> <div className="flex justify-end">
<Button type="submit" isLoading={isLoading}> <Button type="submit" isLoading={isPending}>
Save Save
</Button> </Button>
</div> </div>
@@ -28,13 +28,13 @@ export const ShowGeneralPostgres = ({ postgresId }: Props) => {
{ enabled: !!postgresId }, { enabled: !!postgresId },
); );
const { mutateAsync: reload, isLoading: isReloading } = const { mutateAsync: reload, isPending: isReloading } =
api.postgres.reload.useMutation(); api.postgres.reload.useMutation();
const { mutateAsync: stop, isLoading: isStopping } = const { mutateAsync: stop, isPending: isStopping } =
api.postgres.stop.useMutation(); api.postgres.stop.useMutation();
const { mutateAsync: start, isLoading: isStarting } = const { mutateAsync: start, isPending: isStarting } =
api.postgres.start.useMutation(); api.postgres.start.useMutation();
const [isDrawerOpen, setIsDrawerOpen] = useState(false); const [isDrawerOpen, setIsDrawerOpen] = useState(false);
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { PenBox } from "lucide-react"; import { PenBox } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -43,7 +43,7 @@ interface Props {
export const UpdatePostgres = ({ postgresId }: Props) => { export const UpdatePostgres = ({ postgresId }: Props) => {
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const utils = api.useUtils(); const utils = api.useUtils();
const { mutateAsync, error, isError, isLoading } = const { mutateAsync, error, isError, isPending } =
api.postgres.update.useMutation(); api.postgres.update.useMutation();
const { data } = api.postgres.one.useQuery( const { data } = api.postgres.one.useQuery(
{ {
@@ -148,7 +148,7 @@ export const UpdatePostgres = ({ postgresId }: Props) => {
/> />
<DialogFooter> <DialogFooter>
<Button <Button
isLoading={isLoading} isLoading={isPending}
form="hook-form-update-postgres" form="hook-form-update-postgres"
type="submit" type="submit"
className="flex items-center gap-1.5 focus-visible:ring-2 focus-visible:ring-offset-2" className="flex items-center gap-1.5 focus-visible:ring-2 focus-visible:ring-offset-2"
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { Folder, HelpCircle } from "lucide-react"; import { Folder, HelpCircle } from "lucide-react";
import { useState } from "react"; import { useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -81,7 +81,7 @@ export const AddApplication = ({ environmentId, projectName }: Props) => {
// Self-hosted: show only if there are remote servers (Dokploy is default, hide if no remote servers) // Self-hosted: show only if there are remote servers (Dokploy is default, hide if no remote servers)
const shouldShowServerDropdown = hasServers; const shouldShowServerDropdown = hasServers;
const { mutateAsync, isLoading, error, isError } = const { mutateAsync, isPending, error, isError } =
api.application.create.useMutation(); api.application.create.useMutation();
const form = useForm<AddTemplate>({ const form = useForm<AddTemplate>({
@@ -283,7 +283,7 @@ export const AddApplication = ({ environmentId, projectName }: Props) => {
</form> </form>
<DialogFooter> <DialogFooter>
<Button isLoading={isLoading} form="hook-form" type="submit"> <Button isLoading={isPending} form="hook-form" type="submit">
Create Create
</Button> </Button>
</DialogFooter> </DialogFooter>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { CircuitBoard, HelpCircle } from "lucide-react"; import { CircuitBoard, HelpCircle } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -75,7 +75,7 @@ export const AddCompose = ({ environmentId, projectName }: Props) => {
const slug = slugify(projectName); const slug = slugify(projectName);
const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery();
const { data: servers } = api.server.withSSHKey.useQuery(); const { data: servers } = api.server.withSSHKey.useQuery();
const { mutateAsync, isLoading, error, isError } = const { mutateAsync, isPending, error, isError } =
api.compose.create.useMutation(); api.compose.create.useMutation();
// Get environment data to extract projectId // Get environment data to extract projectId
@@ -307,7 +307,7 @@ export const AddCompose = ({ environmentId, projectName }: Props) => {
</form> </form>
<DialogFooter> <DialogFooter>
<Button isLoading={isLoading} form="hook-form" type="submit"> <Button isLoading={isPending} form="hook-form" type="submit">
Create Create
</Button> </Button>
</DialogFooter> </DialogFooter>
@@ -1,4 +1,4 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
import { AlertTriangle, Database, HelpCircle } from "lucide-react"; import { AlertTriangle, Database, HelpCircle } from "lucide-react";
import { useState } from "react"; import { useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -52,7 +52,7 @@ import {
import { slugify } from "@/lib/slug"; import { slugify } from "@/lib/slug";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
type DbType = typeof mySchema._type.type; type DbType = z.infer<typeof mySchema>["type"];
const dockerImageDefaultPlaceholder: Record<DbType, string> = { const dockerImageDefaultPlaceholder: Record<DbType, string> = {
mongo: "mongo:7", mongo: "mongo:7",
@@ -196,7 +196,7 @@ export const AddDatabase = ({ environmentId, projectName }: Props) => {
// Self-hosted: show only if there are remote servers (Dokploy is default, hide if no remote servers) // Self-hosted: show only if there are remote servers (Dokploy is default, hide if no remote servers)
const shouldShowServerDropdown = hasServers; const shouldShowServerDropdown = hasServers;
const form = useForm<AddDatabase>({ const form = useForm({
defaultValues: { defaultValues: {
type: "postgres", type: "postgres",
dockerImage: "", dockerImage: "",
@@ -116,7 +116,7 @@ export const AddTemplate = ({ environmentId, baseUrl }: Props) => {
); );
const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery();
const { data: servers } = api.server.withSSHKey.useQuery(); const { data: servers } = api.server.withSSHKey.useQuery();
const { data: tags, isLoading: isLoadingTags } = api.compose.getTags.useQuery( const { data: tags, isPending: isLoadingTags } = api.compose.getTags.useQuery(
{ baseUrl: customBaseUrl }, { baseUrl: customBaseUrl },
{ {
enabled: open, enabled: open,
@@ -125,7 +125,7 @@ export const AddTemplate = ({ environmentId, baseUrl }: Props) => {
const utils = api.useUtils(); const utils = api.useUtils();
const [serverId, setServerId] = useState<string | undefined>(undefined); const [serverId, setServerId] = useState<string | undefined>(undefined);
const { mutateAsync, isLoading, error, isError } = const { mutateAsync, isPending, error, isError } =
api.compose.deployTemplate.useMutation(); api.compose.deployTemplate.useMutation();
const templates = const templates =
@@ -512,7 +512,7 @@ export const AddTemplate = ({ environmentId, baseUrl }: Props) => {
<AlertDialogFooter> <AlertDialogFooter>
<AlertDialogCancel>Cancel</AlertDialogCancel> <AlertDialogCancel>Cancel</AlertDialogCancel>
<AlertDialogAction <AlertDialogAction
disabled={isLoading} disabled={isPending}
onClick={async () => { onClick={async () => {
const promise = mutateAsync({ const promise = mutateAsync({
serverId: serverId:
@@ -93,7 +93,7 @@ export const AdvancedEnvironmentSelector = ({
await createEnvironment.mutateAsync({ await createEnvironment.mutateAsync({
projectId, projectId,
name: name.trim(), name: name.trim(),
description: description.trim() || null, description: description.trim() || undefined,
}); });
toast.success("Environment created successfully"); toast.success("Environment created successfully");
@@ -115,7 +115,7 @@ export const AdvancedEnvironmentSelector = ({
await updateEnvironment.mutateAsync({ await updateEnvironment.mutateAsync({
environmentId: selectedEnvironment.environmentId, environmentId: selectedEnvironment.environmentId,
name: name.trim(), name: name.trim(),
description: description.trim() || null, description: description.trim() || undefined,
}); });
toast.success("Environment updated successfully"); toast.success("Environment updated successfully");
@@ -168,7 +168,7 @@ export const AdvancedEnvironmentSelector = ({
const result = await duplicateEnvironment.mutateAsync({ const result = await duplicateEnvironment.mutateAsync({
environmentId: environment.environmentId, environmentId: environment.environmentId,
name: `${environment.name}-copy`, name: `${environment.name}-copy`,
description: environment.description, description: environment.description || undefined,
}); });
toast.success("Environment duplicated successfully"); toast.success("Environment duplicated successfully");
@@ -334,9 +334,9 @@ export const AdvancedEnvironmentSelector = ({
</Button> </Button>
<Button <Button
onClick={handleCreateEnvironment} onClick={handleCreateEnvironment}
disabled={!name.trim() || createEnvironment.isLoading} disabled={!name.trim() || createEnvironment.isPending}
> >
{createEnvironment.isLoading ? "Creating..." : "Create"} {createEnvironment.isPending ? "Creating..." : "Create"}
</Button> </Button>
</DialogFooter> </DialogFooter>
</DialogContent> </DialogContent>
@@ -387,9 +387,9 @@ export const AdvancedEnvironmentSelector = ({
</Button> </Button>
<Button <Button
onClick={handleUpdateEnvironment} onClick={handleUpdateEnvironment}
disabled={!name.trim() || updateEnvironment.isLoading} disabled={!name.trim() || updateEnvironment.isPending}
> >
{updateEnvironment.isLoading ? "Updating..." : "Update"} {updateEnvironment.isPending ? "Updating..." : "Update"}
</Button> </Button>
</DialogFooter> </DialogFooter>
</DialogContent> </DialogContent>
@@ -427,12 +427,12 @@ export const AdvancedEnvironmentSelector = ({
variant="destructive" variant="destructive"
onClick={handleDeleteEnvironment} onClick={handleDeleteEnvironment}
disabled={ disabled={
deleteEnvironment.isLoading || deleteEnvironment.isPending ||
haveServices || haveServices ||
!selectedEnvironment !selectedEnvironment
} }
> >
{deleteEnvironment.isLoading ? "Deleting..." : "Delete"} {deleteEnvironment.isPending ? "Deleting..." : "Delete"}
</Button> </Button>
</DialogFooter> </DialogFooter>
</DialogContent> </DialogContent>
@@ -28,7 +28,7 @@ export const StepTwo = ({ templateInfo, setTemplateInfo }: StepProps) => {
const suggestions = templateInfo.suggestions || []; const suggestions = templateInfo.suggestions || [];
const selectedVariant = templateInfo.details; const selectedVariant = templateInfo.details;
const { mutateAsync, isLoading, error, isError } = const { mutateAsync, isPending, error, isError } =
api.ai.suggest.useMutation(); api.ai.suggest.useMutation();
useEffect(() => { useEffect(() => {
@@ -184,7 +184,7 @@ export const StepTwo = ({ templateInfo, setTemplateInfo }: StepProps) => {
</div> </div>
); );
} }
if (isLoading) { if (isPending) {
return ( return (
<div className="flex flex-col items-center justify-center h-full space-y-4"> <div className="flex flex-col items-center justify-center h-full space-y-4">
<Bot className="w-16 h-16 text-primary animate-pulse" /> <Bot className="w-16 h-16 text-primary animate-pulse" />

Some files were not shown because too many files have changed in this diff Show More