[4.x] Improve CollectionStructure performance (#8800)

Co-authored-by: Duncan McClean <[email protected]>
statamic · Dec 11, 2023 · dc83887 · dc83887
1 parent 54d4672
commit dc83887
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/Structures/CollectionStructure.php b/src/Structures/CollectionStructure.php
@@ -135,13 +135,15 @@ public function trees()
 
     public function in($site)
     {
-        $tree = app(CollectionTreeRepository::class)->find($this->collection()->handle(), $site);
+        return Blink::once("collection-structure-tree-{$this->handle()}-{$site}", function () use ($site) {
+            $tree = app(CollectionTreeRepository::class)->find($this->collection()->handle(), $site);
 
-        if (! $tree && $this->existsIn($site)) {
-            $tree = $this->makeTree($site);
-        }
+            if (! $tree && $this->existsIn($site)) {
+                $tree = $this->makeTree($site);
+            }
 
-        return $tree;
+            return $tree;
+        });
     }
 
     public function existsIn($site)

diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
@@ -160,6 +160,7 @@ public function save()
         $this->cachedFlattenedPages = null;
 
         Blink::forget('collection-structure-flattened-pages-collection*');
+        Blink::forget('collection-structure-tree*');
 
         $this->repository()->save($this);
 
@@ -170,6 +171,8 @@ public function save()
 
     public function delete()
     {
+        Blink::forget('collection-structure-tree*');
+
         $this->repository()->delete($this);
 
         $this->dispatchDeletedEvent();