Skip to content

Commit 0d6e984

Browse files
committed
fix: preserve application status when saving provider settings
1 parent 853ca33 commit 0d6e984

2 files changed

Lines changed: 73 additions & 7 deletions

File tree

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
import { beforeEach, describe, expect, it, vi } from "vitest";
2+
3+
const mockUpdateApplication = vi.hoisted(() => vi.fn());
4+
5+
vi.mock("@dokploy/server/services/permission", () => {
6+
return {
7+
checkServicePermissionAndAccess: vi.fn(async () => undefined),
8+
};
9+
});
10+
11+
vi.mock("@dokploy/server/index", () => ({
12+
IS_CLOUD: true,
13+
hasValidLicense: vi.fn(async () => false),
14+
updateApplication: mockUpdateApplication,
15+
findApplicationById: vi.fn(async () => ({
16+
applicationId: "app-1",
17+
appName: "example-app",
18+
})),
19+
}));
20+
21+
vi.mock("@dokploy/server/lib/auth", () => ({
22+
validateRequest: vi.fn(),
23+
}));
24+
25+
vi.mock("@/server/api/utils/audit", () => ({
26+
audit: vi.fn(async () => undefined),
27+
}));
28+
29+
const { applicationRouter } = await import("@/server/api/routers/application");
30+
31+
const caller = applicationRouter.createCaller({
32+
session: { activeOrganizationId: "org-1" },
33+
user: { id: "user-1", email: "[email protected]", role: "owner" },
34+
} as Parameters<typeof applicationRouter.createCaller>[0]);
35+
36+
describe("saving an application provider", () => {
37+
beforeEach(() => {
38+
vi.clearAllMocks();
39+
});
40+
41+
it.each(["done", "running"])(
42+
"keeps the %s application status when GitHub settings change",
43+
async (status) => {
44+
let savedStatus = status;
45+
mockUpdateApplication.mockImplementation(async (_id, update) => {
46+
if (update.applicationStatus !== undefined) {
47+
savedStatus = update.applicationStatus;
48+
}
49+
});
50+
51+
await caller.saveGithubProvider({
52+
applicationId: "app-1",
53+
repository: "example-repo",
54+
owner: "example-owner",
55+
branch: "main",
56+
buildPath: "/",
57+
githubId: "provider-1",
58+
watchPaths: ["src/**"],
59+
triggerType: "push",
60+
enableSubmodules: false,
61+
});
62+
63+
expect(savedStatus).toBe(status);
64+
expect(mockUpdateApplication).toHaveBeenCalledWith(
65+
"app-1",
66+
expect.objectContaining({
67+
watchPaths: ["src/**"],
68+
sourceType: "github",
69+
}),
70+
);
71+
},
72+
);
73+
});

‎apps/dokploy/server/api/routers/application.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ export const applicationRouter = createTRPCRouter({
545545
sourceType: "github",
546546
owner: input.owner,
547547
buildPath: input.buildPath,
548-
applicationStatus: "idle",
549548
githubId: input.githubId,
550549
watchPaths: input.watchPaths,
551550
triggerType: input.triggerType,
@@ -572,7 +571,6 @@ export const applicationRouter = createTRPCRouter({
572571
gitlabBranch: input.gitlabBranch,
573572
gitlabBuildPath: input.gitlabBuildPath,
574573
sourceType: "gitlab",
575-
applicationStatus: "idle",
576574
gitlabId: input.gitlabId,
577575
gitlabProjectId: input.gitlabProjectId,
578576
gitlabPathNamespace: input.gitlabPathNamespace,
@@ -601,7 +599,6 @@ export const applicationRouter = createTRPCRouter({
601599
bitbucketBranch: input.bitbucketBranch,
602600
bitbucketBuildPath: input.bitbucketBuildPath,
603601
sourceType: "bitbucket",
604-
applicationStatus: "idle",
605602
bitbucketId: input.bitbucketId,
606603
watchPaths: input.watchPaths,
607604
enableSubmodules: input.enableSubmodules,
@@ -627,7 +624,6 @@ export const applicationRouter = createTRPCRouter({
627624
giteaBranch: input.giteaBranch,
628625
giteaBuildPath: input.giteaBuildPath,
629626
sourceType: "gitea",
630-
applicationStatus: "idle",
631627
giteaId: input.giteaId,
632628
watchPaths: input.watchPaths,
633629
enableSubmodules: input.enableSubmodules,
@@ -652,7 +648,6 @@ export const applicationRouter = createTRPCRouter({
652648
username: input.username,
653649
password: input.password,
654650
sourceType: "docker",
655-
applicationStatus: "idle",
656651
registryUrl: input.registryUrl,
657652
});
658653
const application = await findApplicationById(input.applicationId);
@@ -676,7 +671,6 @@ export const applicationRouter = createTRPCRouter({
676671
customGitUrl: input.customGitUrl,
677672
customGitSSHKeyId: input.customGitSSHKeyId,
678673
sourceType: "git",
679-
applicationStatus: "idle",
680674
watchPaths: input.watchPaths,
681675
enableSubmodules: input.enableSubmodules,
682676
});
@@ -729,7 +723,6 @@ export const applicationRouter = createTRPCRouter({
729723
customGitSSHKeyId: null,
730724

731725
sourceType: "github", // Reset to default
732-
applicationStatus: "idle",
733726
watchPaths: null,
734727
enableSubmodules: false,
735728
});

0 commit comments

Comments
 (0)