Merge remote-tracking branch 'origin/next' into fix/form-state

app/Livewire/Project/New/GithubPrivateRepository.php

@@ -71,7 +71,7 @@ class GithubPrivateRepository extends Component
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
         $this->repositories = $this->branches = collect();
-        $this->github_apps = GithubApp::where('team_id', currentTeam()->id)
+        $this->github_apps = GithubApp::ownedByCurrentTeam()
             ->where('is_public', false)
             ->whereNotNull('app_id')
             ->get();
@@ -106,7 +106,7 @@ class GithubPrivateRepository extends Component
         $this->total_branches_count = 0;
         $this->page = 1;
         $this->selected_github_app_id = $github_app_id;
-        $this->github_app = GithubApp::where('team_id', currentTeam()->id)
+        $this->github_app = GithubApp::ownedByCurrentTeam()
             ->where('is_public', false)
             ->whereNotNull('app_id')
             ->findOrFail($github_app_id);

app/Livewire/Project/Shared/Destination.php

@@ -112,18 +112,22 @@ class Destination extends Component
     {
         try {
             $server = Server::ownedByCurrentTeam()->findOrFail($server_id);
-            $network = StandaloneDocker::ownedByCurrentTeam()->findOrFail($network_id);
+            $network = StandaloneDocker::ownedByCurrentTeam()->where('server_id', $server->id)->findOrFail($network_id);
             $this->authorize('update', $this->resource);
 
-            $main_destination = $this->resource->destination;
-            $this->resource->update([
-                'destination_id' => $network->id,
-                'destination_type' => StandaloneDocker::class,
-            ]);
-            $this->resource->additional_networks()->detach($network->id, ['server_id' => $server->id]);
-            $this->resource->additional_networks()->attach($main_destination->id, ['server_id' => $main_destination->server->id]);
-            $this->refreshServers();
+            $this->resource->getConnection()->transaction(function () use ($network, $server) {
+                $main_destination = $this->resource->destination;
+                $this->resource->update([
+                    'destination_id' => $network->id,
+                    'destination_type' => StandaloneDocker::class,
+                ]);
+                $this->resource->additional_networks()
+                    ->wherePivot('server_id', $server->id)
+                    ->detach($network->id);
+                $this->resource->additional_networks()->attach($main_destination->id, ['server_id' => $main_destination->server->id]);
+            });
             $this->resource->refresh();
+            $this->refreshServers();
         } catch (\Exception $e) {
             return handleError($e, $this);
         }
@@ -140,7 +144,7 @@ class Destination extends Component
     {
         try {
             $server = Server::ownedByCurrentTeam()->findOrFail($server_id);
-            $network = StandaloneDocker::ownedByCurrentTeam()->findOrFail($network_id);
+            $network = StandaloneDocker::ownedByCurrentTeam()->where('server_id', $server->id)->findOrFail($network_id);
             $this->authorize('update', $this->resource);
 
             $this->resource->additional_networks()->attach($network->id, ['server_id' => $server->id]);
@@ -164,7 +168,9 @@ class Destination extends Component
             }
             $server = Server::ownedByCurrentTeam()->findOrFail($server_id);
             StopApplicationOneServer::run($this->resource, $server);
-            $this->resource->additional_networks()->detach($network_id, ['server_id' => $server_id]);
+            $this->resource->additional_networks()
+                ->wherePivot('server_id', $server_id)
+                ->detach($network_id);
             $this->loadData();
             $this->dispatch('refresh');
             ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));

app/Livewire/Source/Github/Change.php

@@ -21,6 +21,10 @@ class Change extends Component
 
     public string $webhook_endpoint = '';
 
+    public string $custom_webhook_endpoint = '';
+
+    public bool $use_custom_webhook_endpoint = false;
+
     public ?string $ipv4 = null;
 
     public ?string $ipv6 = null;
@@ -76,6 +80,8 @@ class Change extends Component
 
     public string $manifestState = '';
 
+    public string $activeTab = 'general';
+
     protected function rules(): array
     {
         return [
@@ -95,6 +101,9 @@ class Change extends Component
             'metadata' => 'nullable|string',
             'pullRequests' => 'nullable|string',
             'privateKeyId' => 'nullable|int',
+            'webhook_endpoint' => ['required', 'string', 'url'],
+            'custom_webhook_endpoint' => ['nullable', 'string', 'url'],
+            'use_custom_webhook_endpoint' => ['required', 'bool'],
         ];
     }
 
@@ -263,10 +272,18 @@ class Change extends Component
                 }
             }
             $this->parameters = get_route_parameters();
+            $routeName = request()->route()?->getName();
+            if ($routeName === 'source.github.permissions') {
+                $this->activeTab = 'permissions';
+            } elseif ($routeName === 'source.github.resources') {
+                $this->activeTab = 'resources';
+            } else {
+                $this->activeTab = 'general';
+            }
             if (isCloud() && ! isDev()) {
                 $this->webhook_endpoint = config('app.url');
             } else {
-                $this->webhook_endpoint = $this->fqdn ?? $this->ipv4 ?? '';
+                $this->webhook_endpoint = $this->fqdn ?? $this->ipv4 ?? $this->ipv6 ?? config('app.url') ?? '';
                 $this->is_system_wide = $this->github_app->is_system_wide;
             }
         } catch (\Throwable $e) {