Merge pull request #1576 from coollabsio/next

v4.0.0-beta.175

app/Http/Middleware/DecideWhatToDoWithUser.php

@@ -25,14 +25,14 @@ class DecideWhatToDoWithUser
             if ($request->path() === 'verify' || in_array($request->path(), allowedPathsForInvalidAccounts()) || $request->routeIs('verify.verify')) {
                 return $next($request);
             }
-            return redirect()-route('verify.email');
+            return redirect()->route('verify.email');
         }
         if (!isSubscriptionActive() && !isSubscriptionOnGracePeriod()) {
             if (!in_array($request->path(), allowedPathsForUnsubscribedAccounts())) {
                 if (Str::startsWith($request->path(), 'invitations')) {
                     return $next($request);
                 }
-                return redirect()->route('subscription');
+                return redirect()->route('subscription.index');
             }
         }
         if (showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {

app/Livewire/Project/EnvironmentEdit.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Livewire\Project;
+
+use App\Models\Application;
+use App\Models\Project;
+use Livewire\Component;
+
+class EnvironmentEdit extends Component
+{
+    public Project $project;
+    public Application $application;
+    public $environment;
+    public array $parameters;
+
+    protected $rules = [
+        'environment.name' => 'required|min:3|max:255',
+        'environment.description' => 'nullable|min:3|max:255',
+    ];
+    public function mount() {
+        $this->parameters = get_route_parameters();
+
+        $this->project = Project::ownedByCurrentTeam()->where('uuid', request()->route('project_uuid'))->first();
+        $this->environment = $this->project->environments()->where('name', request()->route('environment_name'))->first();
+    }
+
+    public function submit()
+    {
+        $this->validate();
+        try {
+            $this->environment->save();
+            return redirect()->route('project.environment.edit', ['project_uuid' => $this->project->uuid, 'environment_name' => $this->environment->name]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.environment-edit');
+    }
+}

app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -55,8 +55,12 @@ class GithubPrivateRepositoryDeployKey extends Component
         }
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
+        if (isDev()) {
+            $this->private_keys = PrivateKey::where('team_id', currentTeam()->id)->get();
+        } else {
             $this->private_keys = PrivateKey::where('team_id', currentTeam()->id)->where('id', '!=', 0)->get();
         }
+    }
 
     public function instantSave()
     {

app/Models/Application.php

@@ -382,6 +382,9 @@ class Application extends BaseModel
 
     public function deploymentType()
     {
+        if (isDev() && data_get($this, 'private_key_id') === 0) {
+            return 'deploy_key';
+        }
         if (data_get($this, 'private_key_id')) {
             return 'deploy_key';
         } else if (data_get($this, 'source')) {
@@ -859,9 +862,12 @@ class Application extends BaseModel
             }
             $private_key = base64_encode($private_key);
             $git_clone_command_base = "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$customRepository} {$baseDir}";
-            if (!$only_checkout) {
+            if ($only_checkout) {
+                $git_clone_command = $git_clone_command_base;
+            } else {
                 $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command_base);
             }
+            ray($git_clone_command);
             if ($exec_in_docker) {
                 $commands = collect([
                     executeInDocker($deployment_uuid, "mkdir -p /root/.ssh"),
@@ -979,6 +985,7 @@ class Application extends BaseModel
         //     $fileList->push(".$prComposeFile");
         // }
         $commands = collect([
+            "rm -rf /tmp/{$uuid}",
             "mkdir -p /tmp/{$uuid} && cd /tmp/{$uuid}",
             $cloneCommand,
             "git sparse-checkout init --cone",

bootstrap/helpers/docker.php

@@ -216,6 +216,7 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
     $labels = collect([]);
     $labels->push('traefik.enable=true');
     foreach ($domains as $loop => $domain) {
+        try {
             $uuid = new Cuid2(7);
             $url = Url::fromString($domain);
             $host = $url->getHost();
@@ -265,6 +266,10 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $labels->push("traefik.http.middlewares.{$http_label}-stripprefix.stripprefix.prefixes={$path}");
                 }
             }
+        } catch(\Throwable $e) {
+            continue;
+        }
+
     }
 
     return $labels;

bootstrap/helpers/shared.php

@@ -102,6 +102,7 @@ function refreshSession(?Team $team = null): void
 }
 function handleError(?Throwable $error = null, ?Livewire\Component $livewire = null, ?string $customErrorMessage = null)
 {
+    ray($error);
     if ($error instanceof TooManyRequestsException) {
         if (isset($livewire)) {
             return $livewire->dispatch('error', "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.");
@@ -227,11 +228,15 @@ function base_ip(): string
 }
 function getFqdnWithoutPort(String $fqdn)
 {
+    try {
         $url = Url::fromString($fqdn);
         $host = $url->getHost();
         $scheme = $url->getScheme();
         $path = $url->getPath();
         return "$scheme://$host$path";
+    } catch (\Throwable $e) {
+        return $fqdn;
+    }
 }
 /**
  * If fqdn is set, return it, otherwise return public ip.
@@ -1520,6 +1525,9 @@ function parseEnvVariable(Str|string $value)
             $command = $value->after('SERVICE_')->before('_');
             $forService = $value->after('SERVICE_')->after('_')->before('_');
             $port = $value->afterLast('_');
+            if (filter_var($port, FILTER_VALIDATE_INT) === false) {
+                $port = null;
+            }
         } else {
             // SERVICE_BASE64_64_UMAMI
             $command = $value->after('SERVICE_')->beforeLast('_');

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.174',
+    'release' => '4.0.0-beta.175',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.174';
+return '4.0.0-beta.175';

database/migrations/2023_12_30_134507_add_description_to_environments.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('environments', function (Blueprint $table) {
+            $table->string('description')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('environments', function (Blueprint $table) {
+            $table->dropColumn('description');
+        });
+    }
+};

resources/views/livewire/project/environment-edit.blade.php

@@ -0,0 +1,44 @@
+<div>
+    <form wire:submit='submit' class="flex flex-col">
+        <div class="flex items-end gap-2">
+            <h1>Environment: {{ data_get($environment, 'name') }}</h1>
+            <x-forms.button type="submit">Save</x-forms.button>
+        </div>
+        <nav class="flex pt-2 pb-10">
+            <ol class="flex items-center">
+                <li class="inline-flex items-center">
+                    <a class="text-xs truncate lg:text-sm"
+                        href="{{ route('project.show', ['project_uuid' => request()->route('project_uuid')]) }}">
+                        {{ $project->name }}</a>
+                </li>
+                <li>
+                    <div class="flex items-center">
+                        <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold text-warning" fill="currentColor"
+                            viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                            <path fill-rule="evenodd"
+                                d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
+                                clip-rule="evenodd"></path>
+                        </svg>
+                        <a class="text-xs truncate lg:text-sm"
+                            href="{{ route('project.resources', ['environment_name' => request()->route('environment_name'), 'project_uuid' => request()->route('project_uuid')]) }}">{{ request()->route('environment_name') }}</a>
+                    </div>
+                </li>
+                <li>
+                    <div class="flex items-center">
+                        <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold text-warning" fill="currentColor"
+                            viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                            <path fill-rule="evenodd"
+                                d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
+                                clip-rule="evenodd"></path>
+                        </svg>
+                        Edit
+                    </div>
+                </li>
+            </ol>
+        </nav>
+        <div class="flex gap-2">
+            <x-forms.input label="Name" id="environment.name" />
+            <x-forms.input label="Description" id="environment.description" />
+        </div>
+    </form>
+</div>

resources/views/project/show.blade.php

@@ -10,12 +10,35 @@
     <div class="text-xs truncate subtitle lg:text-sm">{{ $project->name }}</div>
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($project->environments as $environment)
-            <a  class="items-center justify-center font-bold box"
+            <div class="gap-2 border border-transparent cursor-pointer box group" x-data
+                x-on:click="goto('{{ $project->uuid }}','{{ $environment->name }}')">
+                <a class="flex flex-col flex-1 mx-6 hover:no-underline"
                     href="{{ route('project.resources', [$project->uuid, $environment->name]) }}">
-                {{ $environment->name }}
+                    <div class="font-bold text-white"> {{ $environment->name }}</div>
+                    <div class="description ">
+                        {{ $environment->description }}</div>
                 </a>
+                <div class="flex items-center">
+                    <a class="mx-4 rounded group-hover:text-white"
+                        href="{{ route('project.environment.edit', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => $environment->name]) }}">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                            stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                            <path
+                                d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z" />
+                            <path d="M9 12a3 3 0 1 0 6 0a3 3 0 0 0 -6 0" />
+                        </svg>
+                    </a>
+                </div>
+            </div>
         @empty
             <p>No environments found.</p>
         @endforelse
+        <script>
+            function goto(projectUuid, environmentName) {
+                window.location.href = '/project/' + projectUuid + '/' + environmentName;
+            }
+        </script>
     </div>
 </x-layout>

routes/web.php

@@ -13,6 +13,7 @@ use App\Livewire\Project\Service\Show as ServiceShow;
 use App\Livewire\Dev\Compose as Compose;
 use App\Livewire\Dashboard;
 use App\Livewire\Project\CloneProject;
+use App\Livewire\Project\EnvironmentEdit;
 use App\Livewire\Project\Shared\ExecuteContainerCommand;
 use App\Livewire\Project\Shared\Logs;
 use App\Livewire\Security\ApiTokens;
@@ -113,6 +114,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
 
     Route::get('/project/{project_uuid}/{environment_name}/new', [ProjectController::class, 'new'])->name('project.resources.new');
     Route::get('/project/{project_uuid}/{environment_name}', [ProjectController::class, 'resources'])->name('project.resources');
+    Route::get('/project/{project_uuid}/{environment_name}/edit', EnvironmentEdit::class)->name('project.environment.edit');
 
     // Applications
     Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}', ApplicationConfiguration::class)->name('project.application.configuration');

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.174"
+            "version": "4.0.0-beta.175"
         }
     }
 }