diff --git a/app/Livewire/Project/Resource/EnvironmentSelect.php b/app/Livewire/Project/Resource/EnvironmentSelect.php deleted file mode 100644 index a38d750da..000000000 --- a/app/Livewire/Project/Resource/EnvironmentSelect.php +++ /dev/null @@ -1,35 +0,0 @@ -selectedEnvironment = request()->route('environment_uuid'); - $this->project_uuid = request()->route('project_uuid'); - } - - public function updatedSelectedEnvironment($value) - { - if ($value === 'edit') { - return redirect()->route('project.show', [ - 'project_uuid' => $this->project_uuid, - ]); - } else { - return redirect()->route('project.resource.index', [ - 'project_uuid' => $this->project_uuid, - 'environment_uuid' => $value, - ]); - } - } -} diff --git a/resources/views/components/resources/breadcrumbs.blade.php b/resources/views/components/resources/breadcrumbs.blade.php index 215adbb2a..f84f4287a 100644 --- a/resources/views/components/resources/breadcrumbs.blade.php +++ b/resources/views/components/resources/breadcrumbs.blade.php @@ -5,7 +5,10 @@ ]) @php $projects = auth()->user()->currentTeam()->projects()->get(); - $environments = $resource->environment->project->environments()->with(['applications', 'services'])->get(); + $environments = $resource->environment->project + ->environments() + ->with(['applications', 'services']) + ->get(); $currentProjectUuid = data_get($resource, 'environment.project.uuid'); $currentEnvironmentUuid = data_get($resource, 'environment.uuid'); $currentResourceUuid = data_get($resource, 'uuid'); @@ -20,17 +23,17 @@ {{ data_get($resource, 'environment.project.name', 'Undefined Name') }} - - + -
@foreach ($projects as $project)
  • -
    +
    - - + -
    +
    -
    +
    @foreach ($environments as $environment) @php $envResources = collect() - ->merge($environment->applications->map(fn($app) => ['type' => 'application', 'resource' => $app])) - ->merge($environment->databases()->map(fn($db) => ['type' => 'database', 'resource' => $db])) - ->merge($environment->services->map(fn($svc) => ['type' => 'service', 'resource' => $svc])); + ->merge( + $environment->applications->map( + fn($app) => ['type' => 'application', 'resource' => $app], + ), + ) + ->merge( + $environment + ->databases() + ->map(fn($db) => ['type' => 'database', 'resource' => $db]), + ) + ->merge( + $environment->services->map( + fn($svc) => ['type' => 'service', 'resource' => $svc], + ), + ); @endphp - @foreach ($environments as $environment) @php $envResources = collect() - ->merge($environment->applications->map(fn($app) => ['type' => 'application', 'resource' => $app])) - ->merge($environment->databases()->map(fn($db) => ['type' => 'database', 'resource' => $db])) - ->merge($environment->services->map(fn($svc) => ['type' => 'service', 'resource' => $svc])); + ->merge( + $environment->applications->map( + fn($app) => ['type' => 'application', 'resource' => $app], + ), + ) + ->merge( + $environment + ->databases() + ->map(fn($db) => ['type' => 'database', 'resource' => $db]), + ) + ->merge( + $environment->services->map(fn($svc) => ['type' => 'service', 'resource' => $svc]), + ); @endphp @if ($envResources->count() > 0)
    -
    + @mouseenter="activeEnv = '{{ $environment->uuid }}'" + @mouseleave="activeEnv = null; activeRes = null" class="ml-1 flex items-start"> +
    @foreach ($envResources as $envResource) @php $resType = $envResource['type']; $res = $envResource['resource']; - $resRoute = match($resType) { + $resRoute = match ($resType) { 'application' => route('project.application.configuration', [ 'project_uuid' => $currentProjectUuid, 'environment_uuid' => $environment->uuid, @@ -132,13 +174,16 @@ }; $isCurrentResource = $res->uuid === $currentResourceUuid; @endphp -
    + @@ -164,110 +209,182 @@ $resKey = $environment->uuid . '-' . $res->uuid; @endphp
    -
    +
    @if ($resType === 'application') -
    + - Deployments - Logs + Deployments + Logs @can('canAccessTerminal') - Terminal + Terminal @endcan @elseif ($resType === 'service') -
    + - Logs + Logs @can('canAccessTerminal') - Terminal + Terminal @endcan @else -
    + - Logs + Logs @can('canAccessTerminal') - Terminal + Terminal @endcan @if ( $res->getMorphClass() === 'App\Models\StandalonePostgresql' || - $res->getMorphClass() === 'App\Models\StandaloneMongodb' || - $res->getMorphClass() === 'App\Models\StandaloneMysql' || - $res->getMorphClass() === 'App\Models\StandaloneMariadb') - Backups + $res->getMorphClass() === 'App\Models\StandaloneMongodb' || + $res->getMorphClass() === 'App\Models\StandaloneMysql' || + $res->getMorphClass() === 'App\Models\StandaloneMariadb') + Backups @endif @endif
    @@ -299,7 +416,8 @@ } @endphp
  • -
    +
    - - + + -
    - @@ -392,9 +518,9 @@ @endcan @if ( $resourceType === 'App\Models\StandalonePostgresql' || - $resourceType === 'App\Models\StandaloneMongodb' || - $resourceType === 'App\Models\StandaloneMysql' || - $resourceType === 'App\Models\StandaloneMariadb') + $resourceType === 'App\Models\StandaloneMongodb' || + $resourceType === 'App\Models\StandaloneMysql' || + $resourceType === 'App\Models\StandaloneMariadb') Backups @@ -404,49 +530,99 @@
    -
    diff --git a/resources/views/livewire/project/environment-edit.blade.php b/resources/views/livewire/project/environment-edit.blade.php index 078d93456..1e1cdb9a7 100644 --- a/resources/views/livewire/project/environment-edit.blade.php +++ b/resources/views/livewire/project/environment-edit.blade.php @@ -17,12 +17,6 @@ {{ $project->name }} -
  • @@ -35,7 +29,7 @@
  • -
    + @php + $projects = auth()->user()->currentTeam()->projects()->get(); + @endphp
  • @@ -167,7 +422,8 @@
    @@ -216,7 +472,8 @@