mirror of
https://github.com/Dokploy/dokploy.git
synced 2026-07-23 06:45:27 +02:00
Compare commits
55 Commits
v0.29.10
...
fix/idor-s
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cfd600b197 | ||
|
|
117cfa1a89 | ||
|
|
439eee45ed | ||
|
|
74811073f6 | ||
|
|
df3965a581 | ||
|
|
bddc0c3d15 | ||
|
|
9626c162cc | ||
|
|
c4596ffa76 | ||
|
|
de62aff0fb | ||
|
|
d5dd35c8f8 | ||
|
|
4631ede015 | ||
|
|
bc22d05f8d | ||
|
|
7ba9818894 | ||
|
|
9142127fb3 | ||
|
|
31380fd325 | ||
|
|
f577778667 | ||
|
|
12d3f1871c | ||
|
|
c04d56bf2c | ||
|
|
2e867c5be1 | ||
|
|
e87a245cdc | ||
|
|
71bea42625 | ||
|
|
1cb9491013 | ||
|
|
01ac30974f | ||
|
|
1c4414165d | ||
|
|
93b7942f7d | ||
|
|
6224d57adb | ||
|
|
8d0ae19b58 | ||
|
|
856cf33dd8 | ||
|
|
7924794ae7 | ||
|
|
3c114e2b45 | ||
|
|
cffd8464ef | ||
|
|
b3621bcfff | ||
|
|
b4574aa097 | ||
|
|
d831607f3a | ||
|
|
995a04d30f | ||
|
|
e6bfaa2eac | ||
|
|
3912c1abcc | ||
|
|
bb30dc14fe | ||
|
|
532c8d0c0d | ||
|
|
7871ce7684 | ||
|
|
98b86300df | ||
|
|
82fcdc9598 | ||
|
|
4e3a6db83a | ||
|
|
17fdd64c10 | ||
|
|
215c4666ff | ||
|
|
9749d86b4c | ||
|
|
12a9cceec7 | ||
|
|
d3e0b100a0 | ||
|
|
a296407c85 | ||
|
|
0d79a0a221 | ||
|
|
c9ac7236a7 | ||
|
|
6e5ac41bab | ||
|
|
d7b9f01567 | ||
|
|
8f9be1636c | ||
|
|
86f941d606 |
9
.github/workflows/dokploy.yml
vendored
9
.github/workflows/dokploy.yml
vendored
@@ -152,6 +152,14 @@ jobs:
|
|||||||
VERSION=$(node -p "require('./apps/dokploy/package.json').version")
|
VERSION=$(node -p "require('./apps/dokploy/package.json').version")
|
||||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Fetch install.sh
|
||||||
|
run: |
|
||||||
|
curl -fsSL https://raw.githubusercontent.com/Dokploy/website/main/apps/website/public/install.sh -o install.sh
|
||||||
|
head -1 install.sh | grep -q '^#!' || { echo "Downloaded install.sh is not a shell script"; exit 1; }
|
||||||
|
grep -q 'DOKPLOY_VERSION' install.sh || { echo "install.sh no longer supports DOKPLOY_VERSION pinning"; exit 1; }
|
||||||
|
{ head -1 install.sh; echo "DOKPLOY_VERSION=\"\${DOKPLOY_VERSION:-${{ steps.get_version.outputs.version }}}\""; tail -n +2 install.sh; } > install-pinned.sh
|
||||||
|
mv install-pinned.sh install.sh
|
||||||
|
|
||||||
- name: Create Release
|
- name: Create Release
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
@@ -160,6 +168,7 @@ jobs:
|
|||||||
generate_release_notes: true
|
generate_release_notes: true
|
||||||
draft: false
|
draft: false
|
||||||
prerelease: false
|
prerelease: false
|
||||||
|
files: install.sh
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
|||||||
@@ -69,4 +69,5 @@ EXPOSE 3000
|
|||||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=5 \
|
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=5 \
|
||||||
CMD curl -fs http://localhost:3000/api/trpc/settings.health || exit 1
|
CMD curl -fs http://localhost:3000/api/trpc/settings.health || exit 1
|
||||||
|
|
||||||
CMD ["sh", "-c", "pnpm run wait-for-postgres && exec pnpm start"]
|
# Ejecutar node directamente: pnpm como wrapper queda residente (~100MB RSS)
|
||||||
|
CMD ["sh", "-c", "node -r dotenv/config dist/wait-for-postgres.mjs && node -r dotenv/config dist/migration.mjs && exec node -r dotenv/config dist/server.mjs"]
|
||||||
|
|||||||
26
apps/dokploy/__test__/api/api-key-name.test.ts
Normal file
26
apps/dokploy/__test__/api/api-key-name.test.ts
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
import { API_KEY_NAME_MAX_LENGTH, apiKeyNameSchema } from "@/lib/api-keys";
|
||||||
|
|
||||||
|
describe("apiKeyNameSchema", () => {
|
||||||
|
it("rejects an empty name", () => {
|
||||||
|
const result = apiKeyNameSchema.safeParse("");
|
||||||
|
expect(result.success).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("accepts a name at the maximum length", () => {
|
||||||
|
const name = "a".repeat(API_KEY_NAME_MAX_LENGTH);
|
||||||
|
const result = apiKeyNameSchema.safeParse(name);
|
||||||
|
expect(result.success).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a name over the maximum length instead of passing it to better-auth", () => {
|
||||||
|
const name = "a".repeat(API_KEY_NAME_MAX_LENGTH + 1);
|
||||||
|
const result = apiKeyNameSchema.safeParse(name);
|
||||||
|
expect(result.success).toBe(false);
|
||||||
|
if (!result.success) {
|
||||||
|
expect(result.error.issues[0]?.message).toBe(
|
||||||
|
`Name must be at most ${API_KEY_NAME_MAX_LENGTH} characters`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -42,6 +42,39 @@ test("Add suffix to volumes declared directly in services", () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const composeFileAccessMode = `
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
web:
|
||||||
|
image: nginx:alpine
|
||||||
|
volumes:
|
||||||
|
- web_config:/etc/nginx/conf.d:ro
|
||||||
|
- certs/sub:/etc/certs:Z
|
||||||
|
`;
|
||||||
|
|
||||||
|
test("Add suffix to volumes preserves access mode (:ro, :z, :Z)", () => {
|
||||||
|
const composeData = parse(composeFileAccessMode) as ComposeSpecification;
|
||||||
|
|
||||||
|
const suffix = generateRandomHash();
|
||||||
|
|
||||||
|
if (!composeData.services) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const updatedComposeData = addSuffixToVolumesInServices(
|
||||||
|
composeData.services,
|
||||||
|
suffix,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(updatedComposeData.web?.volumes).toContain(
|
||||||
|
`web_config-${suffix}:/etc/nginx/conf.d:ro`,
|
||||||
|
);
|
||||||
|
expect(updatedComposeData.web?.volumes).toContain(
|
||||||
|
`certs-${suffix}/sub:/etc/certs:Z`,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
const composeFileTypeVolume = `
|
const composeFileTypeVolume = `
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
|
|||||||
93
apps/dokploy/__test__/env/encryption.test.ts
vendored
Normal file
93
apps/dokploy/__test__/env/encryption.test.ts
vendored
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
import {
|
||||||
|
decryptValue,
|
||||||
|
encryptValue,
|
||||||
|
exportEncryptionKeys,
|
||||||
|
isEncrypted,
|
||||||
|
} from "@dokploy/server/lib/encryption";
|
||||||
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
describe("encryptValue / decryptValue", () => {
|
||||||
|
it("round-trips a value", () => {
|
||||||
|
const value =
|
||||||
|
"DATABASE_URL=postgres://user:secret@host:5432/db\nAPI_KEY=123";
|
||||||
|
const encrypted = encryptValue(value);
|
||||||
|
|
||||||
|
expect(encrypted).not.toBe(value);
|
||||||
|
expect(isEncrypted(encrypted)).toBe(true);
|
||||||
|
expect(encrypted).not.toContain("secret");
|
||||||
|
expect(decryptValue(encrypted)).toBe(value);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses a random IV so equal inputs produce different ciphertexts", () => {
|
||||||
|
const value = "KEY=value";
|
||||||
|
expect(encryptValue(value)).not.toBe(encryptValue(value));
|
||||||
|
});
|
||||||
|
|
||||||
|
it("passes legacy plaintext through on decrypt", () => {
|
||||||
|
const plaintext = "KEY=legacy-plaintext-value";
|
||||||
|
expect(decryptValue(plaintext)).toBe(plaintext);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("passes empty values through unchanged", () => {
|
||||||
|
expect(encryptValue("")).toBe("");
|
||||||
|
expect(decryptValue("")).toBe("");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not double-encrypt an already encrypted value", () => {
|
||||||
|
const encrypted = encryptValue("KEY=value");
|
||||||
|
expect(encryptValue(encrypted)).toBe(encrypted);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("throws a descriptive error on tampered ciphertext", () => {
|
||||||
|
const encrypted = encryptValue("KEY=value");
|
||||||
|
const tampered = `${encrypted.slice(0, -4)}AAAA`;
|
||||||
|
expect(() => decryptValue(tampered)).toThrow(/BETTER_AUTH_SECRET/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("exports the derived keys as 32-byte hex lines for backups", () => {
|
||||||
|
expect(exportEncryptionKeys()).toMatch(/^[0-9a-f]{64}(\n[0-9a-f]{64})*$/);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("dedicated ENCRYPTION_KEY", () => {
|
||||||
|
afterEach(() => {
|
||||||
|
vi.unstubAllEnvs();
|
||||||
|
vi.resetModules();
|
||||||
|
});
|
||||||
|
|
||||||
|
const loadWithEncryptionKey = async (key: string) => {
|
||||||
|
vi.stubEnv("ENCRYPTION_KEY", key);
|
||||||
|
vi.resetModules();
|
||||||
|
return await import("@dokploy/server/lib/encryption");
|
||||||
|
};
|
||||||
|
|
||||||
|
it("encrypts with the dedicated key when set", async () => {
|
||||||
|
const withKey = await loadWithEncryptionKey("my-dedicated-key");
|
||||||
|
const encrypted = withKey.encryptValue("KEY=value");
|
||||||
|
|
||||||
|
expect(withKey.decryptValue(encrypted)).toBe("KEY=value");
|
||||||
|
// The default (auth-secret derived) module cannot read it
|
||||||
|
expect(() => decryptValue(encrypted)).toThrow(/ENCRYPTION_KEY/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("still decrypts legacy values via the auth-secret fallback", async () => {
|
||||||
|
// Encrypted before the install adopted a dedicated key
|
||||||
|
const legacyEncrypted = encryptValue("KEY=legacy-value");
|
||||||
|
|
||||||
|
const withKey = await loadWithEncryptionKey("my-dedicated-key");
|
||||||
|
expect(withKey.decryptValue(legacyEncrypted)).toBe("KEY=legacy-value");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("re-encrypts with the dedicated key on write", async () => {
|
||||||
|
const withKey = await loadWithEncryptionKey("my-dedicated-key");
|
||||||
|
const reEncrypted = withKey.encryptValue(
|
||||||
|
withKey.decryptValue(encryptValue("KEY=migrated")),
|
||||||
|
);
|
||||||
|
|
||||||
|
const other = await loadWithEncryptionKey("another-key");
|
||||||
|
// Readable only by the dedicated key (or its own fallback), proving
|
||||||
|
// the write used the primary key, not the legacy one
|
||||||
|
expect(withKey.decryptValue(reEncrypted)).toBe("KEY=migrated");
|
||||||
|
expect(() => other.decryptValue(reEncrypted)).toThrow();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
||||||
import {
|
import {
|
||||||
canEditDeployGitSource,
|
canEditDeployGitSource,
|
||||||
getAccessibleGitProviderIds,
|
getAccessibleGitProviderIds,
|
||||||
} from "@dokploy/server/services/git-provider";
|
} from "@dokploy/server/services/git-provider";
|
||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
const mockDb = vi.hoisted(() => ({
|
const mockDb = vi.hoisted(() => ({
|
||||||
query: {
|
query: {
|
||||||
|
|||||||
@@ -1,16 +1,11 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
const hasValidLicense = vi.fn();
|
|
||||||
const getWebServerSettings = vi.fn();
|
const getWebServerSettings = vi.fn();
|
||||||
const findFirstOrg = vi.fn();
|
|
||||||
const findFirstServer = vi.fn();
|
const findFirstServer = vi.fn();
|
||||||
|
|
||||||
vi.mock("@dokploy/server/db", () => ({
|
vi.mock("@dokploy/server/db", () => ({
|
||||||
db: {
|
db: {
|
||||||
query: {
|
query: {
|
||||||
organization: {
|
|
||||||
findFirst: (...args: unknown[]) => findFirstOrg(...args),
|
|
||||||
},
|
|
||||||
server: {
|
server: {
|
||||||
findFirst: (...args: unknown[]) => findFirstServer(...args),
|
findFirst: (...args: unknown[]) => findFirstServer(...args),
|
||||||
},
|
},
|
||||||
@@ -19,91 +14,56 @@ vi.mock("@dokploy/server/db", () => ({
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("@dokploy/server/db/schema", () => ({
|
vi.mock("@dokploy/server/db/schema", () => ({
|
||||||
organization: {},
|
|
||||||
server: {},
|
server: {},
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("@dokploy/server/services/proprietary/license-key", () => ({
|
|
||||||
hasValidLicense: (...args: unknown[]) => hasValidLicense(...args),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("@dokploy/server/services/web-server-settings", () => ({
|
vi.mock("@dokploy/server/services/web-server-settings", () => ({
|
||||||
getWebServerSettings: (...args: unknown[]) => getWebServerSettings(...args),
|
getWebServerSettings: (...args: unknown[]) => getWebServerSettings(...args),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("drizzle-orm", () => ({ eq: vi.fn() }));
|
vi.mock("drizzle-orm", () => ({ eq: vi.fn() }));
|
||||||
|
|
||||||
import {
|
import { resolveBuildsConcurrency } from "../../server/queues/concurrency";
|
||||||
assertBuildsConcurrencyAllowed,
|
|
||||||
resolveBuildsConcurrency,
|
|
||||||
} from "../../server/queues/concurrency";
|
|
||||||
import { LOCAL_PARTITION } from "../../server/queues/in-memory-queue";
|
import { LOCAL_PARTITION } from "../../server/queues/in-memory-queue";
|
||||||
|
|
||||||
describe("resolveBuildsConcurrency (enterprise gating)", () => {
|
describe("resolveBuildsConcurrency", () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.clearAllMocks();
|
vi.clearAllMocks();
|
||||||
findFirstOrg.mockResolvedValue({ id: "org-1" });
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("local web server partition", () => {
|
describe("local web server partition", () => {
|
||||||
it("returns the configured concurrency when licensed", async () => {
|
it("returns the configured concurrency", async () => {
|
||||||
getWebServerSettings.mockResolvedValue({ buildsConcurrency: 5 });
|
getWebServerSettings.mockResolvedValue({ buildsConcurrency: 5 });
|
||||||
hasValidLicense.mockResolvedValue(true);
|
|
||||||
|
|
||||||
await expect(resolveBuildsConcurrency(LOCAL_PARTITION)).resolves.toBe(5);
|
await expect(resolveBuildsConcurrency(LOCAL_PARTITION)).resolves.toBe(5);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("clamps to the free max (2) when there is no valid license", async () => {
|
it("does not cap high values", async () => {
|
||||||
getWebServerSettings.mockResolvedValue({ buildsConcurrency: 10 });
|
|
||||||
hasValidLicense.mockResolvedValue(false);
|
|
||||||
|
|
||||||
await expect(resolveBuildsConcurrency(LOCAL_PARTITION)).resolves.toBe(2);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("allows the free max (2) without a license", async () => {
|
|
||||||
getWebServerSettings.mockResolvedValue({ buildsConcurrency: 2 });
|
|
||||||
hasValidLicense.mockResolvedValue(false);
|
|
||||||
|
|
||||||
await expect(resolveBuildsConcurrency(LOCAL_PARTITION)).resolves.toBe(2);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not cap the value when licensed (N allowed)", async () => {
|
|
||||||
getWebServerSettings.mockResolvedValue({ buildsConcurrency: 999 });
|
getWebServerSettings.mockResolvedValue({ buildsConcurrency: 999 });
|
||||||
hasValidLicense.mockResolvedValue(true);
|
|
||||||
|
|
||||||
await expect(resolveBuildsConcurrency(LOCAL_PARTITION)).resolves.toBe(
|
await expect(resolveBuildsConcurrency(LOCAL_PARTITION)).resolves.toBe(
|
||||||
999,
|
999,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("floors values below 1 to 1", async () => {
|
||||||
|
getWebServerSettings.mockResolvedValue({ buildsConcurrency: 0 });
|
||||||
|
|
||||||
|
await expect(resolveBuildsConcurrency(LOCAL_PARTITION)).resolves.toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
it("defaults to 1 when settings are missing", async () => {
|
it("defaults to 1 when settings are missing", async () => {
|
||||||
getWebServerSettings.mockResolvedValue(undefined);
|
getWebServerSettings.mockResolvedValue(undefined);
|
||||||
hasValidLicense.mockResolvedValue(true);
|
|
||||||
|
|
||||||
await expect(resolveBuildsConcurrency(LOCAL_PARTITION)).resolves.toBe(1);
|
await expect(resolveBuildsConcurrency(LOCAL_PARTITION)).resolves.toBe(1);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("remote server partition", () => {
|
describe("remote server partition", () => {
|
||||||
it("returns the server concurrency when its org is licensed", async () => {
|
it("returns the server concurrency", async () => {
|
||||||
findFirstServer.mockResolvedValue({
|
findFirstServer.mockResolvedValue({ buildsConcurrency: 4 });
|
||||||
buildsConcurrency: 4,
|
|
||||||
organizationId: "org-1",
|
|
||||||
});
|
|
||||||
hasValidLicense.mockResolvedValue(true);
|
|
||||||
|
|
||||||
await expect(resolveBuildsConcurrency("server-1")).resolves.toBe(4);
|
await expect(resolveBuildsConcurrency("server-1")).resolves.toBe(4);
|
||||||
expect(hasValidLicense).toHaveBeenCalledWith("org-1");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("clamps to the free max (2) when the server org is not licensed", async () => {
|
|
||||||
findFirstServer.mockResolvedValue({
|
|
||||||
buildsConcurrency: 8,
|
|
||||||
organizationId: "org-1",
|
|
||||||
});
|
|
||||||
hasValidLicense.mockResolvedValue(false);
|
|
||||||
|
|
||||||
await expect(resolveBuildsConcurrency("server-1")).resolves.toBe(2);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("defaults to 1 for an unknown server", async () => {
|
it("defaults to 1 for an unknown server", async () => {
|
||||||
@@ -119,30 +79,3 @@ describe("resolveBuildsConcurrency (enterprise gating)", () => {
|
|||||||
await expect(resolveBuildsConcurrency(LOCAL_PARTITION)).resolves.toBe(1);
|
await expect(resolveBuildsConcurrency(LOCAL_PARTITION)).resolves.toBe(1);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("assertBuildsConcurrencyAllowed", () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("allows up to the free max (2) without checking the license", async () => {
|
|
||||||
await expect(
|
|
||||||
assertBuildsConcurrencyAllowed(2, "org-1"),
|
|
||||||
).resolves.toBeUndefined();
|
|
||||||
expect(hasValidLicense).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("allows more than 2 when licensed", async () => {
|
|
||||||
hasValidLicense.mockResolvedValue(true);
|
|
||||||
await expect(
|
|
||||||
assertBuildsConcurrencyAllowed(5, "org-1"),
|
|
||||||
).resolves.toBeUndefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("rejects more than 2 without a license", async () => {
|
|
||||||
hasValidLicense.mockResolvedValue(false);
|
|
||||||
await expect(assertBuildsConcurrencyAllowed(3, "org-1")).rejects.toThrow(
|
|
||||||
/enterprise license/i,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
44
apps/dokploy/__test__/server/server-sshkey-redaction.test.ts
Normal file
44
apps/dokploy/__test__/server/server-sshkey-redaction.test.ts
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
import { redactServerSshKey } from "@dokploy/server/services/server";
|
||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
describe("redactServerSshKey (server SSH private key disclosure guard)", () => {
|
||||||
|
it("blanks the private key while keeping the rest of the ssh key intact", () => {
|
||||||
|
const server = {
|
||||||
|
serverId: "srv-1",
|
||||||
|
name: "prod",
|
||||||
|
sshKey: {
|
||||||
|
sshKeyId: "key-1",
|
||||||
|
publicKey: "ssh-ed25519 AAAA...",
|
||||||
|
privateKey: "-----BEGIN OPENSSH PRIVATE KEY-----\nsecret\n",
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const redacted = redactServerSshKey(server);
|
||||||
|
|
||||||
|
expect(redacted.sshKey.privateKey).toBe("");
|
||||||
|
// Non-secret fields and the surrounding record must survive untouched.
|
||||||
|
expect(redacted.sshKey.publicKey).toBe("ssh-ed25519 AAAA...");
|
||||||
|
expect(redacted.serverId).toBe("srv-1");
|
||||||
|
expect(redacted.name).toBe("prod");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not mutate the original record", () => {
|
||||||
|
const server = {
|
||||||
|
serverId: "srv-1",
|
||||||
|
sshKey: { privateKey: "top-secret" },
|
||||||
|
};
|
||||||
|
redactServerSshKey(server);
|
||||||
|
expect(server.sshKey.privateKey).toBe("top-secret");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("is a no-op when the server has no ssh key", () => {
|
||||||
|
const server = { serverId: "srv-2", sshKey: null };
|
||||||
|
expect(redactServerSshKey(server)).toEqual(server);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("handles a record without a loaded sshKey relation", () => {
|
||||||
|
// e.g. server.update returns the plain row where sshKey is not populated.
|
||||||
|
const server: { serverId: string; sshKey?: null } = { serverId: "srv-3" };
|
||||||
|
expect(redactServerSshKey(server)).toEqual(server);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -256,14 +256,19 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
|
|||||||
: isLoadingRepositories
|
: isLoadingRepositories
|
||||||
? "Loading...."
|
? "Loading...."
|
||||||
: (repositories?.find(
|
: (repositories?.find(
|
||||||
(repo) => repo.name === field.value.repo,
|
(repo) =>
|
||||||
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.username === field.value.owner,
|
||||||
)?.name ?? "Select repository")}
|
)?.name ?? "Select repository")}
|
||||||
|
|
||||||
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search repository..."
|
placeholder="Search repository..."
|
||||||
@@ -283,7 +288,7 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
|
|||||||
<CommandGroup>
|
<CommandGroup>
|
||||||
{repositories?.map((repo) => (
|
{repositories?.map((repo) => (
|
||||||
<CommandItem
|
<CommandItem
|
||||||
value={repo.name}
|
value={`${repo.owner.username}/${repo.name}`}
|
||||||
key={repo.url}
|
key={repo.url}
|
||||||
onSelect={() => {
|
onSelect={() => {
|
||||||
form.setValue("repository", {
|
form.setValue("repository", {
|
||||||
@@ -294,8 +299,8 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
|
|||||||
form.setValue("branch", "");
|
form.setValue("branch", "");
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span className="flex items-center gap-2">
|
<span className="flex min-w-0 items-center gap-2">
|
||||||
<span>{repo.name}</span>
|
<span className="truncate">{repo.name}</span>
|
||||||
<span className="text-muted-foreground text-xs">
|
<span className="text-muted-foreground text-xs">
|
||||||
{repo.owner.username}
|
{repo.owner.username}
|
||||||
</span>
|
</span>
|
||||||
@@ -303,7 +308,8 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
|
|||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
repo.name === field.value.repo
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.username === field.value.owner
|
||||||
? "opacity-100"
|
? "opacity-100"
|
||||||
: "opacity-0",
|
: "opacity-0",
|
||||||
)}
|
)}
|
||||||
@@ -350,7 +356,10 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search branch..."
|
placeholder="Search branch..."
|
||||||
@@ -378,7 +387,7 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
|
|||||||
form.setValue("branch", branch.name);
|
form.setValue("branch", branch.name);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{branch.name}
|
<span className="truncate">{branch.name}</span>
|
||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
|
|||||||
@@ -270,14 +270,18 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
|
|||||||
? "Loading...."
|
? "Loading...."
|
||||||
: (repositories?.find(
|
: (repositories?.find(
|
||||||
(repo: GiteaRepository) =>
|
(repo: GiteaRepository) =>
|
||||||
repo.name === field.value.repo,
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.username === field.value.owner,
|
||||||
)?.name ?? "Select repository")}
|
)?.name ?? "Select repository")}
|
||||||
|
|
||||||
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search repository..."
|
placeholder="Search repository..."
|
||||||
@@ -303,7 +307,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
|
|||||||
{repositories?.map((repo: GiteaRepository) => {
|
{repositories?.map((repo: GiteaRepository) => {
|
||||||
return (
|
return (
|
||||||
<CommandItem
|
<CommandItem
|
||||||
value={repo.name}
|
value={`${repo.owner.username}/${repo.name}`}
|
||||||
key={repo.url}
|
key={repo.url}
|
||||||
onSelect={() => {
|
onSelect={() => {
|
||||||
form.setValue("repository", {
|
form.setValue("repository", {
|
||||||
@@ -313,8 +317,10 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
|
|||||||
form.setValue("branch", "");
|
form.setValue("branch", "");
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span className="flex items-center gap-2">
|
<span className="flex min-w-0 items-center gap-2">
|
||||||
<span>{repo.name}</span>
|
<span className="truncate">
|
||||||
|
{repo.name}
|
||||||
|
</span>
|
||||||
<span className="text-muted-foreground text-xs">
|
<span className="text-muted-foreground text-xs">
|
||||||
{repo.owner.username}
|
{repo.owner.username}
|
||||||
</span>
|
</span>
|
||||||
@@ -322,7 +328,9 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
|
|||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
repo.name === field.value.repo
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.username ===
|
||||||
|
field.value.owner
|
||||||
? "opacity-100"
|
? "opacity-100"
|
||||||
: "opacity-0",
|
: "opacity-0",
|
||||||
)}
|
)}
|
||||||
@@ -371,7 +379,10 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search branch..."
|
placeholder="Search branch..."
|
||||||
@@ -402,7 +413,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
|
|||||||
form.setValue("branch", branch.name);
|
form.setValue("branch", branch.name);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{branch.name}
|
<span className="truncate">{branch.name}</span>
|
||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
|
|||||||
@@ -252,14 +252,19 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
|
|||||||
: isLoadingRepositories
|
: isLoadingRepositories
|
||||||
? "Loading...."
|
? "Loading...."
|
||||||
: (repositories?.find(
|
: (repositories?.find(
|
||||||
(repo) => repo.name === field.value.repo,
|
(repo) =>
|
||||||
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.login === field.value.owner,
|
||||||
)?.name ?? field.value.repo)}
|
)?.name ?? field.value.repo)}
|
||||||
|
|
||||||
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search repository..."
|
placeholder="Search repository..."
|
||||||
@@ -279,7 +284,7 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
|
|||||||
<CommandGroup>
|
<CommandGroup>
|
||||||
{repositories?.map((repo) => (
|
{repositories?.map((repo) => (
|
||||||
<CommandItem
|
<CommandItem
|
||||||
value={repo.name}
|
value={`${repo.owner.login}/${repo.name}`}
|
||||||
key={repo.url}
|
key={repo.url}
|
||||||
onSelect={() => {
|
onSelect={() => {
|
||||||
form.setValue("repository", {
|
form.setValue("repository", {
|
||||||
@@ -289,8 +294,8 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
|
|||||||
form.setValue("branch", "");
|
form.setValue("branch", "");
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span className="flex items-center gap-2">
|
<span className="flex min-w-0 items-center gap-2">
|
||||||
<span>{repo.name}</span>
|
<span className="truncate">{repo.name}</span>
|
||||||
<span className="text-muted-foreground text-xs">
|
<span className="text-muted-foreground text-xs">
|
||||||
{repo.owner.login}
|
{repo.owner.login}
|
||||||
</span>
|
</span>
|
||||||
@@ -298,7 +303,8 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
|
|||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
repo.name === field.value.repo
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.login === field.value.owner
|
||||||
? "opacity-100"
|
? "opacity-100"
|
||||||
: "opacity-0",
|
: "opacity-0",
|
||||||
)}
|
)}
|
||||||
@@ -345,7 +351,10 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search branch..."
|
placeholder="Search branch..."
|
||||||
@@ -373,7 +382,7 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
|
|||||||
form.setValue("branch", branch.name);
|
form.setValue("branch", branch.name);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{branch.name}
|
<span className="truncate">{branch.name}</span>
|
||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
|
|||||||
@@ -272,7 +272,10 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search repository..."
|
placeholder="Search repository..."
|
||||||
@@ -310,8 +313,10 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
|
|||||||
form.setValue("branch", "");
|
form.setValue("branch", "");
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span className="flex items-center gap-2">
|
<span className="flex min-w-0 items-center gap-2">
|
||||||
<span>{repo.name}</span>
|
<span className="truncate">
|
||||||
|
{repo.name}
|
||||||
|
</span>
|
||||||
<span className="text-muted-foreground text-xs">
|
<span className="text-muted-foreground text-xs">
|
||||||
{repo.owner.username}
|
{repo.owner.username}
|
||||||
</span>
|
</span>
|
||||||
@@ -368,7 +373,10 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search branch..."
|
placeholder="Search branch..."
|
||||||
@@ -396,7 +404,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
|
|||||||
form.setValue("branch", branch.name);
|
form.setValue("branch", branch.name);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{branch.name}
|
<span className="truncate">{branch.name}</span>
|
||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
|
||||||
import {
|
import {
|
||||||
Ban,
|
Ban,
|
||||||
CheckCircle2,
|
CheckCircle2,
|
||||||
@@ -8,6 +7,7 @@ import {
|
|||||||
Terminal,
|
Terminal,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
|
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { ShowBuildChooseForm } from "@/components/dashboard/application/build/show";
|
import { ShowBuildChooseForm } from "@/components/dashboard/application/build/show";
|
||||||
import { ShowProviderForm } from "@/components/dashboard/application/general/generic/show";
|
import { ShowProviderForm } from "@/components/dashboard/application/general/generic/show";
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
|
||||||
import {
|
import {
|
||||||
ExternalLink,
|
ExternalLink,
|
||||||
FileText,
|
FileText,
|
||||||
@@ -9,6 +8,7 @@ import {
|
|||||||
RocketIcon,
|
RocketIcon,
|
||||||
Trash2,
|
Trash2,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
|
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { GithubIcon } from "@/components/icons/data-tools-icons";
|
import { GithubIcon } from "@/components/icons/data-tools-icons";
|
||||||
import { DateTooltip } from "@/components/shared/date-tooltip";
|
import { DateTooltip } from "@/components/shared/date-tooltip";
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
|
||||||
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
|
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { DialogAction } from "@/components/shared/dialog-action";
|
import { DialogAction } from "@/components/shared/dialog-action";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
|
|||||||
@@ -258,14 +258,19 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
|
|||||||
: isLoadingRepositories
|
: isLoadingRepositories
|
||||||
? "Loading...."
|
? "Loading...."
|
||||||
: (repositories?.find(
|
: (repositories?.find(
|
||||||
(repo) => repo.name === field.value.repo,
|
(repo) =>
|
||||||
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.username === field.value.owner,
|
||||||
)?.name ?? "Select repository")}
|
)?.name ?? "Select repository")}
|
||||||
|
|
||||||
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search repository..."
|
placeholder="Search repository..."
|
||||||
@@ -285,7 +290,7 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
|
|||||||
<CommandGroup>
|
<CommandGroup>
|
||||||
{repositories?.map((repo) => (
|
{repositories?.map((repo) => (
|
||||||
<CommandItem
|
<CommandItem
|
||||||
value={repo.name}
|
value={`${repo.owner.username}/${repo.name}`}
|
||||||
key={repo.url}
|
key={repo.url}
|
||||||
onSelect={() => {
|
onSelect={() => {
|
||||||
form.setValue("repository", {
|
form.setValue("repository", {
|
||||||
@@ -296,8 +301,8 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
|
|||||||
form.setValue("branch", "");
|
form.setValue("branch", "");
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span className="flex items-center gap-2">
|
<span className="flex min-w-0 items-center gap-2">
|
||||||
<span>{repo.name}</span>
|
<span className="truncate">{repo.name}</span>
|
||||||
<span className="text-muted-foreground text-xs">
|
<span className="text-muted-foreground text-xs">
|
||||||
{repo.owner.username}
|
{repo.owner.username}
|
||||||
</span>
|
</span>
|
||||||
@@ -305,7 +310,8 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
|
|||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
repo.name === field.value.repo
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.username === field.value.owner
|
||||||
? "opacity-100"
|
? "opacity-100"
|
||||||
: "opacity-0",
|
: "opacity-0",
|
||||||
)}
|
)}
|
||||||
@@ -352,7 +358,10 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search branch..."
|
placeholder="Search branch..."
|
||||||
@@ -380,7 +389,7 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
|
|||||||
form.setValue("branch", branch.name);
|
form.setValue("branch", branch.name);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{branch.name}
|
<span className="truncate">{branch.name}</span>
|
||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
|
|||||||
@@ -255,13 +255,18 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
|
|||||||
: isLoadingRepositories
|
: isLoadingRepositories
|
||||||
? "Loading...."
|
? "Loading...."
|
||||||
: (repositories?.find(
|
: (repositories?.find(
|
||||||
(repo) => repo.name === field.value.repo,
|
(repo) =>
|
||||||
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.username === field.value.owner,
|
||||||
)?.name ?? "Select repository")}
|
)?.name ?? "Select repository")}
|
||||||
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search repository..."
|
placeholder="Search repository..."
|
||||||
@@ -282,7 +287,7 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
|
|||||||
{repositories?.map((repo) => (
|
{repositories?.map((repo) => (
|
||||||
<CommandItem
|
<CommandItem
|
||||||
key={repo.url}
|
key={repo.url}
|
||||||
value={repo.name}
|
value={`${repo.owner.username}/${repo.name}`}
|
||||||
onSelect={() => {
|
onSelect={() => {
|
||||||
form.setValue("repository", {
|
form.setValue("repository", {
|
||||||
owner: repo.owner.username,
|
owner: repo.owner.username,
|
||||||
@@ -291,8 +296,8 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
|
|||||||
form.setValue("branch", "");
|
form.setValue("branch", "");
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span className="flex items-center gap-2">
|
<span className="flex min-w-0 items-center gap-2">
|
||||||
<span>{repo.name}</span>
|
<span className="truncate">{repo.name}</span>
|
||||||
<span className="text-muted-foreground text-xs">
|
<span className="text-muted-foreground text-xs">
|
||||||
{repo.owner.username}
|
{repo.owner.username}
|
||||||
</span>
|
</span>
|
||||||
@@ -300,7 +305,8 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
|
|||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
repo.name === field.value.repo
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.username === field.value.owner
|
||||||
? "opacity-100"
|
? "opacity-100"
|
||||||
: "opacity-0",
|
: "opacity-0",
|
||||||
)}
|
)}
|
||||||
@@ -348,7 +354,10 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search branches..."
|
placeholder="Search branches..."
|
||||||
@@ -365,8 +374,10 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
|
|||||||
form.setValue("branch", branch.name)
|
form.setValue("branch", branch.name)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<span className="flex items-center gap-2">
|
<span className="flex min-w-0 items-center gap-2">
|
||||||
{branch.name}
|
<span className="truncate">
|
||||||
|
{branch.name}
|
||||||
|
</span>
|
||||||
</span>
|
</span>
|
||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
|
|||||||
@@ -245,14 +245,19 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
|
|||||||
: isLoadingRepositories
|
: isLoadingRepositories
|
||||||
? "Loading...."
|
? "Loading...."
|
||||||
: (repositories?.find(
|
: (repositories?.find(
|
||||||
(repo) => repo.name === field.value.repo,
|
(repo) =>
|
||||||
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.login === field.value.owner,
|
||||||
)?.name ?? field.value.repo)}
|
)?.name ?? field.value.repo)}
|
||||||
|
|
||||||
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search repository..."
|
placeholder="Search repository..."
|
||||||
@@ -272,7 +277,7 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
|
|||||||
<CommandGroup>
|
<CommandGroup>
|
||||||
{repositories?.map((repo) => (
|
{repositories?.map((repo) => (
|
||||||
<CommandItem
|
<CommandItem
|
||||||
value={repo.name}
|
value={`${repo.owner.login}/${repo.name}`}
|
||||||
key={repo.url}
|
key={repo.url}
|
||||||
onSelect={() => {
|
onSelect={() => {
|
||||||
form.setValue("repository", {
|
form.setValue("repository", {
|
||||||
@@ -282,8 +287,8 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
|
|||||||
form.setValue("branch", "");
|
form.setValue("branch", "");
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span className="flex items-center gap-2">
|
<span className="flex min-w-0 items-center gap-2">
|
||||||
<span>{repo.name}</span>
|
<span className="truncate">{repo.name}</span>
|
||||||
<span className="text-muted-foreground text-xs">
|
<span className="text-muted-foreground text-xs">
|
||||||
{repo.owner.login}
|
{repo.owner.login}
|
||||||
</span>
|
</span>
|
||||||
@@ -291,7 +296,8 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
|
|||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
repo.name === field.value.repo
|
repo.name === field.value.repo &&
|
||||||
|
repo.owner.login === field.value.owner
|
||||||
? "opacity-100"
|
? "opacity-100"
|
||||||
: "opacity-0",
|
: "opacity-0",
|
||||||
)}
|
)}
|
||||||
@@ -338,7 +344,10 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search branch..."
|
placeholder="Search branch..."
|
||||||
@@ -366,7 +375,7 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
|
|||||||
form.setValue("branch", branch.name);
|
form.setValue("branch", branch.name);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{branch.name}
|
<span className="truncate">{branch.name}</span>
|
||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
|
|||||||
@@ -274,7 +274,10 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search repository..."
|
placeholder="Search repository..."
|
||||||
@@ -312,8 +315,10 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
|
|||||||
form.setValue("branch", "");
|
form.setValue("branch", "");
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span className="flex items-center gap-2">
|
<span className="flex min-w-0 items-center gap-2">
|
||||||
<span>{repo.name}</span>
|
<span className="truncate">
|
||||||
|
{repo.name}
|
||||||
|
</span>
|
||||||
<span className="text-muted-foreground text-xs">
|
<span className="text-muted-foreground text-xs">
|
||||||
{repo.owner.username}
|
{repo.owner.username}
|
||||||
</span>
|
</span>
|
||||||
@@ -370,7 +375,10 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="p-0" align="start">
|
<PopoverContent
|
||||||
|
className="w-[var(--radix-popover-trigger-width)] p-0"
|
||||||
|
align="start"
|
||||||
|
>
|
||||||
<Command>
|
<Command>
|
||||||
<CommandInput
|
<CommandInput
|
||||||
placeholder="Search branch..."
|
placeholder="Search branch..."
|
||||||
@@ -398,7 +406,7 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
|
|||||||
form.setValue("branch", branch.name);
|
form.setValue("branch", branch.name);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{branch.name}
|
<span className="truncate">{branch.name}</span>
|
||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={cn(
|
className={cn(
|
||||||
"ml-auto h-4 w-4",
|
"ml-auto h-4 w-4",
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ const Schema = z
|
|||||||
schedule: z.string().min(1, "Schedule (Cron) required"),
|
schedule: z.string().min(1, "Schedule (Cron) required"),
|
||||||
prefix: z.string().min(1, "Prefix required"),
|
prefix: z.string().min(1, "Prefix required"),
|
||||||
enabled: z.boolean(),
|
enabled: z.boolean(),
|
||||||
|
includeEncryptionKey: z.boolean(),
|
||||||
database: z.string().min(1, "Database required"),
|
database: z.string().min(1, "Database required"),
|
||||||
keepLatestCount: z.coerce.number().optional(),
|
keepLatestCount: z.coerce.number().optional(),
|
||||||
serviceName: z.string().nullable(),
|
serviceName: z.string().nullable(),
|
||||||
@@ -223,6 +224,7 @@ export const HandleBackup = ({
|
|||||||
: "",
|
: "",
|
||||||
destinationId: "",
|
destinationId: "",
|
||||||
enabled: true,
|
enabled: true,
|
||||||
|
includeEncryptionKey: true,
|
||||||
prefix: "/",
|
prefix: "/",
|
||||||
schedule: "",
|
schedule: "",
|
||||||
keepLatestCount: undefined,
|
keepLatestCount: undefined,
|
||||||
@@ -262,6 +264,7 @@ export const HandleBackup = ({
|
|||||||
: "",
|
: "",
|
||||||
destinationId: backup?.destinationId ?? "",
|
destinationId: backup?.destinationId ?? "",
|
||||||
enabled: backup?.enabled ?? true,
|
enabled: backup?.enabled ?? true,
|
||||||
|
includeEncryptionKey: backup?.includeEncryptionKey ?? true,
|
||||||
prefix: backup?.prefix ?? "/",
|
prefix: backup?.prefix ?? "/",
|
||||||
schedule: backup?.schedule ?? "",
|
schedule: backup?.schedule ?? "",
|
||||||
keepLatestCount: backup?.keepLatestCount ?? undefined,
|
keepLatestCount: backup?.keepLatestCount ?? undefined,
|
||||||
@@ -309,6 +312,7 @@ export const HandleBackup = ({
|
|||||||
prefix: data.prefix,
|
prefix: data.prefix,
|
||||||
schedule: data.schedule,
|
schedule: data.schedule,
|
||||||
enabled: data.enabled,
|
enabled: data.enabled,
|
||||||
|
includeEncryptionKey: data.includeEncryptionKey,
|
||||||
database: data.database,
|
database: data.database,
|
||||||
keepLatestCount: data.keepLatestCount ?? null,
|
keepLatestCount: data.keepLatestCount ?? null,
|
||||||
databaseType: data.databaseType || databaseType,
|
databaseType: data.databaseType || databaseType,
|
||||||
@@ -665,6 +669,31 @@ export const HandleBackup = ({
|
|||||||
</FormItem>
|
</FormItem>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
|
{databaseType === "web-server" && (
|
||||||
|
<FormField
|
||||||
|
control={form.control}
|
||||||
|
name="includeEncryptionKey"
|
||||||
|
render={({ field }) => (
|
||||||
|
<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 ">
|
||||||
|
<div className="space-y-0.5">
|
||||||
|
<FormLabel>Include encryption key</FormLabel>
|
||||||
|
<FormDescription>
|
||||||
|
Stores the encryption key inside the backup so
|
||||||
|
environment variables can be restored on a new server.
|
||||||
|
Anyone with access to the backup file can decrypt
|
||||||
|
them.
|
||||||
|
</FormDescription>
|
||||||
|
</div>
|
||||||
|
<FormControl>
|
||||||
|
<Switch
|
||||||
|
checked={field.value}
|
||||||
|
onCheckedChange={field.onChange}
|
||||||
|
/>
|
||||||
|
</FormControl>
|
||||||
|
</FormItem>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{backupType === "compose" && (
|
{backupType === "compose" && (
|
||||||
<>
|
<>
|
||||||
{form.watch("databaseType") === "postgres" && (
|
{form.watch("databaseType") === "postgres" && (
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
import type { ColumnDef } from "@tanstack/react-table";
|
import type { ColumnDef } from "@tanstack/react-table";
|
||||||
|
import copy from "copy-to-clipboard";
|
||||||
import { ArrowUpDown, MoreHorizontal } from "lucide-react";
|
import { ArrowUpDown, MoreHorizontal } from "lucide-react";
|
||||||
|
import { toast } from "sonner";
|
||||||
import { Badge } from "@/components/ui/badge";
|
import { Badge } from "@/components/ui/badge";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import {
|
import {
|
||||||
DropdownMenu,
|
DropdownMenu,
|
||||||
DropdownMenuContent,
|
DropdownMenuContent,
|
||||||
|
DropdownMenuItem,
|
||||||
DropdownMenuLabel,
|
DropdownMenuLabel,
|
||||||
DropdownMenuTrigger,
|
DropdownMenuTrigger,
|
||||||
} from "@/components/ui/dropdown-menu";
|
} from "@/components/ui/dropdown-menu";
|
||||||
@@ -37,6 +40,7 @@ export const columns: ColumnDef<Container>[] = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
accessorKey: "state",
|
accessorKey: "state",
|
||||||
|
filterFn: "equals",
|
||||||
header: ({ column }) => {
|
header: ({ column }) => {
|
||||||
return (
|
return (
|
||||||
<Button
|
<Button
|
||||||
@@ -56,7 +60,7 @@ export const columns: ColumnDef<Container>[] = [
|
|||||||
variant={
|
variant={
|
||||||
value === "running"
|
value === "running"
|
||||||
? "default"
|
? "default"
|
||||||
: value === "failed"
|
: value === "exited" || value === "dead"
|
||||||
? "destructive"
|
? "destructive"
|
||||||
: "secondary"
|
: "secondary"
|
||||||
}
|
}
|
||||||
@@ -99,6 +103,28 @@ export const columns: ColumnDef<Container>[] = [
|
|||||||
},
|
},
|
||||||
cell: ({ row }) => <div className="lowercase">{row.getValue("image")}</div>,
|
cell: ({ row }) => <div className="lowercase">{row.getValue("image")}</div>,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
accessorKey: "ports",
|
||||||
|
header: ({ column }) => {
|
||||||
|
return (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
|
||||||
|
>
|
||||||
|
Ports
|
||||||
|
<ArrowUpDown className="ml-2 h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
cell: ({ row }) => {
|
||||||
|
const value = row.getValue("ports") as string;
|
||||||
|
return (
|
||||||
|
<div className="max-w-[16rem] truncate lowercase" title={value}>
|
||||||
|
{value}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
id: "actions",
|
id: "actions",
|
||||||
enableHiding: false,
|
enableHiding: false,
|
||||||
@@ -115,6 +141,14 @@ export const columns: ColumnDef<Container>[] = [
|
|||||||
</DropdownMenuTrigger>
|
</DropdownMenuTrigger>
|
||||||
<DropdownMenuContent align="end">
|
<DropdownMenuContent align="end">
|
||||||
<DropdownMenuLabel>Actions</DropdownMenuLabel>
|
<DropdownMenuLabel>Actions</DropdownMenuLabel>
|
||||||
|
<DropdownMenuItem
|
||||||
|
onClick={() => {
|
||||||
|
copy(container.containerId);
|
||||||
|
toast.success("Container ID copied to clipboard");
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Copy Container ID
|
||||||
|
</DropdownMenuItem>
|
||||||
<ShowDockerModalLogs
|
<ShowDockerModalLogs
|
||||||
containerId={container.containerId}
|
containerId={container.containerId}
|
||||||
serverId={container.serverId}
|
serverId={container.serverId}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import {
|
|||||||
useReactTable,
|
useReactTable,
|
||||||
type VisibilityState,
|
type VisibilityState,
|
||||||
} from "@tanstack/react-table";
|
} from "@tanstack/react-table";
|
||||||
import { ChevronDown, Container } from "lucide-react";
|
import { ChevronDown, Container, RefreshCw } from "lucide-react";
|
||||||
import * as React from "react";
|
import * as React from "react";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import {
|
import {
|
||||||
@@ -26,6 +26,13 @@ import {
|
|||||||
DropdownMenuTrigger,
|
DropdownMenuTrigger,
|
||||||
} from "@/components/ui/dropdown-menu";
|
} from "@/components/ui/dropdown-menu";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from "@/components/ui/select";
|
||||||
import {
|
import {
|
||||||
Table,
|
Table,
|
||||||
TableBody,
|
TableBody,
|
||||||
@@ -44,10 +51,26 @@ interface Props {
|
|||||||
serverId?: string;
|
serverId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const CONTAINER_STATES = [
|
||||||
|
"running",
|
||||||
|
"exited",
|
||||||
|
"paused",
|
||||||
|
"restarting",
|
||||||
|
"created",
|
||||||
|
"removing",
|
||||||
|
"dead",
|
||||||
|
];
|
||||||
|
|
||||||
export const ShowContainers = ({ serverId }: Props) => {
|
export const ShowContainers = ({ serverId }: Props) => {
|
||||||
const { data, isPending } = api.docker.getContainers.useQuery({
|
const { data, isPending, refetch, isRefetching } =
|
||||||
serverId,
|
api.docker.getContainers.useQuery(
|
||||||
});
|
{
|
||||||
|
serverId,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
refetchInterval: 10_000,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
const [sorting, setSorting] = React.useState<SortingState>([]);
|
const [sorting, setSorting] = React.useState<SortingState>([]);
|
||||||
const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
|
const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
|
||||||
@@ -106,12 +129,48 @@ export const ShowContainers = ({ serverId }: Props) => {
|
|||||||
}
|
}
|
||||||
className="md:max-w-sm"
|
className="md:max-w-sm"
|
||||||
/>
|
/>
|
||||||
|
<Select
|
||||||
|
value={
|
||||||
|
(table.getColumn("state")?.getFilterValue() as string) ??
|
||||||
|
"all"
|
||||||
|
}
|
||||||
|
onValueChange={(value) =>
|
||||||
|
table
|
||||||
|
.getColumn("state")
|
||||||
|
?.setFilterValue(value === "all" ? undefined : value)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<SelectTrigger className="w-40 max-sm:w-full capitalize">
|
||||||
|
<SelectValue placeholder="Filter by state" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="all">All states</SelectItem>
|
||||||
|
{CONTAINER_STATES.map((state) => (
|
||||||
|
<SelectItem
|
||||||
|
key={state}
|
||||||
|
value={state}
|
||||||
|
className="capitalize"
|
||||||
|
>
|
||||||
|
{state}
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="icon"
|
||||||
|
className="shrink-0 sm:ml-auto"
|
||||||
|
onClick={() => refetch()}
|
||||||
|
disabled={isRefetching}
|
||||||
|
>
|
||||||
|
<RefreshCw
|
||||||
|
className={`h-4 w-4 ${isRefetching ? "animate-spin" : ""}`}
|
||||||
|
/>
|
||||||
|
<span className="sr-only">Refresh</span>
|
||||||
|
</Button>
|
||||||
<DropdownMenu>
|
<DropdownMenu>
|
||||||
<DropdownMenuTrigger asChild>
|
<DropdownMenuTrigger asChild>
|
||||||
<Button
|
<Button variant="outline" className="max-sm:w-full">
|
||||||
variant="outline"
|
|
||||||
className="sm:ml-auto max-sm:w-full"
|
|
||||||
>
|
|
||||||
Columns <ChevronDown className="ml-2 h-4 w-4" />
|
Columns <ChevronDown className="ml-2 h-4 w-4" />
|
||||||
</Button>
|
</Button>
|
||||||
</DropdownMenuTrigger>
|
</DropdownMenuTrigger>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
|
||||||
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
||||||
|
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { DialogAction } from "@/components/shared/dialog-action";
|
import { DialogAction } from "@/components/shared/dialog-action";
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
|
||||||
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
||||||
|
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { DialogAction } from "@/components/shared/dialog-action";
|
import { DialogAction } from "@/components/shared/dialog-action";
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
|
||||||
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
||||||
|
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { DialogAction } from "@/components/shared/dialog-action";
|
import { DialogAction } from "@/components/shared/dialog-action";
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
|
||||||
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
||||||
|
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { DialogAction } from "@/components/shared/dialog-action";
|
import { DialogAction } from "@/components/shared/dialog-action";
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
|
||||||
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
||||||
|
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { DialogAction } from "@/components/shared/dialog-action";
|
import { DialogAction } from "@/components/shared/dialog-action";
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
|
||||||
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
|
||||||
|
import { Tooltip as TooltipPrimitive } from "radix-ui";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { DialogAction } from "@/components/shared/dialog-action";
|
import { DialogAction } from "@/components/shared/dialog-action";
|
||||||
|
|||||||
@@ -1,11 +1,4 @@
|
|||||||
import {
|
import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from "recharts";
|
||||||
Area,
|
|
||||||
AreaChart,
|
|
||||||
CartesianGrid,
|
|
||||||
ResponsiveContainer,
|
|
||||||
XAxis,
|
|
||||||
YAxis,
|
|
||||||
} from "recharts";
|
|
||||||
import {
|
import {
|
||||||
type ChartConfig,
|
type ChartConfig,
|
||||||
ChartContainer,
|
ChartContainer,
|
||||||
@@ -49,65 +42,60 @@ export const RequestDistributionChart = ({
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="w-full h-[200px] overflow-hidden">
|
<ChartContainer
|
||||||
<ResponsiveContainer
|
config={chartConfig}
|
||||||
width="100%"
|
className="aspect-auto h-[200px] w-full"
|
||||||
height="100%"
|
>
|
||||||
className="overflow-hidden"
|
<AreaChart
|
||||||
|
accessibilityLayer
|
||||||
|
data={stats || []}
|
||||||
|
margin={{
|
||||||
|
top: 10,
|
||||||
|
left: 12,
|
||||||
|
right: 12,
|
||||||
|
bottom: 0,
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<ChartContainer config={chartConfig}>
|
<CartesianGrid vertical={false} />
|
||||||
<AreaChart
|
<XAxis
|
||||||
accessibilityLayer
|
dataKey="hour"
|
||||||
data={stats || []}
|
tickLine={false}
|
||||||
margin={{
|
axisLine={false}
|
||||||
top: 10,
|
tickMargin={8}
|
||||||
left: 12,
|
tickFormatter={(value) =>
|
||||||
right: 12,
|
new Date(value).toLocaleTimeString([], {
|
||||||
bottom: 0,
|
hour: "2-digit",
|
||||||
}}
|
minute: "2-digit",
|
||||||
>
|
})
|
||||||
<CartesianGrid vertical={false} />
|
}
|
||||||
<XAxis
|
/>
|
||||||
dataKey="hour"
|
<YAxis
|
||||||
tickLine={false}
|
tickLine={false}
|
||||||
axisLine={false}
|
axisLine={false}
|
||||||
tickMargin={8}
|
tickMargin={8}
|
||||||
tickFormatter={(value) =>
|
allowDataOverflow={false}
|
||||||
new Date(value).toLocaleTimeString([], {
|
domain={[0, "auto"]}
|
||||||
hour: "2-digit",
|
/>
|
||||||
minute: "2-digit",
|
<ChartTooltip
|
||||||
})
|
cursor={false}
|
||||||
}
|
content={<ChartTooltipContent indicator="line" />}
|
||||||
/>
|
labelFormatter={(value) =>
|
||||||
<YAxis
|
new Date(value).toLocaleString([], {
|
||||||
tickLine={false}
|
month: "short",
|
||||||
axisLine={false}
|
day: "numeric",
|
||||||
tickMargin={8}
|
hour: "2-digit",
|
||||||
allowDataOverflow={false}
|
minute: "2-digit",
|
||||||
domain={[0, "auto"]}
|
})
|
||||||
/>
|
}
|
||||||
<ChartTooltip
|
/>
|
||||||
cursor={false}
|
<Area
|
||||||
content={<ChartTooltipContent indicator="line" />}
|
dataKey="count"
|
||||||
labelFormatter={(value) =>
|
type="monotone"
|
||||||
new Date(value).toLocaleString([], {
|
fill="hsl(var(--chart-1))"
|
||||||
month: "short",
|
fillOpacity={0.4}
|
||||||
day: "numeric",
|
stroke="hsl(var(--chart-1))"
|
||||||
hour: "2-digit",
|
/>
|
||||||
minute: "2-digit",
|
</AreaChart>
|
||||||
})
|
</ChartContainer>
|
||||||
}
|
|
||||||
/>
|
|
||||||
<Area
|
|
||||||
dataKey="count"
|
|
||||||
type="monotone"
|
|
||||||
fill="hsl(var(--chart-1))"
|
|
||||||
fillOpacity={0.4}
|
|
||||||
stroke="hsl(var(--chart-1))"
|
|
||||||
/>
|
|
||||||
</AreaChart>
|
|
||||||
</ChartContainer>
|
|
||||||
</ResponsiveContainer>
|
|
||||||
</div>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -32,10 +32,11 @@ import {
|
|||||||
SelectValue,
|
SelectValue,
|
||||||
} from "@/components/ui/select";
|
} from "@/components/ui/select";
|
||||||
import { Switch } from "@/components/ui/switch";
|
import { Switch } from "@/components/ui/switch";
|
||||||
|
import { API_KEY_NAME_MAX_LENGTH, apiKeyNameSchema } from "@/lib/api-keys";
|
||||||
import { api } from "@/utils/api";
|
import { api } from "@/utils/api";
|
||||||
|
|
||||||
const formSchema = z.object({
|
const formSchema = z.object({
|
||||||
name: z.string().min(1, "Name is required"),
|
name: apiKeyNameSchema,
|
||||||
prefix: z.string().optional(),
|
prefix: z.string().optional(),
|
||||||
expiresIn: z.number().nullable(),
|
expiresIn: z.number().nullable(),
|
||||||
organizationId: z.string().min(1, "Organization is required"),
|
organizationId: z.string().min(1, "Organization is required"),
|
||||||
@@ -159,8 +160,15 @@ export const AddApiKey = () => {
|
|||||||
<FormItem>
|
<FormItem>
|
||||||
<FormLabel>Name</FormLabel>
|
<FormLabel>Name</FormLabel>
|
||||||
<FormControl>
|
<FormControl>
|
||||||
<Input placeholder="My API Key" {...field} />
|
<Input
|
||||||
|
placeholder="My API Key"
|
||||||
|
maxLength={API_KEY_NAME_MAX_LENGTH}
|
||||||
|
{...field}
|
||||||
|
/>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
|
<FormDescription>
|
||||||
|
Maximum {API_KEY_NAME_MAX_LENGTH} characters
|
||||||
|
</FormDescription>
|
||||||
<FormMessage />
|
<FormMessage />
|
||||||
</FormItem>
|
</FormItem>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -227,9 +227,9 @@ export const HandleRegistry = ({ registryId }: Props) => {
|
|||||||
</DialogTrigger>
|
</DialogTrigger>
|
||||||
<DialogContent className="sm:max-w-2xl">
|
<DialogContent className="sm:max-w-2xl">
|
||||||
<DialogHeader>
|
<DialogHeader>
|
||||||
<DialogTitle>Add a external registry</DialogTitle>
|
<DialogTitle>Add an external registry</DialogTitle>
|
||||||
<DialogDescription>
|
<DialogDescription>
|
||||||
Fill the next fields to add a external registry.
|
Fill in the following fields to add an external registry.
|
||||||
</DialogDescription>
|
</DialogDescription>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
{(isError || testRegistryIsError || testRegistryByIdIsError) && (
|
{(isError || testRegistryIsError || testRegistryByIdIsError) && (
|
||||||
|
|||||||
@@ -1828,7 +1828,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
|
|||||||
<div className="">
|
<div className="">
|
||||||
<FormLabel>App Deploy</FormLabel>
|
<FormLabel>App Deploy</FormLabel>
|
||||||
<FormDescription>
|
<FormDescription>
|
||||||
Trigger the action when a app is deployed.
|
Trigger the action when an app is deployed.
|
||||||
</FormDescription>
|
</FormDescription>
|
||||||
</div>
|
</div>
|
||||||
<FormControl>
|
<FormControl>
|
||||||
@@ -1890,7 +1890,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
|
|||||||
<div className="space-y-0.5">
|
<div className="space-y-0.5">
|
||||||
<FormLabel>Dokploy Backup</FormLabel>
|
<FormLabel>Dokploy Backup</FormLabel>
|
||||||
<FormDescription>
|
<FormDescription>
|
||||||
Trigger the action when a dokploy backup is created.
|
Trigger the action when a Dokploy backup is created.
|
||||||
</FormDescription>
|
</FormDescription>
|
||||||
</div>
|
</div>
|
||||||
<FormControl>
|
<FormControl>
|
||||||
@@ -1932,7 +1932,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
|
|||||||
<div className="space-y-0.5">
|
<div className="space-y-0.5">
|
||||||
<FormLabel>Docker Cleanup</FormLabel>
|
<FormLabel>Docker Cleanup</FormLabel>
|
||||||
<FormDescription>
|
<FormDescription>
|
||||||
Trigger the action when the docker cleanup is
|
Trigger the action when Docker cleanup is
|
||||||
performed.
|
performed.
|
||||||
</FormDescription>
|
</FormDescription>
|
||||||
</div>
|
</div>
|
||||||
@@ -1955,7 +1955,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
|
|||||||
<div className="space-y-0.5">
|
<div className="space-y-0.5">
|
||||||
<FormLabel>Dokploy Restart</FormLabel>
|
<FormLabel>Dokploy Restart</FormLabel>
|
||||||
<FormDescription>
|
<FormDescription>
|
||||||
Trigger the action when dokploy is restarted.
|
Trigger the action when Dokploy is restarted.
|
||||||
</FormDescription>
|
</FormDescription>
|
||||||
</div>
|
</div>
|
||||||
<FormControl>
|
<FormControl>
|
||||||
|
|||||||
@@ -4,9 +4,7 @@ import { Button } from "@/components/ui/button";
|
|||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { api } from "@/utils/api";
|
import { api } from "@/utils/api";
|
||||||
|
|
||||||
// Free tier may set up to 2 concurrent builds; enterprise unlocks more.
|
const MAX_CONCURRENCY = 100;
|
||||||
const FREE_MAX_CONCURRENCY = 2;
|
|
||||||
const ENTERPRISE_MAX_CONCURRENCY = 100;
|
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
/**
|
/**
|
||||||
@@ -20,14 +18,10 @@ interface Props {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Control to set the number of concurrent builds, either for a remote server
|
* Control to set the number of concurrent builds, either for a remote server
|
||||||
* (`serverId` provided) or the local web server (omitted). Available to
|
* (`serverId` provided) or the local web server (omitted). Not shown in cloud.
|
||||||
* everyone self-hosted up to FREE_MAX_CONCURRENCY; higher values require a
|
|
||||||
* valid enterprise license. Not shown in cloud.
|
|
||||||
*/
|
*/
|
||||||
export const BuildsConcurrency = ({ serverId, label }: Props) => {
|
export const BuildsConcurrency = ({ serverId, label }: Props) => {
|
||||||
const { data: isCloud } = api.settings.isCloud.useQuery();
|
const { data: isCloud } = api.settings.isCloud.useQuery();
|
||||||
const { data: haveValidLicense } =
|
|
||||||
api.licenseKey.haveValidLicenseKey.useQuery();
|
|
||||||
|
|
||||||
const serverQuery = api.server.one.useQuery(
|
const serverQuery = api.server.one.useQuery(
|
||||||
{ serverId: serverId ?? "" },
|
{ serverId: serverId ?? "" },
|
||||||
@@ -59,10 +53,7 @@ export const BuildsConcurrency = ({ serverId, label }: Props) => {
|
|||||||
// Concurrent builds are a self-hosted feature; not shown in cloud.
|
// Concurrent builds are a self-hosted feature; not shown in cloud.
|
||||||
if (isCloud) return null;
|
if (isCloud) return null;
|
||||||
|
|
||||||
const max = haveValidLicense
|
const clamp = (n: number) => Math.min(MAX_CONCURRENCY, Math.max(1, n));
|
||||||
? ENTERPRISE_MAX_CONCURRENCY
|
|
||||||
: FREE_MAX_CONCURRENCY;
|
|
||||||
const clamp = (n: number) => Math.min(max, Math.max(1, n));
|
|
||||||
|
|
||||||
const handleSave = async () => {
|
const handleSave = async () => {
|
||||||
const parsed = clamp(Number.parseInt(value, 10) || 1);
|
const parsed = clamp(Number.parseInt(value, 10) || 1);
|
||||||
@@ -101,7 +92,7 @@ export const BuildsConcurrency = ({ serverId, label }: Props) => {
|
|||||||
<Input
|
<Input
|
||||||
type="number"
|
type="number"
|
||||||
min={1}
|
min={1}
|
||||||
max={max}
|
max={MAX_CONCURRENCY}
|
||||||
value={value}
|
value={value}
|
||||||
onChange={(e) => setValue(e.target.value)}
|
onChange={(e) => setValue(e.target.value)}
|
||||||
className="w-20"
|
className="w-20"
|
||||||
|
|||||||
@@ -97,6 +97,7 @@ export const ShowUsers = () => {
|
|||||||
<TableRow>
|
<TableRow>
|
||||||
<TableHead className="w-[100px]">Email</TableHead>
|
<TableHead className="w-[100px]">Email</TableHead>
|
||||||
<TableHead className="text-center">Role</TableHead>
|
<TableHead className="text-center">Role</TableHead>
|
||||||
|
<TableHead className="text-center">Status</TableHead>
|
||||||
<TableHead className="text-center">2FA</TableHead>
|
<TableHead className="text-center">2FA</TableHead>
|
||||||
|
|
||||||
<TableHead className="text-center">
|
<TableHead className="text-center">
|
||||||
@@ -173,6 +174,19 @@ export const ShowUsers = () => {
|
|||||||
{member.role}
|
{member.role}
|
||||||
</Badge>
|
</Badge>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
|
<TableCell className="text-center">
|
||||||
|
<Badge
|
||||||
|
variant={
|
||||||
|
member.user.banned
|
||||||
|
? "destructive"
|
||||||
|
: "outline"
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{member.user.banned
|
||||||
|
? "Deactivated"
|
||||||
|
: "Active"}
|
||||||
|
</Badge>
|
||||||
|
</TableCell>
|
||||||
<TableCell className="text-center">
|
<TableCell className="text-center">
|
||||||
{member.user.twoFactorEnabled
|
{member.user.twoFactorEnabled
|
||||||
? "Enabled"
|
? "Enabled"
|
||||||
|
|||||||
@@ -43,7 +43,8 @@ const addServerDomain = z
|
|||||||
.string()
|
.string()
|
||||||
.trim()
|
.trim()
|
||||||
.toLowerCase()
|
.toLowerCase()
|
||||||
.refine((val) => VALID_HOSTNAME_REGEX.test(val), {
|
// empty clears the server domain and reverts to IP-only access
|
||||||
|
.refine((val) => val === "" || VALID_HOSTNAME_REGEX.test(val), {
|
||||||
message: INVALID_HOSTNAME_MESSAGE,
|
message: INVALID_HOSTNAME_MESSAGE,
|
||||||
}),
|
}),
|
||||||
letsEncryptEmail: z.string(),
|
letsEncryptEmail: z.string(),
|
||||||
@@ -51,7 +52,7 @@ const addServerDomain = z
|
|||||||
certificateType: z.enum(["letsencrypt", "none", "custom"]),
|
certificateType: z.enum(["letsencrypt", "none", "custom"]),
|
||||||
})
|
})
|
||||||
.superRefine((data, ctx) => {
|
.superRefine((data, ctx) => {
|
||||||
if (data.https && !data.certificateType) {
|
if (data.domain && data.https && !data.certificateType) {
|
||||||
ctx.addIssue({
|
ctx.addIssue({
|
||||||
code: z.ZodIssueCode.custom,
|
code: z.ZodIssueCode.custom,
|
||||||
path: ["certificateType"],
|
path: ["certificateType"],
|
||||||
@@ -59,6 +60,7 @@ const addServerDomain = z
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
|
data.domain &&
|
||||||
data.https &&
|
data.https &&
|
||||||
data.certificateType === "letsencrypt" &&
|
data.certificateType === "letsencrypt" &&
|
||||||
!data.letsEncryptEmail
|
!data.letsEncryptEmail
|
||||||
|
|||||||
@@ -87,29 +87,29 @@ export const RebuildDatabase = ({ id, type }: Props) => {
|
|||||||
<AlertTriangle className="h-5 w-5 text-destructive" />
|
<AlertTriangle className="h-5 w-5 text-destructive" />
|
||||||
Are you absolutely sure?
|
Are you absolutely sure?
|
||||||
</AlertDialogTitle>
|
</AlertDialogTitle>
|
||||||
<AlertDialogDescription className="space-y-2">
|
<AlertDialogDescription asChild>
|
||||||
<p>This action will:</p>
|
<div className="space-y-2">
|
||||||
<ul className="list-disc list-inside space-y-1">
|
<p>This action will:</p>
|
||||||
<li>Stop the current database service</li>
|
<ul className="list-disc list-inside space-y-1">
|
||||||
<li>Delete all existing data and volumes</li>
|
<li>Stop the current database service</li>
|
||||||
<li>Reset to the default configuration</li>
|
<li>Delete all existing data and volumes</li>
|
||||||
<li>Restart the service with a clean state</li>
|
<li>Reset to the default configuration</li>
|
||||||
</ul>
|
<li>Restart the service with a clean state</li>
|
||||||
<p className="font-medium text-destructive mt-4">
|
</ul>
|
||||||
This action cannot be undone.
|
<p className="font-medium text-destructive mt-4">
|
||||||
</p>
|
This action cannot be undone.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</AlertDialogDescription>
|
</AlertDialogDescription>
|
||||||
</AlertDialogHeader>
|
</AlertDialogHeader>
|
||||||
<AlertDialogFooter>
|
<AlertDialogFooter>
|
||||||
<AlertDialogCancel>Cancel</AlertDialogCancel>
|
<AlertDialogCancel>Cancel</AlertDialogCancel>
|
||||||
<AlertDialogAction
|
<AlertDialogAction
|
||||||
onClick={handleRebuild}
|
onClick={handleRebuild}
|
||||||
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
|
disabled={isPending}
|
||||||
asChild
|
variant="destructive"
|
||||||
>
|
>
|
||||||
<Button isLoading={isPending} type="submit">
|
Yes, rebuild database
|
||||||
Yes, rebuild database
|
|
||||||
</Button>
|
|
||||||
</AlertDialogAction>
|
</AlertDialogAction>
|
||||||
</AlertDialogFooter>
|
</AlertDialogFooter>
|
||||||
</AlertDialogContent>
|
</AlertDialogContent>
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ import Link from "next/link";
|
|||||||
import { usePathname } from "next/navigation";
|
import { usePathname } from "next/navigation";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
|
import { Badge } from "@/components/ui/badge";
|
||||||
import {
|
import {
|
||||||
Breadcrumb,
|
Breadcrumb,
|
||||||
BreadcrumbItem,
|
BreadcrumbItem,
|
||||||
@@ -564,6 +565,8 @@ function SidebarLogo() {
|
|||||||
const { isMobile } = useSidebar();
|
const { isMobile } = useSidebar();
|
||||||
const isCollapsed = state === "collapsed" && !isMobile;
|
const isCollapsed = state === "collapsed" && !isMobile;
|
||||||
const { data: activeOrganization } = api.organization.active.useQuery();
|
const { data: activeOrganization } = api.organization.active.useQuery();
|
||||||
|
const { data: haveValidLicense } =
|
||||||
|
api.licenseKey.haveValidLicenseKey.useQuery();
|
||||||
|
|
||||||
const { data: invitations, refetch: refetchInvitations } =
|
const { data: invitations, refetch: refetchInvitations } =
|
||||||
api.user.getInvitations.useQuery();
|
api.user.getInvitations.useQuery();
|
||||||
@@ -629,9 +632,14 @@ function SidebarLogo() {
|
|||||||
isCollapsed && "hidden",
|
isCollapsed && "hidden",
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<p className="text-sm font-medium leading-none">
|
<div className="flex items-center gap-1.5">
|
||||||
{activeOrganization?.name ?? "Select Organization"}
|
<p className="text-sm font-medium leading-none">
|
||||||
</p>
|
{activeOrganization?.name ?? "Select Organization"}
|
||||||
|
</p>
|
||||||
|
{haveValidLicense && (
|
||||||
|
<Badge variant="blue">Enterprise</Badge>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ChevronsUpDown
|
<ChevronsUpDown
|
||||||
|
|||||||
235
apps/dokploy/components/proprietary/sso/scim-dialog.tsx
Normal file
235
apps/dokploy/components/proprietary/sso/scim-dialog.tsx
Normal file
@@ -0,0 +1,235 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import copy from "copy-to-clipboard";
|
||||||
|
import { Copy, KeyRound, Loader2, Plus, Trash2 } from "lucide-react";
|
||||||
|
import { type ReactNode, useState } from "react";
|
||||||
|
import { toast } from "sonner";
|
||||||
|
import { DialogAction } from "@/components/shared/dialog-action";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogContent,
|
||||||
|
DialogDescription,
|
||||||
|
DialogFooter,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle,
|
||||||
|
DialogTrigger,
|
||||||
|
} from "@/components/ui/dialog";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import { Label } from "@/components/ui/label";
|
||||||
|
import { api } from "@/utils/api";
|
||||||
|
import { useUrl } from "@/utils/hooks/use-url";
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
children: ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const ScimDialog = ({ children }: Props) => {
|
||||||
|
const utils = api.useUtils();
|
||||||
|
const baseURL = useUrl();
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const [newProviderId, setNewProviderId] = useState("");
|
||||||
|
const [justCreatedToken, setJustCreatedToken] = useState<{
|
||||||
|
providerId: string;
|
||||||
|
token: string;
|
||||||
|
} | null>(null);
|
||||||
|
|
||||||
|
const { data: providers = [], isPending } = api.scim.listProviders.useQuery(
|
||||||
|
undefined,
|
||||||
|
{ enabled: open },
|
||||||
|
);
|
||||||
|
const { mutateAsync: generateToken, isPending: isGenerating } =
|
||||||
|
api.scim.generateToken.useMutation();
|
||||||
|
const { mutateAsync: deleteProvider, isPending: isDeleting } =
|
||||||
|
api.scim.deleteProvider.useMutation();
|
||||||
|
|
||||||
|
const scimUrl = `${baseURL || "{baseURL}"}/api/auth/scim/v2`;
|
||||||
|
|
||||||
|
const handleGenerate = async () => {
|
||||||
|
const providerId = newProviderId.trim().toLowerCase();
|
||||||
|
if (!providerId) return;
|
||||||
|
try {
|
||||||
|
const result = await generateToken({ providerId });
|
||||||
|
setJustCreatedToken({
|
||||||
|
providerId: result.providerId,
|
||||||
|
token: result.scimToken,
|
||||||
|
});
|
||||||
|
setNewProviderId("");
|
||||||
|
await utils.scim.listProviders.invalidate();
|
||||||
|
} catch (err) {
|
||||||
|
toast.error(
|
||||||
|
err instanceof Error ? err.message : "Failed to generate SCIM token",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDelete = async (providerId: string) => {
|
||||||
|
try {
|
||||||
|
await deleteProvider({ providerId });
|
||||||
|
toast.success("SCIM provider removed");
|
||||||
|
await utils.scim.listProviders.invalidate();
|
||||||
|
} catch (err) {
|
||||||
|
toast.error(
|
||||||
|
err instanceof Error ? err.message : "Failed to delete SCIM provider",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCopy = (value: string, label: string) => {
|
||||||
|
copy(value);
|
||||||
|
toast.success(`${label} copied`);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleOpenChange = (next: boolean) => {
|
||||||
|
setOpen(next);
|
||||||
|
if (!next) setJustCreatedToken(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog open={open} onOpenChange={handleOpenChange}>
|
||||||
|
<DialogTrigger asChild>{children}</DialogTrigger>
|
||||||
|
<DialogContent className="sm:max-w-[560px]">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle className="flex items-center gap-2">
|
||||||
|
<KeyRound className="size-5" />
|
||||||
|
SCIM provisioning
|
||||||
|
</DialogTitle>
|
||||||
|
<DialogDescription>
|
||||||
|
Automatically provision, update, and deactivate users from your
|
||||||
|
identity provider (Okta, Entra ID, etc.). Configure the SCIM
|
||||||
|
endpoint below in your IdP.
|
||||||
|
</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
<div className="space-y-4 py-2">
|
||||||
|
<div className="grid gap-1">
|
||||||
|
<Label className="text-xs font-medium text-muted-foreground">
|
||||||
|
SCIM 2.0 endpoint URL
|
||||||
|
</Label>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<p className="flex-1 break-all rounded-md bg-muted px-2 py-1.5 font-mono text-xs">
|
||||||
|
{scimUrl}
|
||||||
|
</p>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="icon"
|
||||||
|
className="size-8 shrink-0"
|
||||||
|
onClick={() => handleCopy(scimUrl, "Endpoint URL")}
|
||||||
|
disabled={!baseURL}
|
||||||
|
>
|
||||||
|
<Copy className="size-3.5" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{justCreatedToken && (
|
||||||
|
<div className="rounded-md border border-amber-500/40 bg-amber-500/10 p-3">
|
||||||
|
<p className="text-sm font-medium">
|
||||||
|
Bearer token for {justCreatedToken.providerId}
|
||||||
|
</p>
|
||||||
|
<p className="mt-1 text-xs text-muted-foreground">
|
||||||
|
Copy this token now — it will not be shown again. Paste it into
|
||||||
|
your IdP's SCIM configuration.
|
||||||
|
</p>
|
||||||
|
<div className="mt-2 flex items-center gap-2">
|
||||||
|
<p className="flex-1 break-all rounded-md bg-background px-2 py-1.5 font-mono text-xs">
|
||||||
|
{justCreatedToken.token}
|
||||||
|
</p>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="icon"
|
||||||
|
className="size-8 shrink-0"
|
||||||
|
onClick={() =>
|
||||||
|
handleCopy(justCreatedToken.token, "Bearer token")
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<Copy className="size-3.5" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label className="text-sm font-medium">
|
||||||
|
Generate token for a new provider
|
||||||
|
</Label>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Input
|
||||||
|
value={newProviderId}
|
||||||
|
onChange={(e) => setNewProviderId(e.target.value)}
|
||||||
|
placeholder="okta, entra, jumpcloud..."
|
||||||
|
className="font-mono text-sm"
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === "Enter") {
|
||||||
|
e.preventDefault();
|
||||||
|
void handleGenerate();
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
onClick={handleGenerate}
|
||||||
|
disabled={!newProviderId.trim() || isGenerating}
|
||||||
|
>
|
||||||
|
<Plus className="mr-1 size-4" />
|
||||||
|
Generate
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
Choose a unique identifier for this IdP connection (lowercase,
|
||||||
|
alphanumeric, dashes).
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label className="text-sm font-medium">Existing providers</Label>
|
||||||
|
{isPending ? (
|
||||||
|
<div className="flex items-center gap-2 justify-center py-4">
|
||||||
|
<Loader2 className="size-4 animate-spin text-muted-foreground" />
|
||||||
|
<span className="text-sm text-muted-foreground">
|
||||||
|
Loading...
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
) : providers.length === 0 ? (
|
||||||
|
<p className="rounded-md border border-dashed bg-muted/30 px-3 py-4 text-center text-sm text-muted-foreground">
|
||||||
|
No SCIM providers configured yet.
|
||||||
|
</p>
|
||||||
|
) : (
|
||||||
|
<ul className="flex flex-col gap-2">
|
||||||
|
{providers.map((provider) => (
|
||||||
|
<li
|
||||||
|
key={provider.id}
|
||||||
|
className="flex items-center gap-2 rounded-md border bg-muted/30 px-3 py-2"
|
||||||
|
>
|
||||||
|
<span className="flex-1 font-mono text-sm">
|
||||||
|
{provider.providerId}
|
||||||
|
</span>
|
||||||
|
<DialogAction
|
||||||
|
title="Remove SCIM provider"
|
||||||
|
description={`Remove "${provider.providerId}"? Existing provisioned users will stay but the IdP will no longer be able to sync.`}
|
||||||
|
type="destructive"
|
||||||
|
onClick={() => handleDelete(provider.providerId)}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="size-8 shrink-0 text-destructive hover:text-destructive"
|
||||||
|
disabled={isDeleting}
|
||||||
|
>
|
||||||
|
<Trash2 className="size-3.5" />
|
||||||
|
</Button>
|
||||||
|
</DialogAction>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<DialogFooter>
|
||||||
|
<Button variant="outline" onClick={() => handleOpenChange(false)}>
|
||||||
|
Close
|
||||||
|
</Button>
|
||||||
|
</DialogFooter>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
Eye,
|
Eye,
|
||||||
|
KeyRound,
|
||||||
Loader2,
|
Loader2,
|
||||||
LogIn,
|
LogIn,
|
||||||
Pencil,
|
Pencil,
|
||||||
@@ -34,6 +35,7 @@ import { api } from "@/utils/api";
|
|||||||
import { useUrl } from "@/utils/hooks/use-url";
|
import { useUrl } from "@/utils/hooks/use-url";
|
||||||
import { RegisterOidcDialog } from "./register-oidc-dialog";
|
import { RegisterOidcDialog } from "./register-oidc-dialog";
|
||||||
import { RegisterSamlDialog } from "./register-saml-dialog";
|
import { RegisterSamlDialog } from "./register-saml-dialog";
|
||||||
|
import { ScimDialog } from "./scim-dialog";
|
||||||
|
|
||||||
type ProviderForDetails = {
|
type ProviderForDetails = {
|
||||||
id: string | null;
|
id: string | null;
|
||||||
@@ -169,15 +171,22 @@ export const SSOSettings = () => {
|
|||||||
Users can sign in with their organization's IdP.
|
Users can sign in with their organization's IdP.
|
||||||
</CardDescription>
|
</CardDescription>
|
||||||
</div>
|
</div>
|
||||||
<Button
|
<div className="flex flex-wrap gap-2 shrink-0">
|
||||||
variant="outline"
|
<Button
|
||||||
size="sm"
|
variant="outline"
|
||||||
onClick={() => setManageOriginsOpen(true)}
|
size="sm"
|
||||||
className="shrink-0"
|
onClick={() => setManageOriginsOpen(true)}
|
||||||
>
|
>
|
||||||
<Shield className="mr-2 size-4" />
|
<Shield className="mr-2 size-4" />
|
||||||
Manage origins
|
Manage origins
|
||||||
</Button>
|
</Button>
|
||||||
|
<ScimDialog>
|
||||||
|
<Button variant="outline" size="sm">
|
||||||
|
<KeyRound className="mr-2 size-4" />
|
||||||
|
Manage SCIM
|
||||||
|
</Button>
|
||||||
|
</ScimDialog>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{isPending ? (
|
{isPending ? (
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { Accordion as AccordionPrimitive } from "radix-ui";
|
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { ChevronDownIcon, ChevronUpIcon } from "lucide-react";
|
import { ChevronDownIcon, ChevronUpIcon } from "lucide-react";
|
||||||
|
import { Accordion as AccordionPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
function Accordion({
|
function Accordion({
|
||||||
className,
|
className,
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import * as React from "react";
|
|
||||||
import { AlertDialog as AlertDialogPrimitive } from "radix-ui";
|
import { AlertDialog as AlertDialogPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
function AlertDialog({
|
function AlertDialog({
|
||||||
...props
|
...props
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { cva, type VariantProps } from "class-variance-authority";
|
import { cva, type VariantProps } from "class-variance-authority";
|
||||||
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import * as React from "react";
|
|
||||||
import { Avatar as AvatarPrimitive } from "radix-ui";
|
import { Avatar as AvatarPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { Slot } from "radix-ui";
|
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { ChevronRightIcon, MoreHorizontalIcon } from "lucide-react";
|
import { ChevronRightIcon, MoreHorizontalIcon } from "lucide-react";
|
||||||
|
import { Slot } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
function Breadcrumb({ className, ...props }: React.ComponentProps<"nav">) {
|
function Breadcrumb({ className, ...props }: React.ComponentProps<"nav">) {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import * as React from "react";
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import * as React from "react";
|
import * as React from "react";
|
||||||
import * as RechartsPrimitive from "recharts";
|
|
||||||
import type { TooltipValueType } from "recharts";
|
import type { TooltipValueType } from "recharts";
|
||||||
|
import * as RechartsPrimitive from "recharts";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import * as React from "react";
|
|
||||||
import { Checkbox as CheckboxPrimitive } from "radix-ui";
|
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { CheckIcon } from "lucide-react";
|
import { CheckIcon } from "lucide-react";
|
||||||
|
import { Checkbox as CheckboxPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
function Checkbox({
|
function Checkbox({
|
||||||
className,
|
className,
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import * as React from "react";
|
|
||||||
import { Command as CommandPrimitive } from "cmdk";
|
import { Command as CommandPrimitive } from "cmdk";
|
||||||
|
import { CheckIcon, SearchIcon } from "lucide-react";
|
||||||
import { cn } from "@/lib/utils";
|
import type * as React from "react";
|
||||||
import {
|
import {
|
||||||
Dialog,
|
Dialog,
|
||||||
DialogContent,
|
DialogContent,
|
||||||
@@ -12,7 +11,7 @@ import {
|
|||||||
DialogTitle,
|
DialogTitle,
|
||||||
} from "@/components/ui/dialog";
|
} from "@/components/ui/dialog";
|
||||||
import { InputGroup, InputGroupAddon } from "@/components/ui/input-group";
|
import { InputGroup, InputGroupAddon } from "@/components/ui/input-group";
|
||||||
import { SearchIcon, CheckIcon } from "lucide-react";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
function Command({
|
function Command({
|
||||||
className,
|
className,
|
||||||
@@ -45,10 +44,6 @@ function CommandDialog({
|
|||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<Dialog {...props}>
|
<Dialog {...props}>
|
||||||
<DialogHeader className="sr-only">
|
|
||||||
<DialogTitle>{title}</DialogTitle>
|
|
||||||
<DialogDescription>{description}</DialogDescription>
|
|
||||||
</DialogHeader>
|
|
||||||
<DialogContent
|
<DialogContent
|
||||||
className={cn(
|
className={cn(
|
||||||
"top-1/3 translate-y-0 overflow-hidden rounded-xl! p-0",
|
"top-1/3 translate-y-0 overflow-hidden rounded-xl! p-0",
|
||||||
@@ -56,7 +51,11 @@ function CommandDialog({
|
|||||||
)}
|
)}
|
||||||
showCloseButton={showCloseButton}
|
showCloseButton={showCloseButton}
|
||||||
>
|
>
|
||||||
{children}
|
<DialogHeader className="sr-only">
|
||||||
|
<DialogTitle>{title}</DialogTitle>
|
||||||
|
<DialogDescription>{description}</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
<Command>{children}</Command>
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
);
|
);
|
||||||
@@ -68,7 +67,7 @@ function CommandInput({
|
|||||||
}: React.ComponentProps<typeof CommandPrimitive.Input>) {
|
}: React.ComponentProps<typeof CommandPrimitive.Input>) {
|
||||||
return (
|
return (
|
||||||
<div data-slot="command-input-wrapper" className="p-1 pb-0">
|
<div data-slot="command-input-wrapper" className="p-1 pb-0">
|
||||||
<InputGroup className="h-11! rounded-lg! border-input/30 bg-input/30 shadow-none! *:data-[slot=input-group-addon]:pl-2!">
|
<InputGroup className="h-11! in-data-[slot=dialog-content]:h-12! rounded-lg! border-input/30 bg-input/30 shadow-none! *:data-[slot=input-group-addon]:pl-2! in-data-[slot=dialog-content]:*:[svg]:size-5">
|
||||||
<CommandPrimitive.Input
|
<CommandPrimitive.Input
|
||||||
data-slot="command-input"
|
data-slot="command-input"
|
||||||
className={cn(
|
className={cn(
|
||||||
@@ -122,7 +121,7 @@ function CommandGroup({
|
|||||||
<CommandPrimitive.Group
|
<CommandPrimitive.Group
|
||||||
data-slot="command-group"
|
data-slot="command-group"
|
||||||
className={cn(
|
className={cn(
|
||||||
"overflow-hidden p-1 text-foreground **:[[cmdk-group-heading]]:px-2 **:[[cmdk-group-heading]]:py-1.5 **:[[cmdk-group-heading]]:text-xs **:[[cmdk-group-heading]]:font-medium **:[[cmdk-group-heading]]:text-muted-foreground",
|
"overflow-hidden p-1 text-foreground **:[[cmdk-group-heading]]:px-2 **:[[cmdk-group-heading]]:py-1.5 **:[[cmdk-group-heading]]:text-xs **:[[cmdk-group-heading]]:font-medium **:[[cmdk-group-heading]]:text-muted-foreground in-data-[slot=dialog-content]:**:[[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0",
|
||||||
className,
|
className,
|
||||||
)}
|
)}
|
||||||
{...props}
|
{...props}
|
||||||
@@ -152,13 +151,15 @@ function CommandItem({
|
|||||||
<CommandPrimitive.Item
|
<CommandPrimitive.Item
|
||||||
data-slot="command-item"
|
data-slot="command-item"
|
||||||
className={cn(
|
className={cn(
|
||||||
"group/command-item relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none in-data-[slot=dialog-content]:rounded-lg! data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 data-selected:bg-muted data-selected:text-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 data-selected:*:[svg]:text-foreground",
|
"group/command-item relative flex cursor-default items-center gap-2 rounded-md px-2 py-1.5 in-data-[slot=dialog-content]:py-3 text-sm outline-hidden select-none in-data-[slot=dialog-content]:rounded-lg! data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 data-selected:bg-muted data-selected:text-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 in-data-[slot=dialog-content]:[&_svg:not([class*='size-'])]:size-5 data-selected:*:[svg]:text-foreground",
|
||||||
className,
|
className,
|
||||||
)}
|
)}
|
||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
<CheckIcon className="ml-auto opacity-0 group-has-data-[slot=command-shortcut]/command-item:hidden group-data-[checked=true]/command-item:opacity-100" />
|
{"data-checked" in props && (
|
||||||
|
<CheckIcon className="ml-auto opacity-0 group-has-data-[slot=command-shortcut]/command-item:hidden group-data-[checked=true]/command-item:opacity-100" />
|
||||||
|
)}
|
||||||
</CommandPrimitive.Item>
|
</CommandPrimitive.Item>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import * as React from "react";
|
import { CheckIcon, ChevronRightIcon } from "lucide-react";
|
||||||
import { ContextMenu as ContextMenuPrimitive } from "radix-ui";
|
import { ContextMenu as ContextMenuPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { ChevronRightIcon, CheckIcon } from "lucide-react";
|
|
||||||
|
|
||||||
function ContextMenu({
|
function ContextMenu({
|
||||||
...props
|
...props
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import * as React from "react";
|
import { XIcon } from "lucide-react";
|
||||||
import { Dialog as DialogPrimitive } from "radix-ui";
|
import { Dialog as DialogPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { wasNestedPopupJustClosed } from "@/components/ui/nested-popup-context";
|
import { wasNestedPopupJustClosed } from "@/components/ui/nested-popup-context";
|
||||||
import { XIcon } from "lucide-react";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
function Dialog({
|
function Dialog({
|
||||||
...props
|
...props
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
|
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { markNestedPopupClosed } from "@/components/ui/nested-popup-context";
|
|
||||||
import { CheckIcon, ChevronRightIcon } from "lucide-react";
|
import { CheckIcon, ChevronRightIcon } from "lucide-react";
|
||||||
|
import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
import { markNestedPopupClosed } from "@/components/ui/nested-popup-context";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
function DropdownMenu({
|
function DropdownMenu({
|
||||||
onOpenChange,
|
onOpenChange,
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { Accordion as AccordionPrimitive } from "radix-ui";
|
|
||||||
// import { ScrollArea } from "@acme/components/ui/scroll-area";
|
// import { ScrollArea } from "@acme/components/ui/scroll-area";
|
||||||
// import { cn } from "@acme/components/lib/utils";
|
// import { cn } from "@acme/components/lib/utils";
|
||||||
import { ChevronRight, type LucideIcon } from "lucide-react";
|
import { ChevronRight, type LucideIcon } from "lucide-react";
|
||||||
|
import { Accordion as AccordionPrimitive } from "radix-ui";
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import useResizeObserver from "use-resize-observer";
|
import useResizeObserver from "use-resize-observer";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Label as LabelPrimitive, Slot } from "radix-ui";
|
import { type Label as LabelPrimitive, Slot } from "radix-ui";
|
||||||
import * as React from "react";
|
import * as React from "react";
|
||||||
import {
|
import {
|
||||||
Controller,
|
Controller,
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import * as React from "react";
|
|
||||||
import { cva, type VariantProps } from "class-variance-authority";
|
import { cva, type VariantProps } from "class-variance-authority";
|
||||||
|
import type * as React from "react";
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { Textarea } from "@/components/ui/textarea";
|
import { Textarea } from "@/components/ui/textarea";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
function InputGroup({ className, ...props }: React.ComponentProps<"div">) {
|
function InputGroup({ className, ...props }: React.ComponentProps<"div">) {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { OTPInput, OTPInputContext } from "input-otp";
|
import { OTPInput, OTPInputContext } from "input-otp";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { MinusIcon } from "lucide-react";
|
import { MinusIcon } from "lucide-react";
|
||||||
|
import * as React from "react";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
function InputOTP({
|
function InputOTP({
|
||||||
className,
|
className,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { Label as LabelPrimitive } from "radix-ui";
|
import { Label as LabelPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import * as React from "react";
|
|
||||||
import { Popover as PopoverPrimitive } from "radix-ui";
|
import { Popover as PopoverPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { markNestedPopupClosed } from "@/components/ui/nested-popup-context";
|
import { markNestedPopupClosed } from "@/components/ui/nested-popup-context";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
function Popover({
|
function Popover({
|
||||||
onOpenChange,
|
onOpenChange,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { Progress as ProgressPrimitive } from "radix-ui";
|
import { Progress as ProgressPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import * as React from "react";
|
|
||||||
import { RadioGroup as RadioGroupPrimitive } from "radix-ui";
|
import { RadioGroup as RadioGroupPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { ScrollArea as ScrollAreaPrimitive } from "radix-ui";
|
import { ScrollArea as ScrollAreaPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import * as React from "react";
|
import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react";
|
||||||
import { Select as SelectPrimitive } from "radix-ui";
|
import { Select as SelectPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { ChevronDownIcon, CheckIcon, ChevronUpIcon } from "lucide-react";
|
|
||||||
|
|
||||||
function Select({
|
function Select({
|
||||||
...props
|
...props
|
||||||
@@ -81,7 +80,7 @@ function SelectContent({
|
|||||||
<SelectPrimitive.Viewport
|
<SelectPrimitive.Viewport
|
||||||
data-position={position}
|
data-position={position}
|
||||||
className={cn(
|
className={cn(
|
||||||
"data-[position=popper]:h-(--radix-select-trigger-height) data-[position=popper]:w-full data-[position=popper]:min-w-(--radix-select-trigger-width)",
|
"p-1 data-[position=popper]:h-(--radix-select-trigger-height) data-[position=popper]:w-full data-[position=popper]:min-w-(--radix-select-trigger-width)",
|
||||||
position === "popper" && "",
|
position === "popper" && "",
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
@@ -115,7 +114,7 @@ function SelectItem({
|
|||||||
<SelectPrimitive.Item
|
<SelectPrimitive.Item
|
||||||
data-slot="select-item"
|
data-slot="select-item"
|
||||||
className={cn(
|
className={cn(
|
||||||
"relative flex w-full cursor-default items-center gap-1.5 rounded-md py-1 pr-8 pl-1.5 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground not-data-[variant=destructive]:focus:**:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
|
"relative flex w-full cursor-default items-center gap-1.5 rounded-md py-1.5 pr-8 pl-2 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground not-data-[variant=destructive]:focus:**:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
|
||||||
className,
|
className,
|
||||||
)}
|
)}
|
||||||
{...props}
|
{...props}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { Separator as SeparatorPrimitive } from "radix-ui";
|
import { Separator as SeparatorPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { Dialog as SheetPrimitive } from "radix-ui";
|
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { Button } from "@/components/ui/button";
|
|
||||||
import { XIcon } from "lucide-react";
|
import { XIcon } from "lucide-react";
|
||||||
|
import { Dialog as SheetPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
function Sheet({ ...props }: React.ComponentProps<typeof SheetPrimitive.Root>) {
|
function Sheet({ ...props }: React.ComponentProps<typeof SheetPrimitive.Root>) {
|
||||||
return <SheetPrimitive.Root data-slot="sheet" {...props} />;
|
return <SheetPrimitive.Root data-slot="sheet" {...props} />;
|
||||||
|
|||||||
@@ -368,7 +368,7 @@ function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
|
|||||||
data-slot="sidebar-content"
|
data-slot="sidebar-content"
|
||||||
data-sidebar="content"
|
data-sidebar="content"
|
||||||
className={cn(
|
className={cn(
|
||||||
"no-scrollbar flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
|
"no-scrollbar flex min-h-0 flex-1 flex-col gap-2 overflow-y-auto overflow-x-hidden",
|
||||||
className,
|
className,
|
||||||
)}
|
)}
|
||||||
{...props}
|
{...props}
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useTheme } from "next-themes";
|
|
||||||
import { Toaster as Sonner, type ToasterProps } from "sonner";
|
|
||||||
import {
|
import {
|
||||||
CircleCheckIcon,
|
CircleCheckIcon,
|
||||||
InfoIcon,
|
InfoIcon,
|
||||||
TriangleAlertIcon,
|
|
||||||
OctagonXIcon,
|
|
||||||
Loader2Icon,
|
Loader2Icon,
|
||||||
|
OctagonXIcon,
|
||||||
|
TriangleAlertIcon,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
|
import { useTheme } from "next-themes";
|
||||||
|
import { Toaster as Sonner, type ToasterProps } from "sonner";
|
||||||
|
|
||||||
const Toaster = ({ ...props }: ToasterProps) => {
|
const Toaster = ({ ...props }: ToasterProps) => {
|
||||||
const { theme = "system" } = useTheme();
|
const { theme = "system" } = useTheme();
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { Switch as SwitchPrimitive } from "radix-ui";
|
import { Switch as SwitchPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import * as React from "react";
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import * as React from "react";
|
|
||||||
import { cva, type VariantProps } from "class-variance-authority";
|
import { cva, type VariantProps } from "class-variance-authority";
|
||||||
import { Tabs as TabsPrimitive } from "radix-ui";
|
import { Tabs as TabsPrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import * as React from "react";
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import * as React from "react";
|
|
||||||
import { cva, type VariantProps } from "class-variance-authority";
|
import { cva, type VariantProps } from "class-variance-authority";
|
||||||
import { Toggle as TogglePrimitive } from "radix-ui";
|
import { Toggle as TogglePrimitive } from "radix-ui";
|
||||||
|
import type * as React from "react";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
|||||||
13
apps/dokploy/drizzle/0173_aspiring_annihilus.sql
Normal file
13
apps/dokploy/drizzle/0173_aspiring_annihilus.sql
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
CREATE TABLE "scim_provider" (
|
||||||
|
"id" text PRIMARY KEY NOT NULL,
|
||||||
|
"provider_id" text NOT NULL,
|
||||||
|
"scim_token" text NOT NULL,
|
||||||
|
"organization_id" text,
|
||||||
|
CONSTRAINT "scim_provider_provider_id_unique" UNIQUE("provider_id"),
|
||||||
|
CONSTRAINT "scim_provider_scim_token_unique" UNIQUE("scim_token")
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
ALTER TABLE "two_factor" ADD COLUMN "verified" boolean DEFAULT true NOT NULL;--> statement-breakpoint
|
||||||
|
ALTER TABLE "two_factor" ADD COLUMN "failed_verification_count" integer DEFAULT 0 NOT NULL;--> statement-breakpoint
|
||||||
|
ALTER TABLE "two_factor" ADD COLUMN "locked_until" timestamp;--> statement-breakpoint
|
||||||
|
ALTER TABLE "scim_provider" ADD CONSTRAINT "scim_provider_organization_id_organization_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organization"("id") ON DELETE cascade ON UPDATE no action;
|
||||||
1
apps/dokploy/drizzle/0174_great_naoko.sql
Normal file
1
apps/dokploy/drizzle/0174_great_naoko.sql
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "backup" ADD COLUMN "includeEncryptionKey" boolean DEFAULT true NOT NULL;
|
||||||
8544
apps/dokploy/drizzle/meta/0173_snapshot.json
Normal file
8544
apps/dokploy/drizzle/meta/0173_snapshot.json
Normal file
File diff suppressed because it is too large
Load Diff
8551
apps/dokploy/drizzle/meta/0174_snapshot.json
Normal file
8551
apps/dokploy/drizzle/meta/0174_snapshot.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1212,6 +1212,20 @@
|
|||||||
"when": 1781045439162,
|
"when": 1781045439162,
|
||||||
"tag": "0172_quick_the_professor",
|
"tag": "0172_quick_the_professor",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 173,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1783494977500,
|
||||||
|
"tag": "0173_aspiring_annihilus",
|
||||||
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 174,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1783674181297,
|
||||||
|
"tag": "0174_great_naoko",
|
||||||
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
23
apps/dokploy/lib/api-keys.ts
Normal file
23
apps/dokploy/lib/api-keys.ts
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Maximum length allowed for an API key name.
|
||||||
|
*
|
||||||
|
* This mirrors the default `maximumNameLength` enforced by the
|
||||||
|
* `@better-auth/api-key` plugin. Names longer than this are rejected by
|
||||||
|
* better-auth with a 400, so we validate against it up front to surface a
|
||||||
|
* clear field-level error instead of an opaque 500.
|
||||||
|
*/
|
||||||
|
export const API_KEY_NAME_MAX_LENGTH = 32;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shared validation for an API key name, used by both the tRPC input schema
|
||||||
|
* and the client form so the two can't drift.
|
||||||
|
*/
|
||||||
|
export const apiKeyNameSchema = z
|
||||||
|
.string()
|
||||||
|
.min(1, "Name is required")
|
||||||
|
.max(
|
||||||
|
API_KEY_NAME_MAX_LENGTH,
|
||||||
|
`Name must be at most ${API_KEY_NAME_MAX_LENGTH} characters`,
|
||||||
|
);
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "dokploy",
|
"name": "dokploy",
|
||||||
"version": "v0.29.10",
|
"version": "v0.29.12",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -47,8 +47,9 @@
|
|||||||
"@ai-sdk/mistral": "^3.0.20",
|
"@ai-sdk/mistral": "^3.0.20",
|
||||||
"@ai-sdk/openai": "^3.0.29",
|
"@ai-sdk/openai": "^3.0.29",
|
||||||
"@ai-sdk/openai-compatible": "^2.0.30",
|
"@ai-sdk/openai-compatible": "^2.0.30",
|
||||||
"@better-auth/api-key": "1.5.4",
|
"@better-auth/api-key": "1.6.23",
|
||||||
"@better-auth/sso": "1.5.4",
|
"@better-auth/scim": "1.6.23",
|
||||||
|
"@better-auth/sso": "1.6.23",
|
||||||
"@codemirror/autocomplete": "^6.18.6",
|
"@codemirror/autocomplete": "^6.18.6",
|
||||||
"@codemirror/lang-css": "^6.3.1",
|
"@codemirror/lang-css": "^6.3.1",
|
||||||
"@codemirror/lang-json": "^6.0.1",
|
"@codemirror/lang-json": "^6.0.1",
|
||||||
@@ -82,7 +83,7 @@
|
|||||||
"ai": "^6.0.86",
|
"ai": "^6.0.86",
|
||||||
"ai-sdk-ollama": "^3.7.0",
|
"ai-sdk-ollama": "^3.7.0",
|
||||||
"bcrypt": "5.1.1",
|
"bcrypt": "5.1.1",
|
||||||
"better-auth": "1.5.4",
|
"better-auth": "1.6.23",
|
||||||
"bl": "6.0.11",
|
"bl": "6.0.11",
|
||||||
"boxen": "^7.1.1",
|
"boxen": "^7.1.1",
|
||||||
"bullmq": "5.67.3",
|
"bullmq": "5.67.3",
|
||||||
@@ -94,7 +95,7 @@
|
|||||||
"dockerode": "4.0.2",
|
"dockerode": "4.0.2",
|
||||||
"dompurify": "^3.3.3",
|
"dompurify": "^3.3.3",
|
||||||
"dotenv": "16.4.5",
|
"dotenv": "16.4.5",
|
||||||
"drizzle-orm": "0.45.1",
|
"drizzle-orm": "0.45.2",
|
||||||
"drizzle-zod": "0.8.3",
|
"drizzle-zod": "0.8.3",
|
||||||
"fancy-ansi": "^0.1.3",
|
"fancy-ansi": "^0.1.3",
|
||||||
"input-otp": "^1.4.2",
|
"input-otp": "^1.4.2",
|
||||||
|
|||||||
@@ -1039,7 +1039,9 @@ const EnvironmentPage = (
|
|||||||
<CardHeader className="p-0">
|
<CardHeader className="p-0">
|
||||||
<CardTitle className="text-xl flex flex-row gap-2 items-center">
|
<CardTitle className="text-xl flex flex-row gap-2 items-center">
|
||||||
<FolderInput className="size-6 text-muted-foreground self-center" />
|
<FolderInput className="size-6 text-muted-foreground self-center" />
|
||||||
{currentEnvironment.project.name}
|
<p className="text-base font-medium max-w-[250px] truncate">
|
||||||
|
{currentEnvironment.project.name}
|
||||||
|
</p>
|
||||||
<AdvancedEnvironmentSelector
|
<AdvancedEnvironmentSelector
|
||||||
projectId={projectId}
|
projectId={projectId}
|
||||||
currentEnvironmentId={environmentId}
|
currentEnvironmentId={environmentId}
|
||||||
|
|||||||
@@ -29,8 +29,6 @@ const Page = () => {
|
|||||||
<CardDescription>
|
<CardDescription>
|
||||||
Configure how many deployments can build at the same time on
|
Configure how many deployments can build at the same time on
|
||||||
each server. Builds of the same service are always serialized.
|
each server. Builds of the same service are always serialized.
|
||||||
Free plan allows up to 2 concurrent builds; an enterprise
|
|
||||||
license unlocks more.
|
|
||||||
</CardDescription>
|
</CardDescription>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent className="flex flex-col gap-6">
|
<CardContent className="flex flex-col gap-6">
|
||||||
|
|||||||
@@ -54,20 +54,6 @@ const Page = ({ isCloud }: Props) => {
|
|||||||
</EnterpriseFeatureGate>
|
</EnterpriseFeatureGate>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
<Card className="h-full bg-sidebar p-2.5 rounded-xl mx-auto w-full">
|
|
||||||
<div className="rounded-xl bg-background shadow-md">
|
|
||||||
<EnterpriseFeatureGate
|
|
||||||
lockedProps={{
|
|
||||||
title: "Application Authentication",
|
|
||||||
description:
|
|
||||||
"Protect deployed applications behind an OIDC SSO gate (oauth2-proxy). Part of Dokploy Enterprise.",
|
|
||||||
ctaLabel: "Go to License",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<ForwardAuthServers />
|
|
||||||
</EnterpriseFeatureGate>
|
|
||||||
</div>
|
|
||||||
</Card>
|
|
||||||
{!isCloud && (
|
{!isCloud && (
|
||||||
<Card className="h-full bg-sidebar p-2.5 rounded-xl mx-auto w-full">
|
<Card className="h-full bg-sidebar p-2.5 rounded-xl mx-auto w-full">
|
||||||
<div className="rounded-xl bg-background shadow-md">
|
<div className="rounded-xl bg-background shadow-md">
|
||||||
|
|||||||
@@ -310,7 +310,7 @@ export default function Home({ IS_CLOUD, enforceSSO }: Props) {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex gap-4">
|
<div className="grid grid-cols-2 gap-4">
|
||||||
<Button
|
<Button
|
||||||
variant="outline"
|
variant="outline"
|
||||||
className="w-full"
|
className="w-full"
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
{
|
|
||||||
"settings.common.save": "Yadda saxla",
|
|
||||||
"settings.common.enterTerminal": "Terminala daxil ol",
|
|
||||||
"settings.server.domain.title": "Server Domeni",
|
|
||||||
"settings.server.domain.description": "Server tətbiqinizə domen əlavə edin.",
|
|
||||||
"settings.server.domain.form.domain": "Domen",
|
|
||||||
"settings.server.domain.form.letsEncryptEmail": "Let's Encrypt E-poçtu",
|
|
||||||
"settings.server.domain.form.certificate.label": "Sertifikat Təminatçısı",
|
|
||||||
"settings.server.domain.form.certificate.placeholder": "Sertifikat seçin",
|
|
||||||
"settings.server.domain.form.certificateOptions.none": "Heç biri",
|
|
||||||
"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt",
|
|
||||||
|
|
||||||
"settings.server.webServer.title": "Veb Server",
|
|
||||||
"settings.server.webServer.description": "Veb serveri yenidən yüklə və ya təmizlə.",
|
|
||||||
"settings.server.webServer.actions": "Əməliyyatlar",
|
|
||||||
"settings.server.webServer.reload": "Yenidən yüklə",
|
|
||||||
"settings.server.webServer.watchLogs": "Logları izlə",
|
|
||||||
"settings.server.webServer.updateServerIp": "Server IP-ni Yenilə",
|
|
||||||
"settings.server.webServer.server.label": "Server",
|
|
||||||
"settings.server.webServer.traefik.label": "Traefik",
|
|
||||||
"settings.server.webServer.traefik.modifyEnv": "Mühiti Dəyişdir",
|
|
||||||
"settings.server.webServer.traefik.managePorts": "Əlavə Port Təyinatları",
|
|
||||||
"settings.server.webServer.traefik.managePortsDescription": "Traefik üçün əlavə portlar əlavə edin və ya silin",
|
|
||||||
"settings.server.webServer.traefik.targetPort": "Hədəf Port",
|
|
||||||
"settings.server.webServer.traefik.publishedPort": "Dərc Edilmiş Port",
|
|
||||||
"settings.server.webServer.traefik.addPort": "Port Əlavə Et",
|
|
||||||
"settings.server.webServer.traefik.portsUpdated": "Portlar uğurla yeniləndi",
|
|
||||||
"settings.server.webServer.traefik.portsUpdateError": "Portların yenilənməsi uğursuz oldu",
|
|
||||||
"settings.server.webServer.traefik.publishMode": "Dərc Rejimi",
|
|
||||||
"settings.server.webServer.storage.label": "Yer",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedImages": "İstifadə edilməyən şəkilləri təmizlə",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedVolumes": "İstifadə edilməyən həcmləri təmizlə",
|
|
||||||
"settings.server.webServer.storage.cleanStoppedContainers": "Dayandırılmış konteynerləri təmizlə",
|
|
||||||
"settings.server.webServer.storage.cleanDockerBuilder": "Docker Builder və Sistemi təmizlə",
|
|
||||||
"settings.server.webServer.storage.cleanMonitoring": "Monitorinqi təmizlə",
|
|
||||||
"settings.server.webServer.storage.cleanAll": "Hamısını təmizlə",
|
|
||||||
|
|
||||||
"settings.profile.title": "Hesab",
|
|
||||||
"settings.profile.description": "Profilinizin məlumatlarını buradan dəyişin.",
|
|
||||||
"settings.profile.email": "E-poçt",
|
|
||||||
"settings.profile.password": "Şifrə",
|
|
||||||
"settings.profile.avatar": "Avatar",
|
|
||||||
|
|
||||||
"settings.appearance.title": "Görünüş",
|
|
||||||
"settings.appearance.description": "İdarəetmə panelinizin görünüşünü fərdiləşdirin.",
|
|
||||||
"settings.appearance.theme": "Mövzu",
|
|
||||||
"settings.appearance.themeDescription": "İdarəetmə paneliniz üçün mövzu seçin",
|
|
||||||
"settings.appearance.themes.light": "İşıqlı",
|
|
||||||
"settings.appearance.themes.dark": "Qaranlıq",
|
|
||||||
"settings.appearance.themes.system": "Sistem",
|
|
||||||
"settings.appearance.language": "Dil",
|
|
||||||
"settings.appearance.languageDescription": "İdarəetmə paneliniz üçün dil seçin",
|
|
||||||
|
|
||||||
"settings.terminal.connectionSettings": "Bağlantı parametrləri",
|
|
||||||
"settings.terminal.ipAddress": "IP Ünvanı",
|
|
||||||
"settings.terminal.port": "Port",
|
|
||||||
"settings.terminal.username": "İstifadəçi adı"
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
{
|
|
||||||
"settings.common.save": "Speichern",
|
|
||||||
"settings.server.domain.title": "Server-Domain",
|
|
||||||
"settings.server.domain.description": "Füg eine Domain zu deiner Server-Anwendung hinzu.",
|
|
||||||
"settings.server.domain.form.domain": "Domain",
|
|
||||||
"settings.server.domain.form.letsEncryptEmail": "Let's Encrypt E-Mail",
|
|
||||||
"settings.server.domain.form.certificate.label": "Zertifikat",
|
|
||||||
"settings.server.domain.form.certificate.placeholder": "Wähl ein Zertifikat aus",
|
|
||||||
"settings.server.domain.form.certificateOptions.none": "Keins",
|
|
||||||
"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (Standard)",
|
|
||||||
|
|
||||||
"settings.server.webServer.title": "Web-Server",
|
|
||||||
"settings.server.webServer.description": "Lade den Web-Server neu oder reinige ihn.",
|
|
||||||
"settings.server.webServer.actions": "Aktionen",
|
|
||||||
"settings.server.webServer.reload": "Neu laden",
|
|
||||||
"settings.server.webServer.watchLogs": "Logs anschauen",
|
|
||||||
"settings.server.webServer.updateServerIp": "Server-IP Aktualisieren",
|
|
||||||
"settings.server.webServer.server.label": "Server",
|
|
||||||
"settings.server.webServer.traefik.label": "Traefik",
|
|
||||||
"settings.server.webServer.traefik.modifyEnv": "Umgebungsvariablen ändern",
|
|
||||||
"settings.server.webServer.storage.label": "Speicherplatz",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedImages": "Nicht genutzte Bilder löschen",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedVolumes": "Nicht genutzte Volumes löschen",
|
|
||||||
"settings.server.webServer.storage.cleanStoppedContainers": "Gestoppte Container löschen",
|
|
||||||
"settings.server.webServer.storage.cleanDockerBuilder": "Docker Builder & System bereinigen",
|
|
||||||
"settings.server.webServer.storage.cleanMonitoring": "Monitoring bereinigen",
|
|
||||||
"settings.server.webServer.storage.cleanAll": "Alles bereinigen",
|
|
||||||
|
|
||||||
"settings.profile.title": "Konto",
|
|
||||||
"settings.profile.description": "Ändere die Details deines Profiles hier.",
|
|
||||||
"settings.profile.email": "E-Mail",
|
|
||||||
"settings.profile.password": "Passwort",
|
|
||||||
"settings.profile.avatar": "Avatar",
|
|
||||||
|
|
||||||
"settings.appearance.title": "Aussehen",
|
|
||||||
"settings.appearance.description": "Pass das Design deines Dashboards an.",
|
|
||||||
"settings.appearance.theme": "Theme",
|
|
||||||
"settings.appearance.themeDescription": "Wähl ein Theme für dein Dashboard aus",
|
|
||||||
"settings.appearance.themes.light": "Hell",
|
|
||||||
"settings.appearance.themes.dark": "Dunkel",
|
|
||||||
"settings.appearance.themes.system": "System",
|
|
||||||
"settings.appearance.language": "Sprache",
|
|
||||||
"settings.appearance.languageDescription": "Wähl eine Sprache für dein Dashboard aus"
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
{
|
|
||||||
"settings.common.save": "Save",
|
|
||||||
"settings.common.enterTerminal": "Terminal",
|
|
||||||
"settings.server.domain.title": "Server Domain",
|
|
||||||
"settings.server.domain.description": "Add a domain to your server application.",
|
|
||||||
"settings.server.domain.form.domain": "Domain",
|
|
||||||
"settings.server.domain.form.letsEncryptEmail": "Let's Encrypt Email",
|
|
||||||
"settings.server.domain.form.certificate.label": "Certificate Provider",
|
|
||||||
"settings.server.domain.form.certificate.placeholder": "Select a certificate",
|
|
||||||
"settings.server.domain.form.certificateOptions.none": "None",
|
|
||||||
"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt",
|
|
||||||
|
|
||||||
"settings.server.webServer.title": "Web Server",
|
|
||||||
"settings.server.webServer.description": "Reload or clean the web server.",
|
|
||||||
"settings.server.webServer.actions": "Actions",
|
|
||||||
"settings.server.webServer.reload": "Reload",
|
|
||||||
"settings.server.webServer.watchLogs": "View Logs",
|
|
||||||
"settings.server.webServer.updateServerIp": "Update Server IP",
|
|
||||||
"settings.server.webServer.server.label": "Server",
|
|
||||||
"settings.server.webServer.traefik.label": "Traefik",
|
|
||||||
"settings.server.webServer.traefik.modifyEnv": "Modify Environment",
|
|
||||||
"settings.server.webServer.traefik.managePorts": "Additional Port Mappings",
|
|
||||||
"settings.server.webServer.traefik.managePortsDescription": "Add or remove additional ports for Traefik",
|
|
||||||
"settings.server.webServer.traefik.targetPort": "Target Port",
|
|
||||||
"settings.server.webServer.traefik.publishedPort": "Published Port",
|
|
||||||
"settings.server.webServer.traefik.addPort": "Add Port",
|
|
||||||
"settings.server.webServer.traefik.portsUpdated": "Ports updated successfully",
|
|
||||||
"settings.server.webServer.traefik.portsUpdateError": "Failed to update ports",
|
|
||||||
"settings.server.webServer.traefik.publishMode": "Publish Mode",
|
|
||||||
"settings.server.webServer.storage.label": "Space",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedImages": "Clean unused images",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedVolumes": "Clean unused volumes",
|
|
||||||
"settings.server.webServer.storage.cleanStoppedContainers": "Clean stopped containers",
|
|
||||||
"settings.server.webServer.storage.cleanDockerBuilder": "Clean Docker Builder & System",
|
|
||||||
"settings.server.webServer.storage.cleanMonitoring": "Clean Monitoring",
|
|
||||||
"settings.server.webServer.storage.cleanAll": "Clean all",
|
|
||||||
|
|
||||||
"settings.profile.title": "Account",
|
|
||||||
"settings.profile.description": "Change the details of your profile here.",
|
|
||||||
"settings.profile.email": "Email",
|
|
||||||
"settings.profile.password": "Password",
|
|
||||||
"settings.profile.avatar": "Avatar",
|
|
||||||
|
|
||||||
"settings.appearance.title": "Appearance",
|
|
||||||
"settings.appearance.description": "Customize the theme of your dashboard.",
|
|
||||||
"settings.appearance.theme": "Theme",
|
|
||||||
"settings.appearance.themeDescription": "Select a theme for your dashboard",
|
|
||||||
"settings.appearance.themes.light": "Light",
|
|
||||||
"settings.appearance.themes.dark": "Dark",
|
|
||||||
"settings.appearance.themes.system": "System",
|
|
||||||
"settings.appearance.language": "Language",
|
|
||||||
"settings.appearance.languageDescription": "Select a language for your dashboard",
|
|
||||||
|
|
||||||
"settings.terminal.connectionSettings": "Connection settings",
|
|
||||||
"settings.terminal.ipAddress": "IP Address",
|
|
||||||
"settings.terminal.port": "Port",
|
|
||||||
"settings.terminal.username": "Username"
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
{
|
|
||||||
"settings.common.save": "Guardar",
|
|
||||||
"settings.server.domain.title": "Dominio del Servidor",
|
|
||||||
"settings.server.domain.description": "Añade un dominio a tu aplicación de servidor.",
|
|
||||||
"settings.server.domain.form.domain": "Dominio",
|
|
||||||
"settings.server.domain.form.letsEncryptEmail": "Correo de Let's Encrypt",
|
|
||||||
"settings.server.domain.form.certificate.label": "Proveedor de Certificado",
|
|
||||||
"settings.server.domain.form.certificate.placeholder": "Selecciona un certificado",
|
|
||||||
"settings.server.domain.form.certificateOptions.none": "Ninguno",
|
|
||||||
"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt",
|
|
||||||
|
|
||||||
"settings.server.webServer.title": "Servidor Web",
|
|
||||||
"settings.server.webServer.description": "Recarga o limpia el servidor web.",
|
|
||||||
"settings.server.webServer.actions": "Acciones",
|
|
||||||
"settings.server.webServer.reload": "Recargar",
|
|
||||||
"settings.server.webServer.watchLogs": "Ver registros",
|
|
||||||
"settings.server.webServer.updateServerIp": "Actualizar IP del Servidor",
|
|
||||||
"settings.server.webServer.server.label": "Servidor",
|
|
||||||
"settings.server.webServer.traefik.label": "Traefik",
|
|
||||||
"settings.server.webServer.traefik.modifyEnv": "Modificar Entorno",
|
|
||||||
"settings.server.webServer.traefik.managePorts": "Asignación Adicional de Puertos",
|
|
||||||
"settings.server.webServer.traefik.managePortsDescription": "Añadir o eliminar puertos adicionales para Traefik",
|
|
||||||
"settings.server.webServer.traefik.targetPort": "Puerto de Destino",
|
|
||||||
"settings.server.webServer.traefik.publishedPort": "Puerto Publicado",
|
|
||||||
"settings.server.webServer.traefik.addPort": "Añadir Puerto",
|
|
||||||
"settings.server.webServer.traefik.portsUpdated": "Puertos actualizados correctamente",
|
|
||||||
"settings.server.webServer.traefik.portsUpdateError": "Error al actualizar los puertos",
|
|
||||||
"settings.server.webServer.traefik.publishMode": "Modo de Publicación",
|
|
||||||
"settings.server.webServer.storage.label": "Espacio",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedImages": "Limpiar imágenes no utilizadas",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedVolumes": "Limpiar volúmenes no utilizados",
|
|
||||||
"settings.server.webServer.storage.cleanStoppedContainers": "Limpiar contenedores detenidos",
|
|
||||||
"settings.server.webServer.storage.cleanDockerBuilder": "Limpiar Constructor de Docker y Sistema",
|
|
||||||
"settings.server.webServer.storage.cleanMonitoring": "Limpiar Monitoreo",
|
|
||||||
"settings.server.webServer.storage.cleanAll": "Limpiar todo",
|
|
||||||
|
|
||||||
"settings.profile.title": "Cuenta",
|
|
||||||
"settings.profile.description": "Cambia los detalles de tu perfil aquí.",
|
|
||||||
"settings.profile.email": "Correo electrónico",
|
|
||||||
"settings.profile.password": "Contraseña",
|
|
||||||
"settings.profile.avatar": "Avatar",
|
|
||||||
|
|
||||||
"settings.appearance.title": "Apariencia",
|
|
||||||
"settings.appearance.description": "Personaliza el tema de tu panel.",
|
|
||||||
"settings.appearance.theme": "Tema",
|
|
||||||
"settings.appearance.themeDescription": "Selecciona un tema para tu panel",
|
|
||||||
"settings.appearance.themes.light": "Claro",
|
|
||||||
"settings.appearance.themes.dark": "Oscuro",
|
|
||||||
"settings.appearance.themes.system": "Sistema",
|
|
||||||
"settings.appearance.language": "Idioma",
|
|
||||||
"settings.appearance.languageDescription": "Selecciona un idioma para tu panel"
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
{
|
|
||||||
"settings.common.save": "ذخیره",
|
|
||||||
"settings.server.domain.title": "دامنه سرور",
|
|
||||||
"settings.server.domain.description": "یک دامنه به برنامه سرور خود اضافه کنید.",
|
|
||||||
"settings.server.domain.form.domain": "دامنه",
|
|
||||||
"settings.server.domain.form.letsEncryptEmail": "ایمیل Let's Encrypt",
|
|
||||||
"settings.server.domain.form.certificate.label": "گواهینامه",
|
|
||||||
"settings.server.domain.form.certificate.placeholder": "یک گواهینامه انتخاب کنید",
|
|
||||||
"settings.server.domain.form.certificateOptions.none": "هیچکدام",
|
|
||||||
"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (پیشفرض)",
|
|
||||||
|
|
||||||
"settings.server.webServer.title": "وب سرور",
|
|
||||||
"settings.server.webServer.description": "وب سرور را بازنشانی یا پاک کنید.",
|
|
||||||
"settings.server.webServer.actions": "اقدامات",
|
|
||||||
"settings.server.webServer.reload": "بارگذاری مجدد",
|
|
||||||
"settings.server.webServer.watchLogs": "مشاهده گزارشها",
|
|
||||||
"settings.server.webServer.updateServerIp": "بهروزرسانی آیپی سرور",
|
|
||||||
"settings.server.webServer.server.label": "سرور",
|
|
||||||
"settings.server.webServer.traefik.label": "ترافیک",
|
|
||||||
"settings.server.webServer.traefik.modifyEnv": "ویرایش محیط",
|
|
||||||
"settings.server.webServer.storage.label": "فضا",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedImages": "پاکسازی Image های بدون استفاده",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedVolumes": "پاکسازی ولومهای بدون استفاده",
|
|
||||||
"settings.server.webServer.storage.cleanStoppedContainers": "پاکسازی کانتینرهای متوقفشده",
|
|
||||||
"settings.server.webServer.storage.cleanDockerBuilder": "پاکسازی بیلدر و سیستم داکر",
|
|
||||||
"settings.server.webServer.storage.cleanMonitoring": "پاکسازی پایش",
|
|
||||||
"settings.server.webServer.storage.cleanAll": "پاکسازی همه",
|
|
||||||
|
|
||||||
"settings.profile.title": "حساب کاربری",
|
|
||||||
"settings.profile.description": "جزئیات پروفایل خود را در اینجا تغییر دهید.",
|
|
||||||
"settings.profile.email": "ایمیل",
|
|
||||||
"settings.profile.password": "رمز عبور",
|
|
||||||
"settings.profile.avatar": "تصویر پروفایل",
|
|
||||||
|
|
||||||
"settings.appearance.title": "ظاهر",
|
|
||||||
"settings.appearance.description": "تم داشبورد خود را سفارشی کنید.",
|
|
||||||
"settings.appearance.theme": "تم",
|
|
||||||
"settings.appearance.themeDescription": "یک تم برای داشبورد خود انتخاب کنید",
|
|
||||||
"settings.appearance.themes.light": "روشن",
|
|
||||||
"settings.appearance.themes.dark": "تاریک",
|
|
||||||
"settings.appearance.themes.system": "سیستم",
|
|
||||||
"settings.appearance.language": "زبان",
|
|
||||||
"settings.appearance.languageDescription": "یک زبان برای داشبورد خود انتخاب کنید"
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
{
|
|
||||||
"settings.common.save": "Sauvegarder",
|
|
||||||
"settings.server.domain.title": "Nom de domaine du serveur",
|
|
||||||
"settings.server.domain.description": "Ajouter un nom de domaine au serveur de votre application.",
|
|
||||||
"settings.server.domain.form.domain": "Domaine",
|
|
||||||
"settings.server.domain.form.letsEncryptEmail": "Adresse email Let's Encrypt",
|
|
||||||
"settings.server.domain.form.certificate.label": "Certificat",
|
|
||||||
"settings.server.domain.form.certificate.placeholder": "Choisir un certificat",
|
|
||||||
"settings.server.domain.form.certificateOptions.none": "Aucun",
|
|
||||||
"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (Par défaut)",
|
|
||||||
|
|
||||||
"settings.server.webServer.title": "Serveur web",
|
|
||||||
"settings.server.webServer.description": "Recharger ou nettoyer le serveur web.",
|
|
||||||
"settings.server.webServer.actions": "Actions",
|
|
||||||
"settings.server.webServer.reload": "Recharger",
|
|
||||||
"settings.server.webServer.watchLogs": "Consulter les logs",
|
|
||||||
"settings.server.webServer.updateServerIp": "Mettre à jour l'IP du serveur",
|
|
||||||
"settings.server.webServer.server.label": "Serveur",
|
|
||||||
"settings.server.webServer.traefik.label": "Traefik",
|
|
||||||
"settings.server.webServer.traefik.modifyEnv": "Modifier les variables d'environnement",
|
|
||||||
"settings.server.webServer.storage.label": "Stockage",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedImages": "Supprimer les images inutilisées",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedVolumes": "Supprimer les volumes inutilisés",
|
|
||||||
"settings.server.webServer.storage.cleanStoppedContainers": "Supprimer les conteneurs arrêtés",
|
|
||||||
"settings.server.webServer.storage.cleanDockerBuilder": "Nettoyer le Docker Builder & System",
|
|
||||||
"settings.server.webServer.storage.cleanMonitoring": "Nettoyer le monitoring",
|
|
||||||
"settings.server.webServer.storage.cleanAll": "Tout nettoyer",
|
|
||||||
|
|
||||||
"settings.profile.title": "Compte",
|
|
||||||
"settings.profile.description": "Modifier les informations de votre compte ici.",
|
|
||||||
"settings.profile.email": "Adresse Email",
|
|
||||||
"settings.profile.password": "Mot de passe",
|
|
||||||
"settings.profile.avatar": "Photo de profil",
|
|
||||||
|
|
||||||
"settings.appearance.title": "Apparence",
|
|
||||||
"settings.appearance.description": "Customiser le thème de votre dashboard.",
|
|
||||||
"settings.appearance.theme": "Thème",
|
|
||||||
"settings.appearance.themeDescription": "Choisir un thème pour votre dashboard",
|
|
||||||
"settings.appearance.themes.light": "Clair",
|
|
||||||
"settings.appearance.themes.dark": "Sombre",
|
|
||||||
"settings.appearance.themes.system": "Système",
|
|
||||||
"settings.appearance.language": "Langue",
|
|
||||||
"settings.appearance.languageDescription": "Sélectionner une langue pour votre dashboard"
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
{
|
|
||||||
"settings.common.save": "Simpan",
|
|
||||||
"settings.common.enterTerminal": "Buka Terminal",
|
|
||||||
"settings.server.domain.title": "Domain Server",
|
|
||||||
"settings.server.domain.description": "Tambahkan domain ke aplikasi server anda.",
|
|
||||||
"settings.server.domain.form.domain": "Domain",
|
|
||||||
"settings.server.domain.form.letsEncryptEmail": "Email Let's Encrypt",
|
|
||||||
"settings.server.domain.form.certificate.label": "Penyedia Sertifikat",
|
|
||||||
"settings.server.domain.form.certificate.placeholder": "Pilih sertifikat",
|
|
||||||
"settings.server.domain.form.certificateOptions.none": "Tidak ada",
|
|
||||||
"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt",
|
|
||||||
|
|
||||||
"settings.server.webServer.title": "Server Web",
|
|
||||||
"settings.server.webServer.description": "Muat ulang atau bersihkan server web.",
|
|
||||||
"settings.server.webServer.actions": "Opsi",
|
|
||||||
"settings.server.webServer.reload": "Muat ulang",
|
|
||||||
"settings.server.webServer.watchLogs": "Lihat log",
|
|
||||||
"settings.server.webServer.updateServerIp": "Perbarui IP Server",
|
|
||||||
"settings.server.webServer.server.label": "Server",
|
|
||||||
"settings.server.webServer.traefik.label": "Traefik",
|
|
||||||
"settings.server.webServer.traefik.modifyEnv": "Ubah Environment",
|
|
||||||
"settings.server.webServer.traefik.managePorts": "Pengaturan Port Tambahan",
|
|
||||||
"settings.server.webServer.traefik.managePortsDescription": "Tambahkan atau hapus port tambahan untuk Traefik",
|
|
||||||
"settings.server.webServer.traefik.targetPort": "Port Tujuan",
|
|
||||||
"settings.server.webServer.traefik.publishedPort": "Port saai ini",
|
|
||||||
"settings.server.webServer.traefik.addPort": "Tambah Port",
|
|
||||||
"settings.server.webServer.traefik.portsUpdated": "Port berhasil diperbarui",
|
|
||||||
"settings.server.webServer.traefik.portsUpdateError": "Gagal memperbarui Port",
|
|
||||||
"settings.server.webServer.traefik.publishMode": "Pilihan mode Port",
|
|
||||||
"settings.server.webServer.storage.label": "Penyimpanan",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedImages": "Hapus Image tidak terpakai",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedVolumes": "Hapus Volume tidak terpakai",
|
|
||||||
"settings.server.webServer.storage.cleanStoppedContainers": "Hapus Container tidak aktif",
|
|
||||||
"settings.server.webServer.storage.cleanDockerBuilder": "Bersihkan Docker Builder & System",
|
|
||||||
"settings.server.webServer.storage.cleanMonitoring": "Bersihkan Monitoring",
|
|
||||||
"settings.server.webServer.storage.cleanAll": "Bersihkan",
|
|
||||||
|
|
||||||
"settings.profile.title": "Akun",
|
|
||||||
"settings.profile.description": "Ubah detail profil Anda di sini.",
|
|
||||||
"settings.profile.email": "Email",
|
|
||||||
"settings.profile.password": "Kata Sandi",
|
|
||||||
"settings.profile.avatar": "Avatar",
|
|
||||||
|
|
||||||
"settings.appearance.title": "Tampilan",
|
|
||||||
"settings.appearance.description": "Sesuaikan tema dasbor Anda.",
|
|
||||||
"settings.appearance.theme": "Tema",
|
|
||||||
"settings.appearance.themeDescription": "Pilih tema untuk dasbor Anda",
|
|
||||||
"settings.appearance.themes.light": "Terang",
|
|
||||||
"settings.appearance.themes.dark": "Gelap",
|
|
||||||
"settings.appearance.themes.system": "Sistem",
|
|
||||||
"settings.appearance.language": "Bahasa",
|
|
||||||
"settings.appearance.languageDescription": "Pilih bahasa untuk dasbor Anda",
|
|
||||||
|
|
||||||
"settings.terminal.connectionSettings": "Pengaturan koneksi",
|
|
||||||
"settings.terminal.ipAddress": "Alamat IP",
|
|
||||||
"settings.terminal.port": "Port",
|
|
||||||
"settings.terminal.username": "Username"
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
{
|
|
||||||
"settings.common.save": "Salva",
|
|
||||||
"settings.server.domain.title": "Dominio del server",
|
|
||||||
"settings.server.domain.description": "Aggiungi un dominio alla tua applicazione server.",
|
|
||||||
"settings.server.domain.form.domain": "Dominio",
|
|
||||||
"settings.server.domain.form.letsEncryptEmail": "Email di Let's Encrypt",
|
|
||||||
"settings.server.domain.form.certificate.label": "Certificato",
|
|
||||||
"settings.server.domain.form.certificate.placeholder": "Seleziona un certificato",
|
|
||||||
"settings.server.domain.form.certificateOptions.none": "Nessuno",
|
|
||||||
"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (Predefinito)",
|
|
||||||
|
|
||||||
"settings.server.webServer.title": "Server Web",
|
|
||||||
"settings.server.webServer.description": "Ricarica o pulisci il server web.",
|
|
||||||
"settings.server.webServer.actions": "Azioni",
|
|
||||||
"settings.server.webServer.reload": "Ricarica",
|
|
||||||
"settings.server.webServer.watchLogs": "Guarda i log",
|
|
||||||
"settings.server.webServer.updateServerIp": "Aggiorna IP del server",
|
|
||||||
"settings.server.webServer.server.label": "Server",
|
|
||||||
"settings.server.webServer.traefik.label": "Traefik",
|
|
||||||
"settings.server.webServer.traefik.modifyEnv": "Modifica Env",
|
|
||||||
"settings.server.webServer.storage.label": "Spazio",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedImages": "Pulisci immagini inutilizzate",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedVolumes": "Pulisci volumi inutilizzati",
|
|
||||||
"settings.server.webServer.storage.cleanStoppedContainers": "Pulisci container fermati",
|
|
||||||
"settings.server.webServer.storage.cleanDockerBuilder": "Pulisci Docker Builder e sistema",
|
|
||||||
"settings.server.webServer.storage.cleanMonitoring": "Pulisci monitoraggio",
|
|
||||||
"settings.server.webServer.storage.cleanAll": "Pulisci tutto",
|
|
||||||
|
|
||||||
"settings.profile.title": "Account",
|
|
||||||
"settings.profile.description": "Modifica i dettagli del tuo profilo qui.",
|
|
||||||
"settings.profile.email": "Email",
|
|
||||||
"settings.profile.password": "Password",
|
|
||||||
"settings.profile.avatar": "Avatar",
|
|
||||||
|
|
||||||
"settings.appearance.title": "Aspetto",
|
|
||||||
"settings.appearance.description": "Personalizza il tema della tua dashboard.",
|
|
||||||
"settings.appearance.theme": "Tema",
|
|
||||||
"settings.appearance.themeDescription": "Seleziona un tema per la tua dashboard",
|
|
||||||
"settings.appearance.themes.light": "Chiaro",
|
|
||||||
"settings.appearance.themes.dark": "Scuro",
|
|
||||||
"settings.appearance.themes.system": "Sistema",
|
|
||||||
"settings.appearance.language": "Lingua",
|
|
||||||
"settings.appearance.languageDescription": "Seleziona una lingua per la tua dashboard"
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
{
|
|
||||||
"settings.common.save": "保存",
|
|
||||||
"settings.server.domain.title": "サーバードメイン",
|
|
||||||
"settings.server.domain.description": "サーバーアプリケーションにドメインを追加",
|
|
||||||
"settings.server.domain.form.domain": "ドメイン",
|
|
||||||
"settings.server.domain.form.letsEncryptEmail": "Let's Encrypt メールアドレス",
|
|
||||||
"settings.server.domain.form.certificate.label": "証明書",
|
|
||||||
"settings.server.domain.form.certificate.placeholder": "証明書を選択",
|
|
||||||
"settings.server.domain.form.certificateOptions.none": "なし",
|
|
||||||
"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (デフォルト)",
|
|
||||||
|
|
||||||
"settings.server.webServer.title": "ウェブサーバー",
|
|
||||||
"settings.server.webServer.description": "ウェブサーバーをリロードまたはクリーンアップします",
|
|
||||||
"settings.server.webServer.actions": "アクション",
|
|
||||||
"settings.server.webServer.reload": "リロード",
|
|
||||||
"settings.server.webServer.watchLogs": "ログを監視",
|
|
||||||
"settings.server.webServer.updateServerIp": "サーバーIPを更新",
|
|
||||||
"settings.server.webServer.server.label": "サーバー",
|
|
||||||
"settings.server.webServer.traefik.label": "Traefik",
|
|
||||||
"settings.server.webServer.traefik.modifyEnv": "環境設定を変更",
|
|
||||||
"settings.server.webServer.storage.label": "ストレージ",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedImages": "未使用のイメージを削除",
|
|
||||||
"settings.server.webServer.storage.cleanUnusedVolumes": "未使用のボリュームを削除",
|
|
||||||
"settings.server.webServer.storage.cleanStoppedContainers": "停止中のコンテナを削除",
|
|
||||||
"settings.server.webServer.storage.cleanDockerBuilder": "Docker ビルダー&システムをクリーンアップ",
|
|
||||||
"settings.server.webServer.storage.cleanMonitoring": "モニタリングをクリーンアップ",
|
|
||||||
"settings.server.webServer.storage.cleanAll": "すべてをクリーンアップ",
|
|
||||||
|
|
||||||
"settings.profile.title": "アカウント",
|
|
||||||
"settings.profile.description": "ここでプロフィールの詳細を変更できます",
|
|
||||||
"settings.profile.email": "メールアドレス",
|
|
||||||
"settings.profile.password": "パスワード",
|
|
||||||
"settings.profile.avatar": "アバター",
|
|
||||||
|
|
||||||
"settings.appearance.title": "外観",
|
|
||||||
"settings.appearance.description": "ダッシュボードのテーマをカスタマイズ",
|
|
||||||
"settings.appearance.theme": "テーマ",
|
|
||||||
"settings.appearance.themeDescription": "ダッシュボードのテーマを選択してください",
|
|
||||||
"settings.appearance.themes.light": "ライト",
|
|
||||||
"settings.appearance.themes.dark": "ダーク",
|
|
||||||
"settings.appearance.themes.system": "システム",
|
|
||||||
"settings.appearance.language": "言語",
|
|
||||||
"settings.appearance.languageDescription": "ダッシュボードの言語を選択してください"
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user