Skip to content

[5.x] Add support for collection entry blueprints loaded via addons #11674

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.

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
wants to merge 2 commits into
base: 5.x
Choose a base branch
from
Open
Changes from all commits
Commits
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
31 changes: 30 additions & 1 deletion src/Entries/Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use Statamic\Events\CollectionSaving;
use Statamic\Events\EntryBlueprintFound;
use Statamic\Facades;
use Statamic\Facades\Addon;
use Statamic\Facades\Blink;
use Statamic\Facades\Blueprint;
use Statamic\Facades\Entry;
Expand All @@ -26,6 +27,7 @@
use Statamic\Facades\Site;
use Statamic\Facades\Stache;
use Statamic\Facades\Taxonomy;
use Statamic\Facades\YAML;
use Statamic\Statamic;
use Statamic\Structures\CollectionStructure;
use Statamic\Support\Arr;
Expand Down Expand Up @@ -314,16 +316,43 @@ public function entryBlueprints()
private function getEntryBlueprints()
{
$blueprints = Blueprint::in('collections/'.$this->handle());
$addonBlueprints = $this->getAddonEntryBlueprints();

if ($blueprints->isEmpty()) {
$blueprints = collect([$this->fallbackEntryBlueprint()]);
}

return $blueprints->values()->map(function ($blueprint) {
return $blueprints->merge($addonBlueprints)->values()->map(function ($blueprint) {
return $this->ensureEntryBlueprintFields($blueprint);
});
}

public function getAddonEntryBlueprints()
{
return Addon::all()
->map(function ($addon) {
$path = $addon->directory().'resources/blueprints/collections/'.$this->handle();
if (! is_dir($path)) {
return null;
}

return File::withAbsolutePaths()
->getFilesByType($path, 'yaml')
->mapWithKeys(fn ($path) => [Str::after($path, $path.'/') => $path])
->map(function ($path) use ($addon) {
return Blueprint::make()
->setHandle($addon->handle().'_'.pathinfo($path, PATHINFO_FILENAME))
->setContents(YAML::file($path)->parse())
->setNamespace('collections.'.$this->handle());
});
})
->filter()
->flatten(1)
->keyBy(function ($blueprint) {
return $blueprint->handle();
});
}

public function entryBlueprint($blueprint = null, $entry = null)
{
if (! $blueprint = $this->getBaseEntryBlueprint($blueprint)) {
Expand Down