Display even if there's no limit

pelican-dev · Jan 29, 2025 · 52ff3a9 · 52ff3a9
1 parent 0ce8253
commit 52ff3a9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/app/Filament/Server/Resources/BackupResource.php b/app/Filament/Server/Resources/BackupResource.php
@@ -20,25 +20,31 @@ class BackupResource extends Resource
 
     protected static bool $canCreateAnother = false;
 
-    public static function getNavigationBadge(): ?string
+    public static function getNavigationBadge(): string
     {
         /** @var Server $server */
         $server = Filament::getTenant();
 
-        if ($server->backup_limit === 0) {
-            return null;
-        }
+        $limit = $server->backup_limit;
 
-        return $server->backups->count() . ' / ' . $server->backup_limit;
+        return $server->backups->count() . ($limit === 0 ? '' : ' / ' . $limit);
     }
 
-    public static function getNavigationBadgeColor(): string
+    public static function getNavigationBadgeColor(): ?string
     {
         /** @var Server $server */
         $server = Filament::getTenant();
 
-        return $server->backups->count() >= $server->backup_limit ? 'danger'
-            : ($server->backups->count() >= $server->backup_limit * 0.7 ? 'warning' : 'success');
+        $limit = $server->backup_limit;
+
+        if ($limit === 0) {
+            return null;
+        }
+
+        $count = $server->backups->count();
+
+        return $count >= $limit ? 'danger'
+            : ($count >= $limit * 0.7 ? 'warning' : 'success');
     }
 
     // TODO: find better way handle server conflict state

diff --git a/app/Filament/Server/Resources/DatabaseResource.php b/app/Filament/Server/Resources/DatabaseResource.php
@@ -18,25 +18,31 @@ class DatabaseResource extends Resource
 
     protected static ?string $navigationIcon = 'tabler-database';
 
-    public static function getNavigationBadge(): ?string
+    public static function getNavigationBadge(): string
     {
         /** @var Server $server */
         $server = Filament::getTenant();
 
-        if ($server->database_limit === 0) {
-            return null;
-        }
+        $limit = $server->database_limit;
 
-        return $server->databases->count() . ' / ' . $server->database_limit;
+        return $server->databases->count() . ($limit === 0 ? '' : ' / ' . $limit);
     }
 
-    public static function getNavigationBadgeColor(): string|array|null
+    public static function getNavigationBadgeColor(): ?string
     {
         /** @var Server $server */
         $server = Filament::getTenant();
 
-        return $server->databases->count() >= $server->database_limit ? 'danger'
-            : ($server->databases->count() >= $server->database_limit * 0.7 ? 'warning' : 'success');
+        $limit = $server->database_limit;
+        if ($limit === 0) {
+            return null;
+        }
+
+        $count = $server->databases->count();
+
+        return $count >= $limit
+            ? 'danger'
+            : ($count >= $limit * 0.7 ? 'warning' : 'success');
     }
 
     // TODO: find better way handle server conflict state

diff --git a/app/Filament/Server/Resources/UserResource.php b/app/Filament/Server/Resources/UserResource.php
@@ -38,7 +38,7 @@ class UserResource extends Resource
 
     protected static ?string $tenantOwnershipRelationshipName = 'subServers';
 
-    public static function getNavigationBadge(): ?string
+    public static function getNavigationBadge(): string
     {
         /** @var Server $server */
         $server = Filament::getTenant();