starred/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-11-06 13:10:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into origin/next

Browse Source 
# Conflicts:
#	app/Livewire/Dashboard.php
#	app/Livewire/Dashboard/ActiveDeployments.php
#	resources/views/livewire/team/member.blade.php
#	tests/Feature/Security/PrivateKeyServerLookupTest.php
This commit is contained in:
Andras Bacsai
2026-10-29 21:20:31 +01:00
parent b85a9197a1 0d398ced24
commit ca6eb20a38
5 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/livewire/server/index.blade.php
+12 -2
View File
@@ -61,6 +61,7 @@
'name' => $server->name,
'description' => $server->description,
'href' => route('server.show', ['server_uuid' => $server->uuid]),
'patchesHref' => route('server.security.patches', ['server_uuid' => $server->uuid]),
'status' => $status,
'statusType' => $statusType,
'resourceCount' => $server->definedResources()->count(),
@@ -91,6 +92,9 @@
.some(value => String(value || '').toLowerCase().includes(query))
);
},
openPatches(url) {
window.Livewire.navigate(url);
},
setViewMode(mode) {
this.viewMode = mode;
this.$wire.saveListView('servers', mode);
@@ -167,7 +171,10 @@
$cardPatchBadges = array_filter($serverRow['patchBadges'], fn ($badge) => $badge['type'] !== 'success');
@endphp
@if ($cardPatchBadges !== [])
<div class="relative z-10 mt-auto flex flex-wrap gap-1.5 pt-3"
<div class="relative z-10 mt-auto flex cursor-pointer flex-wrap gap-1.5 pt-3"
role="link" tabindex="0" aria-label="Open patches"
@click.prevent.stop="openPatches(@js($serverRow['patchesHref']))"
@keydown.enter.prevent.stop="openPatches(@js($serverRow['patchesHref']))"
data-tooltip="{{ $serverRow['patchCheckedAt'] }}">
@foreach ($cardPatchBadges as $badge)
<x-status-badge :status="$badge['label']" :type="$badge['type']" />
@@ -222,7 +229,10 @@
</span>
</div>
@if ($showPatches)
<div class="hidden flex-wrap gap-1 lg:flex" :data-tooltip="server.patchCheckedAt">
<div class="hidden cursor-pointer flex-wrap gap-1 lg:flex" :data-tooltip="server.patchCheckedAt"
role="link" tabindex="0" aria-label="Open patches"
@click.prevent.stop="openPatches(server.patchesHref)"
@keydown.enter.prevent.stop="openPatches(server.patchesHref)">
<template x-for="badge in server.patchBadges" :key="badge.label">
<x-status-badge :dynamic="true">
<span class="relative inline-flex size-1.5 shrink-0 rounded-full"