Merge pull request #3844 from Dokploy/fix/improve-loading-queries

Fix/improve loading queries
This commit is contained in:
Mauricio Siu
2026-02-28 23:06:59 -06:00
committed by GitHub
7 changed files with 61 additions and 31 deletions
@@ -14,13 +14,18 @@ vi.mock("@dokploy/server/db", () => {
set: vi.fn(() => chain), set: vi.fn(() => chain),
where: vi.fn(() => chain), where: vi.fn(() => chain),
returning: vi.fn().mockResolvedValue([{}] as any), returning: vi.fn().mockResolvedValue([{}] as any),
from: vi.fn(() => chain),
innerJoin: vi.fn(() => chain),
then: (resolve: (v: any) => void) => {
resolve([]);
},
} as any; } as any;
return chain; return chain;
}; };
return { return {
db: { db: {
select: vi.fn(), select: vi.fn(() => createChainableMock()),
insert: vi.fn(), insert: vi.fn(),
update: vi.fn(() => createChainableMock()), update: vi.fn(() => createChainableMock()),
delete: vi.fn(), delete: vi.fn(),
@@ -31,6 +36,9 @@ vi.mock("@dokploy/server/db", () => {
patch: { patch: {
findMany: vi.fn().mockResolvedValue([]), findMany: vi.fn().mockResolvedValue([]),
}, },
member: {
findMany: vi.fn().mockResolvedValue([]),
},
}, },
}, },
}; };
@@ -15,13 +15,18 @@ vi.mock("@dokploy/server/db", () => {
set: vi.fn(() => chain), set: vi.fn(() => chain),
where: vi.fn(() => chain), where: vi.fn(() => chain),
returning: vi.fn().mockResolvedValue([{}]), returning: vi.fn().mockResolvedValue([{}]),
from: vi.fn(() => chain),
innerJoin: vi.fn(() => chain),
then: (resolve: (v: any) => void) => {
resolve([]);
},
}; };
return chain; return chain;
}; };
return { return {
db: { db: {
select: vi.fn(), select: vi.fn(() => createChainableMock()),
insert: vi.fn(), insert: vi.fn(),
update: vi.fn(() => createChainableMock()), update: vi.fn(() => createChainableMock()),
delete: vi.fn(), delete: vi.fn(),
@@ -32,6 +37,9 @@ vi.mock("@dokploy/server/db", () => {
patch: { patch: {
findMany: vi.fn().mockResolvedValue([]), findMany: vi.fn().mockResolvedValue([]),
}, },
member: {
findMany: vi.fn().mockResolvedValue([]),
},
}, },
}, },
}; };
+5 -2
View File
@@ -12,7 +12,11 @@ vi.mock("@dokploy/server/db", () => {
chain.where = () => chain; chain.where = () => chain;
chain.values = () => chain; chain.values = () => chain;
chain.returning = () => Promise.resolve([{}]); chain.returning = () => Promise.resolve([{}]);
chain.then = undefined; chain.from = () => chain;
chain.innerJoin = () => chain;
chain.then = (resolve: (value: unknown) => void) => {
resolve([]);
};
const tableMock = { const tableMock = {
findFirst: vi.fn(() => Promise.resolve(undefined)), findFirst: vi.fn(() => Promise.resolve(undefined)),
@@ -21,7 +25,6 @@ vi.mock("@dokploy/server/db", () => {
update: vi.fn(() => chain), update: vi.fn(() => chain),
delete: vi.fn(() => chain), delete: vi.fn(() => chain),
}; };
const createQueryMock = () => tableMock;
return { return {
db: { db: {
@@ -32,7 +32,6 @@ interface Props {
} }
export const BreadcrumbSidebar = ({ list }: Props) => { export const BreadcrumbSidebar = ({ list }: Props) => {
console.log(list);
return ( return (
<header className="flex h-16 shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-[[data-collapsible=icon]]/sidebar-wrapper:h-12"> <header className="flex h-16 shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-[[data-collapsible=icon]]/sidebar-wrapper:h-12">
<div className="flex items-center justify-between w-full"> <div className="flex items-center justify-between w-full">
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "dokploy", "name": "dokploy",
"version": "v0.28.1", "version": "v0.28.2",
"private": true, "private": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"type": "module", "type": "module",
+13 -11
View File
@@ -73,23 +73,25 @@ const { handler, api } = betterAuth({
disabled: process.env.NODE_ENV === "production", disabled: process.env.NODE_ENV === "production",
}, },
async trustedOrigins() { async trustedOrigins() {
const trustedOrigins = await getTrustedOrigins();
if (IS_CLOUD) { if (IS_CLOUD) {
return trustedOrigins; return getTrustedOrigins();
} }
const settings = await getWebServerSettings(); const [trustedOrigins, settings] = await Promise.all([
if (!settings) { getTrustedOrigins(),
return []; getWebServerSettings(),
} ]);
return [ if (!settings) return [];
...(settings?.serverIp ? [`http://${settings?.serverIp}:3000`] : []), const devOrigins =
...(settings?.host ? [`https://${settings?.host}`] : []), process.env.NODE_ENV === "development"
...(process.env.NODE_ENV === "development"
? [ ? [
"http://localhost:3000", "http://localhost:3000",
"https://absolutely-handy-falcon.ngrok-free.app", "https://absolutely-handy-falcon.ngrok-free.app",
] ]
: []), : [];
return [
...(settings?.serverIp ? [`http://${settings?.serverIp}:3000`] : []),
...(settings?.host ? [`https://${settings?.host}`] : []),
...devOrigins,
...trustedOrigins, ...trustedOrigins,
]; ];
}, },
+24 -14
View File
@@ -117,23 +117,33 @@ export const getDokployUrl = async () => {
return `http://${settings?.serverIp}:${process.env.PORT}`; return `http://${settings?.serverIp}:${process.env.PORT}`;
}; };
export const getTrustedOrigins = async () => { const TRUSTED_ORIGINS_CACHE_TTL_MS = 30 * 60_000;
const members = await db.query.member.findMany({ let trustedOriginsCache: { data: string[]; expiresAt: number } | null = null;
where: eq(member.role, "owner"),
with: {
user: true,
},
});
if (members.length === 0) { export const getTrustedOrigins = async () => {
return []; const runQuery = async () => {
const rows = await db
.select({ trustedOrigins: user.trustedOrigins })
.from(member)
.innerJoin(user, eq(member.userId, user.id))
.where(eq(member.role, "owner"));
return Array.from(new Set(rows.flatMap((r) => r.trustedOrigins ?? [])));
};
if (IS_CLOUD) {
const now = Date.now();
if (trustedOriginsCache && now < trustedOriginsCache.expiresAt) {
return trustedOriginsCache.data;
}
const trustedOrigins = await runQuery();
trustedOriginsCache = {
data: trustedOrigins,
expiresAt: now + TRUSTED_ORIGINS_CACHE_TTL_MS,
};
return trustedOrigins;
} }
const trustedOrigins = members.flatMap( return runQuery();
(member) => member.user.trustedOrigins || [],
);
return Array.from(new Set(trustedOrigins));
}; };
export const getTrustedProviders = async () => { export const getTrustedProviders = async () => {