Skip to content

Commit

Permalink
Merge pull request #1027 from Dokploy/canary
Browse files Browse the repository at this point in the history 
v0.16.1
  • Loading branch information
@Siumauricio
Siumauricio authored Dec 30, 2024
2 parents eb7bae2 + 638fbe1 commit 973b544
Show file tree
Hide file tree
Showing 234 changed files with 1,657 additions and 974 deletions.
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ export const AddSwarmSettings = ({ applicationId }: Props) => {
refetch();
})
.catch(() => {
toast.error("Error to update the swarm settings");
toast.error("Error updating the swarm settings");
});
};
return (
Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/advanced/cluster/show-cluster-settings.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export const ShowClusterSettings = ({ applicationId }: Props) => {
});
})
.catch(() => {
toast.error("Error to update the command");
toast.error("Error updating the command");
});
};

Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const AddCommand = ({ applicationId }: Props) => {
});
})
.catch(() => {
toast.error("Error to update the command");
toast.error("Error updating the command");
});
};

Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/advanced/ports/add-port.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const AddPort = ({
setIsOpen(false);
})
.catch(() => {
toast.error("Error to create the port");
toast.error("Error creating the port");
});
};

Expand Down
4 changes: 2 additions & 2 deletions apps/dokploy/components/dashboard/application/advanced/ports/delete-port.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ export const DeletePort = ({ portId }: Props) => {
applicationId: data?.applicationId,
});

toast.success("Port delete succesfully");
toast.success("Port delete successfully");
})
.catch(() => {
toast.error("Error to delete the port");
toast.error("Error deleting the port");
});
}}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/advanced/ports/update-port.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const UpdatePort = ({ portId }: Props) => {
setIsOpen(false);
})
.catch(() => {
toast.error("Error to update the port");
toast.error("Error updating the port");
});
};

Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/advanced/redirects/add-redirect.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export const AddRedirect = ({
onDialogToggle(false);
})
.catch(() => {
toast.error("Error to create the redirect");
toast.error("Error creating the redirect");
});
};

Expand Down
4 changes: 2 additions & 2 deletions apps/dokploy/components/dashboard/application/advanced/redirects/delete-redirect.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ export const DeleteRedirect = ({ redirectId }: Props) => {
utils.application.readTraefikConfig.invalidate({
applicationId: data?.applicationId,
});
toast.success("Redirect delete succesfully");
toast.success("Redirect delete successfully");
})
.catch(() => {
toast.error("Error to delete the redirect");
toast.error("Error deleting the redirect");
});
}}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/advanced/redirects/update-redirect.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const UpdateRedirect = ({ redirectId }: Props) => {
setIsOpen(false);
})
.catch(() => {
toast.error("Error to update the redirect");
toast.error("Error updating the redirect");
});
};

Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/advanced/security/add-security.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const AddSecurity = ({
setIsOpen(false);
})
.catch(() => {
toast.error("Error to create the security");
toast.error("Error creating security");
});
};

Expand Down
4 changes: 2 additions & 2 deletions apps/dokploy/components/dashboard/application/advanced/security/delete-security.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ export const DeleteSecurity = ({ securityId }: Props) => {
utils.application.readTraefikConfig.invalidate({
applicationId: data?.applicationId,
});
toast.success("Security delete succesfully");
toast.success("Security delete successfully");
})
.catch(() => {
toast.error("Error to delete the security");
toast.error("Error deleting the security");
});
}}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/advanced/security/update-security.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const UpdateSecurity = ({ securityId }: Props) => {
setIsOpen(false);
})
.catch(() => {
toast.error("Error to update the security");
toast.error("Error updating the security");
});
};

Expand Down
114 changes: 90 additions & 24 deletions .../dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ import React, { useEffect } from "react";
import { useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "@/components/ui/tooltip";
import { InfoIcon } from "lucide-react";

const addResourcesApplication = z.object({
memoryReservation: z.number().nullable().optional(),
Expand Down Expand Up @@ -72,7 +79,7 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
await refetch();
})
.catch(() => {
toast.error("Error to Update the resources");
toast.error("Error updating the resources");
});
};
return (
Expand Down Expand Up @@ -101,10 +108,25 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
name="memoryReservation"
render={({ field }) => (
<FormItem>
<FormLabel>Memory Reservation</FormLabel>
<div className="flex items-center gap-2">
<FormLabel>Memory Reservation</FormLabel>
<TooltipProvider>
<Tooltip delayDuration={0}>
<TooltipTrigger>
<InfoIcon className="h-4 w-4 text-muted-foreground" />
</TooltipTrigger>
<TooltipContent>
<p>
Memory soft limit in bytes. Example: 256MB =
268435456 bytes
</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
<FormControl>
<Input
placeholder="256 MB"
placeholder="268435456 (256MB in bytes)"
{...field}
value={field.value?.toString() || ""}
onChange={(e) => {
Expand All @@ -120,7 +142,6 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
}}
/>
</FormControl>

<FormMessage />
</FormItem>
)}
Expand All @@ -132,10 +153,25 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
render={({ field }) => {
return (
<FormItem>
<FormLabel>Memory Limit</FormLabel>
<div className="flex items-center gap-2">
<FormLabel>Memory Limit</FormLabel>
<TooltipProvider>
<Tooltip delayDuration={0}>
<TooltipTrigger>
<InfoIcon className="h-4 w-4 text-muted-foreground" />
</TooltipTrigger>
<TooltipContent>
<p>
Memory hard limit in bytes. Example: 1GB =
1073741824 bytes
</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
<FormControl>
<Input
placeholder={"1024 MB"}
placeholder="1073741824 (1GB in bytes)"
{...field}
value={field.value?.toString() || ""}
onChange={(e) => {
Expand Down Expand Up @@ -163,21 +199,36 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
render={({ field }) => {
return (
<FormItem>
<FormLabel>Cpu Limit</FormLabel>
<div className="flex items-center gap-2">
<FormLabel>CPU Limit</FormLabel>
<TooltipProvider>
<Tooltip delayDuration={0}>
<TooltipTrigger>
<InfoIcon className="h-4 w-4 text-muted-foreground" />
</TooltipTrigger>
<TooltipContent>
<p>
CPU quota in units of 10^-9 CPUs. Example: 2
CPUs = 2000000000
</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
<FormControl>
<Input
placeholder={"2"}
placeholder="2000000000 (2 CPUs)"
{...field}
type="number"
value={field.value?.toString() || ""}
onChange={(e) => {
const value = e.target.value;
if (
value === "" ||
/^[0-9]*\.?[0-9]*$/.test(value)
) {
const float = Number.parseFloat(value);
field.onChange(float);
if (value === "") {
field.onChange(null);
} else {
const number = Number.parseInt(value, 10);
if (!Number.isNaN(number)) {
field.onChange(number);
}
}
}}
/>
Expand All @@ -193,21 +244,36 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
render={({ field }) => {
return (
<FormItem>
<FormLabel>Cpu Reservation</FormLabel>
<div className="flex items-center gap-2">
<FormLabel>CPU Reservation</FormLabel>
<TooltipProvider>
<Tooltip delayDuration={0}>
<TooltipTrigger>
<InfoIcon className="h-4 w-4 text-muted-foreground" />
</TooltipTrigger>
<TooltipContent>
<p>
CPU shares (relative weight). Example: 1 CPU =
1000000000
</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
<FormControl>
<Input
placeholder={"1"}
placeholder="1000000000 (1 CPU)"
{...field}
type="number"
value={field.value?.toString() || ""}
onChange={(e) => {
const value = e.target.value;
if (
value === "" ||
/^[0-9]*\.?[0-9]*$/.test(value)
) {
const float = Number.parseFloat(value);
field.onChange(float);
if (value === "") {
field.onChange(null);
} else {
const number = Number.parseInt(value, 10);
if (!Number.isNaN(number)) {
field.onChange(number);
}
}
}}
/>
Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export const UpdateTraefikConfig = ({ applicationId }: Props) => {
form.reset();
})
.catch(() => {
toast.error("Error to update the traefik config");
toast.error("Error updating the Traefik config");
});
};

Expand Down
6 changes: 3 additions & 3 deletions apps/dokploy/components/dashboard/application/advanced/volumes/add-volumes.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export const AddVolumes = ({
setIsOpen(false);
})
.catch(() => {
toast.error("Error to create the Bind mount");
toast.error("Error creating the Bind mount");
});
} else if (data.type === "volume") {
await mutateAsync({
Expand All @@ -122,7 +122,7 @@ export const AddVolumes = ({
setIsOpen(false);
})
.catch(() => {
toast.error("Error to create the Volume mount");
toast.error("Error creating the Volume mount");
});
} else if (data.type === "file") {
await mutateAsync({
Expand All @@ -138,7 +138,7 @@ export const AddVolumes = ({
setIsOpen(false);
})
.catch(() => {
toast.error("Error to create the File mount");
toast.error("Error creating the File mount");
});
}

Expand Down
4 changes: 2 additions & 2 deletions apps/dokploy/components/dashboard/application/advanced/volumes/delete-volume.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ export const DeleteVolume = ({ mountId, refetch }: Props) => {
})
.then(() => {
refetch();
toast.success("Mount deleted succesfully");
toast.success("Mount deleted successfully");
})
.catch(() => {
toast.error("Error to delete the mount");
toast.error("Error deleting the mount");
});
}}
>
Expand Down
6 changes: 3 additions & 3 deletions apps/dokploy/components/dashboard/application/advanced/volumes/update-volume.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export const UpdateVolume = ({
setIsOpen(false);
})
.catch(() => {
toast.error("Error to update the Bind mount");
toast.error("Error updating the Bind mount");
});
} else if (data.type === "volume") {
await mutateAsync({
Expand All @@ -153,7 +153,7 @@ export const UpdateVolume = ({
setIsOpen(false);
})
.catch(() => {
toast.error("Error to update the Volume mount");
toast.error("Error updating the Volume mount");
});
} else if (data.type === "file") {
await mutateAsync({
Expand All @@ -168,7 +168,7 @@ export const UpdateVolume = ({
setIsOpen(false);
})
.catch(() => {
toast.error("Error to update the File mount");
toast.error("Error updating the File mount");
});
}
refetch();
Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/build/show.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
await refetch();
})
.catch(() => {
toast.error("Error to save the build type");
toast.error("Error saving the build type");
});
};

Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/components/dashboard/application/deployments/refresh-token.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const RefreshToken = ({ applicationId }: Props) => {
toast.success("Refresh updated");
})
.catch(() => {
toast.error("Error to update the refresh token");
toast.error("Error updating the refresh token");
});
}}
>
Expand Down
Loading

0 comments on commit 973b544

Please sign in to comment.