From 43ab1aa7b871ca319e0cdff054034e83eb5686a9 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Fri, 2 May 2025 23:11:21 -0600 Subject: [PATCH] Enhance ShowSchedules component with improved user feedback and schedule execution - Updated the ShowSchedules component to include a delay before refetching schedules after a successful manual run, enhancing user experience by providing a brief confirmation period. - Removed unnecessary console logging in the updateSchedule function to streamline the code and improve maintainability. - Modified the scheduleJob utility to accept scheduleId as the first parameter, improving clarity and consistency in job scheduling. --- .../dashboard/application/schedules/show-schedules.tsx | 6 +++++- packages/server/src/services/schedule.ts | 2 -- packages/server/src/utils/schedules/utils.ts | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/dokploy/components/dashboard/application/schedules/show-schedules.tsx b/apps/dokploy/components/dashboard/application/schedules/show-schedules.tsx index c1345ebe..19092ec9 100644 --- a/apps/dokploy/components/dashboard/application/schedules/show-schedules.tsx +++ b/apps/dokploy/components/dashboard/application/schedules/show-schedules.tsx @@ -165,8 +165,12 @@ export const ShowSchedules = ({ id, scheduleType = "application" }: Props) => { await runManually({ scheduleId: schedule.scheduleId, }) - .then(() => { + .then(async () => { toast.success("Schedule run successfully"); + + await new Promise((resolve) => + setTimeout(resolve, 1500), + ); refetchSchedules(); }) .catch(() => { diff --git a/packages/server/src/services/schedule.ts b/packages/server/src/services/schedule.ts index 186cabd2..a00ffc35 100644 --- a/packages/server/src/services/schedule.ts +++ b/packages/server/src/services/schedule.ts @@ -101,8 +101,6 @@ export const updateSchedule = async ( await handleScript(updatedSchedule); } - console.log("updatedSchedule", updatedSchedule); - if (IS_CLOUD) { // scheduleJob(updatedSchedule); } else { diff --git a/packages/server/src/utils/schedules/utils.ts b/packages/server/src/utils/schedules/utils.ts index 2be3f5f5..14c32213 100644 --- a/packages/server/src/utils/schedules/utils.ts +++ b/packages/server/src/utils/schedules/utils.ts @@ -13,7 +13,7 @@ import path from "node:path"; export const scheduleJob = (schedule: Schedule) => { const { cronExpression, scheduleId } = schedule; - scheduleJobNode(cronExpression, async () => { + scheduleJobNode(scheduleId, cronExpression, async () => { await runCommand(scheduleId); }); };