andwati/dokploy
1
0
Fork 0
mirror of https://github.com/andwati/dokploy.git synced 2026-11-11 06:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[autofix.ci] apply automated fixes

Browse Source
This commit is contained in:
autofix-ci[bot]
2025-10-23 12:00:30 +00:00
committed by GitHub
parent 046606e496
commit 8e5be8dbcb
4 changed files with 98 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dokploy/components/dashboard/impersonation/impersonation-bar.tsx
+1 -1
View File
@@ -281,7 +281,7 @@ export const ImpersonationBar = () => {
<div className="flex items-center gap-4 flex-1 flex-wrap"> <div className="flex items-center gap-4 flex-1 flex-wrap">
<Avatar className="h-10 w-10"> <Avatar className="h-10 w-10">
<AvatarImage <AvatarImage
className="object-cover" className="object-cover"
src={data?.user?.image || ""} src={data?.user?.image || ""}
alt={data?.user?.name || ""} alt={data?.user?.name || ""}
/> />
apps/dokploy/components/layouts/user-nav.tsx
+1 -1
View File
@@ -44,7 +44,7 @@ export const UserNav = () => {
> >
<Avatar className="h-8 w-8 rounded-lg"> <Avatar className="h-8 w-8 rounded-lg">
<AvatarImage <AvatarImage
className="object-cover" className="object-cover"
src={data?.user?.image || ""} src={data?.user?.image || ""}
alt={data?.user?.image || ""} alt={data?.user?.image || ""}
/> />
packages/server/src/utils/notifications/volume-backup.ts
+26 -11
View File
@@ -25,7 +25,14 @@ export const sendVolumeBackupNotifications = async ({
projectName: string; projectName: string;
applicationName: string; applicationName: string;
volumeName: string; volumeName: string;
serviceType: "application" | "postgres" | "mysql" | "mongodb" | "mariadb" | "redis" | "compose"; serviceType:
| "application"
| "postgres"
| "mysql"
| "mongodb"
| "mariadb"
| "redis"
| "compose";
type: "error" | "success"; type: "error" | "success";
organizationId: string; organizationId: string;
errorMessage?: string; errorMessage?: string;
@@ -106,11 +113,15 @@ export const sendVolumeBackupNotifications = async ({
value: serviceType, value: serviceType,
inline: true, inline: true,
}, },
...(backupSize ? [{ ...(backupSize
name: decorate("`📊`", "Backup Size"), ? [
value: backupSize, {
inline: true, name: decorate("`📊`", "Backup Size"),
}] : []), value: backupSize,
inline: true,
},
]
: []),
{ {
name: decorate("`📅`", "Date"), name: decorate("`📅`", "Date"),
value: `<t:${unixDate}:D>`, value: `<t:${unixDate}:D>`,
@@ -236,11 +247,15 @@ export const sendVolumeBackupNotifications = async ({
value: serviceType, value: serviceType,
short: true, short: true,
}, },
...(backupSize ? [{ ...(backupSize
title: "Backup Size", ? [
value: backupSize, {
short: true, title: "Backup Size",
}] : []), value: backupSize,
short: true,
},
]
: []),
{ {
title: "Time", title: "Time",
value: date.toLocaleString(), value: date.toLocaleString(),
packages/server/src/utils/volume-backups/utils.ts
+68 -38
View File
@@ -81,37 +81,52 @@ export const runVolumeBackup = async (volumeBackupId: string) => {
// Send success notification // Send success notification
try { try {
const projectName = volumeBackup.application?.environment?.project?.name || const projectName =
volumeBackup.compose?.environment?.project?.name || volumeBackup.application?.environment?.project?.name ||
volumeBackup.postgres?.environment?.project?.name || volumeBackup.compose?.environment?.project?.name ||
volumeBackup.mysql?.environment?.project?.name || volumeBackup.postgres?.environment?.project?.name ||
volumeBackup.mariadb?.environment?.project?.name || volumeBackup.mysql?.environment?.project?.name ||
volumeBackup.mongo?.environment?.project?.name || volumeBackup.mariadb?.environment?.project?.name ||
volumeBackup.redis?.environment?.project?.name || volumeBackup.mongo?.environment?.project?.name ||
"Unknown Project"; volumeBackup.redis?.environment?.project?.name ||
"Unknown Project";
const organizationId = volumeBackup.application?.environment?.project?.organizationId || const organizationId =
volumeBackup.compose?.environment?.project?.organizationId || volumeBackup.application?.environment?.project?.organizationId ||
volumeBackup.postgres?.environment?.project?.organizationId || volumeBackup.compose?.environment?.project?.organizationId ||
volumeBackup.mysql?.environment?.project?.organizationId || volumeBackup.postgres?.environment?.project?.organizationId ||
volumeBackup.mariadb?.environment?.project?.organizationId || volumeBackup.mysql?.environment?.project?.organizationId ||
volumeBackup.mongo?.environment?.project?.organizationId || volumeBackup.mariadb?.environment?.project?.organizationId ||
volumeBackup.redis?.environment?.project?.organizationId || volumeBackup.mongo?.environment?.project?.organizationId ||
""; volumeBackup.redis?.environment?.project?.organizationId ||
"";
// Map service type to match notification function expectations // Map service type to match notification function expectations
const mappedServiceType = volumeBackup.serviceType === "mongo" ? "mongodb" : volumeBackup.serviceType; const mappedServiceType =
volumeBackup.serviceType === "mongo"
? "mongodb"
: volumeBackup.serviceType;
await sendVolumeBackupNotifications({ await sendVolumeBackupNotifications({
projectName, projectName,
applicationName: volumeBackup.name, applicationName: volumeBackup.name,
volumeName: volumeBackup.volumeName, volumeName: volumeBackup.volumeName,
serviceType: mappedServiceType as "application" | "postgres" | "mysql" | "mongodb" | "mariadb" | "redis" | "compose", serviceType: mappedServiceType as
| "application"
| "postgres"
| "mysql"
| "mongodb"
| "mariadb"
| "redis"
| "compose",
type: "success", type: "success",
organizationId, organizationId,
}); });
} catch (notificationError) { } catch (notificationError) {
console.error("Failed to send volume backup success notification:", notificationError); console.error(
"Failed to send volume backup success notification:",
notificationError,
);
} }
} catch (error) { } catch (error) {
const { VOLUME_BACKUPS_PATH } = paths(!!serverId); const { VOLUME_BACKUPS_PATH } = paths(!!serverId);
@@ -130,38 +145,53 @@ export const runVolumeBackup = async (volumeBackupId: string) => {
// Send error notification // Send error notification
try { try {
const projectName = volumeBackup.application?.environment?.project?.name || const projectName =
volumeBackup.compose?.environment?.project?.name || volumeBackup.application?.environment?.project?.name ||
volumeBackup.postgres?.environment?.project?.name || volumeBackup.compose?.environment?.project?.name ||
volumeBackup.mysql?.environment?.project?.name || volumeBackup.postgres?.environment?.project?.name ||
volumeBackup.mariadb?.environment?.project?.name || volumeBackup.mysql?.environment?.project?.name ||
volumeBackup.mongo?.environment?.project?.name || volumeBackup.mariadb?.environment?.project?.name ||
volumeBackup.redis?.environment?.project?.name || volumeBackup.mongo?.environment?.project?.name ||
"Unknown Project"; volumeBackup.redis?.environment?.project?.name ||
"Unknown Project";
const organizationId = volumeBackup.application?.environment?.project?.organizationId || const organizationId =
volumeBackup.compose?.environment?.project?.organizationId || volumeBackup.application?.environment?.project?.organizationId ||
volumeBackup.postgres?.environment?.project?.organizationId || volumeBackup.compose?.environment?.project?.organizationId ||
volumeBackup.mysql?.environment?.project?.organizationId || volumeBackup.postgres?.environment?.project?.organizationId ||
volumeBackup.mariadb?.environment?.project?.organizationId || volumeBackup.mysql?.environment?.project?.organizationId ||
volumeBackup.mongo?.environment?.project?.organizationId || volumeBackup.mariadb?.environment?.project?.organizationId ||
volumeBackup.redis?.environment?.project?.organizationId || volumeBackup.mongo?.environment?.project?.organizationId ||
""; volumeBackup.redis?.environment?.project?.organizationId ||
"";
// Map service type to match notification function expectations // Map service type to match notification function expectations
const mappedServiceType = volumeBackup.serviceType === "mongo" ? "mongodb" : volumeBackup.serviceType; const mappedServiceType =
volumeBackup.serviceType === "mongo"
? "mongodb"
: volumeBackup.serviceType;
await sendVolumeBackupNotifications({ await sendVolumeBackupNotifications({
projectName, projectName,
applicationName: volumeBackup.name, applicationName: volumeBackup.name,
volumeName: volumeBackup.volumeName, volumeName: volumeBackup.volumeName,
serviceType: mappedServiceType as "application" | "postgres" | "mysql" | "mongodb" | "mariadb" | "redis" | "compose", serviceType: mappedServiceType as
| "application"
| "postgres"
| "mysql"
| "mongodb"
| "mariadb"
| "redis"
| "compose",
type: "error", type: "error",
organizationId, organizationId,
errorMessage: error instanceof Error ? error.message : String(error), errorMessage: error instanceof Error ? error.message : String(error),
}); });
} catch (notificationError) { } catch (notificationError) {
console.error("Failed to send volume backup error notification:", notificationError); console.error(
"Failed to send volume backup error notification:",
notificationError,
);
} }
console.error(error); console.error(error);