From 82588f3e1647cce592debacac496d951f6e9afff Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sat, 21 Sep 2024 21:57:53 -0600 Subject: [PATCH] refactor(multi-server): add flag to queues --- .../dashboard/settings/git/gitlab/edit-gitlab-provider.tsx | 2 -- apps/dokploy/pages/api/deploy/[refreshToken].ts | 1 + apps/dokploy/pages/api/deploy/compose/[refreshToken].ts | 1 + apps/dokploy/pages/api/deploy/github.ts | 1 + apps/dokploy/server/api/routers/compose.ts | 2 ++ 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/dokploy/components/dashboard/settings/git/gitlab/edit-gitlab-provider.tsx b/apps/dokploy/components/dashboard/settings/git/gitlab/edit-gitlab-provider.tsx index be38d78b..db19e629 100644 --- a/apps/dokploy/components/dashboard/settings/git/gitlab/edit-gitlab-provider.tsx +++ b/apps/dokploy/components/dashboard/settings/git/gitlab/edit-gitlab-provider.tsx @@ -19,10 +19,8 @@ import { } from "@/components/ui/form"; import { Input } from "@/components/ui/input"; import { api } from "@/utils/api"; -import { useUrl } from "@/utils/hooks/use-url"; import { zodResolver } from "@hookform/resolvers/zod"; import { Edit } from "lucide-react"; -import { useRouter } from "next/router"; import { useEffect, useState } from "react"; import { useForm } from "react-hook-form"; import { toast } from "sonner"; diff --git a/apps/dokploy/pages/api/deploy/[refreshToken].ts b/apps/dokploy/pages/api/deploy/[refreshToken].ts index 7b4e0a75..829d4d34 100644 --- a/apps/dokploy/pages/api/deploy/[refreshToken].ts +++ b/apps/dokploy/pages/api/deploy/[refreshToken].ts @@ -87,6 +87,7 @@ export default async function handler( descriptionLog: `Hash: ${deploymentHash}`, type: "deploy", applicationType: "application", + server: !!application.serverId, }; await myQueue.add( "deployments", diff --git a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts index 65ab80df..8f24d2c0 100644 --- a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts +++ b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts @@ -63,6 +63,7 @@ export default async function handler( type: "deploy", applicationType: "compose", descriptionLog: `Hash: ${deploymentHash}`, + server: !!composeResult.serverId, }; await myQueue.add( "deployments", diff --git a/apps/dokploy/pages/api/deploy/github.ts b/apps/dokploy/pages/api/deploy/github.ts index f8f9d59c..032d6b7e 100644 --- a/apps/dokploy/pages/api/deploy/github.ts +++ b/apps/dokploy/pages/api/deploy/github.ts @@ -86,6 +86,7 @@ export default async function handler( descriptionLog: `Hash: ${deploymentHash}`, type: "deploy", applicationType: "application", + server: !!app.serverId, }; await myQueue.add( "deployments", diff --git a/apps/dokploy/server/api/routers/compose.ts b/apps/dokploy/server/api/routers/compose.ts index 6a98f109..8829ee55 100644 --- a/apps/dokploy/server/api/routers/compose.ts +++ b/apps/dokploy/server/api/routers/compose.ts @@ -187,12 +187,14 @@ export const composeRouter = createTRPCRouter({ redeploy: protectedProcedure .input(apiFindCompose) .mutation(async ({ input }) => { + const compose = await findComposeById(input.composeId); const jobData: DeploymentJob = { composeId: input.composeId, titleLog: "Rebuild deployment", type: "redeploy", applicationType: "compose", descriptionLog: "", + server: !!compose.serverId, }; await myQueue.add( "deployments",