Skip to content

Improve Site Defaults performance with many sites #624

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

Merged
duncanmcclean merged 2 commits into from
Jul 2, 2026
Merged

Improve Site Defaults performance with many sites #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b50200b
Cache Site Defaults origins lookup
duncanmcclean Jul 2, 2026
0ba7f36
Cache augmented Site Defaults values
duncanmcclean Jul 2, 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
37 changes: 20 additions & 17 deletions src/SiteDefaults/LocalizedSiteDefaults.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Support\Collection;
use Statamic\Data\HasOrigin;
use Statamic\Facades\Blink;
use Statamic\Facades\Blueprint;
use Statamic\Facades\Site;
use Statamic\SeoPro\Events\SiteDefaultsSaved;
Expand Down Expand Up @@ -98,23 +99,25 @@ public function blueprint(): \Statamic\Fields\Blueprint

public function augmented(): array
{
$contentValues = Blueprint::make()
->setContents(['tabs' => ['main' => ['sections' => Fields::new()->getConfig()]]])
->fields()
->addValues($this->values()->all())
->augment()
->values();

$siteDefaultValues = $this->blueprint()
->fields()
->addValues($this->values()->all())
->augment()
->values();

return $siteDefaultValues
->merge($contentValues)
->only($this->keys()->all())
->all();
return Blink::once("seo-pro::site-defaults.augmented.{$this->locale}", function () {
$contentValues = Blueprint::make()
->setContents(['tabs' => ['main' => ['sections' => Fields::new()->getConfig()]]])
->fields()
->addValues($this->values()->all())
->augment()
->values();

$siteDefaultValues = $this->blueprint()
->fields()
->addValues($this->values()->all())
->augment()
->values();

return $siteDefaultValues
->merge($contentValues)
->only($this->keys()->all())
->all();
});
}

public function editUrl(): string
Expand Down
12 changes: 8 additions & 4 deletions src/SiteDefaults/SiteDefaults.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,18 @@ public static function get(): Collection
public static function origins($origins = null): Collection|bool
{
if (func_num_args() === 0) {
return Site::all()
->mapWithKeys(fn ($site) => [$site->handle() => null])
->merge(Addon::get('statamic/seo-pro')->settings()->get('site_defaults_sites', []))
->map(fn ($origin) => empty($origin) ? null : $origin);
return Blink::once('seo-pro::site-defaults-origins', function () {
return Site::all()
->mapWithKeys(fn ($site) => [$site->handle() => null])
->merge(Addon::get('statamic/seo-pro')->settings()->get('site_defaults_sites', []))
->map(fn ($origin) => empty($origin) ? null : $origin);
});
}

Addon::get('statamic/seo-pro')->settings()->set('site_defaults_sites', $origins)->save();

Blink::forget('seo-pro::site-defaults');
Blink::forget('seo-pro::site-defaults-origins');

return true;
}
Expand All @@ -67,6 +70,7 @@ public static function save(LocalizedSiteDefaults $localized): bool
Addon::get('statamic/seo-pro')->settings()->set('site_defaults', $data)->save();

Blink::forget('seo-pro::site-defaults');
Blink::forget("seo-pro::site-defaults.augmented.{$localized->locale()}");

return true;
}
Expand Down