source-controls (#193)

* edit source control * assign project after creation * global and project scoped source controls
vitodeploy · May 7, 2024 · 179aefe · 179aefe
1 parent e704a13
commit 179aefe
Show file tree

Hide file tree

Showing 15 changed files with 362 additions and 10 deletions.
diff --git a/app/Actions/Projects/CreateProject.php b/app/Actions/Projects/CreateProject.php
@@ -14,18 +14,20 @@ public function create(User $user, array $input): Project
             $input['name'] = strtolower($input['name']);
         }
 
-        $this->validate($user, $input);
+        $this->validate($input);
 
         $project = new Project([
             'name' => $input['name'],
         ]);
 
         $project->save();
 
+        $project->users()->attach($user);
+
         return $project;
     }
 
-    private function validate(User $user, array $input): void
+    private function validate(array $input): void
     {
         Validator::make($input, [
             'name' => [

diff --git a/app/Actions/SourceControl/ConnectSourceControl.php b/app/Actions/SourceControl/ConnectSourceControl.php
@@ -3,21 +3,23 @@
 namespace App\Actions\SourceControl;
 
 use App\Models\SourceControl;
+use App\Models\User;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
 
 class ConnectSourceControl
 {
-    public function connect(array $input): void
+    public function connect(User $user, array $input): void
     {
         $this->validate($input);
 
         $sourceControl = new SourceControl([
             'provider' => $input['provider'],
             'profile' => $input['name'],
             'url' => Arr::has($input, 'url') ? $input['url'] : null,
+            'project_id' => isset($input['global']) && $input['global'] ? null : $user->current_project_id,
         ]);
 
         $this->validateProvider($sourceControl, $input);

diff --git a/app/Actions/SourceControl/EditSourceControl.php b/app/Actions/SourceControl/EditSourceControl.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Actions\SourceControl;
+
+use App\Models\SourceControl;
+use App\Models\User;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+
+class EditSourceControl
+{
+    public function edit(SourceControl $sourceControl, User $user, array $input): void
+    {
+        $this->validate($input);
+
+        $sourceControl->profile = $input['name'];
+        $sourceControl->url = isset($input['url']) ? $input['url'] : null;
+        $sourceControl->project_id = isset($input['global']) && $input['global'] ? null : $user->current_project_id;
+
+        $this->validateProvider($sourceControl, $input);
+
+        $sourceControl->provider_data = $sourceControl->provider()->createData($input);
+
+        if (! $sourceControl->provider()->connect()) {
+            throw ValidationException::withMessages([
+                'token' => __('Cannot connect to :provider or invalid token!', ['provider' => $sourceControl->provider]
+                ),
+            ]);
+        }
+
+        $sourceControl->save();
+    }
+
+    /**
+     * @throws ValidationException
+     */
+    private function validate(array $input): void
+    {
+        $rules = [
+            'name' => [
+                'required',
+            ],
+        ];
+        Validator::make($input, $rules)->validate();
+    }
+
+    /**
+     * @throws ValidationException
+     */
+    private function validateProvider(SourceControl $sourceControl, array $input): void
+    {
+        Validator::make($input, $sourceControl->provider()->createRules($input))->validate();
+    }
+}
diff --git a/app/Http/Controllers/Settings/SourceControlController.php b/app/Http/Controllers/Settings/SourceControlController.php
@@ -4,6 +4,7 @@
 
 use App\Actions\SourceControl\ConnectSourceControl;
 use App\Actions\SourceControl\DeleteSourceControl;
+use App\Actions\SourceControl\EditSourceControl;
 use App\Facades\Toast;
 use App\Helpers\HtmxResponse;
 use App\Http\Controllers\Controller;
@@ -14,16 +15,23 @@
 
 class SourceControlController extends Controller
 {
-    public function index(): View
+    public function index(Request $request): View
     {
-        return view('settings.source-controls.index', [
-            'sourceControls' => SourceControl::query()->orderByDesc('id')->get(),
-        ]);
+        $data = [
+            'sourceControls' => SourceControl::getByCurrentProject(),
+        ];
+
+        if ($request->has('edit')) {
+            $data['editSourceControl'] = SourceControl::find($request->input('edit'));
+        }
+
+        return view('settings.source-controls.index', $data);
     }
 
     public function connect(Request $request): HtmxResponse
     {
         app(ConnectSourceControl::class)->connect(
+            $request->user(),
             $request->input(),
         );
 
@@ -32,6 +40,19 @@ public function connect(Request $request): HtmxResponse
         return htmx()->redirect(route('settings.source-controls'));
     }
 
+    public function update(SourceControl $sourceControl, Request $request): HtmxResponse
+    {
+        app(EditSourceControl::class)->edit(
+            $sourceControl,
+            $request->user(),
+            $request->input(),
+        );
+
+        Toast::success('Source control updated.');
+
+        return htmx()->redirect(route('settings.source-controls'));
+    }
+
     public function delete(SourceControl $sourceControl): RedirectResponse
     {
         try {

diff --git a/app/Models/Project.php b/app/Models/Project.php
@@ -19,6 +19,7 @@
  * @property User $user
  * @property Collection<Server> $servers
  * @property Collection<NotificationChannel> $notificationChannels
+ * @property Collection<SourceControl> $sourceControls
  */
 class Project extends Model
 {
@@ -59,4 +60,9 @@ public function users(): BelongsToMany
     {
         return $this->belongsToMany(User::class, 'user_project')->withTimestamps();
     }
+
+    public function sourceControls(): HasMany
+    {
+        return $this->hasMany(SourceControl::class);
+    }
 }
diff --git a/app/Models/SourceControl.php b/app/Models/SourceControl.php
@@ -3,7 +3,9 @@
 namespace App\Models;
 
 use App\SourceControlProviders\SourceControlProvider;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
@@ -12,6 +14,7 @@
  * @property ?string $profile
  * @property ?string $url
  * @property string $access_token
+ * @property ?int $project_id
  */
 class SourceControl extends AbstractModel
 {
@@ -23,11 +26,13 @@ class SourceControl extends AbstractModel
         'profile',
         'url',
         'access_token',
+        'project_id',
     ];
 
     protected $casts = [
         'access_token' => 'encrypted',
         'provider_data' => 'encrypted:array',
+        'project_id' => 'integer',
     ];
 
     public function provider(): SourceControlProvider
@@ -46,4 +51,16 @@ public function sites(): HasMany
     {
         return $this->hasMany(Site::class);
     }
+
+    public function project(): BelongsTo
+    {
+        return $this->belongsTo(Project::class);
+    }
+
+    public static function getByCurrentProject(): Collection
+    {
+        return self::query()
+            ->where('project_id', auth()->user()->current_project_id)
+            ->orWhereNull('project_id')->get();
+    }
 }
diff --git a/database/migrations/2024_05_07_184201_add_project_id_to_source_controls_table.php b/database/migrations/2024_05_07_184201_add_project_id_to_source_controls_table.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('source_controls', function (Blueprint $table) {
+            $table->unsignedBigInteger('project_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('source_controls', function (Blueprint $table) {
+            $table->dropColumn('project_id');
+        });
+    }
+};
diff --git a/resources/views/components/checkbox.blade.php b/resources/views/components/checkbox.blade.php
@@ -0,0 +1,19 @@
+@props([
+    "disabled" => false,
+    "id",
+    "name",
+    "value",
+])
+
+<div class="flex items-center">
+    <input
+        id="{{ $id }}"
+        name="{{ $name }}"
+        type="checkbox"
+        value="{{ $value }}"
+        {{ $attributes->merge(["disabled" => $disabled, "class" => "rounded border-gray-300 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:border-gray-700 dark:bg-gray-900 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800"]) }}
+    />
+    <label for="{{ $id }}" class="ms-2 text-sm font-medium text-gray-900 dark:text-gray-300">
+        {{ $slot }}
+    </label>
+</div>
diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php
@@ -18,7 +18,8 @@
 
 <div
     x-data="{
-        show: @js($show),
+        forceShow: @js($show),
+        show: false,
         focusables() {
             // All focusable element types...
             let selector = 'a, button, input:not([type=\'hidden\']), textarea, select, details, [tabindex]:not([tabindex=\'-1\'])'
@@ -34,6 +35,7 @@
         prevFocusableIndex() { return Math.max(0, this.focusables().indexOf(document.activeElement)) -1 },
     }"
     x-init="
+        setTimeout(() => (show = forceShow), 100)
         $watch('show', (value) => {
             if (value) {
                 document.body.classList.add('overflow-y-hidden')

diff --git a/resources/views/settings/source-controls/partials/connect.blade.php b/resources/views/settings/source-controls/partials/connect.blade.php
@@ -131,6 +131,15 @@ class="text-primary-500"
                 </div>
             </div>
 
+            <div class="mt-6">
+                <x-checkbox id="global" name="global" :checked="old('global')" value="1">
+                    Is Global (Accessible in all projects)
+                </x-checkbox>
+                @error("global")
+                    <x-input-error class="mt-2" :messages="$message" />
+                @enderror
+            </div>
+
             <div class="mt-6 flex justify-end">
                 <x-secondary-button type="button" x-on:click="$dispatch('close')">
                     {{ __("Cancel") }}