Merge pull request #988 from SlovakNationalGallery/MG-53-frontends

[collection] add frontend scope
SlovakNationalGallery · Apr 12, 2024 · 819c12a · 819c12a
2 parents eefc263 + 5dfda7f
commit 819c12a
Show file tree

Hide file tree

Showing 18 changed files with 241 additions and 35 deletions.
diff --git a/app/Collection.php b/app/Collection.php
@@ -46,6 +46,7 @@ function getArtworksDirAttribute()
 
     protected $casts = [
         'published_at' => 'datetime',
+        'frontends' => 'array',
     ];
 
     public function items()

diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php
@@ -74,8 +74,14 @@ public function store()
             }
 
             $collection->featured = Request::boolean('featured');
-            $collection->published_at = Request::input('published_at');
-
+            if (Gate::allows('administer')) {
+                $collection->frontends = Request::input('frontends');
+            } else {
+                $collection->frontends = [\auth()->user()->frontend];
+            }
+            if (Gate::allows('publish')) {
+                $collection->published_at = Request::input('published_at');
+            }
             if (Request::has('title_color')) {
                 $collection->title_color = Request::input('title_color');
             }
@@ -160,7 +166,14 @@ public function update($id)
                 }
             }
 
-            $collection->published_at = Request::input('published_at', null);
+
+            if (Gate::allows('administer')) {
+                $collection->frontends = Request::input('frontends');
+            }
+
+            if (Gate::allows('publish', $collection)) {
+                $collection->published_at = Request::input('published_at');
+            }
 
             if (Request::has('user_id') && Gate::allows('administer')) {
                 $collection->user_id = Request::input('user_id');

diff --git a/app/Http/Middleware/ApplyFrontendScope.php b/app/Http/Middleware/ApplyFrontendScope.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Collection;
 use App\Facades\Frontend;
 use App\Item;
 use Illuminate\Http\Request;
@@ -11,7 +12,8 @@ class ApplyFrontendScope
 {
     public function handle(Request $request, \Closure $next): Response
     {
-        Item::addGlobalScope('frontend', fn ($query) => $query->whereJsonContains('frontends', Frontend::get()));
+        Collection::addGlobalScope('frontend', fn ($query) => $query->whereJsonContains('collections.frontends', Frontend::get()));
+        Item::addGlobalScope('frontend', fn ($query) => $query->whereJsonContains('items.frontends', Frontend::get()));
 
         return $next($request);
     }

diff --git a/app/Policies/ImportPolicy.php b/app/Policies/ImportPolicy.php
@@ -12,7 +12,7 @@ class ImportPolicy
 
     public function viewAny(User $user)
     {
-        return $user->role === 'importer';
+        return $user->can_import;
     }
 
     public function viewAll()
@@ -22,7 +22,7 @@ public function viewAll()
 
     public function view(User $user, Import $import)
     {
-        return $user->id === $import->user_id && $user->role === 'importer';
+        return $user->id === $import->user_id && $user->can_import;
     }
 
     public function create()
@@ -32,12 +32,12 @@ public function create()
 
     public function update(User $user, Import $import)
     {
-        return $user->id === $import->user_id && $user->role === 'importer';
+        return $user->id === $import->user_id && $user->can_import;
     }
 
     public function updateFile(User $user, Import $import)
     {
-        return $user->id === $import->user_id && $user->role === 'importer';
+        return $user->id === $import->user_id && $user->can_import;
     }
 
     public function updateMetadata()
@@ -52,6 +52,6 @@ public function delete()
 
     public function launch(User $user, Import $import)
     {
-        return $user->id === $import->user_id && $user->role === 'importer';
+        return $user->id === $import->user_id && $user->can_import;
     }
 }
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -24,19 +24,23 @@ class AuthServiceProvider extends ServiceProvider
     public function boot()
     {
         Gate::define('administer', function ($user) {
-            return $user->role === 'admin';
+            return $user->can_administer;
         });
 
         Gate::define('edit', function ($user) {
-            return $user->role === 'editor';
+            return $user->can_edit;
+        });
+
+        Gate::define('publish', function ($user) {
+            return $user->can_publish;
         });
 
         Gate::define('import', function ($user) {
-            return $user->role === 'importer';
+            return $user->can_import;
         });
 
         Gate::before(function ($user) {
-            if ($user->role === 'admin') {
+            if ($user->can_administer) {
                 return true;
             }
         });

diff --git a/app/User.php b/app/User.php
@@ -2,15 +2,25 @@
 
 namespace App;
 
+use App\Enums\FrontendEnum;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Support\Collection;
+use Illuminate\Validation\Rule;
 
 class User extends Authenticatable
 {
     use HasFactory;
-    public static $roles = ['admin', 'editor', 'importer'];
-
-    protected $fillable = ['name', 'email', 'role', 'username'];
+    protected $fillable = [
+        'name',
+        'email',
+        'username',
+        'frontend',
+        'can_administer',
+        'can_edit',
+        'can_publish',
+        'can_import',
+    ];
 
     /**
      * The attributes that should be hidden for arrays.
@@ -19,10 +29,27 @@ class User extends Authenticatable
      */
     protected $hidden = ['password', 'remember_token'];
 
-    public static $rules = [
-        'name' => 'required',
-        'role' => 'in:admin,editor,importer|required',
-        'email' => 'email|required',
-        'username' => 'required',
-    ];
+    public static $rules;
+
+    public static function boot()
+    {
+        parent::boot();
+        self::$rules = [
+            'name' => 'required',
+            'email' => 'email|required',
+            'username' => 'required',
+            'can_administer' => 'boolean|required',
+            'can_edit' => 'boolean|required',
+            'can_publish' => 'boolean|required',
+            'can_import' => 'boolean|required',
+            'frontend' => [Rule::enum(FrontendEnum::class), 'required'],
+        ];
+    }
+
+    public function getPermissionsAttribute(): Collection
+    {
+        return collect(['can_administer', 'can_edit', 'can_publish', 'can_import'])->filter(
+            fn($permission) => $this->$permission
+        );
+    }
 }
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
@@ -21,7 +21,6 @@ public function definition()
             'username' => fake()->userName(),
             'name' => fake()->name(),
             'email' => fake()->safeEmail(),
-            'role' => 'editor',
             'password' => bcrypt(Str::random(10)),
             'remember_token' => Str::random(10),
         ];

diff --git a/database/migrations/2024_04_01_220614_add_frontends_to_collections_table.php b/database/migrations/2024_04_01_220614_add_frontends_to_collections_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::statement("ALTER TABLE collections ADD COLUMN frontends JSON DEFAULT (JSON_ARRAY('webumenia'))");
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('collections', function (Blueprint $table) {
+            $table->dropColumn('frontends');
+        });
+    }
+};
diff --git a/database/migrations/2024_04_03_153144_add_frontends_to_users_table.php b/database/migrations/2024_04_03_153144_add_frontends_to_users_table.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('frontend')->default('webumenia');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('frontend');
+        });
+    }
+};
diff --git a/database/migrations/2024_04_11_003601_change_role_to_permission_columns_in_users_table.php b/database/migrations/2024_04_11_003601_change_role_to_permission_columns_in_users_table.php
@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('can_administer')->default(false);
+            $table->boolean('can_edit')->default(false);
+            $table->boolean('can_publish')->default(false);
+            $table->boolean('can_import')->default(false);
+        });
+
+        DB::table('users')
+            ->eachById(function ($user) {
+                DB::table('users')
+                    ->where('id', $user->id)
+                    ->update([
+                        'can_administer' => $user->role === 'admin',
+                        'can_edit' => $user->role === 'editor',
+                        'can_import' => $user->role === 'importer',
+                    ]);
+            });
+
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('role');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('role')->nullable();
+        });
+
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn(['can_administer', 'can_edit', 'can_publish', 'can_import']);
+        });
+    }
+};
diff --git a/lang/sk/permissions.php b/lang/sk/permissions.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'can_administer' => 'Administrácia',
+    'can_edit' => 'Editovanie',
+    'can_publish' => 'Publikovanie',
+    'can_import' => 'Import',
+];
diff --git a/resources/views/collections/form.blade.php b/resources/views/collections/form.blade.php
@@ -34,6 +34,19 @@
 <!-- translatable -->
 <div class="col-md-12">
 
+	@can('admin')
+	<div class="form-group">
+		{{ Form::label('frontends[]', 'Publikovať na') }}
+		<div>
+			@foreach(\App\Enums\FrontendEnum::cases() as $frontend)
+				<label class="checkbox-inline">
+					{{ Form::checkbox('frontends[]', $frontend->value, old('frontends[]'), ['class' => 'form-control']) }} {{ $frontend }}
+				</label>
+			@endforeach
+		</div>
+	</div>
+	@endcan
+
 	<!-- Nav tabs -->
 	<ul class="nav nav-tabs top-space" role="tablist">
 		@foreach (\Config::get('translatable.locales') as $i=>$locale)
@@ -102,7 +115,7 @@
 		@endif
 	</div>
 </div>
-@can('administer')
+@can('publish')
 <div class="col-md-6">
 	<div class="form-group checkbox">
 		{!! Form::label('published_at', 'Publikovať') !!}