From 5dfa7645f343151988f05e20a115710a43a410db Mon Sep 17 00:00:00 2001 From: Khiet Tam Nguyen Date: Sun, 18 May 2025 15:07:05 +1000 Subject: [PATCH 1/6] fix: multiple notifications for isolated compose and randomize compose --- .../dashboard/compose/general/isolated-deployment.tsx | 8 ++------ .../dashboard/compose/general/randomize-compose.tsx | 4 ---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/apps/dokploy/components/dashboard/compose/general/isolated-deployment.tsx b/apps/dokploy/components/dashboard/compose/general/isolated-deployment.tsx index 8ee9c786..29aa3bc0 100644 --- a/apps/dokploy/components/dashboard/compose/general/isolated-deployment.tsx +++ b/apps/dokploy/components/dashboard/compose/general/isolated-deployment.tsx @@ -71,8 +71,8 @@ export const IsolatedDeployment = ({ composeId }: Props) => { isolatedDeployment: formData?.isolatedDeployment || false, }) .then(async (_data) => { - randomizeCompose(); - refetch(); + await randomizeCompose(); + await refetch(); toast.success("Compose updated"); }) .catch(() => { @@ -88,11 +88,7 @@ export const IsolatedDeployment = ({ composeId }: Props) => { .then(async (data) => { await utils.project.all.invalidate(); setCompose(data); - toast.success("Compose Isolated"); }) - .catch(() => { - toast.error("Error isolating the compose"); - }); }; return ( diff --git a/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx b/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx index 4cc877fd..46ec61d3 100644 --- a/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx @@ -94,11 +94,7 @@ export const RandomizeCompose = ({ composeId }: Props) => { .then(async (data) => { await utils.project.all.invalidate(); setCompose(data); - toast.success("Compose randomized"); }) - .catch(() => { - toast.error("Error randomizing the compose"); - }); }; return ( From 0f48f2c83024b3b6e74510cdbc0aaf98410a6de3 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Sun, 18 May 2025 05:12:06 +0000 Subject: [PATCH 2/6] [autofix.ci] apply automated fixes --- .../dashboard/compose/general/isolated-deployment.tsx | 9 ++++----- .../dashboard/compose/general/randomize-compose.tsx | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/apps/dokploy/components/dashboard/compose/general/isolated-deployment.tsx b/apps/dokploy/components/dashboard/compose/general/isolated-deployment.tsx index 29aa3bc0..d76f7902 100644 --- a/apps/dokploy/components/dashboard/compose/general/isolated-deployment.tsx +++ b/apps/dokploy/components/dashboard/compose/general/isolated-deployment.tsx @@ -84,11 +84,10 @@ export const IsolatedDeployment = ({ composeId }: Props) => { await mutateAsync({ composeId, suffix: data?.appName || "", - }) - .then(async (data) => { - await utils.project.all.invalidate(); - setCompose(data); - }) + }).then(async (data) => { + await utils.project.all.invalidate(); + setCompose(data); + }); }; return ( diff --git a/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx b/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx index 46ec61d3..8315416d 100644 --- a/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx @@ -90,11 +90,10 @@ export const RandomizeCompose = ({ composeId }: Props) => { await mutateAsync({ composeId, suffix, - }) - .then(async (data) => { - await utils.project.all.invalidate(); - setCompose(data); - }) + }).then(async (data) => { + await utils.project.all.invalidate(); + setCompose(data); + }); }; return ( From e2befc24a5052060c0d17396220a4ee0814c381c Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 18 May 2025 02:17:41 -0600 Subject: [PATCH 3/6] fix: update rsync command in web server backup to remove verbose flag --- packages/server/src/utils/backups/web-server.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/server/src/utils/backups/web-server.ts b/packages/server/src/utils/backups/web-server.ts index ed6b020f..7af65b1c 100644 --- a/packages/server/src/utils/backups/web-server.ts +++ b/packages/server/src/utils/backups/web-server.ts @@ -66,8 +66,12 @@ export const runWebServerBackup = async (backup: BackupSchedule) => { writeStream.write(`Cleaning up temp file: ${cleanupCommand}\n`); await execAsync(cleanupCommand); + console.log( + `rsync -a --ignore-errors ${BASE_PATH}/ ${tempDir}/filesystem/`, + ); + await execAsync( - `rsync -av --ignore-errors ${BASE_PATH}/ ${tempDir}/filesystem/`, + `rsync -a --ignore-errors ${BASE_PATH}/ ${tempDir}/filesystem/`, ); writeStream.write("Copied filesystem to temp directory\n"); From cbf9aef0df6492ac7c92285feba41a445e1bb77f Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 18 May 2025 02:18:05 -0600 Subject: [PATCH 4/6] fix: remove console log for rsync command in web server backup --- packages/server/src/utils/backups/web-server.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/server/src/utils/backups/web-server.ts b/packages/server/src/utils/backups/web-server.ts index 7af65b1c..54592d87 100644 --- a/packages/server/src/utils/backups/web-server.ts +++ b/packages/server/src/utils/backups/web-server.ts @@ -66,10 +66,6 @@ export const runWebServerBackup = async (backup: BackupSchedule) => { writeStream.write(`Cleaning up temp file: ${cleanupCommand}\n`); await execAsync(cleanupCommand); - console.log( - `rsync -a --ignore-errors ${BASE_PATH}/ ${tempDir}/filesystem/`, - ); - await execAsync( `rsync -a --ignore-errors ${BASE_PATH}/ ${tempDir}/filesystem/`, ); From 616e11722ca7776901c6a43faf8a001fccf7bef3 Mon Sep 17 00:00:00 2001 From: Khiet Tam Nguyen Date: Sun, 18 May 2025 18:26:44 +1000 Subject: [PATCH 5/6] fix: randomize-compose missing await --- .../dashboard/compose/general/randomize-compose.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx b/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx index 8315416d..5ac67e0c 100644 --- a/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx @@ -77,8 +77,8 @@ export const RandomizeCompose = ({ composeId }: Props) => { randomize: formData?.randomize || false, }) .then(async (_data) => { - randomizeCompose(); - refetch(); + await randomizeCompose(); + await refetch(); toast.success("Compose updated"); }) .catch(() => { From 17a26353b6d2412b6023ddfc4cc785605c1368fc Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 18 May 2025 02:30:04 -0600 Subject: [PATCH 6/6] chore: bump version to v0.22.6 in package.json --- apps/dokploy/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 12ed499b..adb10f0e 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.22.5", + "version": "v0.22.6", "private": true, "license": "Apache-2.0", "type": "module",