From 87547d562279ddf85fc2a58890776d1d0119c669 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 13 Jun 2023 10:59:27 +0200
Subject: [PATCH] fix

---
 .../Project/New/GithubPrivateRepository.php        | 14 +++++++-------
 app/Models/GithubApp.php                           |  4 ++--
 resources/views/source/all.blade.php               |  7 +++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/Http/Livewire/Project/New/GithubPrivateRepository.php b/app/Http/Livewire/Project/New/GithubPrivateRepository.php
index 73b07984b..09ae573f3 100644
--- a/app/Http/Livewire/Project/New/GithubPrivateRepository.php
+++ b/app/Http/Livewire/Project/New/GithubPrivateRepository.php
@@ -42,6 +42,13 @@ class GithubPrivateRepository extends Component
     public bool $is_static = false;
     public string|null $publish_directory = null;
 
+    public function mount()
+    {
+        $this->parameters = get_parameters();
+        $this->query = request()->query();
+        $this->repositories = $this->branches = collect();
+        $this->github_apps = GithubApp::private();
+    }
     protected function loadRepositoryByPage()
     {
         $response = Http::withToken($this->token)->get("{$this->github_app->api_url}/installation/repositories?per_page=100&page={$this->page}");
@@ -152,11 +159,4 @@ class GithubPrivateRepository extends Component
         }
         $this->emit('saved', 'Application settings updated!');
     }
-    public function mount()
-    {
-        $this->parameters = get_parameters();
-        $this->query = request()->query();
-        $this->repositories = $this->branches = collect();
-        $this->github_apps = GithubApp::private();
-    }
 }
diff --git a/app/Models/GithubApp.php b/app/Models/GithubApp.php
index df76efcf5..6c858a35d 100644
--- a/app/Models/GithubApp.php
+++ b/app/Models/GithubApp.php
@@ -41,10 +41,10 @@ class GithubApp extends BaseModel
     }
     static public function public()
     {
-        return GithubApp::where('team_id', session('currentTeam')->id)->where('is_public', true)->get();
+        return GithubApp::whereTeamId(session('currentTeam')->id)->whereisPublic(true)->whereNotNull('app_id')->get();
     }
     static public function private()
     {
-        return GithubApp::where('team_id', session('currentTeam')->id)->where('is_public', false)->get();
+        return GithubApp::whereTeamId(session('currentTeam')->id)->whereisPublic(false)->whereNotNull('app_id')->get();
     }
 }
diff --git a/resources/views/source/all.blade.php b/resources/views/source/all.blade.php
index 6ca3fca40..d251ab163 100644
--- a/resources/views/source/all.blade.php
+++ b/resources/views/source/all.blade.php
@@ -9,7 +9,11 @@
                     <x-git-icon class="text-white w-9 h-9" git="{{ $source->getMorphClass() }}" />
                     <div class="group-hover:text-white">
                         <div>{{ $source->name }}</div>
+                        @if (is_null($source->app_id))
+                            <span class="text-error">Not registered</span>
+                        @endif
                     </div>
+
                 </a>
             @endif
             @if ($source->getMorphClass() === 'App\Models\GitlabApp')
@@ -18,6 +22,9 @@
                     <x-git-icon class="text-white w-9 h-9" git="{{ $source->getMorphClass() }}" />
                     <div class="group-hover:text-white">
                         <div>{{ $source->name }}</div>
+                        @if (is_null($source->app_id))
+                            <span class="text-error">Not registered</span>
+                        @endif
                     </div>
                 </a>
             @endif