Skip to content

[6.x] Lazy-load actions for collections, submissions & terms #14097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duncanmcclean wants to merge 5 commits into
base: 6.x
Choose a base branch
from
Open

[6.x] Lazy-load actions for collections, submissions & terms #14097

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e545d48
Lazy-load actions for assets, collections, submissions & terms
duncanmcclean Feb 27, 2026
b9abd9e
fix tests
duncanmcclean Feb 27, 2026
6ce4868
Merge branch '6.x' into lazy-load-actions
duncanmcclean Mar 26, 2026
3cd616c
don't touch assets
duncanmcclean Mar 26, 2026
241aa8b
ensure actions are loaded in collection grid mode
duncanmcclean Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/js/components/assets/Browser/Browser.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ export default {
},

actionContext() {
return { container: this.container.id };
return { container: this.container.id, folder: this.path || '/' };
},

canCreateFolders() {
Expand Down
1 change: 0 additions & 1 deletion src/Http/Controllers/CP/Collections/CollectionsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
6 changes: 0 additions & 6 deletions src/Http/Resources/CP/Assets/FolderAsset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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()),
];
}
Expand Down
2 changes: 0 additions & 2 deletions src/Http/Resources/CP/Submissions/ListedSubmission.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),
];
}

Expand Down
3 changes: 0 additions & 3 deletions src/Http/Resources/CP/Taxonomies/ListedTerm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,7 +27,6 @@ public function columns($columns)
public function toArray($request)
{
$term = $this->resource;
$taxonomy = $term->taxonomy();

return [
'id' => $term->id(),
Expand All @@ -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()]),
];
}

Expand Down
4 changes: 2 additions & 2 deletions tests/Feature/Assets/BrowserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' => [
Expand Down