tiennm99/coolify
1
0 Fork 0
mirror of https://github.com/tiennm99/coolify.git synced 2026-10-14 18:18:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(v5): use resource uuids at boundaries

Browse Source
This commit is contained in:
Andras Bacsai committed 2026-07-02 21:26:41 +02:00
1 parent c9416abec6
commit fd5b2fec9a
15 files changed
+407 -142
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

resources/js/v5/Pages/Clusters.tsx
+4 -4
View File
@@ -59,7 +59,7 @@ type ServerFormErrors = {
host?: string[];
ssh_user?: string[];
ssh_port?: string[];
private_key_id?: string[];
private_key_uuid?: string[];
node_address?: string[];
builder_enabled?: string[];
builder_capacity?: string[];
@@ -530,7 +530,7 @@ export default function Clusters({
host: serverHost,
ssh_user: serverSshUser,
ssh_port: Number(serverSshPort),
private_key_id: selectedPrivateKeyId === '' ? null : Number(selectedPrivateKeyId),
private_key_uuid: selectedPrivateKeyId === '' ? null : selectedPrivateKeyId,
node_address: serverNodeAddress.trim() === '' ? null : serverNodeAddress,
builder_enabled: serverBuilderEnabled,
ingress_enabled: serverIngressEnabled,
@@ -1835,7 +1835,7 @@ export default function Clusters({
value={selectedPrivateKeyId}
onChange={(event) => setSelectedPrivateKeyId(event.target.value)}
className="appearance-none rounded-md border border-border bg-background bg-[length:1rem_1rem] bg-[position:right_0.75rem_center] bg-no-repeat px-3 py-2 pr-10 text-sm outline-none transition focus:border-ring focus:ring-0 aria-invalid:border-destructive aria-invalid:ring-0 dark:aria-invalid:border-destructive/50"
aria-invalid={serverErrors.private_key_id ? true : undefined}
aria-invalid={serverErrors.private_key_uuid ? true : undefined}
style={{
backgroundImage: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 256 256' fill='none' stroke='%23ffffff' stroke-width='28' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m64 96 64 64 64-64'/%3E%3C/svg%3E")`,
}}
@@ -1847,7 +1847,7 @@ export default function Clusters({
</option>
))}
</select>
<FieldError message={serverErrors.private_key_id?.[0]} />
<FieldError message={serverErrors.private_key_uuid?.[0]} />
</Field>
<div className="rounded-lg border border-border bg-muted/20 transition-colors focus-within:border-ring">
resources/js/v5/Pages/Dashboard.tsx
+3 -3
View File
@@ -413,8 +413,8 @@ function normalizeConnection(connection: V5ResourceConnection): CanvasConnection
'X-CSRF-TOKEN': csrfToken(),
},
body: JSON.stringify({
resource_one: { type: 'application', id: Number(fromApplicationId) },
resource_two: { type: 'application', id: Number(toApplicationId) },
resource_one: { type: 'application', uuid: fromApplicationId },
resource_two: { type: 'application', uuid: toApplicationId },
}),
});
const payload = (await response.json()) as { connection?: V5ResourceConnection; message?: string; detail?: string };
@@ -896,7 +896,7 @@ function normalizeConnection(connection: V5ResourceConnection): CanvasConnection
'X-CSRF-TOKEN': csrfToken(),
},
body: JSON.stringify({
server_id: selectedNginxServerId || null,
server_uuid: selectedNginxServerId || null,
image: nginxImage.trim() || DEFAULT_NGINX_IMAGE,
}),
});