Refactor

src/Entries/Collection.php

@@ -475,6 +475,13 @@ public function updateEntryOrder($ids = null)
         return $this;
     }
 
+    public function updateEntryParent($ids = null)
+    {
+        Facades\Collection::updateEntryParent($this, $ids);
+
+        return $this;
+    }
+
     public function path()
     {
         return vsprintf('%s/%s.yaml', [

src/Entries/UpdateStructuredEntryOrder.php → src/Entries/UpdateStructuredEntryOrderAndParent.php

@@ -4,7 +4,7 @@
 
 use Statamic\Events\CollectionTreeSaved;
 
-class UpdateStructuredEntryOrder
+class UpdateStructuredEntryOrderAndParent
 {
     public function handle(CollectionTreeSaved $event)
     {
@@ -19,5 +19,6 @@ public function handle(CollectionTreeSaved $event)
         }
 
         $collection->updateEntryOrder($ids);
+        $collection->updateEntryParent($ids);
     }
 }

src/Providers/EventServiceProvider.php

@@ -18,7 +18,7 @@ class EventServiceProvider extends ServiceProvider
         ],
         \Statamic\Events\CollectionTreeSaved::class => [
             \Statamic\Entries\UpdateStructuredEntryUris::class,
-            \Statamic\Entries\UpdateStructuredEntryOrder::class,
+            \Statamic\Entries\UpdateStructuredEntryOrderAndParent::class,
         ],
         \Statamic\Events\EntryBlueprintFound::class => [
             \Statamic\Entries\AddSiteColumnToBlueprint::class,

src/Stache/Repositories/CollectionRepository.php

@@ -92,6 +92,11 @@ public function updateEntryOrder(Collection $collection, $ids = null)
         $this->store->updateEntryOrder($collection, $ids);
     }
 
+    public function updateEntryParent(Collection $collection, $ids = null)
+    {
+        $this->store->updateEntryParent($collection, $ids);
+    }
+
     public function whereStructured(): IlluminateCollection
     {
         return $this->all()->filter->hasStructure();

src/Stache/Repositories/CollectionTreeRepository.php

@@ -3,8 +3,6 @@
 namespace Statamic\Stache\Repositories;
 
 use Statamic\Contracts\Structures\CollectionTree as TreeContract;
-use Statamic\Contracts\Structures\Tree;
-use Statamic\Facades\Stache as StacheFacade;
 use Statamic\Stache\Stache;
 use Statamic\Structures\CollectionTree;
 
@@ -22,16 +20,4 @@ public static function bindings()
             TreeContract::class => CollectionTree::class,
         ];
     }
-
-    public function save(Tree $tree)
-    {
-        $result = parent::save($tree);
-
-        StacheFacade::store('entries')
-            ->store($tree->collection()->handle())
-            ->resolveIndexes()
-            ->each->update();
-
-        return $result;
-    }
 }

src/Stache/Stores/CollectionsStore.php

@@ -100,6 +100,15 @@ public function updateEntryOrder($collection, $ids = null)
         $this->updateEntriesWithinIndex($index, $ids);
     }
 
+    public function updateEntryParent($collection, $ids = null)
+    {
+        $index = Stache::store('entries')
+            ->store($collection->handle())
+            ->index('parent');
+
+        $this->updateEntriesWithinIndex($index, $ids);
+    }
+
     private function updateEntriesWithinIndex($index, $ids)
     {
         if (empty($ids)) {