diff --git a/resources/views/livewire/project/application/domains.blade.php b/resources/views/livewire/project/application/domains.blade.php index db316c36f1..f900c57506 100644 --- a/resources/views/livewire/project/application/domains.blade.php +++ b/resources/views/livewire/project/application/domains.blade.php @@ -1,6 +1,4 @@ @php - $configuredCount = collect($domainRows)->where('is_suggested', false)->count(); - $suggestedCount = collect($domainRows)->where('is_suggested', true)->count(); $hasRows = count($domainRows) > 0; $hasDnsChecksInProgress = collect($domainRows)->contains(fn ($row) => $row['dns_status'] === 'checking'); $composeDomainGroups = collect($domainRows) @@ -81,25 +79,16 @@ @endcannot {{-- Toolbar --}} -
-
-

Domains

-

- {{ $configuredCount }} domain{{ $configuredCount === 1 ? '' : 's' }} - @if ($suggestedCount > 0) - · {{ $suggestedCount }} not added - @endif -

-
+
+ @if ($hasRows) +
+ + +
+ @endif
- @if ($hasRows) -
- - -
- @endif @can('update', $application) diff --git a/resources/views/livewire/project/service/domains.blade.php b/resources/views/livewire/project/service/domains.blade.php index e40ab95145..293ff827d2 100644 --- a/resources/views/livewire/project/service/domains.blade.php +++ b/resources/views/livewire/project/service/domains.blade.php @@ -1,6 +1,5 @@ @php $configuredCount = collect($domainRows)->where('is_suggested', false)->count(); - $suggestedCount = collect($domainRows)->where('is_suggested', true)->count(); $hasRows = count($domainRows) > 0; $hasDnsChecksInProgress = collect($domainRows)->contains(fn ($row) => $row['dns_status'] === 'checking'); $serviceAppCount = count($serviceApps); @@ -69,25 +68,16 @@ @endcannot {{-- Toolbar --}} -
-
-

Domains

-

- {{ $configuredCount }} domain{{ $configuredCount === 1 ? '' : 's' }} across {{ $domainGroups->count() }} service{{ $domainGroups->count() === 1 ? '' : 's' }} - @if ($suggestedCount > 0) - · {{ $suggestedCount }} not added - @endif -

-
+
+ @if ($domainGroups->isNotEmpty()) +
+ + +
+ @endif
- @if ($domainGroups->isNotEmpty()) -
- - -
- @endif @can('update', $service) @if ($configuredCount > 0) toContain('DNS status') ->not->toContain('Last checked') ->not->toContain("service-domain-group-{$this->webApp->id}") - ->and(substr_count($html, '2 domains'))->toBe(1) ->and(substr_count($html, 'Domain'))->toBe(1) ->and(substr_count($html, "id=\"service-domain-group-{$this->apiApp->id}\""))->toBe(1); });