Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

fix(domains): remove the in-page title and domain count

Andras Bacsai0ae8faa07b6f
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 --}}
- <div class="flex flex-wrap items-center gap-2">
- <div class="min-w-0 flex-1">
- <h2 id="domains-section">Domains</h2>
- <p class="text-[13px] text-neutral-500 dark:text-fg-dim">
- {{ $configuredCount }} domain{{ $configuredCount === 1 ? '' : 's' }}
- @if ($suggestedCount > 0)
- · {{ $suggestedCount }} not added
- @endif
- </p>
- </div>
+ <div id="domains-section" class="flex flex-wrap items-center gap-2">
+ @if ($hasRows)
+ <div class="relative w-full sm:w-64">
+ <x-reicon name="search"
+ class="pointer-events-none absolute top-1/2 left-2.5 z-10 size-3.5 -translate-y-1/2 text-neutral-400 dark:text-fg-faint" />
+ <input type="search" x-model="domainSearch" aria-label="Search services or domains"
+ class="input h-8! w-full pl-8! text-[13px]!" placeholder="Search services or domains" />
+ </div>
+ @endif
<div class="ml-auto flex flex-wrap items-center gap-2">
- @if ($hasRows)
- <div class="relative w-full sm:w-64">
- <x-reicon name="search"
- class="pointer-events-none absolute top-1/2 left-2.5 z-10 size-3.5 -translate-y-1/2 text-neutral-400 dark:text-fg-faint" />
- <input type="search" x-model="domainSearch" aria-label="Search services or domains"
- class="input h-8! w-full pl-8! text-[13px]!" placeholder="Search services or domains" />
- </div>
- @endif
@can('update', $application)
<x-forms.button wire:click="checkAllDns" :showLoadingIndicator="false" wire:loading.attr="disabled" wire:target="checkAllDns,checkDomainDns">
<x-reicon name="refresh" class="size-3.5" />
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 --}}
- <div class="flex flex-wrap items-center gap-2">
- <div class="min-w-0 flex-1">
- <h2 id="domains-section">Domains</h2>
- <p class="text-[13px] text-neutral-500 dark:text-fg-dim">
- {{ $configuredCount }} domain{{ $configuredCount === 1 ? '' : 's' }} across {{ $domainGroups->count() }} service{{ $domainGroups->count() === 1 ? '' : 's' }}
- @if ($suggestedCount > 0)
- · {{ $suggestedCount }} not added
- @endif
- </p>
- </div>
+ <div id="domains-section" class="flex flex-wrap items-center gap-2">
+ @if ($domainGroups->isNotEmpty())
+ <div class="relative w-full sm:w-64">
+ <x-reicon name="search"
+ class="pointer-events-none absolute top-1/2 left-2.5 z-10 size-3.5 -translate-y-1/2 text-neutral-400 dark:text-fg-faint" />
+ <input type="search" x-model="domainSearch" aria-label="Search services or domains"
+ class="input h-8! w-full pl-8! text-[13px]!" placeholder="Search services or domains" />
+ </div>
+ @endif
<div class="ml-auto flex flex-wrap items-center gap-2">
- @if ($domainGroups->isNotEmpty())
- <div class="relative w-full sm:w-64">
- <x-reicon name="search"
- class="pointer-events-none absolute top-1/2 left-2.5 z-10 size-3.5 -translate-y-1/2 text-neutral-400 dark:text-fg-faint" />
- <input type="search" x-model="domainSearch" aria-label="Search services or domains"
- class="input h-8! w-full pl-8! text-[13px]!" placeholder="Search services or domains" />
- </div>
- @endif
@can('update', $service)
@if ($configuredCount > 0)
<x-forms.button wire:click="checkAllDns" :showLoadingIndicator="false" wire:loading.attr="disabled"
diff --git a/tests/Feature/ServiceDomainsTest.php b/tests/Feature/ServiceDomainsTest.php
index e1893de8bc..b660d4d174 100644
--- a/tests/Feature/ServiceDomainsTest.php
+++ b/tests/Feature/ServiceDomainsTest.php
@@ -160,7 +160,6 @@ it('groups configured domains and shows redirect settings in the table', functio
->toContain('<span>DNS status</span>')
->not->toContain('<span>Last checked</span>')
->not->toContain("service-domain-group-{$this->webApp->id}")
- ->and(substr_count($html, '2 domains'))->toBe(1)
->and(substr_count($html, '<span>Domain</span>'))->toBe(1)
->and(substr_count($html, "id=\"service-domain-group-{$this->apiApp->id}\""))->toBe(1);
});