Skip to content

Commit b499cef

Browse files
authored
Merge pull request #3250 from Dokploy/3249-cant-enable-volume-backup-notifications-on-new-custom-webhook-notifications
chore(dependencies): update Next.js to version 16.0.10 and remove tur…
2 parents e7dc05d + a04a4c0 commit b499cef

File tree

8 files changed

+68
-60
lines changed

8 files changed

+68
-60
lines changed

.github/sponsors/awesome.png

2.7 KB
Loading

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ For detailed documentation, visit [docs.dokploy.com](https://docs.dokploy.com).
8080
<a href="https://www.lambdatest.com/?utm_source=dokploy&utm_medium=sponsor" target="_blank">
8181
<img src="https://www.lambdatest.com/blue-logo.png" width="450" height="100" />
8282
</a>
83-
83+
<a href="https://awesome.tools/" target="_blank">
84+
<img src=".github/sponsors/awesome.png" width="200" height="150" />
85+
</a>
8486
</div>
8587

8688
<!-- Premium Supporters 🥇 -->

apps/dokploy/components/dashboard/settings/notifications/handle-notifications.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
369369
webhookUrl: notification.lark?.webhookUrl,
370370
name: notification.name,
371371
dockerCleanup: notification.dockerCleanup,
372+
volumeBackup: notification.volumeBackup,
372373
serverThreshold: notification.serverThreshold,
373374
});
374375
} else if (notification.notificationType === "custom") {
@@ -388,6 +389,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
388389
)
389390
: [],
390391
name: notification.name,
392+
volumeBackup: notification.volumeBackup,
391393
dockerCleanup: notification.dockerCleanup,
392394
serverThreshold: notification.serverThreshold,
393395
});
@@ -522,6 +524,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
522524
appDeploy: appDeploy,
523525
dokployRestart: dokployRestart,
524526
databaseBackup: databaseBackup,
527+
volumeBackup: volumeBackup,
525528
webhookUrl: data.webhookUrl,
526529
name: data.name,
527530
dockerCleanup: dockerCleanup,
@@ -547,6 +550,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
547550
appDeploy: appDeploy,
548551
dokployRestart: dokployRestart,
549552
databaseBackup: databaseBackup,
553+
volumeBackup: volumeBackup,
550554
endpoint: data.endpoint,
551555
headers: headersRecord,
552556
name: data.name,

apps/dokploy/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"reset-password": "node -r dotenv/config dist/reset-password.mjs",
1414
"reset-2fa": "node -r dotenv/config dist/reset-2fa.mjs",
1515
"dev": "tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json ",
16-
"dev-turbopack": "TURBOPACK=1 tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json",
1716
"studio": "drizzle-kit studio --config ./server/db/drizzle.config.ts",
1817
"migration:generate": "drizzle-kit generate --config ./server/db/drizzle.config.ts",
1918
"migration:run": "tsx -r dotenv/config migration.ts",
@@ -118,7 +117,7 @@
118117
"lucide-react": "^0.469.0",
119118
"micromatch": "4.0.8",
120119
"nanoid": "3.3.11",
121-
"next": "^16.0.7",
120+
"next": "^16.0.10",
122121
"next-i18next": "^15.4.2",
123122
"next-themes": "^0.2.1",
124123
"nextjs-toploader": "^3.9.17",

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"scripts": {
99
"dokploy:setup": "pnpm --filter=dokploy run setup",
1010
"dokploy:dev": "pnpm --filter=dokploy run dev",
11-
"dokploy:dev:turbopack": "pnpm --filter=dokploy run dev-turbopack",
1211
"dokploy:build": "pnpm --filter=dokploy run build",
1312
"dokploy:start": "pnpm --filter=dokploy run start",
1413
"test": "pnpm --filter=dokploy run test",

packages/server/src/db/schema/notification.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@ export const apiCreateCustom = notificationsSchema
390390
.pick({
391391
appBuildError: true,
392392
databaseBackup: true,
393+
volumeBackup: true,
393394
dokployRestart: true,
394395
name: true,
395396
appDeploy: true,
@@ -416,6 +417,7 @@ export const apiCreateLark = notificationsSchema
416417
.pick({
417418
appBuildError: true,
418419
databaseBackup: true,
420+
volumeBackup: true,
419421
dokployRestart: true,
420422
name: true,
421423
appDeploy: true,

packages/server/src/services/notification.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,7 @@ export const updateCustomNotification = async (
653653
appDeploy: input.appDeploy,
654654
appBuildError: input.appBuildError,
655655
databaseBackup: input.databaseBackup,
656+
volumeBackup: input.volumeBackup,
656657
dokployRestart: input.dokployRestart,
657658
dockerCleanup: input.dockerCleanup,
658659
organizationId: input.organizationId,
@@ -772,6 +773,7 @@ export const updateLarkNotification = async (
772773
appDeploy: input.appDeploy,
773774
appBuildError: input.appBuildError,
774775
databaseBackup: input.databaseBackup,
776+
volumeBackup: input.volumeBackup,
775777
dokployRestart: input.dokployRestart,
776778
dockerCleanup: input.dockerCleanup,
777779
organizationId: input.organizationId,

pnpm-lock.yaml

Lines changed: 56 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)