Merge pull request #226 from lara-zeus/fix-badge-count

fix badge count for multi tenant
lara-zeus · Jan 8, 2024 · 3099ab3 · 3099ab3
2 parents 1265011 + 6017526
commit 3099ab3
Show file tree

Hide file tree

Showing 8 changed files with 506 additions and 467 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           coverage: none
 
       - name: Install composer dependencies

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,17 +13,12 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.0, 8.1]
-        laravel: [9.*, 10.*]
+        php: [8.2]
+        laravel: [10.*]
         stability: [prefer-stable]
         include:
-          - laravel: 9.*
-            testbench: 7.*
           - laravel: 10.*
             testbench: 8.*
-        exclude:
-          - laravel: 10.*
-            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/composer.lock b/composer.lock
diff --git a/src/Filament/Resources/BoltResource.php b/src/Filament/Resources/BoltResource.php
@@ -16,11 +16,6 @@ public static function canViewAny(): bool
             && parent::canViewAny();
     }
 
-    public static function getNavigationBadge(): ?string
-    {
-        return (string) static::getModel()::query()->count();
-    }
-
     public static function getNavigationGroup(): ?string
     {
         return BoltPlugin::get()->getNavigationGroupLabel();

diff --git a/src/Filament/Resources/CategoryResource.php b/src/Filament/Resources/CategoryResource.php
@@ -45,6 +45,11 @@ public static function getModel(): string
         return BoltPlugin::getModel('Category');
     }
 
+    public static function getNavigationBadge(): ?string
+    {
+        return (string) BoltPlugin::getModel('Category')::query()->count();
+    }
+
     public static function getGloballySearchableAttributes(): array
     {
         return ['name', 'slug'];

diff --git a/src/Filament/Resources/CollectionResource.php b/src/Filament/Resources/CollectionResource.php
@@ -30,6 +30,11 @@ public static function getModel(): string
         return BoltPlugin::getModel('Collection');
     }
 
+    public static function getNavigationBadge(): ?string
+    {
+        return (string) BoltPlugin::getModel('Collection')::query()->count();
+    }
+
     public static function getGloballySearchableAttributes(): array
     {
         return ['name', 'values'];

diff --git a/src/Filament/Resources/FormResource.php b/src/Filament/Resources/FormResource.php
@@ -52,6 +52,11 @@ public static function getModel(): string
         return BoltPlugin::getModel('Form');
     }
 
+    public static function getNavigationBadge(): ?string
+    {
+        return (string) BoltPlugin::getModel('Form')::query()->count();
+    }
+
     public static function getGloballySearchableAttributes(): array
     {
         return ['name', 'slug'];

diff --git a/src/Filament/Resources/ResponseResource.php b/src/Filament/Resources/ResponseResource.php
@@ -35,6 +35,11 @@ public static function getModel(): string
         return BoltPlugin::getModel('Response');
     }
 
+    public static function getNavigationBadge(): ?string
+    {
+        return (string) BoltPlugin::getModel('Response')::query()->count();
+    }
+
     public static function getModelLabel(): string
     {
         return __('Entries');