From 7d5cd097684bebe2b7aa179c190714d7259df874 Mon Sep 17 00:00:00 2001
From: paranarimasu <33796518+paranarimasu@users.noreply.github.com>
Date: Sun, 28 Aug 2022 23:29:11 -0500
Subject: [PATCH] fix(admin): model action query & fix(api): restricted type
 validation rules (#457)

---
 app/Concerns/Http/Requests/Api/ValidatesParameters.php | 3 ++-
 app/Nova/Actions/Wiki/Anime/BackfillAnimeAction.php    | 4 +---
 app/Nova/Actions/Wiki/Audio/MoveAudioAction.php        | 4 +---
 app/Nova/Actions/Wiki/Studio/BackfillStudioAction.php  | 4 +---
 app/Nova/Actions/Wiki/Video/MoveVideoAction.php        | 4 +---
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/Concerns/Http/Requests/Api/ValidatesParameters.php b/app/Concerns/Http/Requests/Api/ValidatesParameters.php
index a25c058e5..9a269bac8 100644
--- a/app/Concerns/Http/Requests/Api/ValidatesParameters.php
+++ b/app/Concerns/Http/Requests/Api/ValidatesParameters.php
@@ -30,7 +30,8 @@ trait ValidatesParameters
 
         return [
             $param => [
-                'nullable',
+                'sometimes',
+                'required',
                 "array:$types",
             ],
         ];
diff --git a/app/Nova/Actions/Wiki/Anime/BackfillAnimeAction.php b/app/Nova/Actions/Wiki/Anime/BackfillAnimeAction.php
index 5bbdb64e1..1e440602e 100644
--- a/app/Nova/Actions/Wiki/Anime/BackfillAnimeAction.php
+++ b/app/Nova/Actions/Wiki/Anime/BackfillAnimeAction.php
@@ -124,9 +124,7 @@ class BackfillAnimeAction extends Action implements ShouldQueue
      */
     public function fields(NovaRequest $request): array
     {
-        $anime = $request->resourceId !== null
-            ? $request->findModel()
-            : null;
+        $anime = $request->findModelQuery()->first();
 
         return [
             Heading::make(__('nova.backfill_resources')),
diff --git a/app/Nova/Actions/Wiki/Audio/MoveAudioAction.php b/app/Nova/Actions/Wiki/Audio/MoveAudioAction.php
index 99f1afbd2..f15e10ed4 100644
--- a/app/Nova/Actions/Wiki/Audio/MoveAudioAction.php
+++ b/app/Nova/Actions/Wiki/Audio/MoveAudioAction.php
@@ -71,9 +71,7 @@ class MoveAudioAction extends Action
      */
     public function fields(NovaRequest $request): array
     {
-        $audio = $request->resourceId !== null
-            ? $request->findModel()
-            : null;
+        $audio = $request->findModelQuery()->first();
 
         $fs = Storage::disk(Config::get(AudioConstants::DEFAULT_DISK_QUALIFIED));
 
diff --git a/app/Nova/Actions/Wiki/Studio/BackfillStudioAction.php b/app/Nova/Actions/Wiki/Studio/BackfillStudioAction.php
index c9c17c4c4..a2ec02ea0 100644
--- a/app/Nova/Actions/Wiki/Studio/BackfillStudioAction.php
+++ b/app/Nova/Actions/Wiki/Studio/BackfillStudioAction.php
@@ -108,9 +108,7 @@ class BackfillStudioAction extends Action implements ShouldQueue
      */
     public function fields(NovaRequest $request): array
     {
-        $studio = $request->resourceId !== null
-            ? $request->findModel()
-            : null;
+        $studio = $request->findModelQuery()->first();
 
         return [
             Heading::make(__('nova.backfill_images')),
diff --git a/app/Nova/Actions/Wiki/Video/MoveVideoAction.php b/app/Nova/Actions/Wiki/Video/MoveVideoAction.php
index 041df54e4..c22bfe63a 100644
--- a/app/Nova/Actions/Wiki/Video/MoveVideoAction.php
+++ b/app/Nova/Actions/Wiki/Video/MoveVideoAction.php
@@ -71,9 +71,7 @@ class MoveVideoAction extends Action
      */
     public function fields(NovaRequest $request): array
     {
-        $video = $request->resourceId !== null
-            ? $request->findModel()
-            : null;
+        $video = $request->findModelQuery()->first();
 
         $fs = Storage::disk(Config::get(VideoConstants::DEFAULT_DISK_QUALIFIED));