Adjust searching with visibility, add custom rule for the field (#165)

Kovah · Jun 24, 2022 · 87915d7 · 87915d7
1 parent 22b7469
commit 87915d7
Show file tree

Hide file tree

Showing 36 changed files with 213 additions and 112 deletions.
diff --git a/app/Http/Controllers/App/SearchController.php b/app/Http/Controllers/App/SearchController.php
@@ -25,7 +25,7 @@ public function getSearch(): View
                 'old_query' => null,
                 'search_title' => true,
                 'search_description' => true,
-                'private_only' => false,
+                'visibility' => null,
                 'broken_only' => false,
                 'empty_tags' => false,
                 'empty_lists' => false,
@@ -53,7 +53,7 @@ public function doSearch(SearchRequest $request): View
                 'old_query' => $this->searchQuery,
                 'search_title' => $this->searchTitle,
                 'search_description' => $this->searchDescription,
-                'private_only' => $this->searchPrivateOnly,
+                'visibility' => $this->searchVisibility,
                 'broken_only' => $this->searchBrokenOnly,
                 'only_lists' => $this->searchLists,
                 'only_tags' => $this->searchTags,

diff --git a/app/Http/Controllers/Guest/LinkController.php b/app/Http/Controllers/Guest/LinkController.php
@@ -18,7 +18,7 @@ class LinkController extends Controller
     public function index(Request $request): View
     {
         $links = Link::publicOnly()
-            ->with('tags')
+            ->with(['tags' => fn ($query) => $query->publicOnly()])
             ->orderBy(
                 $request->input('orderBy', 'created_at'),
                 $request->input('orderDir', 'desc')

diff --git a/app/Http/Controllers/Guest/ListController.php b/app/Http/Controllers/Guest/ListController.php
@@ -18,7 +18,7 @@ class ListController extends Controller
     public function index(Request $request): View
     {
         $lists = LinkList::publicOnly()
-            ->withCount('links')
+            ->withCount(['links' => fn ($query) => $query->publicOnly()])
             ->orderBy(
                 $request->input('orderBy', 'name'),
                 $request->input('orderDir', 'asc')

diff --git a/app/Http/Controllers/Guest/TagController.php b/app/Http/Controllers/Guest/TagController.php
@@ -18,7 +18,7 @@ class TagController extends Controller
     public function index(Request $request): View
     {
         $tags = Tag::publicOnly()
-            ->withCount('links')
+            ->withCount(['links' => fn ($query) => $query->publicOnly()])
             ->orderBy(
                 $request->input('orderBy', 'name'),
                 $request->input('orderDir', 'asc')

diff --git a/app/Http/Controllers/Traits/SearchesLinks.php b/app/Http/Controllers/Traits/SearchesLinks.php
@@ -11,7 +11,7 @@ trait SearchesLinks
     protected string|null $searchQuery;
     protected bool $searchTitle = false;
     protected bool $searchDescription = false;
-    protected bool $searchPrivateOnly = false;
+    protected ?int $searchVisibility = null;
     protected bool $searchBrokenOnly = false;
     protected string|null $searchLists = null;
     protected string|null $searchTags = null;
@@ -59,8 +59,8 @@ protected function buildDatabaseQuery(SearchRequest $request): Builder
         }
 
         // Show private only if applicable
-        if ($this->searchPrivateOnly = (bool)$request->input('private_only', false)) {
-            $search->where('is_private', true);
+        if ($this->searchVisibility = $request->input('visibility')) {
+            $search->where('visibility', $this->searchVisibility);
         }
 
         // Show broken only if applicable

diff --git a/app/Http/Requests/Models/LinkStoreRequest.php b/app/Http/Requests/Models/LinkStoreRequest.php
@@ -2,6 +2,8 @@
 
 namespace App\Http\Requests\Models;
 
+use App\Enums\ModelAttribute;
+use App\Rules\ModelVisibility;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -46,7 +48,7 @@ public function rules(): array
             ],
             'visibility' => [
                 'sometimes',
-                'integer',
+                new ModelVisibility()
             ],
             'check_disabled' => [
                 'sometimes',

diff --git a/app/Http/Requests/Models/LinkUpdateRequest.php b/app/Http/Requests/Models/LinkUpdateRequest.php
@@ -2,14 +2,14 @@
 
 namespace App\Http\Requests\Models;
 
+use App\Rules\ModelVisibility;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
 
 class LinkUpdateRequest extends FormRequest
 {
-    /** @var bool */
-    private $requireUniqueUrl;
+    private bool $requireUniqueUrl = false;
 
     /**
      * Determine if the user is authorized to make this request.
@@ -34,13 +34,28 @@ public function authorize(Request $request): bool
     public function rules(): array
     {
         $rules = [
-            'url' => 'required|string',
-            'title' => 'nullable|string',
-            'description' => 'nullable|string',
+            'url' => [
+                'required',
+                'string',
+            ],
+            'title' => [
+                'nullable',
+                'string',
+            ],
+            'description' => [
+                'nullable',
+                'string',
+            ],
             'lists' => 'nullable',
             'tags' => 'nullable',
-            'visibility' => 'sometimes|integer',
-            'check_disabled' => 'sometimes|boolean',
+            'visibility' => [
+                'sometimes',
+                new ModelVisibility(),
+            ],
+            'check_disabled' => [
+                'sometimes',
+                'boolean',
+            ],
         ];
 
         if ($this->requireUniqueUrl) {

diff --git a/app/Http/Requests/Models/ListStoreRequest.php b/app/Http/Requests/Models/ListStoreRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\Models;
 
+use App\Rules\ModelVisibility;
 use Illuminate\Foundation\Http\FormRequest;
 
 class ListStoreRequest extends FormRequest
@@ -34,7 +35,7 @@ public function rules(): array
             ],
             'visibility' => [
                 'sometimes',
-                'integer',
+                new ModelVisibility(),
             ],
         ];
     }

diff --git a/app/Http/Requests/Models/ListUpdateRequest.php b/app/Http/Requests/Models/ListUpdateRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\Models;
 
+use App\Rules\ModelVisibility;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
@@ -35,7 +36,10 @@ public function rules(): array
         $rules = [
             'name' => 'required|string',
             'description' => 'nullable|string',
-            'visibility' => 'sometimes|integer',
+            'visibility' => [
+                'sometimes',
+                new ModelVisibility(),
+            ],
         ];
 
         if ($this->requireUniqueName) {

diff --git a/app/Http/Requests/Models/NoteStoreRequest.php b/app/Http/Requests/Models/NoteStoreRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\Models;
 
+use App\Rules\ModelVisibility;
 use Illuminate\Foundation\Http\FormRequest;
 
 class NoteStoreRequest extends FormRequest
@@ -32,7 +33,7 @@ public function rules(): array
             ],
             'visibility' => [
                 'sometimes',
-                'integer',
+                new ModelVisibility(),
             ],
         ];
     }

diff --git a/app/Http/Requests/Models/NoteUpdateRequest.php b/app/Http/Requests/Models/NoteUpdateRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\Models;
 
+use App\Rules\ModelVisibility;
 use Illuminate\Foundation\Http\FormRequest;
 
 class NoteUpdateRequest extends FormRequest
@@ -29,7 +30,7 @@ public function rules(): array
             ],
             'visibility' => [
                 'sometimes',
-                'integer',
+                new ModelVisibility(),
             ],
         ];
     }

diff --git a/app/Http/Requests/Models/TagStoreRequest.php b/app/Http/Requests/Models/TagStoreRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\Models;
 
+use App\Rules\ModelVisibility;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -31,7 +32,7 @@ public function rules(): array
             ],
             'visibility' => [
                 'sometimes',
-                'integer',
+                new ModelVisibility(),
             ],
         ];
     }

diff --git a/app/Http/Requests/Models/TagUpdateRequest.php b/app/Http/Requests/Models/TagUpdateRequest.php
@@ -2,14 +2,14 @@
 
 namespace App\Http\Requests\Models;
 
+use App\Rules\ModelVisibility;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
 
 class TagUpdateRequest extends FormRequest
 {
-    /** @var bool */
-    private $requireUniqueName = false;
+    private bool $requireUniqueName = false;
 
     /**
      * Determine if the user is authorized to make this request.
@@ -37,7 +37,7 @@ public function rules(): array
             'name' => 'required',
             'visibility' => [
                 'sometimes',
-                'integer',
+                new ModelVisibility(),
             ],
         ];
 

diff --git a/app/Http/Requests/SearchRequest.php b/app/Http/Requests/SearchRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests;
 
+use App\Rules\ModelVisibility;
 use Illuminate\Foundation\Http\FormRequest;
 
 class SearchRequest extends FormRequest
@@ -36,6 +37,11 @@ public function rules(): array
             'broken_only' => [
                 'required_without_all:query,only_lists,only_tags',
             ],
+            'visibility' => [
+                'sometimes',
+                'integer',
+                new ModelVisibility(),
+            ],
         ];
     }
 

diff --git a/app/Rules/ModelVisibility.php b/app/Rules/ModelVisibility.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Rules;
+
+use App\Enums\ModelAttribute;
+use Illuminate\Contracts\Validation\Rule;
+
+class ModelVisibility implements Rule
+{
+    /**
+     * Create a new rule instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param string $attribute
+     * @param mixed  $value
+     * @return bool
+     */
+    public function passes($attribute, $value): bool
+    {
+        return in_array((int)$value, [
+            ModelAttribute::VISIBILITY_PUBLIC,
+            ModelAttribute::VISIBILITY_INTERNAL,
+            ModelAttribute::VISIBILITY_PRIVATE,
+        ], true);
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return trans('validation.custom.visibility.visibility');
+    }
+}
diff --git a/app/View/Components/Forms/VisibilityToggle.php b/app/View/Components/Forms/VisibilityToggle.php
@@ -8,8 +8,12 @@
 
 class VisibilityToggle extends Component
 {
-    public function __construct(private ?int $existingValue = null, public string $inputClasses = '', public string $labelClasses = '')
-    {
+    public function __construct(
+        private ?int $existingValue = null,
+        private string $visibilitySetting = 'links_default_visibility',
+        public string $inputClasses = '',
+        public string $labelClasses = ''
+    ) {
     }
 
     public function render(): View
@@ -23,11 +27,14 @@ public function render(): View
             'internal' => $internal,
             'private' => $private,
             'publicSelected' => old('visibility', $this->existingValue) === $public
-                || (old('visibility', $this->existingValue) === null && usersettings('links_default_visibility') === $public),
+                || (old('visibility',
+                        $this->existingValue) === null && usersettings($this->visibilitySetting) === $public),
             'internalSelected' => old('visibility', $this->existingValue) === $internal
-                || (old('visibility', $this->existingValue) === null && usersettings('links_default_visibility') === $internal),
+                || (old('visibility',
+                        $this->existingValue) === null && usersettings($this->visibilitySetting) === $internal),
             'privateSelected' => old('visibility', $this->existingValue) === $private
-                || (old('visibility', $this->existingValue) === null && usersettings('links_default_visibility') === $private),
+                || (old('visibility',
+                        $this->existingValue) === null && usersettings($this->visibilitySetting) === $private),
         ]);
     }
 }
diff --git a/lang/en_US/search.php b/lang/en_US/search.php
@@ -8,7 +8,7 @@
     'query' => 'Search for...',
     'search_title' => 'Search Title',
     'search_description' => 'Search Description',
-    'private_only' => 'Private Links only',
+    'visibility' => 'Search by visibility...',
     'broken_links' => 'Broken Links only',
     'empty_tags' => 'without Tags',
     'empty_lists' => 'without Lists',

diff --git a/lang/en_US/validation.php b/lang/en_US/validation.php
@@ -125,8 +125,8 @@
     */
 
     'custom' => [
-        'attribute-name' => [
-            'rule-name' => 'custom-message',
+        'visibility' => [
+            'visibility' => 'The Visibility must bei either 1 (public), 2 (internal) or 3 (private).',
         ],
     ],