diff --git a/resources/js/components/assets/Browser/Browser.vue b/resources/js/components/assets/Browser/Browser.vue index 4dd0a7d0cd9..dc7db0617ef 100644 --- a/resources/js/components/assets/Browser/Browser.vue +++ b/resources/js/components/assets/Browser/Browser.vue @@ -296,7 +296,7 @@ export default { }, actionContext() { - return { container: this.container.id }; + return { container: this.container.id, folder: this.path || '/' }; }, canCreateFolders() { diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php index aab2c39d3fe..aca8ca0ce81 100644 --- a/src/Http/Controllers/CP/Collections/CollectionsController.php +++ b/src/Http/Controllers/CP/Collections/CollectionsController.php @@ -94,7 +94,6 @@ private function collections() 'editable' => User::current()->can('edit', $collection), 'blueprint_editable' => User::current()->can('configure fields'), 'available_in_selected_site' => $collection->sites()->contains(Site::selected()->handle()), - 'actions' => Action::for($collection), 'actions_url' => cp_route('collections.actions.run'), 'icon' => $collection->icon(), 'create_label' => $collection->createLabel(), diff --git a/src/Http/Resources/CP/Assets/FolderAsset.php b/src/Http/Resources/CP/Assets/FolderAsset.php index 924d0bd523e..ac7f31c226f 100644 --- a/src/Http/Resources/CP/Assets/FolderAsset.php +++ b/src/Http/Resources/CP/Assets/FolderAsset.php @@ -3,7 +3,6 @@ namespace Statamic\Http\Resources\CP\Assets; use Illuminate\Http\Resources\Json\JsonResource; -use Statamic\Facades\Action; use Statamic\Facades\User; use Statamic\Support\Str; @@ -45,11 +44,6 @@ public function toArray($request) $this->merge($this->values()), - 'actions' => Action::for($this->resource, [ - 'container' => $this->container()->handle(), - 'folder' => $this->folder(), - ]), - $this->merge($this->thumbnails()), ]; } diff --git a/src/Http/Resources/CP/Submissions/ListedSubmission.php b/src/Http/Resources/CP/Submissions/ListedSubmission.php index 4e7e64a3aa9..2f81734d40e 100644 --- a/src/Http/Resources/CP/Submissions/ListedSubmission.php +++ b/src/Http/Resources/CP/Submissions/ListedSubmission.php @@ -3,7 +3,6 @@ namespace Statamic\Http\Resources\CP\Submissions; use Illuminate\Http\Resources\Json\JsonResource; -use Statamic\Facades\Action; use Statamic\Facades\User; class ListedSubmission extends JsonResource @@ -36,7 +35,6 @@ public function toArray($request) ])), 'url' => cp_route('forms.submissions.show', [$form->handle(), $this->resource->id()]), 'deleteable' => User::current()->can('delete', $this->resource), - 'actions' => Action::for($this->resource), ]; } diff --git a/src/Http/Resources/CP/Taxonomies/ListedTerm.php b/src/Http/Resources/CP/Taxonomies/ListedTerm.php index a6852f834e7..1aa5e99c459 100644 --- a/src/Http/Resources/CP/Taxonomies/ListedTerm.php +++ b/src/Http/Resources/CP/Taxonomies/ListedTerm.php @@ -3,7 +3,6 @@ namespace Statamic\Http\Resources\CP\Taxonomies; use Illuminate\Http\Resources\Json\JsonResource; -use Statamic\Facades\Action; use Statamic\Facades\User; class ListedTerm extends JsonResource @@ -28,7 +27,6 @@ public function columns($columns) public function toArray($request) { $term = $this->resource; - $taxonomy = $term->taxonomy(); return [ 'id' => $term->id(), @@ -45,7 +43,6 @@ public function toArray($request) 'taxonomy' => $term->taxonomy()->toArray(), 'viewable' => User::current()->can('view', $term), 'editable' => User::current()->can('edit', $term), - 'actions' => Action::for($term, ['taxonomy' => $taxonomy->handle()]), ]; } diff --git a/tests/Feature/Assets/BrowserTest.php b/tests/Feature/Assets/BrowserTest.php index 89a20ea15ef..38dead6d0b0 100644 --- a/tests/Feature/Assets/BrowserTest.php +++ b/tests/Feature/Assets/BrowserTest.php @@ -317,8 +317,8 @@ private function jsonStructure() return [ 'links' => ['folder_action', 'asset_action'], 'data' => [ - ['id', 'size_formatted', 'last_modified_relative', 'actions'], - ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail'], + ['id', 'size_formatted', 'last_modified_relative'], + ['id', 'size_formatted', 'last_modified_relative', 'thumbnail'], ], 'meta' => [ 'folder' => [